diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
| commit | e6aaa3624cc6179b82a9bfff1760e742a669064c (patch) | |
| tree | 3fed4deb0540d34f85dfb53b02bea7519e66cc6f /kapptemplate | |
| parent | 4071ae43ea213cd0f7d5c344c939ebd97d097051 (diff) | |
| download | tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.tar.gz tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kapptemplate')
| -rw-r--r-- | kapptemplate/kapp/app.cpp | 4 | ||||
| -rw-r--r-- | kapptemplate/kpartapp/app.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp index 397982fa..f7888c47 100644 --- a/kapptemplate/kapp/app.cpp +++ b/kapptemplate/kapp/app.cpp @@ -224,7 +224,7 @@ void ${APP_NAME}::filePrint() void ${APP_NAME}::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(); @@ -235,7 +235,7 @@ void ${APP_NAME}::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 ${APP_NAME}::optionsPreferences() diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp index c5d21f06..d62e0883 100644 --- a/kapptemplate/kpartapp/app.cpp +++ b/kapptemplate/kpartapp/app.cpp @@ -132,7 +132,7 @@ void ${APP_NAME}::optionsConfigureKeys() void ${APP_NAME}::optionsConfigureToolbars() { - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); // use the standard toolbar editor KEditToolbar dlg(factory()); @@ -143,7 +143,7 @@ void ${APP_NAME}::optionsConfigureToolbars() void ${APP_NAME}::applyNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } void ${APP_NAME}::fileOpen() |