simplify ctor, toolbarIconName -> iconName

svn path=/branches/work/akonadi-ports/kdepim/; revision=1064653

configuredialog.cpp

@@ -2254,7 +2254,7 @@ void AppearancePage::MessageTagTab::slotUpdateTagSettingWidgets( int aIndex )
   mFontRequester->setFont( tmp_font );
 
   mIconButton->setEnabled( true );
-  mIconButton->setIcon( tmp_desc->toolbarIconName() );
+  mIconButton->setIcon( tmp_desc->iconName() );
 
   mKeySequenceWidget->setEnabled( true );
   mKeySequenceWidget->setKeySequence( tmp_desc->shortcut().primary(),
@@ -2341,7 +2341,7 @@ void AppearancePage::MessageTagTab::slotAddNewTag()
   mTagAddLineEdit->setText( QString() );
   QListWidgetItem *newItem = new QListWidgetItem( mTagListBox );
   newItem->setText( tmp_desc->name() );
-  newItem->setIcon( KIcon( tmp_desc->toolbarIconName() ) );
+  newItem->setIcon( KIcon( tmp_desc->iconName() ) );
   mTagListBox->addItem( newItem );
   mTagListBox->setCurrentItem( newItem );
 }
@@ -2370,7 +2370,7 @@ void AppearancePage::MessageTagTab::doLoadFromGlobalSettings()
         itl != tmp_list.end(); ++itl ) {
     const KMMessageTagDescription *tmp_desc = kmkernel->msgTagMgr()->find( *itl );
     if ( tmp_desc ) {
-      new QListWidgetItem( KIcon( tmp_desc->toolbarIconName() ), tmp_desc->name(), mTagListBox );
+      new QListWidgetItem( KIcon( tmp_desc->iconName() ), tmp_desc->name(), mTagListBox );
       KMMessageTagDescription *insert_desc = new KMMessageTagDescription( *tmp_desc );
       mMsgTagDict->insert( *itl , insert_desc );
       mMsgTagList->append( insert_desc );

kmmainwidget.cpp

@@ -4116,7 +4116,7 @@ void KMMainWidget::initializeMessageTagActions()
     QString cleanName = i18n("Message Tag %1", it.value()->name() );
     QString iconText = it.value()->name();
     cleanName.replace('&',"&&");
-    tagAction = new KToggleAction( KIcon(it.value()->toolbarIconName()),
+    tagAction = new KToggleAction( KIcon(it.value()->iconName()),
       cleanName, this );
     tagAction->setShortcut( it.value()->shortcut() );
     tagAction->setIconText( iconText );

kmmessagetag.cpp

@@ -50,20 +50,14 @@
 //----------------------------KMMessageTagDescription------------------------------------
 KMMessageTagDescription::KMMessageTagDescription(
                             const Nepomuk::Tag &tag,
-                            const int aPriority, const QColor &aTextColor, 
-                            const QColor &aBackgroundColor, 
-                            const QFont &aTextFont, const bool aInToolbar, 
-                            const KShortcut &aShortcut ) : mTag( tag ) {
+                            const int aPriority,
+                            const QColor &aTextColor ) : mTag( tag ) {
   if ( !tag.isValid() ) {
     mEmpty = true;
     return;
   }
   mPriority = aPriority;
   mTextColor = aTextColor;
-  mBackgroundColor = aBackgroundColor;
-  mTextFont = aTextFont;
-  mInToolbar = aInToolbar;
-  mShortcut = aShortcut;
   mEmpty = false;
 }
 
@@ -73,7 +67,7 @@ KMMessageTagDescription::KMMessageTagDescription( const Nepomuk::Tag &tag, const
   readConfig(aGroup);
 }
 
-const QString KMMessageTagDescription::toolbarIconName() const
+const QString KMMessageTagDescription::iconName() const
 {
   if ( mTag.symbols().isEmpty() )
     return QLatin1String( "mail-tagged" );

kmmessagetag.h

@@ -50,28 +50,21 @@ class KMMessageTagDescription
         @p aGroup . Calls readConfig( @p aGroup ) .It defaults to certain values
         for values that are not defined in the configuration.
 
+      @param tag The corresponding Nepomuk tag.
       @param aGroup The object the description is to be read from
     */
     explicit KMMessageTagDescription( const Nepomuk::Tag &tag, const KConfigGroup &aGroup );
 
     /** Constructor using a set of given parameters
-      @param aLabel 10 letter random label that uniquely identifies the tag
-      @param aName Visible name for the tag
+      @param tag The corresponding Nepomuk tag.
       @param aPriority Priority of the tag. 0 is the highest. Used in defining
             which tag to modify the appearance if the message has multiple
             tags. Note that Important and ToAct flags still dominate tags.
       @param aTextColor Text color
-      @param aBackgroundColor Background color.
-      @param aTextFont Font of the text
-      @param aInToolbar Whether the toggle button appears in the toolbar
     */
-    KMMessageTagDescription( const Nepomuk::Tag &tag,
-                  const int aPriority = -1,
-                  const QColor &aTextColor = QColor(),
-                  const QColor &aBackgroundColor = QColor(),
-                  const QFont &aTextFont = QFont(),
-                  const bool aInToolbar = false,
-                  const KShortcut &aShortcut = KShortcut() );
+    explicit KMMessageTagDescription( const Nepomuk::Tag &tag,
+                                      const int aPriority = -1,
+                                      const QColor &aTextColor = QColor() );
 
     /** Accessor functions */
     Nepomuk::Tag tag() const { return mTag; }
@@ -81,7 +74,7 @@ class KMMessageTagDescription
     const QColor backgroundColor() const { return mBackgroundColor; }
     const QFont textFont() const { return mTextFont; }
     bool inToolbar() const { return mInToolbar; }
-    const QString toolbarIconName() const;
+    const QString iconName() const;
     bool isEmpty() const { return mEmpty; }
     const KShortcut shortcut() { return mShortcut; }
 

rulewidgethandlermanager.cpp

@@ -1279,7 +1279,7 @@ namespace {
       valueCombo->setEditable( true );
       valueCombo->addItem( QString() ); // empty entry for user input
       foreach ( const KMMessageTagDescription * tagDesc, *kmkernel->msgTagMgr()->msgTagList() ) {
-        valueCombo->addItem( KIcon(tagDesc->toolbarIconName()),
+        valueCombo->addItem( KIcon(tagDesc->iconName()),
                              tagDesc->name(), tagDesc->tag().resourceUri() );
       }
       valueCombo->adjustSize();