Rename KLocale to enhance compatibility with KDE4

11 files changed, 39 insertions, 39 deletions

diff --git a/doc/classref/allclasses.html b/doc/classref/allclasses.html
index 6bdd84d..4e990f2 100644
--- a/doc/classref/allclasses.html
+++ b/doc/classref/allclasses.html
@@ -512,7 +512,7 @@
 <tr ><td><a href="tdeui/KListViewItem.html">KListViewItem</A></td></tr>
 <tr ><td><a href="tdeui/KListViewSearchLine.html">KListViewSearchLine</A></td></tr>
 <tr ><td><a href="tdeui/KListViewSearchLineWidget.html">KListViewSearchLineWidget</A></td></tr>
-<tr ><td><a href="tdecore/KLocale.html">KLocale</A></td></tr>
+<tr ><td><a href="tdecore/TDELocale.html">TDELocale</A></td></tr>
 <tr ><td><a href="tdecore/KLockFile.html">KLockFile</A></td></tr>
 <tr ><td><a href="tdecore/KMD4.html">KMD4</A></td></tr>
 <tr ><td><a href="tdecore/KMD5.html">KMD5</A></td></tr>
diff --git a/doc/classref/tdecore/KCalendarSystem.html b/doc/classref/tdecore/KCalendarSystem.html
index 6a7b323..45a9a55 100644
--- a/doc/classref/tdecore/KCalendarSystem.html
+++ b/doc/classref/tdecore/KCalendarSystem.html
@@ -39,7 +39,7 @@
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KCalendarSystem instance</i></td></tr>
 <tr><td>In versions KDE 3.2.0 and above only</td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
-<tr><td>locale</td><td>KLocale</td><td>0</td></tr>
+<tr><td>locale</td><td>TDELocale</td><td>0</td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>addDays</b> (date, ndays) = 0
@@ -145,7 +145,7 @@
 <tr><td><a href = "../glossary.html#purevirtual"><i>pure virtual</i></a></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>locale</b> ()
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(KLocale)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TDELocale)</i></td></tr>
 <tr><td>In versions KDE 3.2.0 and above only</td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>maxValidYear</b> () = 0
diff --git a/doc/classref/tdecore/KCalendarSystemFactory.html b/doc/classref/tdecore/KCalendarSystemFactory.html
index 01800d5..d6a4b5d 100644
--- a/doc/classref/tdecore/KCalendarSystemFactory.html
+++ b/doc/classref/tdecore/KCalendarSystemFactory.html
@@ -50,7 +50,7 @@
 <tr><td><i>static</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>calType</td><td>TQString</td><td>TQString .fromLatin1 ("gregorian" )</td></tr>
-<tr><td>locale</td><td>KLocale</td><td>0</td></tr>
+<tr><td>locale</td><td>TDELocale</td><td>0</td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 </ul>
diff --git a/doc/classref/tdecore/TDEGlobal.html b/doc/classref/tdecore/TDEGlobal.html
index 521b8e4..261b047 100644
--- a/doc/classref/tdecore/TDEGlobal.html
+++ b/doc/classref/tdecore/TDEGlobal.html
@@ -64,7 +64,7 @@
 <tr><td><i>static</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>locale</b> ()
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(KLocale)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TDELocale)</i></td></tr>
 <tr><td><i>static</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>registerStaticDeleter</b> (d)
@@ -113,7 +113,7 @@
 <tr><td>_activeInstance</td><td>TDEInstance*</td></tr>
 <tr><td>_charsets</td><td>KCharsets*</td></tr>
 <tr><td>_instance</td><td>TDEInstance*</td></tr>
-<tr><td>_locale</td><td>KLocale*</td></tr>
+<tr><td>_locale</td><td>TDELocale*</td></tr>
 <tr><td>_staticDeleters</td><td>KStaticDeleterList*</td></tr>
 <tr><td>_stringDict</td><td>KStringDict*</td></tr>
 </table></li></ul>
diff --git a/doc/classref/tdecore/KLocale.html b/doc/classref/tdecore/TDELocale.html
index c3ea0c6..889e7e2 100644
--- a/doc/classref/tdecore/KLocale.html
+++ b/doc/classref/tdecore/TDELocale.html
@@ -3,7 +3,7 @@
         "http://www.w3.org/TR/html4/loose.dtd"">
 <html>
 <head>
-  <title>class KLocale</title>
+  <title>class TDELocale</title>
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="GENERATOR" content="wabbit dumphtml">
 </head>
@@ -12,7 +12,7 @@
 <hr>
 <table width="100%"><tr>
             <td width ="70%">
-                <h1>class KLocale</h1><hr>
+                <h1>class TDELocale</h1><hr>
             </td>
             <td  width="30%" valign="top" align="right">
                 <table>
@@ -28,7 +28,7 @@
             <td width="30%" align=left>tdecore</td>
         </tr>
         <tr><td>Class</td>
-            <td>KLocale</td>
+            <td>TDELocale</td>
         </tr>
         <tr><td>Inherits</td>
             <td> </td>
@@ -41,20 +41,20 @@
 }<li><b>SignPosition</b> = {ParensAround, BeforeQuantityMoney, AfterQuantityMoney, BeforeMoney, AfterMoney
 }</ul>
 <h3>methods</h3><ul>
-<li><b>KLocale</b> (catalog, config = 0)
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KLocale instance</i></td></tr>
+<li><b>TDELocale</b> (catalog, config = 0)
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a TDELocale instance</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>catalog</td><td>TQString</td><td></td></tr>
 <tr><td>config</td><td>TDEConfig</td><td>0</td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>KLocale</b> (rhs)
+<li><b>TDELocale</b> (rhs)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td><i>Not Implemented</i></td></tr></table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
-<li><b>KLocale</b> (a0)
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KLocale instance</i></td></tr>
+<li><b>TDELocale</b> (a0)
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a TDELocale instance</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
-<tr><td>a0</td><td>KLocale</td><td></td></tr>
+<tr><td>a0</td><td>TDELocale</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>_initLanguage</b> (config)
@@ -231,7 +231,7 @@
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQStringList)</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>measureSystem</b> ()
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(KLocale.MeasureSystem)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TDELocale.MeasureSystem)</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>monetaryDecimalSymbol</b> ()
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQString)</i></td></tr>
@@ -297,7 +297,7 @@
 <tr><td>In versions KDE 3.2.0 and above only</td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>str</td><td>TQString</td><td></td></tr>
-<tr><td>flags</td><td>KLocale.ReadDateFlags</td><td></td></tr>
+<tr><td>flags</td><td>TDELocale.ReadDateFlags</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>readMoney</b> (numStr)
@@ -323,7 +323,7 @@
 <tr><td>In versions KDE 3.2.0 and above only</td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>str</td><td>TQString</td><td></td></tr>
-<tr><td>flags</td><td>KLocale.ReadTimeFlags</td><td></td></tr>
+<tr><td>flags</td><td>TDELocale.ReadTimeFlags</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>removeCatalogue</b> (catalog)
@@ -419,7 +419,7 @@
 <li><b>setMeasureSystem</b> (value)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
-<tr><td>value</td><td>KLocale.MeasureSystem</td><td></td></tr>
+<tr><td>value</td><td>TDELocale.MeasureSystem</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>setMonetaryDecimalSymbol</b> (symbol)
@@ -437,7 +437,7 @@
 <li><b>setNegativeMonetarySignPosition</b> (signpos)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
-<tr><td>signpos</td><td>KLocale.SignPosition</td><td></td></tr>
+<tr><td>signpos</td><td>TDELocale.SignPosition</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>setNegativePrefixCurrencySymbol</b> (prefix)
@@ -461,7 +461,7 @@
 <li><b>setPositiveMonetarySignPosition</b> (signpos)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
-<tr><td>signpos</td><td>KLocale.SignPosition</td><td></td></tr>
+<tr><td>signpos</td><td>TDELocale.SignPosition</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>setPositivePrefixCurrencySymbol</b> (prefix)
diff --git a/doc/classref/tdecore/index.html b/doc/classref/tdecore/index.html
index ac43534..14483c2 100644
--- a/doc/classref/tdecore/index.html
+++ b/doc/classref/tdecore/index.html
@@ -111,7 +111,7 @@
 <tr ><td><a href="KLibFactory.html">KLibFactory</a></td></tr>
 <tr ><td><a href="KLibLoader.html">KLibLoader</a></td></tr>
 <tr ><td><a href="KLibrary.html">KLibrary</a></td></tr>
-<tr ><td><a href="KLocale.html">KLocale</a></td></tr>
+<tr ><td><a href="TDELocale.html">TDELocale</a></td></tr>
 <tr ><td><a href="KLockFile.html">KLockFile</a></td></tr>
 <tr ><td><a href="KMD4.html">KMD4</a></td></tr>
 <tr ><td><a href="KMD5.html">KMD5</a></td></tr>
diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB
index 6502a65..0c3ac50 100644
--- a/examples/pytde-sampler/qt_widgets/CONTRIB
+++ b/examples/pytde-sampler/qt_widgets/CONTRIB
@@ -65,7 +65,7 @@ tdecore,KKeyServer,,,
 tdecore,KLibFactory,,,
 tdecore,KLibLoader,,,
 tdecore,KLibrary,,,
-tdecore,KLocale,,,
+tdecore,TDELocale,,,
 tdecore,KMD5,,,
 tdecore,KMacroExpander,,,
 tdecore,KMacroExpanderBase,,,
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