From 20600994a984148547d0eba3488f98c9670cd07f Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 9 Jan 2013 20:21:26 +0100 Subject: [PATCH] Remove not necessary virtual --- configuredialog_p.h | 78 ++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/configuredialog_p.h b/configuredialog_p.h index 1f88f3737..c1b466678 100644 --- a/configuredialog_p.h +++ b/configuredialog_p.h @@ -161,8 +161,8 @@ public: void save(); private: - virtual void doLoadFromGlobalSettings(); - virtual void doLoadOther(); + void doLoadFromGlobalSettings(); + void doLoadOther(); //FIXME virtual void doResetToDefaultsOther(); private: @@ -199,8 +199,8 @@ private slots: void slotCheckOnStatupChanged( bool checked ); private: - virtual void doLoadFromGlobalSettings(); - virtual void doLoadOther(); + void doLoadFromGlobalSettings(); + void doLoadOther(); struct RetrievalOptions { RetrievalOptions( bool manualCheck, bool offline, bool checkOnStartup ) @@ -258,9 +258,9 @@ private slots: private: //virtual void doLoadFromGlobalSettings(); - virtual void doLoadOther(); + void doLoadOther(); void updateFontSelector(); - virtual void doResetToDefaultsOther(); + void doResetToDefaultsOther(); private: QCheckBox *mCustomFontCheck; @@ -280,8 +280,8 @@ public: private: //virtual void doLoadFromGlobalSettings(); - virtual void doLoadOther(); - virtual void doResetToDefaultsOther(); + void doLoadOther(); + void doResetToDefaultsOther(); void loadColor( bool loadFromConfig ); private: @@ -301,7 +301,7 @@ public: private: //virtual void doLoadFromGlobalSettings(); - virtual void doLoadOther(); + void doLoadOther(); //FIXME virtual void doResetToDefaultsOther(); private: // data @@ -326,8 +326,8 @@ public: void save(); private: // methods - virtual void doLoadFromGlobalSettings(); - virtual void doLoadOther(); + void doLoadFromGlobalSettings(); + void doLoadOther(); // virtual void doResetToDefaultsOther(); void setDateDisplay( int id, const QString & format ); @@ -357,7 +357,7 @@ public: void save(); private: - virtual void doLoadOther(); + void doLoadOther(); //FIXME virtual void doResetToDefaultsOther(); private: // data @@ -377,7 +377,7 @@ public: void save(); private: - virtual void doLoadFromGlobalSettings(); + void doLoadFromGlobalSettings(); private: // data QCheckBox *mSystemTrayCheck; @@ -454,7 +454,7 @@ private slots: const QModelIndex &, int destinationRow ); private: - virtual void doLoadFromGlobalSettings(); + void doLoadFromGlobalSettings(); void swapTagsInListBox( const int first, const int second ); void updateButtons(); @@ -522,8 +522,8 @@ protected slots: void slotConfigureCompletionOrder(); private: - virtual void doLoadFromGlobalSettings(); - virtual void doResetToDefaultsOther(); + void doLoadFromGlobalSettings(); + void doResetToDefaultsOther(); private: QCheckBox *mAutoAppSignFileCheck; @@ -560,8 +560,8 @@ public: private slots: private: - virtual void doLoadFromGlobalSettings(); - virtual void doResetToDefaultsOther(); + void doLoadFromGlobalSettings(); + void doResetToDefaultsOther(); private: TemplateParser::TemplatesConfiguration* mWidget; }; @@ -574,10 +574,8 @@ public: void save(); -private slots: - private: - virtual void doLoadFromGlobalSettings(); + void doLoadFromGlobalSettings(); private: TemplateParser::CustomTemplates* mWidget; @@ -592,8 +590,8 @@ public: void save(); private: - virtual void doLoadFromGlobalSettings(); - virtual void doResetToDefaultsOther(); + void doLoadFromGlobalSettings(); + void doResetToDefaultsOther(); private: SimpleStringListEditor *mReplyListEditor; @@ -615,8 +613,8 @@ private slots: private: //virtual void doLoadFromGlobalSettings(); - virtual void doLoadOther(); - virtual void doResetToDefaultsOther(); + void doLoadOther(); + void doResetToDefaultsOther(); private: SimpleStringListEditor *mCharsetListEditor; @@ -640,8 +638,8 @@ private slots: private: //virtual void doLoadFromGlobalSettings(); - virtual void doLoadOther(); - virtual void doResetToDefaultsOther(); + void doLoadOther(); + void doResetToDefaultsOther(); private: QCheckBox *mCreateOwnMessageIdCheck; @@ -666,7 +664,7 @@ private slots: void slotOutlookCompatibleClicked(); private: - virtual void doLoadFromGlobalSettings(); + void doLoadFromGlobalSettings(); //FIXME virtual void doResetToDefaultsOther(); private: @@ -685,8 +683,8 @@ public: void save(); private: - virtual void doLoadFromGlobalSettings(); - virtual void doResetToDefaultsOther(); + void doLoadFromGlobalSettings(); + void doResetToDefaultsOther(); private: MessageComposer::ComposerAutoCorrectionWidget *autocorrectionWidget; @@ -756,7 +754,7 @@ public: private: //virtual void doLoadFromGlobalSettings(); - virtual void doLoadOther(); + void doLoadOther(); //FIXME virtual void doResetToDefaultsOther(); private: @@ -780,8 +778,8 @@ public: void save(); private: - virtual void doLoadFromGlobalSettings(); - virtual void doLoadOther(); + void doLoadFromGlobalSettings(); + void doLoadOther(); //FIXME virtual void doResetToDefaultsOther(); private: @@ -804,8 +802,8 @@ private Q_SLOTS: //void slotConfigureChiasmus(); private: - virtual void doLoadFromGlobalSettings(); - virtual void doLoadOther(); + void doLoadFromGlobalSettings(); + void doLoadOther(); //FIXME virtual void doResetToDefaultsOther(); private: @@ -827,7 +825,7 @@ private slots: private: //virtual void doLoadFromGlobalSettings(); - virtual void doLoadOther(); + void doLoadOther(); //FIXME virtual void doResetToDefaultsOther(); private: @@ -870,8 +868,8 @@ public: QString helpAnchor() const; private: - virtual void doLoadFromGlobalSettings(); - virtual void doLoadOther(); + void doLoadFromGlobalSettings(); + void doLoadOther(); //FIXME virtual void doResetToDefaultsOther(); private: @@ -884,10 +882,10 @@ class MiscPageInviteTab : public ConfigModuleTab { public: MiscPageInviteTab( QWidget * parent=0 ); void save(); - virtual void doResetToDefaultsOther(); + void doResetToDefaultsOther(); private: - virtual void doLoadFromGlobalSettings(); + void doLoadFromGlobalSettings(); private: MessageViewer::InvitationSettings *mInvitationUi;