diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
| commit | b9e542d0c805e9adee3a67e44532d5321032e21e (patch) | |
| tree | e82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /languages/cpp/app_templates/kpartapp/app.cpp | |
| parent | 7a392a04059bd904dab4c78910a6d34aa0b37798 (diff) | |
| download | tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'languages/cpp/app_templates/kpartapp/app.cpp')
| -rw-r--r-- | languages/cpp/app_templates/kpartapp/app.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp index 1088f65d..1a306aee 100644 --- a/languages/cpp/app_templates/kpartapp/app.cpp +++ b/languages/cpp/app_templates/kpartapp/app.cpp @@ -149,12 +149,12 @@ void %{APPNAME}::optionsConfigureToolbars() { #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); # endif #else - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); #endif // use the standard toolbar editor @@ -168,12 +168,12 @@ void %{APPNAME}::applyNewToolbarConfig() { #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); # endif #else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); #endif } |