From 34ec7cf1e70300eb43f3822ce3261893f9f8ace6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:19:04 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- superkaramba/src/taskmanager.cpp | 26 +++++++++++++------------- superkaramba/src/taskmanager.h | 14 +++++++------- superkaramba/src/themesdlg.cpp | 4 ++-- 3 files changed, 22 insertions(+), 22 deletions(-) (limited to 'superkaramba') diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index 9186349..4e3afb2 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -345,8 +345,8 @@ Task::Task(WId win, TaskManager * parent, const char *name) : // try to guess the icon from the classhint if(_pixmap.isNull()) TDEGlobal::instance()->iconLoader()->loadIcon(className().lower(), - KIcon::Small,KIcon::Small, - KIcon::DefaultState, 0, true); + TDEIcon::Small,TDEIcon::Small, + TDEIcon::DefaultState, 0, true); // load xapp icon if (_pixmap.isNull()) @@ -373,7 +373,7 @@ void Task::refresh(bool icon) if(_pixmap.isNull()) { TDEGlobal::instance()->iconLoader()->loadIcon(className().lower(), - KIcon::Small, KIcon::Small, KIcon::DefaultState, 0, true); + TDEIcon::Small, TDEIcon::Small, TDEIcon::DefaultState, 0, true); } // load xapp icon @@ -532,20 +532,20 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon ) isStaticIcon = false; switch( size ) { - case KIcon::SizeSmall: + case TDEIcon::SizeSmall: { pixmap = icon( 16, 16, true ); // Icon of last resort if( pixmap.isNull() ) { pixmap = TDEGlobal::iconLoader()->loadIcon( "go", - KIcon::NoGroup, - KIcon::SizeSmall ); + TDEIcon::NoGroup, + TDEIcon::SizeSmall ); isStaticIcon = true; } } break; - case KIcon::SizeMedium: + case TDEIcon::SizeMedium: { // // Try 34x34 first for KDE 2.1 icons with shadows, if we don't @@ -562,13 +562,13 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon ) // Icon of last resort if( pixmap.isNull() ) { pixmap = TDEGlobal::iconLoader()->loadIcon( "go", - KIcon::NoGroup, - KIcon::SizeMedium ); + TDEIcon::NoGroup, + TDEIcon::SizeMedium ); isStaticIcon = true; } } break; - case KIcon::SizeLarge: + case TDEIcon::SizeLarge: { // If there's a 48x48 icon in the hints then use it pixmap = icon( size, size, false ); @@ -576,9 +576,9 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon ) // If not, try to get one from the classname if ( pixmap.isNull() || pixmap.width() != size || pixmap.height() != size ) { pixmap = TDEGlobal::iconLoader()->loadIcon( className(), - KIcon::NoGroup, + TDEIcon::NoGroup, size, - KIcon::DefaultState, + TDEIcon::DefaultState, 0L, true ); isStaticIcon = true; @@ -593,7 +593,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon ) // Icon of last resort if( pixmap.isNull() ) { pixmap = TDEGlobal::iconLoader()->loadIcon( "go", - KIcon::NoGroup, + TDEIcon::NoGroup, size ); isStaticIcon = true; } diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h index 12915f2..6740f54 100644 --- a/superkaramba/src/taskmanager.h +++ b/superkaramba/src/taskmanager.h @@ -104,25 +104,25 @@ public: TQValueList transients() const { return _transients; } /** - * Returns a 16x16 (KIcon::Small) icon for the task. This method will + * Returns a 16x16 (TDEIcon::Small) icon for the task. This method will * only fall back to a static icon if there is no icon of any size in * the WM hints. */ TQPixmap pixmap() const { return _pixmap; } /** - * Returns the best icon for any of the KIcon::StdSizes. If there is no + * Returns the best icon for any of the TDEIcon::StdSizes. If there is no * icon of the specified size specified in the WM hints, it will try to - * get one using KIconLoader. + * get one using TDEIconLoader. * *
      *   bool gotStaticIcon;
-     *   TQPixmap icon = myTask->icon( KIcon::SizeMedium, gotStaticIcon );
+     *   TQPixmap icon = myTask->icon( TDEIcon::SizeMedium, gotStaticIcon );
      * 
* - * @param size Any of the constants in KIcon::StdSizes. - * @param isStaticIcon Set to true if KIconLoader was used, false otherwise. - * @see KIcon + * @param size Any of the constants in TDEIcon::StdSizes. + * @param isStaticIcon Set to true if TDEIconLoader was used, false otherwise. + * @see TDEIcon */ TQPixmap bestIcon( int size, bool &isStaticIcon ); diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp index d47b039..9311853 100644 --- a/superkaramba/src/themesdlg.cpp +++ b/superkaramba/src/themesdlg.cpp @@ -127,7 +127,7 @@ void ThemesDlg::populateListbox() item = new ThemeWidget; item->icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("knewstuff", - KIcon::NoGroup, KIcon::SizeHuge)); + TDEIcon::NoGroup, TDEIcon::SizeHuge)); item->setHeaderText(i18n("Get New Stuff")); item->setDescriptionText(i18n("Download new themes.")); @@ -143,7 +143,7 @@ void ThemesDlg::populateListbox() item = new ThemeWidget; item->icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("ksysguard", - KIcon::NoGroup, KIcon::SizeHuge)); + TDEIcon::NoGroup, TDEIcon::SizeHuge)); item->setHeaderText(i18n("Open Local Theme")); item->setDescriptionText(i18n("Add local theme to the list.")); item->buttonGo->setProperty("stdItem", 18); -- cgit v1.2.3