Changeset 188 for trunk/Components

Timestamp:

Jun 5, 2007, 8:28:53 PM (18 years ago)

Author:

RBRi

Message:

refactored, now uses FileUtilsUnit

Location:

trunk/Components

Files:

• ACLLanguageUnit.pas (modified) (3 diffs)
• CanvasFontManager.pas (modified) (1 diff)
• CustomFileControls.pas (modified) (8 diffs)
• DriveInfoUnit.PAS (deleted)

trunk/Components/ACLLanguageUnit.pas

@@ -5 +5 @@
 uses
   OS2Def,
-  Classes, Forms;
+  Classes,
+  Forms;
 
 type
@@ -130 +131 @@
 uses
   Dos, SysUtils, // system
-  StdCtrls, Buttons, ExtCtrls, TabCtrls, Dialogs,
-  Coolbar2, Multicolumnlistbox,
-  ACLUtility, ACLStringUtility,
-//  ACLProfile,
-  ACLFileUtility;
+  StdCtrls,
+  Buttons,
+  ExtCtrls,
+  TabCtrls,
+  Dialogs,
+  Coolbar2,
+  Multicolumnlistbox,
+  ACLUtility,
+  ACLStringUtility,
+  FileUtilsUnit;
 
 var
@@ -699 +705 @@
   if OSDir <> '' then
   begin
-    FilePath := AddSlash( OSDir )
+    FilePath := AddDirectorySeparator( OSDir )
                 + 'lang\'
                 + Filename;

trunk/Components/CanvasFontManager.pas

@@ -132 +132 @@
 
 uses
-  PMWin, PMGpi, OS2Def, PmDev,
+  PMWin,
+  PMGpi,
+  OS2Def,
+  PmDev,
   SysUtils,
   ACLStringUtility;

trunk/Components/CustomFileControls.pas

@@ -7 +7 @@
 
 Uses
-  Dos, SysUtils, Classes, Forms, StdCtrls, CustomListBox, Graphics;
+  Dos,
+  SysUtils,
+  Classes,
+  Forms,
+  StdCtrls,
+  CustomListBox,
+  Graphics;
 
 
@@ -337 +343 @@
 
 Uses
-{$IFDEF OS2}
-  BseDos, OS2Def, DriveInfoUnit,
-  BseDev, BseErr,
-{$ENDIF}
-
-{$IFDEF Win95}
-  WinBase,
-{$ENDIF}
+  BseDos,
+  OS2Def,
+  BseDev,
+  BseErr,
+
   Dialogs,
-  ACLStringUtility, ACLUtility, ACLFileUtility, BitmapUtility;
+  FileUtilsUnit,
+  ACLStringUtility,
+  ACLUtility,
+  BitmapUtility;
 
 var
@@ -864 +870 @@
     Data:= longint( Items.Objects[ Index ] );
     if ( Data and dfSubDir ) = 0 then
-      FullPath:= AddSlash( S ) + FullPath;
+      FullPath:= AddDirectorySeparator( S ) + FullPath;
     dec( Index );
   end;
@@ -918 +924 @@
   SubDirs:= TStringList.Create;
 
-  Status := SysUtils.FindFirst( AddSlash( Directory ) + '*.*', faDirectory, Search);
+  Status := SysUtils.FindFirst( AddDirectorySeparator( Directory ) + '*.*', faDirectory, Search);
   While Status = 0 Do
   Begin
@@ -967 +973 @@
     GetDir(Ord(UpCase(Drive))-Ord('A')+1,s);
     {$I+}
-    S:= RemoveSlash( S );
-    S:= AddSlash( S );
+    S:= RemoveRightDirectorySeparator( S );
+    S:= AddDirectorySeparator( S );
     NewDir:=s+NewDir;
   End;
 
-  NewDir:= RemoveSlash( NewDir );
+  NewDir:= RemoveRightDirectorySeparator( NewDir );
 
   FDirectory := NewDir;
@@ -1116 +1122 @@
       begin
         try
-          DriveLabel := GetVolumeLabel( DriveNumberToLetter( DriveNumber ) );
+          DriveLabel := GetVolumeLabel( DriveNumberToDriveLetter( DriveNumber ) );
           DriveString := DriveString + DriveLabel;
         except
@@ -1142 +1148 @@
     on EInOutError do
       // Current drive inaccessible
-      Drive := GetBootDrive;
+      Drive := GetBootDriveLetter;
   end;
 End;
@@ -1261 +1267 @@
                                 // and the user doesn't want to retry,
                                 // so go back to boot drive.
-                                SetDrive( GetBootDrive );
+                                SetDrive(GetBootDriveLetter);
                                 Screen.Cursor := crDefault;
                                 Exit;