diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,6 +125,10 @@ add_definitions(-DHAVE_POSIX_ACL) endif(ACL_HEADERS_FOUND AND ACL_LIBS AND ATTR_LIBS) +if (CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" CACHE STRING "" FORCE) +endif() + #include(ConfigureChecks.cmake) add_subdirectory(krusader) diff --git a/krArc/krarc.h b/krArc/krarc.h --- a/krArc/krarc.h +++ b/krArc/krarc.h @@ -63,7 +63,7 @@ protected: virtual bool initDirDict(const QUrl &url, bool forced = false); virtual bool initArcParameters(); - void checkIf7zIsEncrypted(bool &, QString); + void checkIf7zIsEncrypted(bool &, QString) Q_DECL_OVERRIDE; virtual void parseLine(int lineNo, QString line); virtual bool setArcFile(const QUrl &url); virtual QString getPassword(); diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp --- a/krArc/krarc.cpp +++ b/krArc/krarc.cpp @@ -73,21 +73,21 @@ KrArcCodec(QTextCodec * codec) : originalCodec(codec) {} virtual ~KrArcCodec() {} - virtual QByteArray name() const { + virtual QByteArray name() const Q_DECL_OVERRIDE { return originalCodec->name(); } - virtual QList aliases() const { + virtual QList aliases() const Q_DECL_OVERRIDE { return originalCodec->aliases(); } - virtual int mibEnum() const { + virtual int mibEnum() const Q_DECL_OVERRIDE { return originalCodec->mibEnum(); } protected: - virtual QString convertToUnicode(const char *in, int length, ConverterState *state) const { + virtual QString convertToUnicode(const char *in, int length, ConverterState *state) const Q_DECL_OVERRIDE { return originalCodec->toUnicode(in, length, state); } - virtual QByteArray convertFromUnicode(const QChar *in, int length, ConverterState *state) const { + virtual QByteArray convertFromUnicode(const QChar *in, int length, ConverterState *state) const Q_DECL_OVERRIDE { // the QByteArray is embedded into the unicode charset (QProcess hell) QByteArray result; for (int i = 0; i != length; i++) { diff --git a/krusader/ActionMan/addplaceholderpopup.h b/krusader/ActionMan/addplaceholderpopup.h --- a/krusader/ActionMan/addplaceholderpopup.h +++ b/krusader/ActionMan/addplaceholderpopup.h @@ -116,10 +116,10 @@ { public: ParameterText(const exp_parameter& parameter, QWidget* parent); - QString text(); - QString preset(); - void reset(); - bool valid(); + QString text() Q_DECL_OVERRIDE; + QString preset() Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + bool valid() Q_DECL_OVERRIDE; private: KLineEdit * _lineEdit; QString _preset; @@ -134,10 +134,10 @@ Q_OBJECT public: ParameterPlaceholder(const exp_parameter& parameter, QWidget* parent); - QString text(); - QString preset(); - void reset(); - bool valid(); + QString text() Q_DECL_OVERRIDE; + QString preset() Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + bool valid() Q_DECL_OVERRIDE; private: KLineEdit * _lineEdit; QToolButton* _button; @@ -153,10 +153,10 @@ { public: ParameterYes(const exp_parameter& parameter, QWidget* parent); - QString text(); - QString preset(); - void reset(); - bool valid(); + QString text() Q_DECL_OVERRIDE; + QString preset() Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + bool valid() Q_DECL_OVERRIDE; private: QCheckBox* _checkBox; }; @@ -169,10 +169,10 @@ { public: ParameterNo(const exp_parameter& parameter, QWidget* parent); - QString text(); - QString preset(); - void reset(); - bool valid(); + QString text() Q_DECL_OVERRIDE; + QString preset() Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + bool valid() Q_DECL_OVERRIDE; private: QCheckBox* _checkBox; }; @@ -186,10 +186,10 @@ Q_OBJECT public: ParameterFile(const exp_parameter& parameter, QWidget* parent); - QString text(); - QString preset(); - void reset(); - bool valid(); + QString text() Q_DECL_OVERRIDE; + QString preset() Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + bool valid() Q_DECL_OVERRIDE; private: KLineEdit * _lineEdit; QToolButton* _button; @@ -205,10 +205,10 @@ { public: ParameterChoose(const exp_parameter& parameter, QWidget* parent); - QString text(); - QString preset(); - void reset(); - bool valid(); + QString text() Q_DECL_OVERRIDE; + QString preset() Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + bool valid() Q_DECL_OVERRIDE; private: KComboBox * _combobox; }; @@ -221,10 +221,10 @@ { public: ParameterSelect(const exp_parameter& parameter, QWidget* parent); - QString text(); - QString preset(); - void reset(); - bool valid(); + QString text() Q_DECL_OVERRIDE; + QString preset() Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + bool valid() Q_DECL_OVERRIDE; private: KComboBox * _combobox; }; @@ -238,10 +238,10 @@ Q_OBJECT public: ParameterGoto(const exp_parameter& parameter, QWidget* parent); - QString text(); - QString preset(); - void reset(); - bool valid(); + QString text() Q_DECL_OVERRIDE; + QString preset() Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + bool valid() Q_DECL_OVERRIDE; private: KLineEdit * _lineEdit; QToolButton* _dirButton, *_placeholderButton; @@ -258,10 +258,10 @@ { public: ParameterSyncprofile(const exp_parameter& parameter, QWidget* parent); - QString text(); - QString preset(); - void reset(); - bool valid(); + QString text() Q_DECL_OVERRIDE; + QString preset() Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + bool valid() Q_DECL_OVERRIDE; private: KComboBox * _combobox; }; @@ -274,10 +274,10 @@ { public: ParameterPanelprofile(const exp_parameter& parameter, QWidget* parent); - QString text(); - QString preset(); - void reset(); - bool valid(); + QString text() Q_DECL_OVERRIDE; + QString preset() Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + bool valid() Q_DECL_OVERRIDE; private: KComboBox * _combobox; }; @@ -290,10 +290,10 @@ { public: ParameterSearch(const exp_parameter& parameter, QWidget* parent); - QString text(); - QString preset(); - void reset(); - bool valid(); + QString text() Q_DECL_OVERRIDE; + QString preset() Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + bool valid() Q_DECL_OVERRIDE; private: KComboBox * _combobox; }; @@ -306,10 +306,10 @@ { public: ParameterInt(const exp_parameter& parameter, QWidget* parent); - QString text(); - QString preset(); - void reset(); - bool valid(); + QString text() Q_DECL_OVERRIDE; + QString preset() Q_DECL_OVERRIDE; + void reset() Q_DECL_OVERRIDE; + bool valid() Q_DECL_OVERRIDE; private: QSpinBox * _spinbox; int _default; diff --git a/krusader/Archive/krarchandler.h b/krusader/Archive/krarchandler.h --- a/krusader/Archive/krarchandler.h +++ b/krusader/Archive/krarchandler.h @@ -74,7 +74,7 @@ // queries the password from the user static QString getPassword(QString path); // detects the archive type - void checkIf7zIsEncrypted(bool &, QString); + void checkIf7zIsEncrypted(bool &, QString) Q_DECL_OVERRIDE; private: //! checks if a returned status ("exit code") of an archiving-related process is OK static bool checkStatus(QString type, int exitCode); diff --git a/krusader/BookMan/krbookmarkhandler.h b/krusader/BookMan/krbookmarkhandler.h --- a/krusader/BookMan/krbookmarkhandler.h +++ b/krusader/BookMan/krbookmarkhandler.h @@ -64,7 +64,7 @@ void clearBookmarks(KrBookmark *root, bool removeBookmarks = true); void buildMenu(KrBookmark *parent, QMenu *menu, int depth = 0); - bool eventFilter(QObject *obj, QEvent *ev); + bool eventFilter(QObject *obj, QEvent *ev) Q_DECL_OVERRIDE; void rightClicked(QMenu *menu, KrBookmark *bm); void rightClickOnSpecialBookmark(); diff --git a/krusader/Dialogs/krspecialwidgets.h b/krusader/Dialogs/krspecialwidgets.h --- a/krusader/Dialogs/krspecialwidgets.h +++ b/krusader/Dialogs/krspecialwidgets.h @@ -46,7 +46,7 @@ void addSlice(KIO::filesize_t size, QString label); protected: - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; private: QList slices; @@ -88,7 +88,7 @@ } protected: - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; private: KIO::filesize_t totalSpace, freeSpace; diff --git a/krusader/Dialogs/krspwidgets.h b/krusader/Dialogs/krspwidgets.h --- a/krusader/Dialogs/krspwidgets.h +++ b/krusader/Dialogs/krspwidgets.h @@ -56,8 +56,8 @@ newFTPSub(); protected: - void reject(); - void accept(); + void reject() Q_DECL_OVERRIDE; + void accept() Q_DECL_OVERRIDE; }; /////////////////////////// KRMaskChoiceSub ///////////////////////////////// @@ -69,15 +69,15 @@ explicit KRMaskChoiceSub(QWidget * parent = 0); public slots: - void addSelection(); - void deleteSelection(); - void clearSelections(); - void acceptFromList(QListWidgetItem *i); - void currentItemChanged(QListWidgetItem *i); + void addSelection() Q_DECL_OVERRIDE; + void deleteSelection() Q_DECL_OVERRIDE; + void clearSelections() Q_DECL_OVERRIDE; + void acceptFromList(QListWidgetItem *i) Q_DECL_OVERRIDE; + void currentItemChanged(QListWidgetItem *i) Q_DECL_OVERRIDE; protected: - void reject(); - void accept(); + void reject() Q_DECL_OVERRIDE; + void accept() Q_DECL_OVERRIDE; }; #endif diff --git a/krusader/Dialogs/krsqueezedtextlabel.h b/krusader/Dialogs/krsqueezedtextlabel.h --- a/krusader/Dialogs/krsqueezedtextlabel.h +++ b/krusader/Dialogs/krsqueezedtextlabel.h @@ -54,7 +54,7 @@ void clicked(QMouseEvent *); /**< emitted when someone clicks on the label */ protected: - void resizeEvent(QResizeEvent *) { + void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE { squeezeTextToLabel(_index, _length); } virtual void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; diff --git a/krusader/Dialogs/newftpgui.h b/krusader/Dialogs/newftpgui.h --- a/krusader/Dialogs/newftpgui.h +++ b/krusader/Dialogs/newftpgui.h @@ -50,7 +50,7 @@ KLineEdit* password; protected: - bool event(QEvent *); + bool event(QEvent *) Q_DECL_OVERRIDE; private slots: void slotTextChanged(const QString &); diff --git a/krusader/Dialogs/packgui.h b/krusader/Dialogs/packgui.h --- a/krusader/Dialogs/packgui.h +++ b/krusader/Dialogs/packgui.h @@ -31,11 +31,11 @@ PackGUI(QString defaultName, QString defaultPath, int noOfFiles, QString filename = ""); public slots: - void browse(); + void browse() Q_DECL_OVERRIDE; protected slots: - void accept(); - void reject(); + void accept() Q_DECL_OVERRIDE; + void reject() Q_DECL_OVERRIDE; public: static QString filename, destination, type; diff --git a/krusader/DiskUsage/filelightParts/fileTree.h b/krusader/DiskUsage/filelightParts/fileTree.h --- a/krusader/DiskUsage/filelightParts/fileTree.h +++ b/krusader/DiskUsage/filelightParts/fileTree.h @@ -338,7 +338,7 @@ } virtual ~Directory() {} - virtual bool isDir() const { + virtual bool isDir() const Q_DECL_OVERRIDE { return true; } diff --git a/krusader/FileSystem/defaultfilesystem.h b/krusader/FileSystem/defaultfilesystem.h --- a/krusader/FileSystem/defaultfilesystem.h +++ b/krusader/FileSystem/defaultfilesystem.h @@ -61,7 +61,7 @@ QUrl getUrl(const QString &name) const Q_DECL_OVERRIDE; bool canMoveToTrash(const QStringList &) const Q_DECL_OVERRIDE { return isLocal(); } - QString mountPoint() const { return _mountPoint; } + QString mountPoint() const Q_DECL_OVERRIDE { return _mountPoint; } bool hasAutoUpdate() const Q_DECL_OVERRIDE { return !_watcher.isNull(); } void updateFilesystemInfo() Q_DECL_OVERRIDE; diff --git a/krusader/FileSystem/filesystem.h b/krusader/FileSystem/filesystem.h --- a/krusader/FileSystem/filesystem.h +++ b/krusader/FileSystem/filesystem.h @@ -67,9 +67,9 @@ virtual ~FileSystem(); // DirListerInterface implementation - inline QList fileItems() const { return _fileItems.values(); } - inline unsigned long numFileItems() const { return _fileItems.count(); } - inline bool isRoot() const { + inline QList fileItems() const Q_DECL_OVERRIDE { return _fileItems.values(); } + inline unsigned long numFileItems() const Q_DECL_OVERRIDE { return _fileItems.count(); } + inline bool isRoot() const Q_DECL_OVERRIDE { const QString path = _currentDirectory.path(); return path.isEmpty() || path == "/"; } diff --git a/krusader/GUI/kcmdline.h b/krusader/GUI/kcmdline.h --- a/krusader/GUI/kcmdline.h +++ b/krusader/GUI/kcmdline.h @@ -79,14 +79,14 @@ void setCurrent(const QString &path); //virtual methods from KrActionBase void setText(QString text); - QString command() const; - ExecType execType() const; - QString startpath() const; - QString user() const; - QString text() const; - bool acceptURLs() const; - bool confirmExecution() const; - bool doSubstitution() const; + QString command() const Q_DECL_OVERRIDE; + ExecType execType() const Q_DECL_OVERRIDE; + QString startpath() const Q_DECL_OVERRIDE; + QString user() const Q_DECL_OVERRIDE; + QString text() const Q_DECL_OVERRIDE; + bool acceptURLs() const Q_DECL_OVERRIDE; + bool confirmExecution() const Q_DECL_OVERRIDE; + bool doSubstitution() const Q_DECL_OVERRIDE; signals: void signalRun(); diff --git a/krusader/GUI/mediabutton.h b/krusader/GUI/mediabutton.h --- a/krusader/GUI/mediabutton.h +++ b/krusader/GUI/mediabutton.h @@ -61,7 +61,7 @@ void aboutToShow(); protected: - bool eventFilter(QObject *o, QEvent *e); + bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; bool getNameAndIcon(Solid::Device &, QString &, QIcon &); private: diff --git a/krusader/KViewer/lister.cpp b/krusader/KViewer/lister.cpp --- a/krusader/KViewer/lister.cpp +++ b/krusader/KViewer/lister.cpp @@ -1182,15 +1182,15 @@ } protected: - virtual QString currentCharacterSet() { + virtual QString currentCharacterSet() Q_DECL_OVERRIDE { return _lister->characterSet(); } - virtual void chooseDefault() { + virtual void chooseDefault() Q_DECL_OVERRIDE { _lister->setCharacterSet(QString()); } - virtual void chooseEncoding(QString encodingName) { + virtual void chooseEncoding(QString encodingName) Q_DECL_OVERRIDE { QString charset = KCharsets::charsets()->encodingForName(encodingName); _lister->setCharacterSet(charset); } diff --git a/krusader/KViewer/panelviewer.h b/krusader/KViewer/panelviewer.h --- a/krusader/KViewer/panelviewer.h +++ b/krusader/KViewer/panelviewer.h @@ -93,19 +93,19 @@ { Q_OBJECT public slots: - virtual bool closeUrl(); + virtual bool closeUrl() Q_DECL_OVERRIDE; public: explicit PanelViewer(QWidget *parent, KrViewer::Mode mode = KrViewer::Default); ~PanelViewer(); - virtual bool isEditor() { + virtual bool isEditor() Q_DECL_OVERRIDE { return false; } protected: - virtual void openFile(KFileItem fi); - virtual KParts::ReadOnlyPart* createPart(QString mimetype); + virtual void openFile(KFileItem fi) Q_DECL_OVERRIDE; + virtual KParts::ReadOnlyPart* createPart(QString mimetype) Q_DECL_OVERRIDE; KParts::ReadOnlyPart* getDefaultPart(KFileItem fi); KParts::ReadOnlyPart* getHexPart(); KParts::ReadOnlyPart* getListerPart(bool hexMode = false); @@ -116,24 +116,24 @@ { Q_OBJECT public: - virtual bool isModified(); - virtual bool isEditor() { + virtual bool isModified() Q_DECL_OVERRIDE; + virtual bool isEditor() Q_DECL_OVERRIDE { return true; } static void configureDeps(); public slots: - virtual bool closeUrl(); - virtual bool queryClose(); + virtual bool closeUrl() Q_DECL_OVERRIDE; + virtual bool queryClose() Q_DECL_OVERRIDE; public: explicit PanelEditor(QWidget *parent, KrViewer::Mode mode = KrViewer::Default); ~PanelEditor(); protected: - virtual void openFile(KFileItem fi); - virtual KParts::ReadOnlyPart* createPart(QString mimetype); + virtual void openFile(KFileItem fi) Q_DECL_OVERRIDE; + virtual KParts::ReadOnlyPart* createPart(QString mimetype) Q_DECL_OVERRIDE; static QString missingKPartMsg(); }; diff --git a/krusader/Konfigurator/konfiguratoritems.h b/krusader/Konfigurator/konfiguratoritems.h --- a/krusader/Konfigurator/konfiguratoritems.h +++ b/krusader/Konfigurator/konfiguratoritems.h @@ -121,8 +121,8 @@ void slotSetDefaults(QObject *); protected: - virtual void checkStateSet(); - virtual void nextCheckState(); + virtual void checkStateSet() Q_DECL_OVERRIDE; + virtual void nextCheckState() Q_DECL_OVERRIDE; void updateDeps(); bool defaultValue; diff --git a/krusader/Konfigurator/krresulttable.h b/krusader/Konfigurator/krresulttable.h --- a/krusader/Konfigurator/krresulttable.h +++ b/krusader/Konfigurator/krresulttable.h @@ -88,7 +88,7 @@ explicit KrArchiverResultTable(QWidget* parent); virtual ~KrArchiverResultTable(); - bool addRow(SearchObject* search, QGridLayout* grid); + bool addRow(SearchObject* search, QGridLayout* grid) Q_DECL_OVERRIDE; protected: KUrlLabel* _nameLabel; @@ -107,7 +107,7 @@ explicit KrToolResultTable(QWidget* parent); virtual ~KrToolResultTable(); - bool addRow(SearchObject* search, QGridLayout* grid); + bool addRow(SearchObject* search, QGridLayout* grid) Q_DECL_OVERRIDE; protected: QList _apps; diff --git a/krusader/Locate/locate.cpp b/krusader/Locate/locate.cpp --- a/krusader/Locate/locate.cpp +++ b/krusader/Locate/locate.cpp @@ -84,7 +84,7 @@ setAlternatingRowColors(true); } - void startDrag(Qt::DropActions supportedActs) { + void startDrag(Qt::DropActions supportedActs) Q_DECL_OVERRIDE { Q_UNUSED(supportedActs); QList urls; diff --git a/krusader/Panel/krcalcspacedialog.h b/krusader/Panel/krcalcspacedialog.h --- a/krusader/Panel/krcalcspacedialog.h +++ b/krusader/Panel/krcalcspacedialog.h @@ -39,8 +39,8 @@ * to avoid a short appearance and is autoclosed when the calculation finished. */ static void showDialog(QWidget *parent, SizeCalculator *calculator); - void closeEvent(QCloseEvent *); - void keyPressEvent(QKeyEvent *e); + void closeEvent(QCloseEvent *) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; private slots: void slotCancel(); // cancel was pressed diff --git a/krusader/Search/krsearchdialog.h b/krusader/Search/krsearchdialog.h --- a/krusader/Search/krsearchdialog.h +++ b/krusader/Search/krsearchdialog.h @@ -71,7 +71,7 @@ virtual void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; protected slots: - void reject(); + void reject() Q_DECL_OVERRIDE; private: bool gui2query(); diff --git a/krusader/Synchronizer/synchronizergui.h b/krusader/Synchronizer/synchronizergui.h --- a/krusader/Synchronizer/synchronizergui.h +++ b/krusader/Synchronizer/synchronizergui.h @@ -150,7 +150,7 @@ void saveToProfile(QString); protected slots: - void reject(); + void reject() Q_DECL_OVERRIDE; void addFile(SynchronizerFileItem *); void markChanged(SynchronizerFileItem *, bool); void setScrolling(bool); diff --git a/krusader/Synchronizer/synchronizergui.cpp b/krusader/Synchronizer/synchronizergui.cpp --- a/krusader/Synchronizer/synchronizergui.cpp +++ b/krusader/Synchronizer/synchronizergui.cpp @@ -77,12 +77,12 @@ SynchronizerListView(Synchronizer * sync, QWidget * parent) : KrTreeWidget(parent), synchronizer(sync) { } - void mouseMoveEvent(QMouseEvent * e) { + void mouseMoveEvent(QMouseEvent * e) Q_DECL_OVERRIDE { isLeft = ((e->modifiers() & Qt::ShiftModifier) == 0); KrTreeWidget::mouseMoveEvent(e); } - void startDrag(Qt::DropActions /* supportedActs */) { + void startDrag(Qt::DropActions /* supportedActs */) Q_DECL_OVERRIDE { QList urls; unsigned ndx = 0; diff --git a/krusader/Synchronizer/synchronizertask.h b/krusader/Synchronizer/synchronizertask.h --- a/krusader/Synchronizer/synchronizertask.h +++ b/krusader/Synchronizer/synchronizertask.h @@ -126,7 +126,7 @@ } protected slots: - virtual void start(); + virtual void start() Q_DECL_OVERRIDE; void slotFinished(bool result); void slotOtherFinished(bool result); @@ -160,7 +160,7 @@ void sendStatusMessage(); protected: - virtual void start(); + virtual void start() Q_DECL_OVERRIDE; protected slots: void localFileCompareCycle(); diff --git a/krusader/UserAction/expander.cpp b/krusader/UserAction/expander.cpp --- a/krusader/UserAction/expander.cpp +++ b/krusader/UserAction/expander.cpp @@ -114,24 +114,24 @@ class exp_simpleplaceholder : public exp_placeholder { public: - EXP_FUNC; + EXP_FUNC Q_DECL_OVERRIDE; virtual TagString expFunc(const KrPanel*, const QStringList&, const bool&, Expander&) const = 0; }; #define PLACEHOLDER_CLASS(name) \ class name : public exp_placeholder { \ public: \ name(); \ - virtual TagString expFunc ( const KrPanel*, const TagStringList&, const bool&, Expander& ) const; \ + virtual TagString expFunc ( const KrPanel*, const TagStringList&, const bool&, Expander& ) const Q_DECL_OVERRIDE; \ }; #define SIMPLE_PLACEHOLDER_CLASS(name) \ class name : public exp_simpleplaceholder { \ public: \ using exp_simpleplaceholder::expFunc; \ name(); \ - virtual TagString expFunc ( const KrPanel*, const QStringList&, const bool&, Expander& ) const; \ + virtual TagString expFunc ( const KrPanel*, const QStringList&, const bool&, Expander& ) const Q_DECL_OVERRIDE; \ }; diff --git a/krusader/UserAction/kraction.h b/krusader/UserAction/kraction.h --- a/krusader/UserAction/kraction.h +++ b/krusader/UserAction/kraction.h @@ -77,42 +77,42 @@ _category = category; }; - QString command() const { + QString command() const Q_DECL_OVERRIDE { return _command; }; void setCommand(const QString& command) { _command = command; }; - QString user() const { + QString user() const Q_DECL_OVERRIDE { return _user; }; void setUser(const QString& user) { _user = user; }; - QString startpath() const { + QString startpath() const Q_DECL_OVERRIDE { return _startpath; }; void setStartpath(const QString& startpath) { _startpath = startpath; }; - ExecType execType() const { + ExecType execType() const Q_DECL_OVERRIDE { return _execType; }; void setExecType(ExecType execType) { _execType = execType; }; - bool acceptURLs() const { + bool acceptURLs() const Q_DECL_OVERRIDE { return _acceptURLs; }; void setAcceptURLs(const bool& acceptURLs) { _acceptURLs = acceptURLs; }; - bool confirmExecution() const { + bool confirmExecution() const Q_DECL_OVERRIDE { return _confirmExecution; }; void setConfirmExecution(const bool& confirmExecution) { @@ -147,11 +147,11 @@ _showonlyFile = showonlyFile; }; - bool doSubstitution() const { + bool doSubstitution() const Q_DECL_OVERRIDE { return true; } - QString text() const { + QString text() const Q_DECL_OVERRIDE { return QAction::text(); } diff --git a/krusader/krusader.h b/krusader/krusader.h --- a/krusader/krusader.h +++ b/krusader/krusader.h @@ -82,10 +82,10 @@ return this; } virtual KrView *activeView() Q_DECL_OVERRIDE; - ViewActions *viewActions() { + ViewActions *viewActions() Q_DECL_OVERRIDE { return _viewActions; } - virtual KActionCollection *actions() { + virtual KActionCollection *actions() Q_DECL_OVERRIDE { return actionCollection(); } virtual AbstractPanelManager *activeManager() Q_DECL_OVERRIDE;