diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:49:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:49:30 -0600 |
| commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
| tree | d087071b1e8fcf79698938efec19f8e48bab0799 /kandy | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kandy')
| -rw-r--r-- | kandy/src/kandy.cpp | 6 | ||||
| -rw-r--r-- | kandy/src/kandyview.cpp | 4 | ||||
| -rw-r--r-- | kandy/src/mobilemain.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index 512f1550e..6fb5fc2ac 100644 --- a/kandy/src/kandy.cpp +++ b/kandy/src/kandy.cpp @@ -88,7 +88,7 @@ Kandy::Kandy(CommandScheduler *scheduler) connect(mView,TQT_SIGNAL(modifiedChanged(bool)),TQT_SLOT(setTitle())); - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); TQString currentProfile = config->readEntry("CurrentProfile", locate("appdata","default.kandy")); @@ -250,7 +250,7 @@ void Kandy::optionsConfigureKeys() void Kandy::optionsConfigureToolbars() { // use the standard toolbar editor - saveMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); dlg.exec(); @@ -261,7 +261,7 @@ void Kandy::newToolbarConfig() // this slot is called when user clicks "Ok" or "Apply" in the toolbar editor. // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) createGUI(); - applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); } void Kandy::optionsPreferences() diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp index 3791e8939..662802f55 100644 --- a/kandy/src/kandyview.cpp +++ b/kandy/src/kandyview.cpp @@ -283,7 +283,7 @@ bool KandyView::loadFile(const TQString& filename) new CommandItem(mCommandList,cmds->at(i)); } - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); config->writeEntry("CurrentProfile",filename); @@ -296,7 +296,7 @@ bool KandyView::saveFile(const TQString& filename) { if (!mScheduler->saveProfile(filename)) return false; - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); config->writeEntry("CurrentProfile",filename); diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index 945ff7c47..9a8003063 100644 --- a/kandy/src/mobilemain.cpp +++ b/kandy/src/mobilemain.cpp @@ -128,7 +128,7 @@ void MobileMain::optionsConfigureKeys() void MobileMain::optionsConfigureToolbars() { // use the standard toolbar editor - saveMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); dlg.exec(); @@ -138,7 +138,7 @@ void MobileMain::newToolbarConfig() { // recreate our GUI createGUI("kandymobileui.rc"); - applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); } void MobileMain::optionsPreferences() |