|
|
@ -152,8 +152,8 @@ void KDiff3Shell::optionsConfigureKeys()
|
|
|
|
|
|
|
|
|
|
|
|
void KDiff3Shell::optionsConfigureToolbars()
|
|
|
|
void KDiff3Shell::optionsConfigureToolbars()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
#if defined(KDE_MAKE_VERSION)
|
|
|
|
#if defined(TDE_MAKE_VERSION)
|
|
|
|
# if TDE_VERSION >= KDE_MAKE_VERSION(3,1,0)
|
|
|
|
# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
|
|
|
|
saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
|
|
|
|
saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
|
|
|
|
# else
|
|
|
|
# else
|
|
|
|
saveMainWindowSettings(KGlobal::config() );
|
|
|
|
saveMainWindowSettings(KGlobal::config() );
|
|
|
@ -171,8 +171,8 @@ void KDiff3Shell::optionsConfigureToolbars()
|
|
|
|
|
|
|
|
|
|
|
|
void KDiff3Shell::applyNewToolbarConfig()
|
|
|
|
void KDiff3Shell::applyNewToolbarConfig()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
#if defined(KDE_MAKE_VERSION)
|
|
|
|
#if defined(TDE_MAKE_VERSION)
|
|
|
|
# if TDE_VERSION >= KDE_MAKE_VERSION(3,1,0)
|
|
|
|
# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
|
|
|
|
applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
|
|
|
|
applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
|
|
|
|
# else
|
|
|
|
# else
|
|
|
|
applyMainWindowSettings(KGlobal::config());
|
|
|
|
applyMainWindowSettings(KGlobal::config());
|
|
|
|