Changeset 6451 for trunk/qt4-gui/src

Show
Ignore:
Timestamp:
07/16/08 23:07:33 (4 months ago)
Author:
flynd
Message:

No need to use a separate signal for fixed font changes.

Location:
trunk/qt4-gui/src
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/qt4-gui/src/config/general.cpp

    r6450 r6451  
    4848    myDockModeHasChanged(false), 
    4949    myFontHasChanged(false), 
    50     myFixedFontHasChanged(false), 
    5150    myBlockUpdates(false) 
    5251{ 
    … …  
    136135  emit dockModeChanged(); 
    137136  emit fontChanged(); 
    138   emit fixedFontChanged(); 
    139137} 
    140138 
    … …  
    214212    emit fontChanged(); 
    215213  } 
    216   if (myFixedFontHasChanged) 
    217   { 
    218     myFixedFontHasChanged = false; 
    219     emit fixedFontChanged(); 
    220   } 
    221214} 
    222215 
    … …  
    315308  myFixedFont = f; 
    316309  if (myBlockUpdates) 
    317     myFixedFontHasChanged = true; 
    318   else 
    319     emit fixedFontChanged(); 
     310    myFontHasChanged = true; 
     311  else 
     312    emit fontChanged(); 
    320313} 
    321314 

  • trunk/qt4-gui/src/config/general.h

    r6450 r6451  
    179179 
    180180  /** 
    181    * Fixed Font configuration has changed (not emitted for normal font) 
    182    */ 
    183   void fixedFontChanged(); 
    184  
    185   /** 
    186181   * Popup key has changed 
    187182   */ 
    … …  
    196191  bool myDockModeHasChanged; 
    197192  bool myFontHasChanged; 
    198   bool myFixedFontHasChanged; 
    199193  bool myBlockUpdates; 
    200194 

  • trunk/qt4-gui/src/widgets/mledit.cpp

    r6239 r6451  
    4747 
    4848  updateFont(); 
    49   connect(Config::General::instance(), 
    50       myUseFixedFont ? SIGNAL(fixedFontChanged()) : SIGNAL(fontChanged()), 
    51       SLOT(updateFont())); 
     49  connect(Config::General::instance(), SIGNAL(fontChanged()), SLOT(updateFont())); 
    5250} 
    5351