Merge remote-tracking branch 'origin/KDE/4.10'

addressvalidationjob.h

@@ -30,10 +30,10 @@ class AddressValidationJob : public KJob
   Q_OBJECT
 
   public:
-    AddressValidationJob( const QString &emailAddresses, QWidget *parentWidget, QObject *parent = 0 );
+    explicit AddressValidationJob( const QString &emailAddresses, QWidget *parentWidget, QObject *parent = 0 );
     ~AddressValidationJob();
 
-    virtual void start();
+    void start();
 
     bool isValid() const;
 

attachmentcontroller.h

@@ -45,7 +45,7 @@ class AttachmentController : public Message::AttachmentControllerBase
   public slots:
 
      /// @reimp
-    virtual void attachMyPublicKey();
+    void attachMyPublicKey();
 
   private slots:
 

attachmentview.h

@@ -56,13 +56,13 @@ class AttachmentView : public QTreeView
     void updateAttachmentLabel();
   protected:
     /** reimpl to avoid default drag cursor */
-    virtual void startDrag( Qt::DropActions supportedActions );
+    void startDrag( Qt::DropActions supportedActions );
     /* reimpl */
-    virtual void contextMenuEvent( QContextMenuEvent *event );
+    void contextMenuEvent( QContextMenuEvent *event );
     /* reimpl */
-    virtual void keyPressEvent( QKeyEvent *event );
+    void keyPressEvent( QKeyEvent *event );
     /** reimpl to avoid drags from ourselves */
-    virtual void dragEnterEvent( QDragEnterEvent *event );
+    void dragEnterEvent( QDragEnterEvent *event );
 
   private Q_SLOTS:
     void slotShowHideAttchementList(bool);

createnewcontactjob.h

@@ -46,7 +46,7 @@ public:
     /**
      * @brief start the job
      */
-    virtual void start();
+    void start();
 
 private Q_SLOTS:
     void slotCollectionsFetched(KJob*);

kmmainwin.h

@@ -58,9 +58,9 @@ public slots:
 protected:
 
   /// Reimplemented to save the docked state
-  virtual void saveProperties( KConfigGroup & );
+  void saveProperties( KConfigGroup & );
 
-  virtual bool queryClose ();
+  bool queryClose ();
 
 protected slots:
   void slotQuit();

xfaceconfigurator.cpp

@@ -104,32 +104,32 @@ namespace KMail {
     // "obtain X-Face from" combo and label:
     hlay = new QHBoxLayout(); // inherits spacing
     vlay->addLayout( hlay );
-    mSourceCombo = new KComboBox( this );
-    mSourceCombo->setEditable( false );
-    mSourceCombo->setWhatsThis(
+    KComboBox *sourceCombo = new KComboBox( this );
+    sourceCombo->setEditable( false );
+    sourceCombo->setWhatsThis(
                     i18n("Click on the widgets below to obtain help on the input methods."));
-    mSourceCombo->setEnabled( false ); // since !mEnableCheck->isChecked()
-    mSourceCombo->addItems( QStringList()
+    sourceCombo->setEnabled( false ); // since !mEnableCheck->isChecked()
+    sourceCombo->addItems( QStringList()
         << i18nc( "continuation of \"obtain picture from\"",
                  "External Source" )
         << i18nc( "continuation of \"obtain picture from\"",
                  "Input Field Below" ) );
     label = new QLabel( i18n("Obtain pic&ture from:"), this );
-    label->setBuddy( mSourceCombo );
+    label->setBuddy( sourceCombo );
     label->setEnabled( false ); // since !mEnableCheck->isChecked()
     hlay->addWidget( label );
-    hlay->addWidget( mSourceCombo, 1 );
+    hlay->addWidget( sourceCombo, 1 );
 
     // widget stack that is controlled by the source combo:
     QStackedWidget * widgetStack = new QStackedWidget( this );
     widgetStack->setEnabled( false ); // since !mEnableCheck->isChecked()
     vlay->addWidget( widgetStack, 1 );
-    connect( mSourceCombo, SIGNAL(highlighted(int)),
+    connect( sourceCombo, SIGNAL(highlighted(int)),
              widgetStack, SLOT(setCurrentIndex(int)) );
-    connect( mSourceCombo, SIGNAL(activated(int)),
+    connect( sourceCombo, SIGNAL(activated(int)),
              widgetStack, SLOT(setCurrentIndex(int)) );
     connect( mEnableCheck, SIGNAL(toggled(bool)),
-             mSourceCombo, SLOT(setEnabled(bool)) );
+             sourceCombo, SLOT(setEnabled(bool)) );
     connect( mEnableCheck, SIGNAL(toggled(bool)),
              widgetStack, SLOT(setEnabled(bool)) );
     connect( mEnableCheck, SIGNAL(toggled(bool)),
@@ -172,7 +172,7 @@ namespace KMail {
     label1->setWordWrap( true );
     page_vlay->addWidget( label1 );
 
-    widgetStack->setCurrentIndex( 0 ); // since mSourceCombo->currentItem() == 0
+    widgetStack->setCurrentIndex( 0 ); // since sourceCombo->currentItem() == 0
 
     // page 1: input field for direct entering
     ++pageno;

xfaceconfigurator.h

@@ -19,7 +19,6 @@
 
 #include <QWidget>
 
-class KComboBox;
 class KJob;
 class KTextEdit;
 class KUrl;
@@ -55,9 +54,6 @@ namespace KMail {
     QCheckBox     * mEnableCheck;
     KTextEdit     * mTextEdit;
     QLabel        * mXFaceLabel;
-    KComboBox     * mSourceCombo;
-
-
   };
 } // namespace KMail