summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-06-01 22:51:08 +0200
committerMontel Laurent <[email protected]>2017-06-01 22:51:08 +0200
commitde321b02a050d94dd9e6128e8ca2b3fc74c89a5f (patch)
tree6a65df6e88d3ceffa279c651afd6e3b21f0d1bc1
parent0f97028a8b870a11aa8c1d3dae79d93fcd2c60e8 (diff)
Use Q_DECLARE_OVERRIDE
-rw-r--r--app/configuredialog.h8
-rw-r--r--app/entrylistmodel.h10
-rw-r--r--app/entrylistview.h2
-rw-r--r--app/kiten.h2
-rw-r--r--app/resultsview.h4
-rw-r--r--lib/DictEdict/dictfileedict.h16
-rw-r--r--lib/DictEdict/dictfilefieldselector.h6
-rw-r--r--lib/DictEdict/entryedict.h12
-rw-r--r--lib/DictKanjidic/dictfilekanjidic.h12
-rw-r--r--lib/DictKanjidic/entrykanjidic.h16
-rw-r--r--lib/kromajiedit.h2
-rw-r--r--radselect/radicalbutton.h10
-rw-r--r--radselect/radselect.h8
13 files changed, 54 insertions, 54 deletions
diff --git a/app/configuredialog.h b/app/configuredialog.h
index 667c64a..03ddf55 100644
--- a/app/configuredialog.h
+++ b/app/configuredialog.h
@@ -45,12 +45,12 @@ class ConfigureDialog : public KConfigDialog
private slots:
void updateConfiguration();
- void updateSettings();
- void updateWidgets();
- void updateWidgetsDefault();
+ void updateSettings() Q_DECL_OVERRIDE;
+ void updateWidgets() Q_DECL_OVERRIDE;
+ void updateWidgetsDefault() Q_DECL_OVERRIDE;
private:
- bool isDefault();
+ bool isDefault() Q_DECL_OVERRIDE;
QWidget *makeDictionaryPreferencesPage( QWidget *, KitenConfigSkeleton* );
QWidget *makeDictionaryFileSelectionPage( QWidget *, KitenConfigSkeleton* );
QWidget *makeSortingPage( QWidget *, KitenConfigSkeleton* );
diff --git a/app/entrylistmodel.h b/app/entrylistmodel.h
index a7f3dd8..782f55a 100644
--- a/app/entrylistmodel.h
+++ b/app/entrylistmodel.h
@@ -35,14 +35,14 @@ class EntryListModel : public QAbstractTableModel
public:
EntryListModel( const EntryList &list );
- int columnCount( const QModelIndex &parent = QModelIndex() ) const;
- QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const;
+ int columnCount( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
+ QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
EntryList entryList() const;
- Qt::ItemFlags flags( const QModelIndex &index ) const;
- int rowCount( const QModelIndex &parent = QModelIndex() ) const;
+ Qt::ItemFlags flags( const QModelIndex &index ) const Q_DECL_OVERRIDE;
+ int rowCount( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
bool setData( const QModelIndex &index
, const QVariant &value
- , int role = Qt::EditRole );
+ , int role = Qt::EditRole ) Q_DECL_OVERRIDE;
void setEntryList( const EntryList &list );
private:
diff --git a/app/entrylistview.h b/app/entrylistview.h
index e978360..021a3a4 100644
--- a/app/entrylistview.h
+++ b/app/entrylistview.h
@@ -36,7 +36,7 @@ class EntryListView : public QTableView
void setEmptyModel();
protected:
- virtual void resizeEvent( QResizeEvent *event );
+ void resizeEvent( QResizeEvent *event ) Q_DECL_OVERRIDE;
};
#endif
diff --git a/app/kiten.h b/app/kiten.h
index 53199b6..309966c 100644
--- a/app/kiten.h
+++ b/app/kiten.h
@@ -68,7 +68,7 @@ class Kiten : public KXmlGuiWindow
protected:
void setupActions();
void setupExportListDock();
- virtual bool queryClose(); //overridden from KXmlGuiWindow ([email protected])
+ bool queryClose(); //overridden from KXmlGuiWindow ([email protected]) Q_DECL_OVERRIDE
private slots:
void finishInit();
diff --git a/app/resultsview.h b/app/resultsview.h
index 6bc8a25..41b5921 100644
--- a/app/resultsview.h
+++ b/app/resultsview.h
@@ -57,12 +57,12 @@ class ResultsView : public KHTMLPart
protected:
QString deLinkify( DOM::Node );
QString generateCSS();
- virtual bool urlSelected( const QString &url
+ bool urlSelected( const QString &url
, int button
, int state
, const QString &_target
, const KParts::OpenUrlArguments& args = KParts::OpenUrlArguments()
- , const KParts::BrowserArguments& browserArgs = KParts::BrowserArguments() );
+ , const KParts::BrowserArguments& browserArgs = KParts::BrowserArguments() ) Q_DECL_OVERRIDE;
private slots:
void doScroll();
diff --git a/lib/DictEdict/dictfileedict.h b/lib/DictEdict/dictfileedict.h
index a2f6b8a..f91649b 100644
--- a/lib/DictEdict/dictfileedict.h
+++ b/lib/DictEdict/dictfileedict.h
@@ -52,16 +52,16 @@ class KITEN_EXPORT DictFileEdict : public DictFile
DictFileEdict();
virtual ~DictFileEdict();
- virtual EntryList *doSearch( const DictQuery &query );
- virtual QStringList listDictDisplayOptions( QStringList x ) const;
+ EntryList *doSearch( const DictQuery &query ) Q_DECL_OVERRIDE;
+ QStringList listDictDisplayOptions( QStringList x ) const Q_DECL_OVERRIDE;
bool loadDictionary( const QString &file
- , const QString &name );
+ , const QString &name ) Q_DECL_OVERRIDE;
void loadSettings();
- virtual void loadSettings( KConfigSkeleton *config );
- virtual DictionaryPreferenceDialog *preferencesWidget( KConfigSkeleton *config
- , QWidget *parent = NULL );
- virtual bool validDictionaryFile( const QString &filename );
- bool validQuery( const DictQuery &query );
+ void loadSettings( KConfigSkeleton *config ) Q_DECL_OVERRIDE;
+ DictionaryPreferenceDialog *preferencesWidget( KConfigSkeleton *config
+ , QWidget *parent = NULL ) Q_DECL_OVERRIDE;
+ bool validDictionaryFile( const QString &filename ) Q_DECL_OVERRIDE;
+ bool validQuery( const DictQuery &query ) Q_DECL_OVERRIDE;
static QString *deinflectionLabel;
static QString *wordType;
diff --git a/lib/DictEdict/dictfilefieldselector.h b/lib/DictEdict/dictfilefieldselector.h
index 337dac7..31dcbc1 100644
--- a/lib/DictEdict/dictfilefieldselector.h
+++ b/lib/DictEdict/dictfilefieldselector.h
@@ -50,9 +50,9 @@ class DictFileFieldSelector : public DictionaryPreferenceDialog
void readFromPrefs();
void writeToPrefs();
- void updateWidgets();
- void updateWidgetsDefault();
- void updateSettings();
+ void updateWidgets() Q_DECL_OVERRIDE;
+ void updateWidgetsDefault() Q_DECL_OVERRIDE;
+ void updateSettings() Q_DECL_OVERRIDE;
void settingChanged();
signals:
diff --git a/lib/DictEdict/entryedict.h b/lib/DictEdict/entryedict.h
index e92bd1e..6bdee7a 100644
--- a/lib/DictEdict/entryedict.h
+++ b/lib/DictEdict/entryedict.h
@@ -66,7 +66,7 @@ class KITEN_EXPORT EntryEdict : public Entry
EntryEdict( const QString &dict );
EntryEdict( const QString &dict, const QString &entry );
- Entry *clone() const;
+ Entry *clone() const Q_DECL_OVERRIDE;
/**
* Simple accessor.
*/
@@ -91,11 +91,11 @@ class KITEN_EXPORT EntryEdict : public Entry
bool matchesWordType( const DictQuery &query ) const;
- virtual QString dumpEntry() const;
- virtual QString getDictionaryType() const;
- virtual QString HTMLWord() const;
- virtual bool loadEntry( const QString &entryLine );
- virtual QString toHTML() const;
+ QString dumpEntry() const Q_DECL_OVERRIDE;
+ QString getDictionaryType() const Q_DECL_OVERRIDE;
+ QString HTMLWord() const Q_DECL_OVERRIDE;
+ bool loadEntry( const QString &entryLine ) Q_DECL_OVERRIDE;
+ QString toHTML() const Q_DECL_OVERRIDE;
protected:
virtual QString kanjiLinkify( const QString &inString ) const;
diff --git a/lib/DictKanjidic/dictfilekanjidic.h b/lib/DictKanjidic/dictfilekanjidic.h
index 219a3bd..6448433 100644
--- a/lib/DictKanjidic/dictfilekanjidic.h
+++ b/lib/DictKanjidic/dictfilekanjidic.h
@@ -45,18 +45,18 @@ class KITEN_EXPORT DictFileKanjidic : public DictFile
virtual ~DictFileKanjidic();
QMap<QString,QString> displayOptions() const;
- virtual EntryList *doSearch( const DictQuery &query );
+ EntryList *doSearch( const DictQuery &query ) Q_DECL_OVERRIDE;
QStringList dumpDictionary();
- virtual QStringList listDictDisplayOptions( QStringList list ) const;
+ QStringList listDictDisplayOptions( QStringList list ) const Q_DECL_OVERRIDE;
bool loadDictionary( const QString &file
- , const QString &name );
+ , const QString &name ) Q_DECL_OVERRIDE;
QStringList *loadListType( KConfigSkeletonItem *item
, QStringList *list
, const QMap<QString,QString> &long2short );
void loadSettings();
- virtual void loadSettings( KConfigSkeleton *item );
- bool validDictionaryFile( const QString &filename );
- bool validQuery( const DictQuery &query );
+ void loadSettings( KConfigSkeleton *item ) Q_DECL_OVERRIDE;
+ bool validDictionaryFile( const QString &filename ) Q_DECL_OVERRIDE;
+ bool validQuery( const DictQuery &query ) Q_DECL_OVERRIDE;
protected:
virtual inline Entry *makeEntry( const QString &entry );
diff --git a/lib/DictKanjidic/entrykanjidic.h b/lib/DictKanjidic/entrykanjidic.h
index f2a89df..d9c6b8d 100644
--- a/lib/DictKanjidic/entrykanjidic.h
+++ b/lib/DictKanjidic/entrykanjidic.h
@@ -38,11 +38,11 @@ class KITEN_EXPORT EntryKanjidic : public Entry
EntryKanjidic( const QString &dict );
EntryKanjidic( const QString &dict, const QString &entry );
- Entry *clone() const;
- virtual QString dumpEntry() const;
+ Entry *clone() const Q_DECL_OVERRIDE;
+ QString dumpEntry() const Q_DECL_OVERRIDE;
QString getAsRadicalReadings() const;
QStringList getAsRadicalReadingsList() const;
- virtual QString getDictionaryType() const;
+ QString getDictionaryType() const Q_DECL_OVERRIDE;
QString getInNamesReadings() const;
QStringList getInNamesReadingsList() const;
QString getKanjiGrade() const;
@@ -51,14 +51,14 @@ class KITEN_EXPORT EntryKanjidic : public Entry
QString getOnyomiReadings() const;
QStringList getOnyomiReadingsList() const;
QString getStrokesCount() const;
- virtual bool loadEntry( const QString &entryLine );
- virtual QString toHTML() const;
+ bool loadEntry( const QString &entryLine ) Q_DECL_OVERRIDE;
+ QString toHTML() const Q_DECL_OVERRIDE;
protected:
- virtual bool extendedItemCheck( const QString &key, const QString &value ) const;
+ bool extendedItemCheck( const QString &key, const QString &value ) const Q_DECL_OVERRIDE;
virtual QString HTMLExtendedInfo( const QString &field ) const;
- virtual QString HTMLReadings() const;
- virtual QString HTMLWord() const;
+ QString HTMLReadings() const Q_DECL_OVERRIDE;
+ QString HTMLWord() const Q_DECL_OVERRIDE;
virtual QString makeReadingLink( const QString &inReading ) const;
QStringList AsRadicalReadings;
diff --git a/lib/kromajiedit.h b/lib/kromajiedit.h
index 67777cc..0b8176c 100644
--- a/lib/kromajiedit.h
+++ b/lib/kromajiedit.h
@@ -44,7 +44,7 @@ class /* NO_EXPORT */ KRomajiEdit : public KLineEdit
protected:
QMenu *createPopupMenu();
- void keyPressEvent( QKeyEvent *e );
+ void keyPressEvent( QKeyEvent *e ) Q_DECL_OVERRIDE;
private:
QMap<QString, QString> m_hiragana;
diff --git a/radselect/radicalbutton.h b/radselect/radicalbutton.h
index 630dcc4..a11df9c 100644
--- a/radselect/radicalbutton.h
+++ b/radselect/radicalbutton.h
@@ -36,9 +36,9 @@ class RadicalButton : public QPushButton
/**
* Overriding QPushButton's event for mousewheel events on a disabled button
*/
- bool event( QEvent *event );
- QSize minimumSizeHint() const;
- QSize sizeHint() const;
+ bool event( QEvent *event ) Q_DECL_OVERRIDE;
+ QSize minimumSizeHint() const Q_DECL_OVERRIDE;
+ QSize sizeHint() const Q_DECL_OVERRIDE;
typedef enum
{
@@ -53,8 +53,8 @@ class RadicalButton : public QPushButton
void userClicked( const QString &text, RadicalButton::ButtonStatus status );
public slots:
- void mousePressEvent( QMouseEvent *e );
- void mouseReleaseEvent( QMouseEvent *e );
+ void mousePressEvent( QMouseEvent *e ) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent( QMouseEvent *e ) Q_DECL_OVERRIDE;
void resetButton();
void setStatus( RadicalButton::ButtonStatus newStatus );
diff --git a/radselect/radselect.h b/radselect/radselect.h
index 7e473e4..e3c58a7 100644
--- a/radselect/radselect.h
+++ b/radselect/radselect.h
@@ -51,22 +51,22 @@ class RadSelect : public KXmlGuiWindow
protected:
// Overridden virtuals for Qt drag 'n drop (XDND)
- virtual void dragEnterEvent( QDragEnterEvent *event );
- virtual void dropEvent( QDropEvent *event );
+ void dragEnterEvent( QDragEnterEvent *event ) Q_DECL_OVERRIDE;
+ void dropEvent( QDropEvent *event ) Q_DECL_OVERRIDE;
protected:
/**
* This function is called when it is time for the app to save its
* properties for session management purposes.
*/
- void saveProperties( KConfigGroup &config );
+ void saveProperties( KConfigGroup &config ) Q_DECL_OVERRIDE;
/**
* This function is called when this app is restored. The KConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
- void readProperties( const KConfigGroup &config );
+ void readProperties( const KConfigGroup &config ) Q_DECL_OVERRIDE;
private slots: