diff --git a/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp index 8db9aa4..dbbc40d 100644 --- a/katapult/common/imagedisplay.cpp +++ b/katapult/common/imagedisplay.cpp @@ -267,13 +267,13 @@ TQPixmap ImageDisplay::getDisplay() if(status() & S_Active) { - icon = KGlobal::iconLoader()->loadIcon("unknown", KIcon::NoGroup, 128); + icon = TDEGlobal::iconLoader()->loadIcon("unknown", KIcon::NoGroup, 128); if(query().isEmpty()) label = i18n("No items matched."); else label = query(); } else { - icon = KGlobal::iconLoader()->loadIcon("katapult", KIcon::NoGroup, 128); + icon = TDEGlobal::iconLoader()->loadIcon("katapult", KIcon::NoGroup, 128); if(query().isEmpty()) label = "Katapult"; else { @@ -389,7 +389,7 @@ void ImageDisplay::readSettings(KConfigBase *config) fadeTime = config->readUnsignedNumEntry("FadeTime", 250); updateFadeStep(); // fadeStep = fadeTime/FADEINTERVAL; - TQFont defaultFont = KGlobalSettings::generalFont(); + TQFont defaultFont = TDEGlobalSettings::generalFont(); fontFace = config->readEntry("FontFace", defaultFont.family()); minFontSize = config->readUnsignedNumEntry("MinFontSize", 7); maxFontSize = config->readUnsignedNumEntry("MaxFontSize", 14); diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp index 7eca292..660b8e9 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(KGlobal::iconLoader()->loadIcon("katapult", KIcon::Small)); + setPixmap(TDEGlobal::iconLoader()->loadIcon("katapult", KIcon::Small)); display = 0; globalAccel = 0; @@ -115,7 +115,7 @@ void Katapult::initDisplay() void Katapult::initAccel(TQWidget *parent) { - globalAccel = new KGlobalAccel(TQT_TQOBJECT(parent)); + globalAccel = new TDEGlobalAccel(TQT_TQOBJECT(parent)); globalAccel->insert("show_katapult", i18n("Show Launcher"), i18n("Shows the Katapult launcher"), ALT+Key_Space, ALT+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(showLauncher())); globalAccel->readSettings(); diff --git a/katapult/katapult/katapult.h b/katapult/katapult/katapult.h index b364946..fd39057 100644 --- a/katapult/katapult/katapult.h +++ b/katapult/katapult/katapult.h @@ -81,7 +81,7 @@ private: bool executing; int allStatus; KatapultDisplay *display; - KGlobalAccel *globalAccel; + TDEGlobalAccel *globalAccel; KActionCollection *actions; KatapultSettings *settings; Match bestMatch; diff --git a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp index 9847bcb..be9f492 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 KGlobal::iconLoader()->loadIcon("amarok", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("amarok", KIcon::NoGroup, size); } TQString ActionPlaySong::text() const diff --git a/katapult/plugins/catalogs/amarokcatalog/song.cpp b/katapult/plugins/catalogs/amarokcatalog/song.cpp index ebad14a..2b58f14 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 KGlobal::iconLoader()->loadIcon("multimedia", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("multimedia", KIcon::NoGroup, size); return TQPixmap(image); } diff --git a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp index 4eda633..127caa5 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 KGlobal::iconLoader()->loadIcon("fileopen", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::NoGroup, size); } TQString ActionOpenBookmark::text() const diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp index ae098f3..1d5a746 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 KGlobal::iconLoader()->loadIcon(_bookmark.icon(), KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon(_bookmark.icon(), KIcon::NoGroup, size); } KBookmark Bookmark::bookmark() const diff --git a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp index 4a67681..5c9b443 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 KGlobal::iconLoader()->loadIcon("bookmark", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("bookmark", KIcon::NoGroup, size); } TQString MozillaBookmark::url() const diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp index 219fabf..5fbac5b 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp @@ -72,13 +72,13 @@ static TQString formatNumber(const TQString &numStr) if (expString.length()==1) expString=TQString(); // Replace dot with locale decimal separator - mantString.replace(TQChar('.'), KGlobal::locale()->decimalSymbol()); + mantString.replace(TQChar('.'), TDEGlobal::locale()->decimalSymbol()); // Insert the thousand separators - _insertSeparator(mantString, KGlobal::locale()->thousandsSeparator(), KGlobal::locale()->decimalSymbol()); + _insertSeparator(mantString, TDEGlobal::locale()->thousandsSeparator(), TDEGlobal::locale()->decimalSymbol()); // How can we know where we should put the sign? - mantString.prepend(neg?KGlobal::locale()->negativeSign():KGlobal::locale()->positiveSign()); + mantString.prepend(neg?TDEGlobal::locale()->negativeSign():TDEGlobal::locale()->positiveSign()); return mantString + expString; } @@ -88,7 +88,7 @@ static TQString formatNumber(const TQString &numStr) static TQString formatNumber(const TQString& numStr) { - return KGlobal::locale()->formatNumber(numStr, false, 0); + return TDEGlobal::locale()->formatNumber(numStr, false, 0); } #endif @@ -128,7 +128,7 @@ TQString ActionEvaluateExpression::text() const TQPixmap ActionEvaluateExpression::icon(int size) const { - return KGlobal::iconLoader()->loadIcon("xcalc", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("xcalc", KIcon::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 4f6fdcc..b0bd103 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 KGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, size); } TQString Expression::text() const diff --git a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp index dcbb9a5..2605122 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 KGlobal::iconLoader()->loadIcon("fileopen", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("fileopen", KIcon::NoGroup, size); } TQString ActionOpenDocument::text() const diff --git a/katapult/plugins/catalogs/documentcatalog/directory.cpp b/katapult/plugins/catalogs/documentcatalog/directory.cpp index 09ffa72..4f68127 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 KGlobal::iconLoader()->loadIcon("folder", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("folder", KIcon::NoGroup, size); } #include "directory.moc" diff --git a/katapult/plugins/catalogs/execcatalog/actionrun.cpp b/katapult/plugins/catalogs/execcatalog/actionrun.cpp index e9680fd..8cee166 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 KGlobal::iconLoader()->loadIcon("exec", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("exec", KIcon::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 5954405..da8e4f3 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 KGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("konsole", KIcon::NoGroup, size); } TQString Command::text() const diff --git a/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp b/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp index 9f2718a..2cbcb08 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 KGlobal::iconLoader()->loadIcon("viewmag", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("viewmag", KIcon::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 96c7aa6..9211635 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 KGlobal::iconLoader()->loadIcon("help", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("help", KIcon::NoGroup, size); } TQString SearchQuery::text() const diff --git a/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp b/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp index ff1c6c1..537cf8b 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 KGlobal::iconLoader()->loadIcon("exec", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("exec", KIcon::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 a9bb1b9..aadbadf 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 KGlobal::iconLoader()->loadIcon(_icon, KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon(_icon, KIcon::NoGroup, size); } TQString Program::text() const diff --git a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp index 51f2068..cb8def1 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 KGlobal::iconLoader()->loadIcon("katapultspellcheck", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("katapultspellcheck", KIcon::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 965ca0c..9670ad0 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 KGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, size); } TQString Spelling::text() const