diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kicker/applets/swallow | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/swallow')
-rw-r--r-- | kicker/applets/swallow/swallow.cpp | 10 | ||||
-rw-r--r-- | kicker/applets/swallow/swallow.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index 21a36f35b..b5910e3b0 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -255,7 +255,7 @@ void SwallowApplet::removeApplet( SwallowApp *app ) /////////////////////////////////////////////////////////////////// -static void parseCommand(KProcess *proc, TQString cmd) +static void parseCommand(TDEProcess *proc, TQString cmd) { int pos; @@ -282,15 +282,15 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent, this, TQT_SLOT(windowAdded(WId))); if (!swc->cmdline.isEmpty()) { - KProcess *process = new KProcess; + TDEProcess *process = new TDEProcess; parseCommand(process, swc->cmdline); // move window out of sight // *process << "-geometry"; // *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height()); - connect(process, TQT_SIGNAL(processExited(KProcess*)), - this, TQT_SLOT(processExited(KProcess*))); + connect(process, TQT_SIGNAL(processExited(TDEProcess*)), + this, TQT_SLOT(processExited(TDEProcess*))); process->start(); } @@ -340,7 +340,7 @@ void SwallowApp::windowAdded(WId win) } -void SwallowApp::processExited(KProcess *) +void SwallowApp::processExited(TDEProcess *) { SwallowApplet::removeApplet( this ); // also deletes this app } diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h index 437c3fa8b..72795cc79 100644 --- a/kicker/applets/swallow/swallow.h +++ b/kicker/applets/swallow/swallow.h @@ -28,7 +28,7 @@ class TQBoxLayout; class KConfig; -class KProcess; +class TDEProcess; class KWinModule; class SwallowApp; @@ -61,7 +61,7 @@ public: // for KPanelApplet int heightForWidth( int h ); void windowAdded(WId win); - void processExited(KProcess *proc); + void processExited(TDEProcess *proc); public slots: virtual void preferences(); @@ -102,10 +102,10 @@ signals: protected slots: void windowAdded(WId win); - void processExited(KProcess *proc); + void processExited(TDEProcess *proc); private: - KProcess *process; + TDEProcess *process; TQString winTitle; float wh_ratio; |