diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:19 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:20:19 -0600 |
| commit | 672c9c39de40e4da2849acbacf0b943dd26a31ac (patch) | |
| tree | 4e7c5dc2fdb4ad4a5965f155d637469539f5756f /src | |
| parent | f6fa7358bce15f669048effe68b8fb77ed6ffb58 (diff) | |
| download | kdiff3-672c9c39de40e4da2849acbacf0b943dd26a31ac.tar.gz kdiff3-672c9c39de40e4da2849acbacf0b943dd26a31ac.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/kdiff3_shell.cpp | 12 | ||||
| -rw-r--r-- | src/kreplacements/kreplacements.h | 2 | ||||
| -rw-r--r-- | src/optiondialog.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp index 226b6c3..a8a2a84 100644 --- a/src/kdiff3_shell.cpp +++ b/src/kdiff3_shell.cpp @@ -154,12 +154,12 @@ void KDiff3Shell::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 @@ -173,12 +173,12 @@ void KDiff3Shell::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 } diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h index ca172c6..bebe96c 100644 --- a/src/kreplacements/kreplacements.h +++ b/src/kreplacements/kreplacements.h @@ -410,7 +410,7 @@ public: KEditToolbar( int ){} }; -class KGlobal +class TDEGlobal { public: static KConfig* config() { return 0; } diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index 8b15dc8..7c70004 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -518,7 +518,7 @@ void OptionDialog::setupFontPage( void ) #elif defined( KREPLACEMENTS_H ) TQFont("Courier", 10 ); #else - KGlobalSettings::fixedFont(); + TDEGlobalSettings::fixedFont(); #endif OptionFontChooser* pFontChooser = new OptionFontChooser( defaultFont, "Font", &m_font, page, this ); |