[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] /: Remove virtual when not necessary
From:       Montel Laurent <montel () kde ! org>
Date:       2014-12-02 13:00:56
Message-ID: E1Xvn4a-0004qV-0w () scm ! kde ! org
[Download RAW message or body]

Git commit af9209f8d59abafac3830f421289c3bcaa7e59f7 by Montel Laurent.
Committed on 02/12/2014 at 12:58.
Pushed by mlaurent into branch 'master'.

Remove virtual when not necessary

M  +1    -1    incidenceeditor-ng/incidencedialog.h
M  +3    -3    kalarm/editdlg.h
M  +2    -2    kalarm/prefdlg.h
M  +1    -1    kalarm/recurrenceedit.h
M  +1    -1    kmail/configuredialog/configuredialog_p.h
M  +1    -1    kmail/secondarywindow.h
M  +1    -1    libkdepim/progresswidget/progressdialog.h
M  +1    -1    messagelist/core/view.h
M  +1    -1    messageviewer/findbar/findbarbase.h

http://commits.kde.org/kdepim/af9209f8d59abafac3830f421289c3bcaa7e59f7

diff --git a/incidenceeditor-ng/incidencedialog.h b/incidenceeditor-ng/incidencedialog.h
index 471b1ef..9b89f62 100644
--- a/incidenceeditor-ng/incidencedialog.h
+++ b/incidenceeditor-ng/incidencedialog.h
@@ -90,7 +90,7 @@ Q_SIGNALS:
     void incidenceCreated(const Akonadi::Item &);
     void invalidCollection() const;
 protected:
-    virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
+    void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
 
 protected Q_SLOTS:
     virtual void slotButtonClicked(int button);
diff --git a/kalarm/editdlg.h b/kalarm/editdlg.h
index 4ccc7b8..cd10970 100644
--- a/kalarm/editdlg.h
+++ b/kalarm/editdlg.h
@@ -90,9 +90,9 @@ class EditAlarmDlg : public KDialog
         EditAlarmDlg(bool Template, const KAEvent*, bool newAlarm, QWidget* parent = 0,
                      GetResourceType = RES_PROMPT, bool readOnly = false);
         void            init(const KAEvent* event);
-        virtual void    resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE;
-        virtual void    showEvent(QShowEvent*) Q_DECL_OVERRIDE;
-        virtual void    closeEvent(QCloseEvent*) Q_DECL_OVERRIDE;
+        void    resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE;
+        void    showEvent(QShowEvent*) Q_DECL_OVERRIDE;
+        void    closeEvent(QCloseEvent*) Q_DECL_OVERRIDE;
         virtual QString type_caption() const = 0;
         virtual void    type_init(QWidget* parent, QVBoxLayout* frameLayout) = 0;
         virtual void    type_initValues(const KAEvent*) = 0;
diff --git a/kalarm/prefdlg.h b/kalarm/prefdlg.h
index 6bd7186..1212cae 100644
--- a/kalarm/prefdlg.h
+++ b/kalarm/prefdlg.h
@@ -56,8 +56,8 @@ class KAlarmPrefDlg : public KPageDialog
         KPageWidgetItem*   mViewPageItem;
 
     protected:
-        virtual void  showEvent(QShowEvent*) Q_DECL_OVERRIDE;
-        virtual void  resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE;
+        void  showEvent(QShowEvent*) Q_DECL_OVERRIDE;
+        void  resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE;
 
     protected slots:
         virtual void slotOk();
diff --git a/kalarm/recurrenceedit.h b/kalarm/recurrenceedit.h
index ec6e871..13af431 100644
--- a/kalarm/recurrenceedit.h
+++ b/kalarm/recurrenceedit.h
@@ -106,7 +106,7 @@ class RecurrenceEdit : public QFrame
         void          contentsChanged();
 
     protected:
-        virtual void  showEvent(QShowEvent*) Q_DECL_OVERRIDE;
+        void  showEvent(QShowEvent*) Q_DECL_OVERRIDE;
 
     private slots:
         void          periodClicked(QAbstractButton*);
diff --git a/kmail/configuredialog/configuredialog_p.h b/kmail/configuredialog/configuredialog_p.h
index 8320309..ade7517 100644
--- a/kmail/configuredialog/configuredialog_p.h
+++ b/kmail/configuredialog/configuredialog_p.h
@@ -62,7 +62,7 @@ public:
     virtual void defaults();
 
 protected:
-    virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
+    void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
     void addTab(ConfigModuleTab *tab, const QString &title);
 
 private:
diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h
index 5f157fb..581f533 100644
--- a/kmail/secondarywindow.h
+++ b/kmail/secondarywindow.h
@@ -64,7 +64,7 @@ protected:
      *  last _visible_ secondary window is closed in case a system tray applet
      *  exists.
      */
-    virtual void closeEvent(QCloseEvent *) Q_DECL_OVERRIDE;
+    void closeEvent(QCloseEvent *) Q_DECL_OVERRIDE;
 };
 
 } // namespace KMail
diff --git a/libkdepim/progresswidget/progressdialog.h b/libkdepim/progresswidget/progressdialog.h
index a773ff5..f7a2c73 100644
--- a/libkdepim/progresswidget/progressdialog.h
+++ b/libkdepim/progresswidget/progressdialog.h
@@ -152,7 +152,7 @@ Q_SIGNALS:
     void visibilityChanged(bool);
 
 protected:
-    virtual void closeEvent(QCloseEvent *) Q_DECL_OVERRIDE;
+    void closeEvent(QCloseEvent *) Q_DECL_OVERRIDE;
 
     TransactionItemView *mScrollView;
     QMap<const ProgressItem *, TransactionItem *> mTransactionsToListviewItems;
diff --git a/messagelist/core/view.h b/messagelist/core/view.h
index 0602da2..c05a390 100644
--- a/messagelist/core/view.h
+++ b/messagelist/core/view.h
@@ -381,7 +381,7 @@ protected:
     /**
     * Reimplemented in order to catch QHelpEvent
     */
-    virtual bool event(QEvent *e) Q_DECL_OVERRIDE;
+    bool event(QEvent *e) Q_DECL_OVERRIDE;
 
     /**
     * Reimplemented in order to catch palette, font and style changes
diff --git a/messageviewer/findbar/findbarbase.h b/messageviewer/findbar/findbarbase.h
index f356be7..76b4d55 100644
--- a/messageviewer/findbar/findbarbase.h
+++ b/messageviewer/findbar/findbarbase.h
@@ -42,7 +42,7 @@ public:
     void focusAndSetCursor();
 
 protected:
-    virtual bool event(QEvent *e) Q_DECL_OVERRIDE;
+    bool event(QEvent *e) Q_DECL_OVERRIDE;
     virtual void clearSelections();
     virtual void updateHighLight(bool);
     virtual void searchText(bool backward, bool isAutoSearch);

[prev in list] [next in list] [prev in thread] [next in thread]