Martchus
/
qtutilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix -Winconsistent-missing-override

This commit is contained in:
Martchus 2016-05-13 22:53:01 +02:00
parent c1570df362
commit cca4395fe6
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -107,7 +107,7 @@ else()
endif()
# find c++utilities
find_package(c++utilities 3.3.0 REQUIRED)
find_package(c++utilities 4.0.0 REQUIRED)
use_cpp_utilities()
# include modules to apply configuration

6
misc/recentmenumanager.cpp
View File

@ -158,4 +158,10 @@ void RecentMenuManager::handleActionTriggered()
}
}
/*!
* \fn RecentMenuManager::fileSelected()
* \brief Emitted after the user selected a file.
* \remarks Only emitted when the selected file still existed; otherwise the user is ask whether to keep or delete the entry.
*/
}

7
misc/recentmenumanager.h
View File

@ -17,18 +17,13 @@ class LIB_EXPORT RecentMenuManager : public QObject
public:
RecentMenuManager(QMenu *menu, QObject *parent = nullptr);
public Q_SLOTS:
void restore(const QStringList &savedEntries);
QStringList save();
public Q_SLOTS:
void addEntry(const QString &path);
void clearEntries();
Q_SIGNALS:
/*!
* \brief Emitted after the user selected a file.
* \remarks Only emitted when the selected file still existed; otherwise the user is ask whether to keep or delete the entry.
*/
void fileSelected(const QString &path);
private Q_SLOTS:

16
paletteeditor/paletteeditor.h
View File

@ -146,7 +146,7 @@ public:
signals:
void changed(QWidget *widget);
private slots:
private Q_SLOTS:
void emitResetProperty();
private:
@ -164,19 +164,15 @@ class LIB_EXPORT ColorDelegate : public QItemDelegate
public:
explicit ColorDelegate(QObject *parent = nullptr);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
const QModelIndex &index) const;
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
void setEditorData(QWidget *ed, const QModelIndex &index) const;
void setModelData(QWidget *ed, QAbstractItemModel *model,
const QModelIndex &index) const;
void setModelData(QWidget *ed, QAbstractItemModel *model, const QModelIndex &index) const;
void updateEditorGeometry(QWidget *ed,
const QStyleOptionViewItem &option, const QModelIndex &index) const;
void updateEditorGeometry(QWidget *ed, const QStyleOptionViewItem &option, const QModelIndex &index) const;
virtual void paint(QPainter *painter, const QStyleOptionViewItem &opt,
const QModelIndex &index) const;
QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const Q_DECL_OVERRIDE;
void paint(QPainter *painter, const QStyleOptionViewItem &opt, const QModelIndex &index) const;
QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const;
};
}