|
|
|
|
@ -152,15 +152,7 @@ void KDiff3Shell::optionsConfigureKeys()
|
|
|
|
|
|
|
|
|
|
void KDiff3Shell::optionsConfigureToolbars()
|
|
|
|
|
{
|
|
|
|
|
#if defined(TDE_MAKE_VERSION)
|
|
|
|
|
# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
|
|
|
|
|
saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
|
|
|
|
|
# else
|
|
|
|
|
saveMainWindowSettings(TDEGlobal::config() );
|
|
|
|
|
# endif
|
|
|
|
|
#else
|
|
|
|
|
saveMainWindowSettings(TDEGlobal::config() );
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
// use the standard toolbar editor
|
|
|
|
|
KEditToolbar dlg(factory());
|
|
|
|
|
@ -171,15 +163,7 @@ void KDiff3Shell::optionsConfigureToolbars()
|
|
|
|
|
|
|
|
|
|
void KDiff3Shell::applyNewToolbarConfig()
|
|
|
|
|
{
|
|
|
|
|
#if defined(TDE_MAKE_VERSION)
|
|
|
|
|
# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
|
|
|
|
|
applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
|
|
|
|
|
# else
|
|
|
|
|
applyMainWindowSettings(TDEGlobal::config());
|
|
|
|
|
# endif
|
|
|
|
|
#else
|
|
|
|
|
applyMainWindowSettings(TDEGlobal::config());
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void KDiff3Shell::slotNewInstance( const TQString& fn1, const TQString& fn2, const TQString& fn3 )
|
|
|
|
|
|