Rename KIcon to enhance compatibility with KDE4

katapult/common/imagedisplay.cpp

@@ -267,13 +267,13 @@ TQPixmap ImageDisplay::getDisplay()
 		
 		if(status() & S_Active)
 		{
-			icon = TDEGlobal::iconLoader()->loadIcon("unknown", KIcon::NoGroup, 128);
+			icon = TDEGlobal::iconLoader()->loadIcon("unknown", TDEIcon::NoGroup, 128);
 			if(query().isEmpty())
 				label = i18n("No items matched.");
 			else
 				label = query();
 		} else {
-			icon = TDEGlobal::iconLoader()->loadIcon("katapult", KIcon::NoGroup, 128);
+			icon = TDEGlobal::iconLoader()->loadIcon("katapult", TDEIcon::NoGroup, 128);
 			if(query().isEmpty())
 				label = "Katapult";
 			else {

katapult/katapult/katapult.cpp

@@ -50,7 +50,7 @@ Katapult::Katapult()
 	kapp->dcopClient()->registerAs("katapult", false);
 	kapp->dcopClient()->setDefaultObject(objId());
 
-	setPixmap(TDEGlobal::iconLoader()->loadIcon("katapult", KIcon::Small));
+	setPixmap(TDEGlobal::iconLoader()->loadIcon("katapult", TDEIcon::Small));
 
 	display = 0;
 	globalAccel = 0;

katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp

@@ -35,7 +35,7 @@
 
 TQPixmap ActionPlaySong::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("amarok", KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("amarok", TDEIcon::NoGroup, size);
 }
 
 TQString ActionPlaySong::text() const

katapult/plugins/catalogs/amarokcatalog/song.cpp

@@ -68,7 +68,7 @@ TQPixmap Song::icon(int size) const
 {
 	TQImage image = cover.load(size);
 	if ( image.isNull() )
-		return TDEGlobal::iconLoader()->loadIcon("multimedia", KIcon::NoGroup, size);
+		return TDEGlobal::iconLoader()->loadIcon("multimedia", TDEIcon::NoGroup, size);
 	return TQPixmap(image);
 }
 

katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp

@@ -35,7 +35,7 @@
 
 TQPixmap ActionOpenBookmark::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("fileopen", TDEIcon::NoGroup, size);
 }
 
 TQString ActionOpenBookmark::text() const

katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp

@@ -32,7 +32,7 @@ Bookmark::Bookmark(KBookmark _bookmark)
 
 TQPixmap Bookmark::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon(_bookmark.icon(), KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon(_bookmark.icon(), TDEIcon::NoGroup, size);
 }
 
 KBookmark Bookmark::bookmark() const

katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp

@@ -35,7 +35,7 @@ MozillaBookmark::MozillaBookmark(TQString _url, TQString _title, TQPixmap _icon)
 
 TQPixmap MozillaBookmark::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("bookmark", KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("bookmark", TDEIcon::NoGroup, size);
 }
 
 TQString MozillaBookmark::url() const

katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp

@@ -128,7 +128,7 @@ TQString ActionEvaluateExpression::text() const
 
 TQPixmap ActionEvaluateExpression::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("xcalc", KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("xcalc", TDEIcon::NoGroup, size);
 }
 
 bool ActionEvaluateExpression::accepts(const KatapultItem* item) const

katapult/plugins/catalogs/calculatorcatalog/expression.cpp

@@ -40,7 +40,7 @@ TQPixmap Expression::icon(int size) const
 	if (_parseError) {
 		icon = "no";
 	}
-	return TDEGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::NoGroup, size);
 }
 
 TQString Expression::text() const

katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp

@@ -39,7 +39,7 @@ bool ActionOpenDocument::accepts(const KatapultItem* item) const
 
 TQPixmap ActionOpenDocument::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("fileopen", TDEIcon::NoGroup, size);
 }
 
 TQString ActionOpenDocument::text() const

katapult/plugins/catalogs/documentcatalog/directory.cpp

@@ -30,7 +30,7 @@ Directory::Directory(TQString _path, TQString _absPath)
 
 TQPixmap Directory::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("folder", KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("folder", TDEIcon::NoGroup, size);
 }
 
 #include "directory.moc"

katapult/plugins/catalogs/documentcatalog/document.cpp

@@ -54,11 +54,11 @@ TQPixmap Document::icon(int size) const
 			TQT_SLOT(gotPreview(const KFileItem*, const TQPixmap&)));
 	
 		if(this->_gotpix)return this->_pix;
-		return KMimeType::pixmapForURL(u,0, KIcon::NoGroup, size, KIcon::DefaultState, 0L);
+		return KMimeType::pixmapForURL(u,0, TDEIcon::NoGroup, size, TDEIcon::DefaultState, 0L);
 	}
 	else
 	{
-		return KMimeType::pixmapForURL(u,0, KIcon::NoGroup, size, KIcon::DefaultState, 0L);
+		return KMimeType::pixmapForURL(u,0, TDEIcon::NoGroup, size, TDEIcon::DefaultState, 0L);
 	}
 }
 

katapult/plugins/catalogs/execcatalog/actionrun.cpp

@@ -51,7 +51,7 @@ TQString ActionRun::text() const
 
 TQPixmap ActionRun::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("exec", KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("exec", TDEIcon::NoGroup, size);
 }
 
 bool ActionRun::accepts(const KatapultItem* item) const

katapult/plugins/catalogs/execcatalog/command.cpp

@@ -44,7 +44,7 @@ Command::~Command() {
 
 TQPixmap Command::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("konsole", TDEIcon::NoGroup, size);
 }
 
 TQString Command::text() const

katapult/plugins/catalogs/googlecatalog/actionsearch.cpp

@@ -52,7 +52,7 @@ TQString ActionSearch::text() const
 
 TQPixmap ActionSearch::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("viewmag", KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("viewmag", TDEIcon::NoGroup, size);
 }
 
 bool ActionSearch::accepts(const KatapultItem* item) const

katapult/plugins/catalogs/googlecatalog/query.cpp

@@ -44,7 +44,7 @@ SearchQuery::~SearchQuery() {
 
 TQPixmap SearchQuery::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("help", KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("help", TDEIcon::NoGroup, size);
 }
 
 TQString SearchQuery::text() const

katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp

@@ -45,7 +45,7 @@ TQString ActionRunProgram::text() const
 
 TQPixmap ActionRunProgram::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("exec", KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("exec", TDEIcon::NoGroup, size);
 }
 
 void ActionRunProgram::execute(const KatapultItem *item) const

katapult/plugins/catalogs/programcatalog/program.cpp

@@ -39,7 +39,7 @@ Program::Program(KService::Ptr s, bool useExecName)
 
 TQPixmap Program::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon(_icon, KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon(_icon, TDEIcon::NoGroup, size);
 }
 
 TQString Program::text() const

katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp

@@ -53,7 +53,7 @@ TQString ActionCopySpelling::text() const
 
 TQPixmap ActionCopySpelling::icon(int size) const
 {
-	return TDEGlobal::iconLoader()->loadIcon("katapultspellcheck", KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon("katapultspellcheck", TDEIcon::NoGroup, size);
 }
 
 bool ActionCopySpelling::accepts(const KatapultItem* item) const

katapult/plugins/catalogs/spellcatalog/spelling.cpp

@@ -67,7 +67,7 @@ TQPixmap Spelling::icon(int size) const
 	if (_parseError || misspelt) {
 		icon = "no";
 	}
-	return TDEGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, size);
+	return TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::NoGroup, size);
 }
 
 TQString Spelling::text() const