author | sandman <sandman> | 2002-10-30 00:38:55 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-30 00:38:55 (UTC) |
commit | dce0a0f2bf08bbc42dcd97fa9ced44739c7c7763 (patch) (unidiff) | |
tree | 6044f0ac489243eb1fccb99805af89e2fc136684 | |
parent | 1e294abab44c96f1fdf4fe0e7083a19fbeb970e0 (diff) | |
download | opie-dce0a0f2bf08bbc42dcd97fa9ced44739c7c7763.zip opie-dce0a0f2bf08bbc42dcd97fa9ced44739c7c7763.tar.gz opie-dce0a0f2bf08bbc42dcd97fa9ced44739c7c7763.tar.bz2 |
Workaround for some obscure gcc bug -- this fixes bug #363
I had to reorderd some lines, because
if ( m_style_changed )
is always false if the preceding instruction is
bool newtabpos = m_tabstyle_top-> isChecked ( );
-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp index 4132b30..303e0b9 100644 --- a/noncore/settings/appearance2/appearance.cpp +++ b/noncore/settings/appearance2/appearance.cpp | |||
@@ -371,38 +371,39 @@ Appearance::Appearance( QWidget* parent, const char* name, WFlags ) | |||
371 | QWidget *styletab; | 371 | QWidget *styletab; |
372 | 372 | ||
373 | tw-> addTab ( styletab = createStyleTab ( tw ), "appearance/styletabicon.png", tr( "Style" )); | 373 | tw-> addTab ( styletab = createStyleTab ( tw ), "appearance/styletabicon.png", tr( "Style" )); |
374 | tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); | 374 | tw-> addTab ( createFontTab ( tw ), "appearance/fonttabicon.png", tr( "Font" )); |
375 | tw-> addTab ( createColorTab ( tw ), "appearance/colorstabicon.png", tr( "Colors" ) ); | 375 | tw-> addTab ( createColorTab ( tw ), "appearance/colorstabicon.png", tr( "Colors" ) ); |
376 | tw-> addTab ( createDecoTab ( tw ), "appearance/decotabicon.png", tr( "Windows" ) ); | 376 | tw-> addTab ( createDecoTab ( tw ), "appearance/decotabicon.png", tr( "Windows" ) ); |
377 | tw-> addTab ( createGuiTab ( tw ), "appearance/advancedtabicon.png", tr( "Gui" ) ); | 377 | tw-> addTab ( createGuiTab ( tw ), "appearance/advancedtabicon.png", tr( "Gui" ) ); |
378 | 378 | ||
379 | top-> addWidget ( tw, 10 ); | 379 | top-> addWidget ( tw, 10 ); |
380 | top-> addWidget ( m_sample, 1 ); | 380 | top-> addWidget ( m_sample, 1 ); |
381 | 381 | ||
382 | tw-> setCurrentTab ( styletab ); | 382 | tw-> setCurrentTab ( styletab ); |
383 | |||
384 | m_style_changed = m_font_changed = m_color_changed = m_deco_changed = false; | ||
383 | } | 385 | } |
384 | 386 | ||
385 | Appearance::~Appearance() | 387 | Appearance::~Appearance() |
386 | { | 388 | { |
387 | } | 389 | } |
388 | 390 | ||
389 | void Appearance::accept ( ) | 391 | void Appearance::accept ( ) |
390 | { | 392 | { |
391 | Config config("qpe"); | ||
392 | config.setGroup( "Appearance" ); | ||
393 | |||
394 | int newtabstyle = m_tabstyle_list-> currentItem ( ); | ||
395 | bool newtabpos = m_tabstyle_top-> isChecked ( ); | 393 | bool newtabpos = m_tabstyle_top-> isChecked ( ); |
394 | int newtabstyle = m_tabstyle_list-> currentItem ( ); | ||
396 | 395 | ||
396 | Config config ( "qpe" ); | ||
397 | config. setGroup ( "Appearance" ); | ||
397 | 398 | ||
398 | if ( m_style_changed ) { | 399 | if ( m_style_changed ) { |
399 | StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( )); | 400 | StyleListItem *item = (StyleListItem *) m_style_list-> item ( m_style_list-> currentItem ( )); |
400 | if ( item ) | 401 | if ( item ) |
401 | config.writeEntry( "Style", item-> key ( )); | 402 | config.writeEntry( "Style", item-> key ( )); |
402 | } | 403 | } |
403 | 404 | ||
404 | if ( m_deco_changed ) { | 405 | if ( m_deco_changed ) { |
405 | DecoListItem *item = (DecoListItem *) m_deco_list-> item ( m_deco_list-> currentItem ( )); | 406 | DecoListItem *item = (DecoListItem *) m_deco_list-> item ( m_deco_list-> currentItem ( )); |
406 | if ( item ) | 407 | if ( item ) |
407 | config.writeEntry( "Decoration", item-> key ( )); | 408 | config.writeEntry( "Decoration", item-> key ( )); |
408 | } | 409 | } |