From ebcececd59218997957afe1ef40f9514d22db99e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 13:24:50 -0600 Subject: [PATCH] Rename KStandard for enhanced compatibility with KDE4 --- doc/classref/tdecore/KIconLoader.html | 4 ++-- doc/classref/tdecore/TDEGlobal.html | 2 +- doc/classref/tdecore/TDEInstance.html | 2 +- examples/pytde-sampler/qt_widgets/CONTRIB | 2 +- sip/tdecore/kglobal.sip | 2 +- sip/tdecore/kiconloader.sip | 4 ++-- sip/tdecore/kinstance.sip | 2 +- sip/tdecore/kstddirs.sip | 8 ++++---- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/classref/tdecore/KIconLoader.html b/doc/classref/tdecore/KIconLoader.html index 886dee5..015cda4 100644 --- a/doc/classref/tdecore/KIconLoader.html +++ b/doc/classref/tdecore/KIconLoader.html @@ -39,7 +39,7 @@
returns a KIconLoader instance
- +
ArgumentTypeDefault
appnameTQStringTQString .null
dirsKStandardDirs0
dirsTDEStandardDirs0
  • addAppDir (appname) @@ -179,7 +179,7 @@
    returns nothing
    - +
    ArgumentTypeDefault
    _appnameTQString
    _dirsKStandardDirs
    _dirsTDEStandardDirs
  • theme () diff --git a/doc/classref/tdecore/TDEGlobal.html b/doc/classref/tdecore/TDEGlobal.html index ef27a5a..521b8e4 100644 --- a/doc/classref/tdecore/TDEGlobal.html +++ b/doc/classref/tdecore/TDEGlobal.html @@ -52,7 +52,7 @@ static
  • dirs () -
    +
    returns (KStandardDirs)
    returns (TDEStandardDirs)
    static
  • iconLoader () diff --git a/doc/classref/tdecore/TDEInstance.html b/doc/classref/tdecore/TDEInstance.html index 723b744..9d84f67 100644 --- a/doc/classref/tdecore/TDEInstance.html +++ b/doc/classref/tdecore/TDEInstance.html @@ -72,7 +72,7 @@
    returns (TDEConfig)
  • dirs () -
    +
    returns (KStandardDirs)
    returns (TDEStandardDirs)
  • iconLoader ()
    diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB index f2b66f7..eb6c2fe 100644 --- a/examples/pytde-sampler/qt_widgets/CONTRIB +++ b/examples/pytde-sampler/qt_widgets/CONTRIB @@ -96,7 +96,7 @@ tdecore,KShortcut,,, tdecore,KShortcutList,,, tdecore,KSimpleConfig,,, tdecore,TDESocket,,, -tdecore,KStandardDirs,,, +tdecore,TDEStandardDirs,,, tdecore,KStartupInfo,,, tdecore,KStartupInfoData,,, tdecore,KStartupInfoId,,, diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip index 59515a3..97be5df 100644 --- a/sip/tdecore/kglobal.sip +++ b/sip/tdecore/kglobal.sip @@ -33,7 +33,7 @@ class TDEGlobal public: static TDEInstance* instance (); - static KStandardDirs* dirs (); + static TDEStandardDirs* dirs (); static TDEConfig* config (); %If ( KDE_3_2_0 - ) diff --git a/sip/tdecore/kiconloader.sip b/sip/tdecore/kiconloader.sip index 5cc9a18..990725d 100644 --- a/sip/tdecore/kiconloader.sip +++ b/sip/tdecore/kiconloader.sip @@ -32,7 +32,7 @@ class KIconLoader public: - KIconLoader (const TQString& = TQString ::null , KStandardDirs* = 0); + KIconLoader (const TQString& = TQString ::null , TDEStandardDirs* = 0); void addAppDir (const TQString&); TQPixmap loadIcon (const TQString&, KIcon::Group, int = 0, int = KIcon ::DefaultState , TQString* = 0, bool = 0) const; @@ -60,7 +60,7 @@ public: int currentSize (KIcon::Group) const; KIconTheme* theme (); KIconEffect* iconEffect (); - void reconfigure (const TQString&, KStandardDirs*); + void reconfigure (const TQString&, TDEStandardDirs*); static TQPixmap unknown (); bool alphaBlending (KIcon::Group) const; diff --git a/sip/tdecore/kinstance.sip b/sip/tdecore/kinstance.sip index a32a074..94a23c3 100644 --- a/sip/tdecore/kinstance.sip +++ b/sip/tdecore/kinstance.sip @@ -35,7 +35,7 @@ public: TDEInstance (const TQCString&); TDEInstance (const TDEAboutData*); TDEInstance (TDEInstance*); - KStandardDirs* dirs () const; + TDEStandardDirs* dirs () const; TDEConfig* config () const; %If ( KDE_3_2_0 - ) diff --git a/sip/tdecore/kstddirs.sip b/sip/tdecore/kstddirs.sip index 005b8fe..576b7f9 100644 --- a/sip/tdecore/kstddirs.sip +++ b/sip/tdecore/kstddirs.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KStandardDirs +class TDEStandardDirs { %TypeHeaderCode #include @@ -32,7 +32,7 @@ class KStandardDirs public: - KStandardDirs (); + TDEStandardDirs (); void addPrefix (const TQString&); bool addResourceType (const char*, const TQString&); bool addResourceDir (const char*, const TQString&); @@ -56,9 +56,9 @@ public: static bool exists (const TQString&); private: - KStandardDirs (const KStandardDirs&); + TDEStandardDirs (const TDEStandardDirs&); -}; // class KStandardDirs +}; // class TDEStandardDirs %ModuleCode
    returns (KIconLoader)