From 11ce0e9ead6ca61215b1bafdf6f4fb2151018c77 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 08:11:05 -0600 Subject: [PATCH] Rename KLocale to enhance compatibility with KDE4 --- doc/classref/allclasses.html | 2 +- doc/classref/tdecore/KCalendarSystem.html | 4 +-- .../tdecore/KCalendarSystemFactory.html | 2 +- doc/classref/tdecore/TDEGlobal.html | 4 +-- .../tdecore/{KLocale.html => TDELocale.html} | 30 +++++++++---------- doc/classref/tdecore/index.html | 2 +- examples/pytde-sampler/qt_widgets/CONTRIB | 2 +- sip/tdecore/kcalendarsystem.sip | 4 +-- sip/tdecore/kcalendarsystemfactory.sip | 2 +- sip/tdecore/kglobal.sip | 4 +-- sip/tdecore/klocale.sip | 22 +++++++------- 11 files changed, 39 insertions(+), 39 deletions(-) rename doc/classref/tdecore/{KLocale.html => TDELocale.html} (97%) 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 @@ KListViewItem KListViewSearchLine KListViewSearchLineWidget -KLocale +TDELocale KLockFile KMD4 KMD5 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 @@
returns a KCalendarSystem instance
In versions KDE 3.2.0 and above only
- +
ArgumentTypeDefault
localeKLocale0
localeTDELocale0
  • addDays (date, ndays) = 0 @@ -145,7 +145,7 @@ pure virtual
  • locale () -
    +
    returns (KLocale)
    returns (TDELocale)
    In versions KDE 3.2.0 and above only
  • maxValidYear () = 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 @@
    • static
    - +
    ArgumentTypeDefault
    calTypeTQStringTQString .fromLatin1 ("gregorian" )
    localeKLocale0
    localeTDELocale0
    • 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 @@ static
  • locale () - - +
    +
    returns (KLocale)
    returns (TDELocale)
    static
  • registerStaticDeleter (d) @@ -113,7 +113,7 @@
    • _activeInstanceTDEInstance*
    _charsetsKCharsets*
    _instanceTDEInstance*
    _localeKLocale*
    _localeTDELocale*
    _staticDeletersKStaticDeleterList*
    _stringDictKStringDict*
    • diff --git a/doc/classref/tdecore/KLocale.html b/doc/classref/tdecore/TDELocale.html similarity index 97% rename from doc/classref/tdecore/KLocale.html rename to 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""> - class KLocale + class TDELocale @@ -12,7 +12,7 @@
    -

    class KLocale

    +

    class TDELocale

    		 @@ -28,7 +28,7 @@ - + @@ -41,20 +41,20 @@ }
  • SignPosition = {ParensAround, BeforeQuantityMoney, AfterQuantityMoney, BeforeMoney, AfterMoney }

    methods

      -
    • KLocale (catalog, config = 0) -
    • tdecore
    ClassKLocaleTDELocale
    Inherits
    - + 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 @@ -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
    +
  • TDELocale (catalog, config = 0) +
    • returns a KLocale instance
    returns a TDELocale instance
    ArgumentTypeDefault
    catalogTQString
    configTDEConfig0
    -
  • KLocale (rhs) +
  • TDELocale (rhs)
    Not Implemented
    • -
  • KLocale (a0) -
    +
  • TDELocale (a0) +
    • returns a KLocale instance
    returns a TDELocale instance
    - +
    ArgumentTypeDefault
    a0KLocale
    a0TDELocale
  • _initLanguage (config) @@ -231,7 +231,7 @@
    returns (TQStringList)
  • measureSystem () -
    +
    returns (KLocale.MeasureSystem)
    returns (TDELocale.MeasureSystem)
  • monetaryDecimalSymbol ()
    @@ -297,7 +297,7 @@
    returns (TQString)
    In versions KDE 3.2.0 and above only
    - +
    ArgumentTypeDefault
    strTQString
    flagsKLocale.ReadDateFlags
    flagsTDELocale.ReadDateFlags
  • readMoney (numStr) @@ -323,7 +323,7 @@
    • In versions KDE 3.2.0 and above only
    - +
    ArgumentTypeDefault
    strTQString
    flagsKLocale.ReadTimeFlags
    flagsTDELocale.ReadTimeFlags
  • removeCatalogue (catalog) @@ -419,7 +419,7 @@
  • setMeasureSystem (value)
    returns nothing
    - +
    ArgumentTypeDefault
    valueKLocale.MeasureSystem
    valueTDELocale.MeasureSystem
  • setMonetaryDecimalSymbol (symbol) @@ -437,7 +437,7 @@
  • setNegativeMonetarySignPosition (signpos)
    returns nothing
    - +
    ArgumentTypeDefault
    signposKLocale.SignPosition
    signposTDELocale.SignPosition
  • setNegativePrefixCurrencySymbol (prefix) @@ -461,7 +461,7 @@
  • setPositiveMonetarySignPosition (signpos)
    returns nothing
    - +
    ArgumentTypeDefault
    signposKLocale.SignPosition
    signposTDELocale.SignPosition
  • setPositivePrefixCurrencySymbol (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 @@
    • KLibFactory
    KLibLoader
    KLibrary
    KLocale
    TDELocale
    KLockFile
    KMD4
    KMD5