diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:03:49 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:03:49 -0600 |
| commit | 387a27b62f25387e42a850739ced151d64a2e760 (patch) | |
| tree | bbba39b506feb102175f10aa296b201a5a4557f5 /sip/tdecore/kiconloader.sip | |
| parent | 3d1fa8562bf693237a1a76918b4487cca3e2e356 (diff) | |
| download | pytde-387a27b62f25387e42a850739ced151d64a2e760.tar.gz pytde-387a27b62f25387e42a850739ced151d64a2e760.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'sip/tdecore/kiconloader.sip')
| -rw-r--r-- | sip/tdecore/kiconloader.sip | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sip/tdecore/kiconloader.sip b/sip/tdecore/kiconloader.sip index 23f4fcc..bf62f2e 100644 --- a/sip/tdecore/kiconloader.sip +++ b/sip/tdecore/kiconloader.sip @@ -79,19 +79,19 @@ public: #include <kiconloader.h> %End -TQPixmap DesktopIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ()); -TQPixmap DesktopIcon (const TQString&, KInstance*); -TQIconSet DesktopIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ()); -TQPixmap BarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ()); -TQPixmap BarIcon (const TQString&, KInstance*); -TQIconSet BarIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ()); -TQPixmap SmallIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ()); -TQPixmap SmallIcon (const TQString&, KInstance*); -TQIconSet SmallIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ()); -TQPixmap MainBarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ()); -TQPixmap MainBarIcon (const TQString&, KInstance*); -TQIconSet MainBarIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ()); -TQPixmap UserIcon (const TQString&, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ()); -TQPixmap UserIcon (const TQString&, KInstance*); -TQIconSet UserIconSet (const TQString&, KInstance* = KGlobal ::instance ()); -int IconSize (KIcon::Group, KInstance* = KGlobal ::instance ()); +TQPixmap DesktopIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ()); +TQPixmap DesktopIcon (const TQString&, TDEInstance*); +TQIconSet DesktopIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ()); +TQPixmap BarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ()); +TQPixmap BarIcon (const TQString&, TDEInstance*); +TQIconSet BarIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ()); +TQPixmap SmallIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ()); +TQPixmap SmallIcon (const TQString&, TDEInstance*); +TQIconSet SmallIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ()); +TQPixmap MainBarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ()); +TQPixmap MainBarIcon (const TQString&, TDEInstance*); +TQIconSet MainBarIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ()); +TQPixmap UserIcon (const TQString&, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ()); +TQPixmap UserIcon (const TQString&, TDEInstance*); +TQIconSet UserIconSet (const TQString&, TDEInstance* = KGlobal ::instance ()); +int IconSize (KIcon::Group, TDEInstance* = KGlobal ::instance ()); |