21 files changed, 23 insertions, 23 deletions

diff --git a/unicode/src/base/TextGL.pas b/unicode/src/base/TextGL.pas
index 667a224f..65d716c2 100644
--- a/unicode/src/base/TextGL.pas
+++ b/unicode/src/base/TextGL.pas
@@ -73,7 +73,7 @@ uses
   IniFiles,
   UCommon,
   UMain,
-  UPath;
+  UPathUtils;
 
 function FindFontFile(FontIni: TCustomIniFile; Font: string): string;
 var
diff --git a/unicode/src/base/UCatCovers.pas b/unicode/src/base/UCatCovers.pas
index 6ef81b68..86f675c5 100644
--- a/unicode/src/base/UCatCovers.pas
+++ b/unicode/src/base/UCatCovers.pas
@@ -66,7 +66,7 @@ uses
   // UFiles,
   ULog,
   UMain,
-  UPath;
+  UPathUtils;
 
 constructor TCatCovers.Create;
 begin
diff --git a/unicode/src/base/UDLLManager.pas b/unicode/src/base/UDLLManager.pas
index 3faa15bf..dd05d733 100644
--- a/unicode/src/base/UDLLManager.pas
+++ b/unicode/src/base/UDLLManager.pas
@@ -92,7 +92,7 @@ uses
   {$ELSE}
   dynlibs,
   {$ENDIF}
-  UPath,
+  UPathUtils,
   ULog,
   SysUtils;
 
diff --git a/unicode/src/base/UGraphic.pas b/unicode/src/base/UGraphic.pas
index 818e49aa..7c5b18fd 100644
--- a/unicode/src/base/UGraphic.pas
+++ b/unicode/src/base/UGraphic.pas
@@ -281,7 +281,7 @@ uses
   UIni,
   UDisplay,
   UCommandLine,
-  UPath;
+  UPathUtils;
 
 procedure LoadFontTextures;
 begin
diff --git a/unicode/src/base/UIni.pas b/unicode/src/base/UIni.pas
index 03654db7..bf068f11 100644
--- a/unicode/src/base/UIni.pas
+++ b/unicode/src/base/UIni.pas
@@ -264,7 +264,7 @@ uses
   USkins,
   URecord,
   UCommandLine,
-  UPath,
+  UPathUtils,
   UUnicodeUtils;
 
 (**
diff --git a/unicode/src/base/ULanguage.pas b/unicode/src/base/ULanguage.pas
index f79f4165..9571358e 100644
--- a/unicode/src/base/ULanguage.pas
+++ b/unicode/src/base/ULanguage.pas
@@ -79,7 +79,7 @@ uses
   Classes,
   SysUtils,
   ULog,
-  UPath;
+  UPathUtils;
 
 {**
  * LoadList, set default language, set standard implode glues
diff --git a/unicode/src/base/ULog.pas b/unicode/src/base/ULog.pas
index a872729a..6f7aa644 100644
--- a/unicode/src/base/ULog.pas
+++ b/unicode/src/base/ULog.pas
@@ -133,7 +133,7 @@ uses
   UTime,
   UCommon,
   UCommandLine,
-  UPath;
+  UPathUtils;
 
 (*
  * Write to console if in debug mode (Thread-safe).
diff --git a/unicode/src/base/UMain.pas b/unicode/src/base/UMain.pas
index 0c3410d1..5b07c9ae 100644
--- a/unicode/src/base/UMain.pas
+++ b/unicode/src/base/UMain.pas
@@ -80,7 +80,7 @@ uses
   UJoystick,
   ULanguage,
   ULog,
-  UPath,
+  UPathUtils,
   UPlaylist,
   UMusic,
   UBeatTimer,
diff --git a/unicode/src/base/UMusic.pas b/unicode/src/base/UMusic.pas
index 5fc9805f..b959ea05 100644
--- a/unicode/src/base/UMusic.pas
+++ b/unicode/src/base/UMusic.pas
@@ -533,7 +533,7 @@ uses
   UCommandLine,
   URecord,
   ULog,
-  UPath;
+  UPathUtils;
 
 var
   DefaultVideoPlayback : IVideoPlayback;
diff --git a/unicode/src/base/UNote.pas b/unicode/src/base/UNote.pas
index 6da4cf07..93d8d607 100644
--- a/unicode/src/base/UNote.pas
+++ b/unicode/src/base/UNote.pas
@@ -129,7 +129,7 @@ uses
   UCommon,
   UGraphic,
   UGraphicClasses,
-  UPath,
+  UPathUtils,
   UPlatform,
   UThemes;
 
diff --git a/unicode/src/base/UPath.pas b/unicode/src/base/UPathUtils.pas
index 2316ac02..4c4d3bc0 100644
--- a/unicode/src/base/UPath.pas
+++ b/unicode/src/base/UPathUtils.pas
@@ -19,11 +19,11 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
- * $URL: https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/trunk/src/base/UPath.pas $
- * $Id: UPath.pas 1624 2009-03-06 23:45:10Z k-m_schindler $
+ * $URL$
+ * $Id$
  *}
 
-unit UPath;
+unit UPathUtils;
 
 interface
 
diff --git a/unicode/src/base/UPlaylist.pas b/unicode/src/base/UPlaylist.pas
index 744f4ce8..cc983a9e 100644
--- a/unicode/src/base/UPlaylist.pas
+++ b/unicode/src/base/UPlaylist.pas
@@ -35,7 +35,7 @@ interface
 
 uses
   USong,
-  UPath;
+  UPathUtils;
 
 type
   TPlaylistItem = record
diff --git a/unicode/src/base/USkins.pas b/unicode/src/base/USkins.pas
index a4722d95..a19b7546 100644
--- a/unicode/src/base/USkins.pas
+++ b/unicode/src/base/USkins.pas
@@ -74,7 +74,7 @@ uses
   UIni,
   ULog,
   UMain,
-  UPath;
+  UPathUtils;
 
 constructor TSkin.Create;
 begin
diff --git a/unicode/src/base/USong.pas b/unicode/src/base/USong.pas
index eedc6258..86349359 100644
--- a/unicode/src/base/USong.pas
+++ b/unicode/src/base/USong.pas
@@ -154,7 +154,7 @@ uses
   StrUtils,
   TextGL,
   UIni,
-  UPath,
+  UPathUtils,
   UMusic,  //needed for Lines
   UNote;   //needed for Player
 
diff --git a/unicode/src/base/USongs.pas b/unicode/src/base/USongs.pas
index 7a996262..2b2bcf49 100644
--- a/unicode/src/base/USongs.pas
+++ b/unicode/src/base/USongs.pas
@@ -163,7 +163,7 @@ uses
   UGraphic,
   UMain,
   UIni,
-  UPath,
+  UPathUtils,
   UNote,
   UUnicodeUtils;
 
diff --git a/unicode/src/menu/UDisplay.pas b/unicode/src/menu/UDisplay.pas
index f2eb2ced..a4d16500 100644
--- a/unicode/src/menu/UDisplay.pas
+++ b/unicode/src/menu/UDisplay.pas
@@ -123,7 +123,7 @@ uses
   UMain,
   UTexture,
   UTime,
-  UPath;
+  UPathUtils;
 
 constructor TDisplay.Create;
 var
diff --git a/unicode/src/screens/UScreenCredits.pas b/unicode/src/screens/UScreenCredits.pas
index cff83d70..af1eea53 100644
--- a/unicode/src/screens/UScreenCredits.pas
+++ b/unicode/src/screens/UScreenCredits.pas
@@ -176,7 +176,7 @@ uses
   Textgl,
   ULanguage,
   UCommon,
-  UPath;
+  UPathUtils;
 
 function TScreenCredits.ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
diff --git a/unicode/src/screens/UScreenEditConvert.pas b/unicode/src/screens/UScreenEditConvert.pas
index 8c7f5fa7..5dfa3b43 100644
--- a/unicode/src/screens/UScreenEditConvert.pas
+++ b/unicode/src/screens/UScreenEditConvert.pas
@@ -141,7 +141,7 @@ uses
   UGraphic,
   UIni,
   UMain,
-  UPath,
+  UPathUtils,
   USkins,
   UTextEncoding,
   UUnicodeUtils;
diff --git a/unicode/src/screens/UScreenOptionsThemes.pas b/unicode/src/screens/UScreenOptionsThemes.pas
index 9025582c..163d8af9 100644
--- a/unicode/src/screens/UScreenOptionsThemes.pas
+++ b/unicode/src/screens/UScreenOptionsThemes.pas
@@ -61,7 +61,7 @@ uses
   SysUtils,
   UGraphic,
   UMain,
-  UPath,
+  UPathUtils,
   UUnicodeUtils,
   USkins;
 
diff --git a/unicode/src/screens/UScreenSingModi.pas b/unicode/src/screens/UScreenSingModi.pas
index 3ae5b7dc..d361943e 100644
--- a/unicode/src/screens/UScreenSingModi.pas
+++ b/unicode/src/screens/UScreenSingModi.pas
@@ -108,7 +108,7 @@ uses
   UGraphicClasses,
   ULanguage,
   UNote,
-  UPath,
+  UPathUtils,
   URecord, 
   USkins;
 
diff --git a/unicode/src/ultrastardx.dpr b/unicode/src/ultrastardx.dpr
index f6376365..ea701a37 100644
--- a/unicode/src/ultrastardx.dpr
+++ b/unicode/src/ultrastardx.dpr
@@ -201,7 +201,7 @@ uses
   URingBuffer       in 'base\URingBuffer.pas',
   USingScores       in 'base\USingScores.pas',
   USingNotes        in 'base\USingNotes.pas',
-  UPath             in 'base\UPath.pas',
+  UPathUtils        in 'base\UPathUtils.pas',
   UNote             in 'base\UNote.pas',
   UBeatTimer        in 'base\UBeatTimer.pas',