Rename KLocale to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent c8cefea21c
commit 11ce0e9ead

@ -512,7 +512,7 @@
<tr ><td><a href="tdeui/KListViewItem.html">KListViewItem</A></td></tr> <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/KListViewSearchLine.html">KListViewSearchLine</A></td></tr>
<tr ><td><a href="tdeui/KListViewSearchLineWidget.html">KListViewSearchLineWidget</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/KLockFile.html">KLockFile</A></td></tr>
<tr ><td><a href="tdecore/KMD4.html">KMD4</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> <tr ><td><a href="tdecore/KMD5.html">KMD5</A></td></tr>

@ -39,7 +39,7 @@
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KCalendarSystem instance</i></td></tr> <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> <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> </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> </table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>addDays</b> (date, ndays) = 0 <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> <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> </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>locale</b> () <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> <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> </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>maxValidYear</b> () = 0 <li><b>maxValidYear</b> () = 0

@ -50,7 +50,7 @@
<tr><td><i>static</i></td></tr> <tr><td><i>static</i></td></tr>
</table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></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>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> </table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
</ul> </ul>

@ -64,7 +64,7 @@
<tr><td><i>static</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> </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>locale</b> () <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> <tr><td><i>static</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>registerStaticDeleter</b> (d) <li><b>registerStaticDeleter</b> (d)
@ -113,7 +113,7 @@
<tr><td>_activeInstance</td><td>TDEInstance*</td></tr> <tr><td>_activeInstance</td><td>TDEInstance*</td></tr>
<tr><td>_charsets</td><td>KCharsets*</td></tr> <tr><td>_charsets</td><td>KCharsets*</td></tr>
<tr><td>_instance</td><td>TDEInstance*</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>_staticDeleters</td><td>KStaticDeleterList*</td></tr>
<tr><td>_stringDict</td><td>KStringDict*</td></tr> <tr><td>_stringDict</td><td>KStringDict*</td></tr>
</table></li></ul> </table></li></ul>

@ -3,7 +3,7 @@
"http://www.w3.org/TR/html4/loose.dtd""> "http://www.w3.org/TR/html4/loose.dtd"">
<html> <html>
<head> <head>
<title>class KLocale</title> <title>class TDELocale</title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="GENERATOR" content="wabbit dumphtml"> <meta name="GENERATOR" content="wabbit dumphtml">
</head> </head>
@ -12,7 +12,7 @@
<hr> <hr>
<table width="100%"><tr> <table width="100%"><tr>
<td width ="70%"> <td width ="70%">
<h1>class KLocale</h1><hr> <h1>class TDELocale</h1><hr>
</td> </td>
<td width="30%" valign="top" align="right"> <td width="30%" valign="top" align="right">
<table> <table>
@ -28,7 +28,7 @@
<td width="30%" align=left>tdecore</td> <td width="30%" align=left>tdecore</td>
</tr> </tr>
<tr><td>Class</td> <tr><td>Class</td>
<td>KLocale</td> <td>TDELocale</td>
</tr> </tr>
<tr><td>Inherits</td> <tr><td>Inherits</td>
<td> </td> <td> </td>
@ -41,20 +41,20 @@
}<li><b>SignPosition</b> = {ParensAround, BeforeQuantityMoney, AfterQuantityMoney, BeforeMoney, AfterMoney }<li><b>SignPosition</b> = {ParensAround, BeforeQuantityMoney, AfterQuantityMoney, BeforeMoney, AfterMoney
}</ul> }</ul>
<h3>methods</h3><ul> <h3>methods</h3><ul>
<li><b>KLocale</b> (catalog, config = 0) <li><b>TDELocale</b> (catalog, config = 0)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KLocale instance</i></td></tr> <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> </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>catalog</td><td>TQString</td><td></td></tr>
<tr><td>config</td><td>TDEConfig</td><td>0</td></tr> <tr><td>config</td><td>TDEConfig</td><td>0</td></tr>
</table> </table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> </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> <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> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>KLocale</b> (a0) <li><b>TDELocale</b> (a0)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KLocale instance</i></td></tr> <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> </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> </table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>_initLanguage</b> (config) <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 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> </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>measureSystem</b> () <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> </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>monetaryDecimalSymbol</b> () <li><b>monetaryDecimalSymbol</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQString)</i></td></tr> <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> <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> </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>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> </table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>readMoney</b> (numStr) <li><b>readMoney</b> (numStr)
@ -323,7 +323,7 @@
<tr><td>In versions KDE 3.2.0 and above only</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> </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>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> </table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>removeCatalogue</b> (catalog) <li><b>removeCatalogue</b> (catalog)
@ -419,7 +419,7 @@
<li><b>setMeasureSystem</b> (value) <li><b>setMeasureSystem</b> (value)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr> <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> </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> </table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>setMonetaryDecimalSymbol</b> (symbol) <li><b>setMonetaryDecimalSymbol</b> (symbol)
@ -437,7 +437,7 @@
<li><b>setNegativeMonetarySignPosition</b> (signpos) <li><b>setNegativeMonetarySignPosition</b> (signpos)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr> <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> </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> </table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>setNegativePrefixCurrencySymbol</b> (prefix) <li><b>setNegativePrefixCurrencySymbol</b> (prefix)
@ -461,7 +461,7 @@
<li><b>setPositiveMonetarySignPosition</b> (signpos) <li><b>setPositiveMonetarySignPosition</b> (signpos)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr> <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> </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> </table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr> </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>setPositivePrefixCurrencySymbol</b> (prefix) <li><b>setPositivePrefixCurrencySymbol</b> (prefix)

@ -111,7 +111,7 @@
<tr ><td><a href="KLibFactory.html">KLibFactory</a></td></tr> <tr ><td><a href="KLibFactory.html">KLibFactory</a></td></tr>
<tr ><td><a href="KLibLoader.html">KLibLoader</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="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="KLockFile.html">KLockFile</a></td></tr>
<tr ><td><a href="KMD4.html">KMD4</a></td></tr> <tr ><td><a href="KMD4.html">KMD4</a></td></tr>
<tr ><td><a href="KMD5.html">KMD5</a></td></tr> <tr ><td><a href="KMD5.html">KMD5</a></td></tr>

@ -65,7 +65,7 @@ tdecore,KKeyServer,,,
tdecore,KLibFactory,,, tdecore,KLibFactory,,,
tdecore,KLibLoader,,, tdecore,KLibLoader,,,
tdecore,KLibrary,,, tdecore,KLibrary,,,
tdecore,KLocale,,, tdecore,TDELocale,,,
tdecore,KMD5,,, tdecore,KMD5,,,
tdecore,KMacroExpander,,, tdecore,KMacroExpander,,,
tdecore,KMacroExpanderBase,,, tdecore,KMacroExpanderBase,,,

@ -34,7 +34,7 @@ class KCalendarSystem
public: public:
KCalendarSystem (const KLocale* = 0); KCalendarSystem (const TDELocale* = 0);
virtual int year (const TQDate&) const = 0; virtual int year (const TQDate&) const = 0;
virtual TQString yearString (const TQDate&, bool) const; virtual TQString yearString (const TQDate&, bool) const;
virtual int yearStringToInteger (const TQString&, int& /Out/) const; virtual int yearStringToInteger (const TQString&, int& /Out/) const;
@ -70,7 +70,7 @@ public:
virtual bool isSolar () const = 0; virtual bool isSolar () const = 0;
protected: protected:
const KLocale* locale () const; const TDELocale* locale () const;
}; // class KCalendarSystem }; // class KCalendarSystem

@ -35,7 +35,7 @@ class KCalendarSystemFactory
public: public:
KCalendarSystemFactory (); 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 (); static TQStringList calendarSystems ();
}; // class KCalendarSystemFactory }; // class KCalendarSystemFactory

@ -41,7 +41,7 @@ public:
%End %End
static KIconLoader* iconLoader (); static KIconLoader* iconLoader ();
static KLocale* locale (); static TDELocale* locale ();
static KCharsets* charsets (); static KCharsets* charsets ();
static const TQString& staticQString (const char*); static const TQString& staticQString (const char*);
static const TQString& staticQString (const TQString&); static const TQString& staticQString (const TQString&);
@ -50,7 +50,7 @@ public:
static void deleteStaticDeleters (); static void deleteStaticDeleters ();
//ig KStringDict* _stringDict; //ig KStringDict* _stringDict;
//ig TDEInstance* _instance; //ig TDEInstance* _instance;
//ig KLocale* _locale; //ig TDELocale* _locale;
//ig KCharsets* _charsets; //ig KCharsets* _charsets;
//ig KStaticDeleterList* _staticDeleters; //ig KStaticDeleterList* _staticDeleters;
static void setActiveInstance (TDEInstance*); static void setActiveInstance (TDEInstance*);

@ -24,7 +24,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
class KLocale class TDELocale
{ {
%TypeHeaderCode %TypeHeaderCode
#include <klocale.h> #include <klocale.h>
@ -32,8 +32,8 @@ class KLocale
public: public:
KLocale (const TQString&, TDEConfig* = 0); TDELocale (const TQString&, TDEConfig* = 0);
//ig KLocale (const KLocale&); //ig TDELocale (const TDELocale&);
TQString translate (const char*) const; TQString translate (const char*) const;
TQString translate (const char*, const char*) const; TQString translate (const char*, const char*) const;
TQString translate (const char*, const char*, ulong) const; TQString translate (const char*, const char*, ulong) const;
@ -128,7 +128,7 @@ public:
ShortFormat ShortFormat
}; };
TQDate readDate (const TQString&, KLocale::ReadDateFlags, bool* = 0) const; TQDate readDate (const TQString&, TDELocale::ReadDateFlags, bool* = 0) const;
%End %End
TQTime readTime (const TQString&, bool* = 0) const; TQTime readTime (const TQString&, bool* = 0) const;
@ -141,7 +141,7 @@ public:
WithoutSeconds WithoutSeconds
}; };
TQTime readTime (const TQString&, KLocale::ReadTimeFlags, bool* = 0) const; TQTime readTime (const TQString&, TDELocale::ReadTimeFlags, bool* = 0) const;
%End %End
TQString language () const; TQString language () const;
@ -177,8 +177,8 @@ public:
void setThousandsSeparator (const TQString&); void setThousandsSeparator (const TQString&);
void setPositiveSign (const TQString&); void setPositiveSign (const TQString&);
void setNegativeSign (const TQString&); void setNegativeSign (const TQString&);
void setPositiveMonetarySignPosition (KLocale::SignPosition); void setPositiveMonetarySignPosition (TDELocale::SignPosition);
void setNegativeMonetarySignPosition (KLocale::SignPosition); void setNegativeMonetarySignPosition (TDELocale::SignPosition);
void setPositivePrefixCurrencySymbol (bool); void setPositivePrefixCurrencySymbol (bool);
void setNegativePrefixCurrencySymbol (bool); void setNegativePrefixCurrencySymbol (bool);
void setFracDigits (int); void setFracDigits (int);
@ -194,8 +194,8 @@ public:
Imperial Imperial
}; };
KLocale::MeasureSystem measureSystem () const; TDELocale::MeasureSystem measureSystem () const;
void setMeasureSystem (KLocale::MeasureSystem); void setMeasureSystem (TDELocale::MeasureSystem);
void insertCatalogue (const TQString&); void insertCatalogue (const TQString&);
void removeCatalogue (const TQString&); void removeCatalogue (const TQString&);
void setActiveCatalogue (const TQString&); void setActiveCatalogue (const TQString&);
@ -228,10 +228,10 @@ protected:
//force //force
private: private:
KLocale (const KLocale&); TDELocale (const TDELocale&);
//end //end
}; // class KLocale }; // class TDELocale
%ModuleCode %ModuleCode

Loading…
Cancel
Save