summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--katapult/common/imagedisplay.cpp4
-rw-r--r--katapult/katapult/katapult.cpp2
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp2
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/song.cpp2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp2
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp2
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/expression.cpp2
-rw-r--r--katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp2
-rw-r--r--katapult/plugins/catalogs/documentcatalog/directory.cpp2
-rw-r--r--katapult/plugins/catalogs/documentcatalog/document.cpp4
-rw-r--r--katapult/plugins/catalogs/execcatalog/actionrun.cpp2
-rw-r--r--katapult/plugins/catalogs/execcatalog/command.cpp2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/actionsearch.cpp2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/query.cpp2
-rw-r--r--katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp2
-rw-r--r--katapult/plugins/catalogs/programcatalog/program.cpp2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/spelling.cpp2
20 files changed, 22 insertions, 22 deletions
diff --git a/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp
index 27eae8e..4809123 100644
--- a/katapult/common/imagedisplay.cpp
+++ b/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 {
diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp
index f6ef5ae..2ba973c 100644
--- a/katapult/katapult/katapult.cpp
+++ b/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;
diff --git a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp
index be9f492..d01352c 100644
--- a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/amarokcatalog/song.cpp b/katapult/plugins/catalogs/amarokcatalog/song.cpp
index 2b58f14..5c3d304 100644
--- a/katapult/plugins/catalogs/amarokcatalog/song.cpp
+++ b/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);
}
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp
index 127caa5..dbf2605 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp
index 1d5a746..8be1de0 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp
index 5c9b443..4e35d50 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp
index 4ac6e64..47d5529 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/calculatorcatalog/expression.cpp b/katapult/plugins/catalogs/calculatorcatalog/expression.cpp
index b0bd103..70f27cb 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/expression.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp
index 2605122..6714c0d 100644
--- a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/documentcatalog/directory.cpp b/katapult/plugins/catalogs/documentcatalog/directory.cpp
index 4f68127..8ee1993 100644
--- a/katapult/plugins/catalogs/documentcatalog/directory.cpp
+++ b/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"
diff --git a/katapult/plugins/catalogs/documentcatalog/document.cpp b/katapult/plugins/catalogs/documentcatalog/document.cpp
index ca89717..8643264 100644
--- a/katapult/plugins/catalogs/documentcatalog/document.cpp
+++ b/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);
}
}
diff --git a/katapult/plugins/catalogs/execcatalog/actionrun.cpp b/katapult/plugins/catalogs/execcatalog/actionrun.cpp
index 8cee166..88453e9 100644
--- a/katapult/plugins/catalogs/execcatalog/actionrun.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/execcatalog/command.cpp b/katapult/plugins/catalogs/execcatalog/command.cpp
index da8e4f3..c896486 100644
--- a/katapult/plugins/catalogs/execcatalog/command.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp b/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp
index 2cbcb08..fc18886 100644
--- a/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/googlecatalog/query.cpp b/katapult/plugins/catalogs/googlecatalog/query.cpp
index 9211635..0d36a13 100644
--- a/katapult/plugins/catalogs/googlecatalog/query.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp b/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp
index 537cf8b..ee0b6e0 100644
--- a/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/programcatalog/program.cpp b/katapult/plugins/catalogs/programcatalog/program.cpp
index aadbadf..0b4eaa7 100644
--- a/katapult/plugins/catalogs/programcatalog/program.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
index cb8def1..0c80d1e 100644
--- a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
+++ b/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
diff --git a/katapult/plugins/catalogs/spellcatalog/spelling.cpp b/katapult/plugins/catalogs/spellcatalog/spelling.cpp
index 9670ad0..bbbab38 100644
--- a/katapult/plugins/catalogs/spellcatalog/spelling.cpp
+++ b/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