From e6aaa3624cc6179b82a9bfff1760e742a669064c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:49:56 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kapptemplate/kpartapp/app.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kapptemplate/kpartapp/app.cpp') 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() -- cgit v1.2.1