diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:30 -0600 |
| commit | 29df04c24350cc76a41e2410d1c92445f9338b98 (patch) | |
| tree | c2b9cde128e24275393a83d9eaec58b2ef12d109 /kimagemapeditor/kimeshell.cpp | |
| parent | c70534eef6085384ef7ddff369a154dbc8901917 (diff) | |
| download | tdewebdev-29df04c24350cc76a41e2410d1c92445f9338b98.tar.gz tdewebdev-29df04c24350cc76a41e2410d1c92445f9338b98.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kimagemapeditor/kimeshell.cpp')
| -rw-r--r-- | kimagemapeditor/kimeshell.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index 7005fe00..1cc8a867 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -248,12 +248,12 @@ void KimeShell::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 @@ -267,12 +267,12 @@ void KimeShell::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 } |