diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:53 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:53 -0600 |
commit | a935c1de6f952a489a96a27cb897144b5d225ebe (patch) | |
tree | f18b873df3b93a00c8fc16844a30d1476434c03d /katapult/katapult | |
parent | 155220cc57a9be0841398c81b35cd8b22b3156ba (diff) | |
download | katapult-a935c1de6f952a489a96a27cb897144b5d225ebe.tar.gz katapult-a935c1de6f952a489a96a27cb897144b5d225ebe.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'katapult/katapult')
-rw-r--r-- | katapult/katapult/katapult.cpp | 4 | ||||
-rw-r--r-- | katapult/katapult/katapult.h | 2 |
2 files changed, 3 insertions, 3 deletions
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; |