Rename KIcon to enhance compatibility with KDE4

systemsettings/kcmsearch.cpp

@@ -28,7 +28,7 @@
 #include "moduleiconitem.h"
 
 KcmSearch::KcmSearch( TQPtrList<ModulesView> *moduleViewList, TQWidget *parent, const char *name )
-				: KIconViewSearchLine(parent, (moduleViewList->at(0))?moduleViewList->at(0)->groups[0]:NULL, name){
+				: TDEIconViewSearchLine(parent, (moduleViewList->at(0))?moduleViewList->at(0)->groups[0]:NULL, name){
 	this->moduleViewList = moduleViewList;
 }
 

systemsettings/kcmsearch.h

@@ -31,7 +31,7 @@ class ModulesView;
  * Searches all the ModuleIconItem's in MainWindow and "disables" the ones
  * whos keywords don't match the current search.
  */
-class KcmSearch : public KIconViewSearchLine
+class KcmSearch : public TDEIconViewSearchLine
 {
 	Q_OBJECT
   

systemsettings/kcmultiwidget.cpp

@@ -256,13 +256,13 @@ void KCMultiWidget::addModule(const TDECModuleInfo& moduleinfo,
 				parentmodulenames += moduleinfo.moduleName();
 				page = addHBoxPage( parentmodulenames, moduleinfo.comment(),
 						SmallIcon( moduleinfo.icon(),
-							IconSize( KIcon::Small ) ) );
+							IconSize( TDEIcon::Small ) ) );
 				break;
 			case Tabbed:
 			case IconList:
 				page = addHBoxPage( moduleinfo.moduleName(),
 						moduleinfo.comment(), DesktopIcon( moduleinfo.icon(),
-							KIcon::SizeMedium ) );
+							TDEIcon::SizeMedium ) );
 				break;
 			case Plain:
 				page = plainPage();

systemsettings/moduleiconitem.cpp

@@ -24,25 +24,25 @@
 
 #define IMAGE_SIZE 32
 
-ModuleIconItem::ModuleIconItem( KIconView *parent, TDECModuleInfo module)
+ModuleIconItem::ModuleIconItem( TDEIconView *parent, TDECModuleInfo module)
 	: TQIconViewItem( parent, module.moduleName(),
 		SmallIcon( module.icon(), IMAGE_SIZE ) ),
-		currentState( KIcon::ActiveState), imageName(module.icon())
+		currentState( TDEIcon::ActiveState), imageName(module.icon())
 {
 	modules.append(module);
 }
 
-ModuleIconItem::ModuleIconItem( KIconView *parent, const TQString &text,
+ModuleIconItem::ModuleIconItem( TDEIconView *parent, const TQString &text,
 		const TQString &imageName )
 	: TQIconViewItem( parent, text, SmallIcon( imageName, IMAGE_SIZE ) ),
-			currentState( KIcon::ActiveState )
+			currentState( TDEIcon::ActiveState )
 {
 	this->imageName = imageName;
 }
 
 void ModuleIconItem::loadIcon( bool enabled )
 {
-	int newState = enabled ? KIcon::DefaultState : KIcon::DisabledState;
+	int newState = enabled ? TDEIcon::DefaultState : TDEIcon::DisabledState;
 	if( newState == currentState )
 		return;
 

systemsettings/moduleiconitem.h

@@ -35,9 +35,9 @@ class ModuleIconItem : public TQIconViewItem
 {
 
 public:
-  ModuleIconItem( KIconView *parent, TDECModuleInfo module );
+  ModuleIconItem( TDEIconView *parent, TDECModuleInfo module );
 	
-  ModuleIconItem( KIconView *parent, const TQString &text,
+  ModuleIconItem( TDEIconView *parent, const TQString &text,
 									const TQString &imageName );
 
 	/**

systemsettings/modulesview.cpp

@@ -152,7 +152,7 @@ void ModulesView::createRow( const TQString &parentPath, TQBoxLayout *boxLayout
 			TQString path = (*it).subMenu;
 			KServiceGroup::Ptr group = KServiceGroup::group( path );
 			if ( group ) {
-				ModuleIconItem *item = new ModuleIconItem( ((KIconView*)iconView),
+				ModuleIconItem *item = new ModuleIconItem( ((TDEIconView*)iconView),
 												group->caption(), group->icon() );
 				item->modules = rootMenu->modules( path );
 			}

systemsettings/modulesview.h

@@ -26,12 +26,12 @@
 /**
  * Overloaded to give a larger default size that fits with text of two lines.
  */
-class RowIconView : public KIconView
+class RowIconView : public TDEIconView
 {
 
 public:
 	RowIconView( TQWidget* parent, const char *name=0 )
-					: KIconView( parent, name ){ };
+					: TDEIconView( parent, name ){ };
 		
 	// Figure out the hight/width to have only one row
 	TQSize minimumSizeHint() const {