summaryrefslogtreecommitdiffstats
path: root/katapult/common
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:19:53 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:19:53 -0600
commita935c1de6f952a489a96a27cb897144b5d225ebe (patch)
treef18b873df3b93a00c8fc16844a30d1476434c03d /katapult/common
parent155220cc57a9be0841398c81b35cd8b22b3156ba (diff)
downloadkatapult-a935c1de6f952a489a96a27cb897144b5d225ebe.tar.gz
katapult-a935c1de6f952a489a96a27cb897144b5d225ebe.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'katapult/common')
-rw-r--r--katapult/common/imagedisplay.cpp6
1 files changed, 3 insertions, 3 deletions
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);