Rename KLocale to enhance compatibility with KDE4

4 files changed, 16 insertions, 16 deletions

diff --git a/sip/tdecore/kcalendarsystem.sip b/sip/tdecore/kcalendarsystem.sip
index 7839dc1..fdf1c4f 100644
--- a/sip/tdecore/kcalendarsystem.sip
+++ b/sip/tdecore/kcalendarsystem.sip
@@ -34,7 +34,7 @@ class KCalendarSystem
 
 
 public:
-                         KCalendarSystem (const KLocale* = 0);
+                         KCalendarSystem (const TDELocale* = 0);
     virtual int          year (const TQDate&) const = 0;
     virtual TQString      yearString (const TQDate&, bool) const;
     virtual int          yearStringToInteger (const TQString&, int& /Out/) const;
@@ -70,7 +70,7 @@ public:
     virtual bool         isSolar () const = 0;
 
 protected:
-    const KLocale*       locale () const;
+    const TDELocale*       locale () const;
 
 };  // class KCalendarSystem
 
diff --git a/sip/tdecore/kcalendarsystemfactory.sip b/sip/tdecore/kcalendarsystemfactory.sip
index 3774c0e..1146e5f 100644
--- a/sip/tdecore/kcalendarsystemfactory.sip
+++ b/sip/tdecore/kcalendarsystemfactory.sip
@@ -35,7 +35,7 @@ class KCalendarSystemFactory
 
 public:
                          KCalendarSystemFactory ();
-    static KCalendarSystem* create (const TQString& = TQString ::fromLatin1 ("gregorian" ), const KLocale* = 0);
+    static KCalendarSystem* create (const TQString& = TQString ::fromLatin1 ("gregorian" ), const TDELocale* = 0);
     static TQStringList   calendarSystems ();
 
 };  // class KCalendarSystemFactory
diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip
index 97be5df..e05454b 100644
--- a/sip/tdecore/kglobal.sip
+++ b/sip/tdecore/kglobal.sip
@@ -41,7 +41,7 @@ public:
 %End
 
     static KIconLoader*  iconLoader ();
-    static KLocale*      locale ();
+    static TDELocale*      locale ();
     static KCharsets*    charsets ();
     static const TQString& staticQString (const char*);
     static const TQString& staticQString (const TQString&);
@@ -50,7 +50,7 @@ public:
     static void          deleteStaticDeleters ();
 //ig     KStringDict*         _stringDict;
 //ig     TDEInstance*           _instance;
-//ig     KLocale*             _locale;
+//ig     TDELocale*             _locale;
 //ig     KCharsets*           _charsets;
 //ig     KStaticDeleterList*  _staticDeleters;
     static void          setActiveInstance (TDEInstance*);
diff --git a/sip/tdecore/klocale.sip b/sip/tdecore/klocale.sip
index 6afc795..e1a17bc 100644
--- a/sip/tdecore/klocale.sip
+++ b/sip/tdecore/klocale.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KLocale
+class TDELocale
 {
 %TypeHeaderCode
 #include <klocale.h>
@@ -32,8 +32,8 @@ class KLocale
 
 
 public:
-                         KLocale (const TQString&, TDEConfig* = 0);
-//ig                          KLocale (const KLocale&);
+                         TDELocale (const TQString&, TDEConfig* = 0);
+//ig                          TDELocale (const TDELocale&);
     TQString              translate (const char*) const;
     TQString              translate (const char*, const char*) const;
     TQString              translate (const char*, const char*, ulong) const;
@@ -128,7 +128,7 @@ public:
         ShortFormat
     };
 
-    TQDate                readDate (const TQString&, KLocale::ReadDateFlags, bool* = 0) const;
+    TQDate                readDate (const TQString&, TDELocale::ReadDateFlags, bool* = 0) const;
 %End
 
     TQTime                readTime (const TQString&, bool* = 0) const;
@@ -141,7 +141,7 @@ public:
         WithoutSeconds
     };
 
-    TQTime                readTime (const TQString&, KLocale::ReadTimeFlags, bool* = 0) const;
+    TQTime                readTime (const TQString&, TDELocale::ReadTimeFlags, bool* = 0) const;
 %End
 
     TQString              language () const;
@@ -177,8 +177,8 @@ public:
     void                 setThousandsSeparator (const TQString&);
     void                 setPositiveSign (const TQString&);
     void                 setNegativeSign (const TQString&);
-    void                 setPositiveMonetarySignPosition (KLocale::SignPosition);
-    void                 setNegativeMonetarySignPosition (KLocale::SignPosition);
+    void                 setPositiveMonetarySignPosition (TDELocale::SignPosition);
+    void                 setNegativeMonetarySignPosition (TDELocale::SignPosition);
     void                 setPositivePrefixCurrencySymbol (bool);
     void                 setNegativePrefixCurrencySymbol (bool);
     void                 setFracDigits (int);
@@ -194,8 +194,8 @@ public:
         Imperial
     };
 
-    KLocale::MeasureSystem measureSystem () const;
-    void                 setMeasureSystem (KLocale::MeasureSystem);
+    TDELocale::MeasureSystem measureSystem () const;
+    void                 setMeasureSystem (TDELocale::MeasureSystem);
     void                 insertCatalogue (const TQString&);
     void                 removeCatalogue (const TQString&);
     void                 setActiveCatalogue (const TQString&);
@@ -228,10 +228,10 @@ protected:
 //force
 
 private:
-                         KLocale (const KLocale&);
+                         TDELocale (const TDELocale&);
 //end
 
-};  // class KLocale
+};  // class TDELocale
 
 
 %ModuleCode