|
|
|
@ -153,7 +153,7 @@ void KDiff3Shell::optionsConfigureKeys()
|
|
|
|
|
void KDiff3Shell::optionsConfigureToolbars()
|
|
|
|
|
{
|
|
|
|
|
#if defined(KDE_MAKE_VERSION)
|
|
|
|
|
# if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0)
|
|
|
|
|
# if TDE_VERSION >= KDE_MAKE_VERSION(3,1,0)
|
|
|
|
|
saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
|
|
|
|
|
# else
|
|
|
|
|
saveMainWindowSettings(KGlobal::config() );
|
|
|
|
@ -172,7 +172,7 @@ void KDiff3Shell::optionsConfigureToolbars()
|
|
|
|
|
void KDiff3Shell::applyNewToolbarConfig()
|
|
|
|
|
{
|
|
|
|
|
#if defined(KDE_MAKE_VERSION)
|
|
|
|
|
# if KDE_VERSION >= KDE_MAKE_VERSION(3,1,0)
|
|
|
|
|
# if TDE_VERSION >= KDE_MAKE_VERSION(3,1,0)
|
|
|
|
|
applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
|
|
|
|
|
# else
|
|
|
|
|
applyMainWindowSettings(KGlobal::config());
|
|
|
|
|