Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-26 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Mark overriden methods as Q_DECL_OVERRIDE.

Browse Source
This commit is contained in:
Felix Geyer 2012-06-29 14:37:29 +02:00
parent 4e6cf15a09
commit e144f7c85a
17 changed files with 58 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/Application.h
View File

@ -20,6 +20,8 @@
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include "core/Global.h"
class Application : public QApplication class Application : public QApplication
{ {
Q_OBJECT Q_OBJECT
@ -27,7 +29,7 @@ class Application : public QApplication
public: public:
Application(int& argc, char** argv); Application(int& argc, char** argv);
bool event(QEvent* event); bool event(QEvent* event) Q_DECL_OVERRIDE;
Q_SIGNALS: Q_SIGNALS:
void openFile(const QString& filename); void openFile(const QString& filename);

2
src/gui/DialogyWidget.h
View File

@ -31,7 +31,7 @@ public:
explicit DialogyWidget(QWidget* parent = Q_NULLPTR); explicit DialogyWidget(QWidget* parent = Q_NULLPTR);
protected: protected:
virtual void keyPressEvent(QKeyEvent* e); virtual void keyPressEvent(QKeyEvent* e) Q_DECL_OVERRIDE;
private: private:
bool clickButton(QDialogButtonBox::StandardButton standardButton); bool clickButton(QDialogButtonBox::StandardButton standardButton);

10
src/gui/DragTabBar.h
View File

@ -30,11 +30,11 @@ public:
explicit DragTabBar(QWidget* parent = Q_NULLPTR); explicit DragTabBar(QWidget* parent = Q_NULLPTR);
protected: protected:
void dragEnterEvent(QDragEnterEvent* event); void dragEnterEvent(QDragEnterEvent* event) Q_DECL_OVERRIDE;
void dragMoveEvent(QDragMoveEvent* event); void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE;
void dragLeaveEvent(QDragLeaveEvent* event); void dragLeaveEvent(QDragLeaveEvent* event) Q_DECL_OVERRIDE;
void dropEvent(QDropEvent* event); void dropEvent(QDropEvent* event) Q_DECL_OVERRIDE;
void tabLayoutChange(); void tabLayoutChange() Q_DECL_OVERRIDE;
private Q_SLOTS: private Q_SLOTS:
void dragSwitchTab(); void dragSwitchTab();

8
src/gui/IconModels.h
View File

@ -31,8 +31,8 @@ class DefaultIconModel : public QAbstractListModel
public: public:
explicit DefaultIconModel(QObject* parent = Q_NULLPTR); explicit DefaultIconModel(QObject* parent = Q_NULLPTR);
int rowCount(const QModelIndex& parent = QModelIndex()) const; int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
}; };
class CustomIconModel : public QAbstractListModel class CustomIconModel : public QAbstractListModel
@ -42,8 +42,8 @@ class CustomIconModel : public QAbstractListModel
public: public:
explicit CustomIconModel(QObject* parent = Q_NULLPTR); explicit CustomIconModel(QObject* parent = Q_NULLPTR);
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; virtual int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
void setIcons(const QHash<Uuid, QImage>& icons, const QList<Uuid>& iconsOrder); void setIcons(const QHash<Uuid, QImage>& icons, const QList<Uuid>& iconsOrder);
Uuid uuidFromIndex(const QModelIndex& index) const; Uuid uuidFromIndex(const QModelIndex& index) const;
QModelIndex indexFromUuid(const Uuid& uuid) const; QModelIndex indexFromUuid(const Uuid& uuid) const;

2
src/gui/KeePass1OpenWidget.h
View File

@ -29,7 +29,7 @@ public:
~KeePass1OpenWidget(); ~KeePass1OpenWidget();
protected: protected:
void openDatabase(); void openDatabase() Q_DECL_OVERRIDE;
}; };
#endif // KEEPASSX_KEEPASS1OPENWIDGET_H #endif // KEEPASSX_KEEPASS1OPENWIDGET_H

2
src/gui/LineEdit.h
View File

@ -34,7 +34,7 @@ public:
explicit LineEdit(QWidget* parent = Q_NULLPTR); explicit LineEdit(QWidget* parent = Q_NULLPTR);
protected: protected:
void resizeEvent(QResizeEvent* event); void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE;
private Q_SLOTS: private Q_SLOTS:
void updateCloseButton(const QString& text); void updateCloseButton(const QString& text);

2
src/gui/MainWindow.h
View File

@ -39,7 +39,7 @@ public Q_SLOTS:
const QString& keyFile = QString()); const QString& keyFile = QString());
protected: protected:
void closeEvent(QCloseEvent* event); void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE;
private Q_SLOTS: private Q_SLOTS:
void setMenuActionState(DatabaseWidget::Mode mode = DatabaseWidget::None); void setMenuActionState(DatabaseWidget::Mode mode = DatabaseWidget::None);

6
src/gui/entry/EntryAttachmentsModel.h
View File

@ -31,9 +31,9 @@ class EntryAttachmentsModel : public QAbstractListModel
public: public:
explicit EntryAttachmentsModel(QObject* parent = Q_NULLPTR); explicit EntryAttachmentsModel(QObject* parent = Q_NULLPTR);
void setEntryAttachments(EntryAttachments* entry); void setEntryAttachments(EntryAttachments* entry);
int rowCount(const QModelIndex& parent = QModelIndex()) const; int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
int columnCount(const QModelIndex& parent = QModelIndex()) const; int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QString keyByIndex(const QModelIndex& index) const; QString keyByIndex(const QModelIndex& index) const;
private Q_SLOTS: private Q_SLOTS:

12
src/gui/entry/EntryAttributesModel.h
View File

@ -31,12 +31,12 @@ class EntryAttributesModel : public QAbstractListModel
public: public:
explicit EntryAttributesModel(QObject* parent = Q_NULLPTR); explicit EntryAttributesModel(QObject* parent = Q_NULLPTR);
void setEntryAttributes(EntryAttributes* entryAttributes); void setEntryAttributes(EntryAttributes* entryAttributes);
int rowCount(const QModelIndex& parent = QModelIndex()) const; int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
int columnCount(const QModelIndex& parent = QModelIndex()) const; int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole); bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
Qt::ItemFlags flags(const QModelIndex& index) const; Qt::ItemFlags flags(const QModelIndex& index) const Q_DECL_OVERRIDE;
QModelIndex indexByKey(const QString& key) const; QModelIndex indexByKey(const QString& key) const;
QString keyByIndex(const QModelIndex& index) const; QString keyByIndex(const QModelIndex& index) const;

8
src/gui/entry/EntryHistoryModel.h
View File

@ -32,10 +32,10 @@ public:
explicit EntryHistoryModel(QObject* parent = Q_NULLPTR); explicit EntryHistoryModel(QObject* parent = Q_NULLPTR);
Entry* entryFromIndex(const QModelIndex& index) const; Entry* entryFromIndex(const QModelIndex& index) const;
int columnCount(const QModelIndex& parent = QModelIndex()) const; int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
int rowCount(const QModelIndex& parent = QModelIndex()) const; int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QVariant headerData(int section, Qt::Orientation orientation, int role) const; QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE;
void setEntries(const QList<Entry*>& entries); void setEntries(const QList<Entry*>& entries);
void clear(); void clear();

16
src/gui/entry/EntryModel.h
View File

@ -34,14 +34,14 @@ public:
Entry* entryFromIndex(const QModelIndex& index) const; Entry* entryFromIndex(const QModelIndex& index) const;
QModelIndex indexFromEntry(Entry* entry) const; QModelIndex indexFromEntry(Entry* entry) const;
int rowCount(const QModelIndex& parent = QModelIndex()) const; int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
int columnCount(const QModelIndex& parent = QModelIndex()) const; int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
Qt::DropActions supportedDropActions() const; Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
Qt::ItemFlags flags(const QModelIndex& modelIndex) const; Qt::ItemFlags flags(const QModelIndex& modelIndex) const Q_DECL_OVERRIDE;
QStringList mimeTypes() const; QStringList mimeTypes() const Q_DECL_OVERRIDE;
QMimeData* mimeData(const QModelIndexList& indexes) const; QMimeData* mimeData(const QModelIndexList& indexes) const Q_DECL_OVERRIDE;
void setEntries(const QList<Entry*>& entries); void setEntries(const QList<Entry*>& entries);

2
src/gui/entry/EntryView.h
View File

@ -33,7 +33,7 @@ class EntryView : public QTreeView
public: public:
explicit EntryView(QWidget* parent = Q_NULLPTR); explicit EntryView(QWidget* parent = Q_NULLPTR);
void setModel(QAbstractItemModel* model); void setModel(QAbstractItemModel* model) Q_DECL_OVERRIDE;
Entry* currentEntry(); Entry* currentEntry();
bool isSingleEntrySelected(); bool isSingleEntrySelected();
void setCurrentEntry(Entry* entry); void setCurrentEntry(Entry* entry);

18
src/gui/group/GroupModel.h
View File

@ -37,16 +37,16 @@ public:
int rowCount(const QModelIndex& parent = QModelIndex()) const; int rowCount(const QModelIndex& parent = QModelIndex()) const;
int columnCount(const QModelIndex& parent = QModelIndex()) const; int columnCount(const QModelIndex& parent = QModelIndex()) const;
QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const; QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex parent(const QModelIndex& index) const; QModelIndex parent(const QModelIndex& index) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
Qt::DropActions supportedDropActions() const; Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
Qt::ItemFlags flags(const QModelIndex& modelIndex) const; Qt::ItemFlags flags(const QModelIndex& modelIndex) const Q_DECL_OVERRIDE;
bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column,
const QModelIndex& parent); const QModelIndex& parent) Q_DECL_OVERRIDE;
QStringList mimeTypes() const; QStringList mimeTypes() const Q_DECL_OVERRIDE;
QMimeData* mimeData(const QModelIndexList& indexes) const; QMimeData* mimeData(const QModelIndexList& indexes) const Q_DECL_OVERRIDE;
private: private:
QModelIndex parent(Group* group) const; QModelIndex parent(Group* group) const;

2
src/gui/group/GroupView.h
View File

@ -33,7 +33,7 @@ class GroupView : public QTreeView
public: public:
explicit GroupView(Database* db, QWidget* parent = Q_NULLPTR); explicit GroupView(Database* db, QWidget* parent = Q_NULLPTR);
void changeDatabase(Database* newDb); void changeDatabase(Database* newDb);
void setModel(QAbstractItemModel* model); void setModel(QAbstractItemModel* model) Q_DECL_OVERRIDE;
Group* currentGroup(); Group* currentGroup();
void setCurrentGroup(Group* group); void setCurrentGroup(Group* group);
void expandGroup(Group* group, bool expand = true); void expandGroup(Group* group, bool expand = true);

4
src/streams/HashedBlockStream.h
View File

@ -35,8 +35,8 @@ public:
void close(); void close();
protected: protected:
qint64 readData(char* data, qint64 maxSize); qint64 readData(char* data, qint64 maxSize) Q_DECL_OVERRIDE;
qint64 writeData(const char* data, qint64 maxSize); qint64 writeData(const char* data, qint64 maxSize) Q_DECL_OVERRIDE;
private: private:
void init(); void init();

10
src/streams/LayeredStream.h
View File

@ -20,6 +20,8 @@
#include <QtCore/QIODevice> #include <QtCore/QIODevice>
#include "core/Global.h"
class LayeredStream : public QIODevice class LayeredStream : public QIODevice
{ {
Q_OBJECT Q_OBJECT
@ -28,13 +30,13 @@ public:
explicit LayeredStream(QIODevice* baseDevice); explicit LayeredStream(QIODevice* baseDevice);
virtual ~LayeredStream(); virtual ~LayeredStream();
bool isSequential() const; bool isSequential() const Q_DECL_OVERRIDE;
virtual QString errorString() const; virtual QString errorString() const;
bool open(QIODevice::OpenMode mode); bool open(QIODevice::OpenMode mode) Q_DECL_OVERRIDE;
protected: protected:
qint64 readData(char* data, qint64 maxSize); qint64 readData(char* data, qint64 maxSize) Q_DECL_OVERRIDE;
qint64 writeData(const char* data, qint64 maxSize); qint64 writeData(const char* data, qint64 maxSize) Q_DECL_OVERRIDE;
QIODevice* const m_baseDevice; QIODevice* const m_baseDevice;

4
src/streams/SymmetricCipherStream.h
View File

@ -36,8 +36,8 @@ public:
void close(); void close();
protected: protected:
qint64 readData(char* data, qint64 maxSize); qint64 readData(char* data, qint64 maxSize) Q_DECL_OVERRIDE;
qint64 writeData(const char* data, qint64 maxSize); qint64 writeData(const char* data, qint64 maxSize) Q_DECL_OVERRIDE;
private: private:
bool readBlock(); bool readBlock();