diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
| commit | cee429821aa6f1acc97fb482d325fb4eb37376ca (patch) | |
| tree | 4f55e04b7f000c854fe2b8347dcdb62d97de3c73 /kverbos | |
| parent | ab801f72ab45e8066a8ec6c533ef13c2da67e559 (diff) | |
| download | tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.tar.gz tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kverbos')
| -rw-r--r-- | kverbos/kverbos/kfeedercontrol.h | 4 | ||||
| -rw-r--r-- | kverbos/kverbos/kstartuplogo.cpp | 2 | ||||
| -rw-r--r-- | kverbos/kverbos/kverbos.kcfg | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kverbos/kverbos/kfeedercontrol.h b/kverbos/kverbos/kfeedercontrol.h index 635a6311..79a02cc0 100644 --- a/kverbos/kverbos/kfeedercontrol.h +++ b/kverbos/kverbos/kfeedercontrol.h @@ -39,14 +39,14 @@ public: bool addOne(); /** sends n points to the KFeeder */ bool addN(int n); - /** returns if the KProcess is still active. This is useful right after the start to + /** returns if the TDEProcess is still active. This is useful right after the start to * see if it was successful */ bool isActive() { return active; } /** returns the last result of the latest dcop operation */ bool getLastResult() { return lastResult; } private: - KProcess childFeeder; + TDEProcess childFeeder; TQCString feederID; bool active; bool lastResult; diff --git a/kverbos/kverbos/kstartuplogo.cpp b/kverbos/kverbos/kstartuplogo.cpp index b01088ec..3c5a5840 100644 --- a/kverbos/kverbos/kstartuplogo.cpp +++ b/kverbos/kverbos/kstartuplogo.cpp @@ -26,7 +26,7 @@ KStartupLogo::KStartupLogo(TQWidget * parent, const char *name) TQPixmap pm; pm.load(locate("appdata", "pics/startuplogo.png")); setBackgroundPixmap(pm); - TQRect desk = KGlobalSettings::splashScreenDesktopGeometry(); + TQRect desk = TDEGlobalSettings::splashScreenDesktopGeometry(); setGeometry(desk.center().x()-pm.width()/2, desk.center().y()-pm.height()/2, pm.width(),pm.height()); } diff --git a/kverbos/kverbos/kverbos.kcfg b/kverbos/kverbos/kverbos.kcfg index 4da6bd36..94b2cffc 100644 --- a/kverbos/kverbos/kverbos.kcfg +++ b/kverbos/kverbos/kverbos.kcfg @@ -8,7 +8,7 @@ <entry name="UserLanguage" type="String"> <label>The language selected by the user</label> <code> - KConfigBase *globalConf = KGlobal::config(); + KConfigBase *globalConf = TDEGlobal::config(); globalConf->setGroup("Locale"); TQString m_language = globalConf->readEntry("Language", "en"); //keep only the first 2 characters |