summaryrefslogtreecommitdiffstats
path: root/kapptemplate/kpartapp/app.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:56 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:56 -0600
commite6aaa3624cc6179b82a9bfff1760e742a669064c (patch)
tree3fed4deb0540d34f85dfb53b02bea7519e66cc6f /kapptemplate/kpartapp/app.cpp
parent4071ae43ea213cd0f7d5c344c939ebd97d097051 (diff)
downloadtdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.tar.gz
tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kapptemplate/kpartapp/app.cpp')
-rw-r--r--kapptemplate/kpartapp/app.cpp4
1 files changed, 2 insertions, 2 deletions
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()