Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 155220cc57
commit a935c1de6f

@ -267,13 +267,13 @@ TQPixmap ImageDisplay::getDisplay()
if(status() & S_Active) if(status() & S_Active)
{ {
icon = KGlobal::iconLoader()->loadIcon("unknown", KIcon::NoGroup, 128); icon = TDEGlobal::iconLoader()->loadIcon("unknown", KIcon::NoGroup, 128);
if(query().isEmpty()) if(query().isEmpty())
label = i18n("No items matched."); label = i18n("No items matched.");
else else
label = query(); label = query();
} else { } else {
icon = KGlobal::iconLoader()->loadIcon("katapult", KIcon::NoGroup, 128); icon = TDEGlobal::iconLoader()->loadIcon("katapult", KIcon::NoGroup, 128);
if(query().isEmpty()) if(query().isEmpty())
label = "Katapult"; label = "Katapult";
else { else {
@ -389,7 +389,7 @@ void ImageDisplay::readSettings(KConfigBase *config)
fadeTime = config->readUnsignedNumEntry("FadeTime", 250); fadeTime = config->readUnsignedNumEntry("FadeTime", 250);
updateFadeStep(); updateFadeStep();
// fadeStep = fadeTime/FADEINTERVAL; // fadeStep = fadeTime/FADEINTERVAL;
TQFont defaultFont = KGlobalSettings::generalFont(); TQFont defaultFont = TDEGlobalSettings::generalFont();
fontFace = config->readEntry("FontFace", defaultFont.family()); fontFace = config->readEntry("FontFace", defaultFont.family());
minFontSize = config->readUnsignedNumEntry("MinFontSize", 7); minFontSize = config->readUnsignedNumEntry("MinFontSize", 7);
maxFontSize = config->readUnsignedNumEntry("MaxFontSize", 14); maxFontSize = config->readUnsignedNumEntry("MaxFontSize", 14);

@ -50,7 +50,7 @@ Katapult::Katapult()
kapp->dcopClient()->registerAs("katapult", false); kapp->dcopClient()->registerAs("katapult", false);
kapp->dcopClient()->setDefaultObject(objId()); kapp->dcopClient()->setDefaultObject(objId());
setPixmap(KGlobal::iconLoader()->loadIcon("katapult", KIcon::Small)); setPixmap(TDEGlobal::iconLoader()->loadIcon("katapult", KIcon::Small));
display = 0; display = 0;
globalAccel = 0; globalAccel = 0;
@ -115,7 +115,7 @@ void Katapult::initDisplay()
void Katapult::initAccel(TQWidget *parent) 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, globalAccel->insert("show_katapult", i18n("Show Launcher"), i18n("Shows the Katapult launcher"), ALT+Key_Space, ALT+Key_Space,
TQT_TQOBJECT(this), TQT_SLOT(showLauncher())); TQT_TQOBJECT(this), TQT_SLOT(showLauncher()));
globalAccel->readSettings(); globalAccel->readSettings();

@ -81,7 +81,7 @@ private:
bool executing; bool executing;
int allStatus; int allStatus;
KatapultDisplay *display; KatapultDisplay *display;
KGlobalAccel *globalAccel; TDEGlobalAccel *globalAccel;
KActionCollection *actions; KActionCollection *actions;
KatapultSettings *settings; KatapultSettings *settings;
Match bestMatch; Match bestMatch;

@ -35,7 +35,7 @@
TQPixmap ActionPlaySong::icon(int size) const 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 TQString ActionPlaySong::text() const

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

@ -35,7 +35,7 @@
TQPixmap ActionOpenBookmark::icon(int size) const 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 TQString ActionOpenBookmark::text() const

@ -32,7 +32,7 @@ Bookmark::Bookmark(KBookmark _bookmark)
TQPixmap Bookmark::icon(int size) const 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 KBookmark Bookmark::bookmark() const

@ -35,7 +35,7 @@ MozillaBookmark::MozillaBookmark(TQString _url, TQString _title, TQPixmap _icon)
TQPixmap MozillaBookmark::icon(int size) const 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 TQString MozillaBookmark::url() const

@ -72,13 +72,13 @@ static TQString formatNumber(const TQString &numStr)
if (expString.length()==1) expString=TQString(); if (expString.length()==1) expString=TQString();
// Replace dot with locale decimal separator // Replace dot with locale decimal separator
mantString.replace(TQChar('.'), KGlobal::locale()->decimalSymbol()); mantString.replace(TQChar('.'), TDEGlobal::locale()->decimalSymbol());
// Insert the thousand separators // 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? // 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; return mantString + expString;
} }
@ -88,7 +88,7 @@ static TQString formatNumber(const TQString &numStr)
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 #endif
@ -128,7 +128,7 @@ TQString ActionEvaluateExpression::text() const
TQPixmap ActionEvaluateExpression::icon(int size) 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 bool ActionEvaluateExpression::accepts(const KatapultItem* item) const

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

@ -39,7 +39,7 @@ bool ActionOpenDocument::accepts(const KatapultItem* item) const
TQPixmap ActionOpenDocument::icon(int size) 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 TQString ActionOpenDocument::text() const

@ -30,7 +30,7 @@ Directory::Directory(TQString _path, TQString _absPath)
TQPixmap Directory::icon(int size) const 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" #include "directory.moc"

@ -51,7 +51,7 @@ TQString ActionRun::text() const
TQPixmap ActionRun::icon(int size) 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 bool ActionRun::accepts(const KatapultItem* item) const

@ -44,7 +44,7 @@ Command::~Command() {
TQPixmap Command::icon(int size) const 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 TQString Command::text() const

@ -52,7 +52,7 @@ TQString ActionSearch::text() const
TQPixmap ActionSearch::icon(int size) 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 bool ActionSearch::accepts(const KatapultItem* item) const

@ -44,7 +44,7 @@ SearchQuery::~SearchQuery() {
TQPixmap SearchQuery::icon(int size) const 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 TQString SearchQuery::text() const

@ -45,7 +45,7 @@ TQString ActionRunProgram::text() const
TQPixmap ActionRunProgram::icon(int size) 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 void ActionRunProgram::execute(const KatapultItem *item) const

@ -39,7 +39,7 @@ Program::Program(KService::Ptr s, bool useExecName)
TQPixmap Program::icon(int size) const 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 TQString Program::text() const

@ -53,7 +53,7 @@ TQString ActionCopySpelling::text() const
TQPixmap ActionCopySpelling::icon(int size) 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 bool ActionCopySpelling::accepts(const KatapultItem* item) const

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

Loading…
Cancel
Save