------- You are receiving this mail because: ------- You are on the CC list for the bug, or are watching someone who is. http://bugs.kde.org/show_bug.cgi?id=67689 klas.kalass gmx de changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Additional Comments From klas.kalass gmx de 2004-03-22 19:43 ------- CVS commit by kalass: if not hasDefault ; then restoreToDefault simply does not make sense :-) Fixes wrong optimization of default values CCMAIL: 67689-done bugs kde org M +6 -6 ktoolbar.cpp 1.369.2.2 --- kdelibs/kdeui/ktoolbar.cpp #1.369.2.1:1.369.2.2 @ -1122,5 +1122,5 @ void KToolBar::saveSettings(KConfig *con KConfigGroupSaver saver(config, configGroup); - if(!config->hasDefault("Position") && position == d->PositionDefault ) + if(config->hasDefault("Position") && position == d->PositionDefault ) config->revertToDefault("Position"); else @ -1129,5 +1129,5 @ void KToolBar::saveSettings(KConfig *con //kdDebug(220) << name() << " icontext=" << icontext << " hasDefault:" << config->hasDefault( "IconText" ) << " d->IconTextDefault=" << d->IconTextDefault << endl; - if(!config->hasDefault("IconText") && icontext == d->IconTextDefault ) + if(config->hasDefault("IconText") && icontext == d->IconTextDefault ) { //kdDebug(220) << name() << " reverting icontext to default" << endl; @ -1140,10 +1140,10 @ void KToolBar::saveSettings(KConfig *con } - if(!config->hasDefault("IconSize") && iconSize() == d->IconSizeDefault ) + if(config->hasDefault("IconSize") && iconSize() == d->IconSizeDefault ) config->revertToDefault("IconSize"); else config->writeEntry("IconSize", iconSize()); - if(!config->hasDefault("Hidden") && isHidden() == d->HiddenDefault ) + if(config->hasDefault("Hidden") && isHidden() == d->HiddenDefault ) config->revertToDefault("Hidden"); else @ -1162,10 +1162,10 @ void KToolBar::saveSettings(KConfig *con config->writeEntry("Index", index); - if(!config->hasDefault("Offset") && offset() == d->OffsetDefault ) + if(config->hasDefault("Offset") && offset() == d->OffsetDefault ) config->revertToDefault("Offset"); else config->writeEntry("Offset", offset()); - if(!config->hasDefault("NewLine") && newLine() == d->NewLineDefault ) + if(config->hasDefault("NewLine") && newLine() == d->NewLineDefault ) config->revertToDefault("NewLine"); else