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 /kompare/kompare_shell.cpp | |
| parent | 4071ae43ea213cd0f7d5c344c939ebd97d097051 (diff) | |
| download | tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.tar.gz tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kompare/kompare_shell.cpp')
| -rw-r--r-- | kompare/kompare_shell.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp index ad114109..a1c70d90 100644 --- a/kompare/kompare_shell.cpp +++ b/kompare/kompare_shell.cpp @@ -472,7 +472,7 @@ void KompareShell::optionsConfigureKeys() void KompareShell::optionsConfigureToolbars() { - saveMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); // use the standard toolbar editor KEditToolbar dlg(factory()); connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig())); @@ -481,7 +481,7 @@ void KompareShell::optionsConfigureToolbars() void KompareShell::newToolbarConfig() { - applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); } #include "kompare_shell.moc" |