From f49521ca3d0cbf2197b353a7c35f924e7b5b89ff Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:12:48 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- sip/tdecore/kglobal.sip | 2 +- sip/tdecore/kiconeffect.sip | 6 +++--- sip/tdecore/kiconloader.sip | 44 +++++++++++++++++++------------------- sip/tdecore/kicontheme.sip | 22 +++++++++---------- sip/tdecore/kinstance.sip | 2 +- sip/tdecore/kmimesourcefactory.sip | 2 +- 6 files changed, 39 insertions(+), 39 deletions(-) (limited to 'sip/tdecore') diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip index e05454b..645ca68 100644 --- a/sip/tdecore/kglobal.sip +++ b/sip/tdecore/kglobal.sip @@ -40,7 +40,7 @@ public: static TDESharedConfig* sharedConfig (); %End - static KIconLoader* iconLoader (); + static TDEIconLoader* iconLoader (); static TDELocale* locale (); static KCharsets* charsets (); static const TQString& staticQString (const char*); diff --git a/sip/tdecore/kiconeffect.sip b/sip/tdecore/kiconeffect.sip index b6982f5..90e75a6 100644 --- a/sip/tdecore/kiconeffect.sip +++ b/sip/tdecore/kiconeffect.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KIconEffect +class TDEIconEffect { %TypeHeaderCode #include @@ -32,7 +32,7 @@ class KIconEffect public: - KIconEffect (); + TDEIconEffect (); %If ( KDE_3_4_0 - ) @@ -98,5 +98,5 @@ public: %End -}; // class KIconEffect +}; // class TDEIconEffect diff --git a/sip/tdecore/kiconloader.sip b/sip/tdecore/kiconloader.sip index 990725d..d805133 100644 --- a/sip/tdecore/kiconloader.sip +++ b/sip/tdecore/kiconloader.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KIconLoader +class TDEIconLoader { %TypeHeaderCode #include @@ -32,37 +32,37 @@ class KIconLoader public: - KIconLoader (const TQString& = TQString ::null , TDEStandardDirs* = 0); + TDEIconLoader (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; + TQPixmap loadIcon (const TQString&, TDEIcon::Group, int = 0, int = TDEIcon ::DefaultState , TQString* = 0, bool = 0) const; %If ( KDE_3_5_0 - ) - TQIconSet loadIconSet (const TQString&, KIcon::Group, int, bool, bool); + TQIconSet loadIconSet (const TQString&, TDEIcon::Group, int, bool, bool); %End %If ( KDE_3_1_0 - ) - TQIconSet loadIconSet (const TQString&, KIcon::Group, int, bool); + TQIconSet loadIconSet (const TQString&, TDEIcon::Group, int, bool); %End - TQIconSet loadIconSet (const TQString&, KIcon::Group, int = 0); + TQIconSet loadIconSet (const TQString&, TDEIcon::Group, int = 0); TQString iconPath (const TQString&, int, bool = 0) const; - TQMovie loadMovie (const TQString&, KIcon::Group, int = 0) const; - TQString moviePath (const TQString&, KIcon::Group, int = 0) const; - TQStringList loadAnimated (const TQString&, KIcon::Group, int = 0) const; - TQStringList queryIcons (int, KIcon::Context = KIcon ::Any ) const; - TQStringList queryIconsByContext (int, KIcon::Context = KIcon ::Any ) const; + TQMovie loadMovie (const TQString&, TDEIcon::Group, int = 0) const; + TQString moviePath (const TQString&, TDEIcon::Group, int = 0) const; + TQStringList loadAnimated (const TQString&, TDEIcon::Group, int = 0) const; + TQStringList queryIcons (int, TDEIcon::Context = TDEIcon ::Any ) const; + TQStringList queryIconsByContext (int, TDEIcon::Context = TDEIcon ::Any ) const; %If ( KDE_3_1_0 - ) TQStringList queryIconsByDir (const TQString&) const; %End - int currentSize (KIcon::Group) const; - KIconTheme* theme (); - KIconEffect* iconEffect (); + int currentSize (TDEIcon::Group) const; + TDEIconTheme* theme (); + TDEIconEffect* iconEffect (); void reconfigure (const TQString&, TDEStandardDirs*); static TQPixmap unknown (); - bool alphaBlending (KIcon::Group) const; + bool alphaBlending (TDEIcon::Group) const; %If ( KDE_3_1_0 - ) void addExtraDesktopThemes (); @@ -72,26 +72,26 @@ public: %End -}; // class KIconLoader +}; // class TDEIconLoader %ModuleCode #include %End -TQPixmap DesktopIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ()); +TQPixmap DesktopIcon (const TQString&, int = 0, int = TDEIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ()); TQPixmap DesktopIcon (const TQString&, TDEInstance*); TQIconSet DesktopIconSet (const TQString&, int = 0, TDEInstance* = TDEGlobal ::instance ()); -TQPixmap BarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ()); +TQPixmap BarIcon (const TQString&, int = 0, int = TDEIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ()); TQPixmap BarIcon (const TQString&, TDEInstance*); TQIconSet BarIconSet (const TQString&, int = 0, TDEInstance* = TDEGlobal ::instance ()); -TQPixmap SmallIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ()); +TQPixmap SmallIcon (const TQString&, int = 0, int = TDEIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ()); TQPixmap SmallIcon (const TQString&, TDEInstance*); TQIconSet SmallIconSet (const TQString&, int = 0, TDEInstance* = TDEGlobal ::instance ()); -TQPixmap MainBarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ()); +TQPixmap MainBarIcon (const TQString&, int = 0, int = TDEIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ()); TQPixmap MainBarIcon (const TQString&, TDEInstance*); TQIconSet MainBarIconSet (const TQString&, int = 0, TDEInstance* = TDEGlobal ::instance ()); -TQPixmap UserIcon (const TQString&, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ()); +TQPixmap UserIcon (const TQString&, int = TDEIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ()); TQPixmap UserIcon (const TQString&, TDEInstance*); TQIconSet UserIconSet (const TQString&, TDEInstance* = TDEGlobal ::instance ()); -int IconSize (KIcon::Group, TDEInstance* = TDEGlobal ::instance ()); +int IconSize (TDEIcon::Group, TDEInstance* = TDEGlobal ::instance ()); diff --git a/sip/tdecore/kicontheme.sip b/sip/tdecore/kicontheme.sip index c8f2f6a..bbd8ae6 100644 --- a/sip/tdecore/kicontheme.sip +++ b/sip/tdecore/kicontheme.sip @@ -24,7 +24,7 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -class KIcon +class TDEIcon { %TypeHeaderCode #include @@ -32,7 +32,7 @@ class KIcon public: - KIcon (); + TDEIcon (); bool isValid () const; enum Context @@ -198,10 +198,10 @@ public: %End -}; // class KIcon +}; // class TDEIcon -class KIconTheme +class TDEIconTheme { %TypeHeaderCode #include @@ -209,7 +209,7 @@ class KIconTheme public: - KIconTheme (const TQString&, const TQString& = TQString ::null ); + TDEIconTheme (const TQString&, const TQString& = TQString ::null ); TQString name () const; TQString description () const; TQString example () const; @@ -231,11 +231,11 @@ public: %End int depth () const; - int defaultSize (KIcon::Group) const; - TQValueList querySizes (KIcon::Group) const; - TQStringList queryIcons (int, KIcon::Context = KIcon ::Any ) const; - TQStringList queryIconsByContext (int, KIcon::Context = KIcon ::Any ) const; - KIcon iconPath (const TQString&, int, KIcon::MatchType) const; + int defaultSize (TDEIcon::Group) const; + TQValueList querySizes (TDEIcon::Group) const; + TQStringList queryIcons (int, TDEIcon::Context = TDEIcon ::Any ) const; + TQStringList queryIconsByContext (int, TDEIcon::Context = TDEIcon ::Any ) const; + TDEIcon iconPath (const TQString&, int, TDEIcon::MatchType) const; static TQStringList list (); static TQString current (); static void reconfigure (); @@ -245,5 +245,5 @@ public: %End -}; // class KIconTheme +}; // class TDEIconTheme diff --git a/sip/tdecore/kinstance.sip b/sip/tdecore/kinstance.sip index 94a23c3..b960c83 100644 --- a/sip/tdecore/kinstance.sip +++ b/sip/tdecore/kinstance.sip @@ -42,7 +42,7 @@ public: TDESharedConfig* sharedConfig () const; %End - KIconLoader* iconLoader () const; + TDEIconLoader* iconLoader () const; void newIconLoader () const; const TDEAboutData* aboutData () const; TQCString instanceName () const; diff --git a/sip/tdecore/kmimesourcefactory.sip b/sip/tdecore/kmimesourcefactory.sip index 44da6f9..af484a6 100644 --- a/sip/tdecore/kmimesourcefactory.sip +++ b/sip/tdecore/kmimesourcefactory.sip @@ -32,7 +32,7 @@ class KMimeSourceFactory : TQMimeSourceFactory public: - KMimeSourceFactory (KIconLoader* = TDEGlobal ::iconLoader ()); + KMimeSourceFactory (TDEIconLoader* = TDEGlobal ::iconLoader ()); virtual TQString makeAbsolute (const TQString&, const TQString&) const; protected: -- cgit v1.2.1