Commit de321b02 authored by Laurent Montel's avatar Laurent Montel 😁

Use Q_DECLARE_OVERRIDE

parent 0f97028a
......@@ -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* );
......
......@@ -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:
......
......@@ -36,7 +36,7 @@ class EntryListView : public QTableView
void setEmptyModel();
protected:
virtual void resizeEvent( QResizeEvent *event );
void resizeEvent( QResizeEvent *event ) Q_DECL_OVERRIDE;
};
#endif
......@@ -68,7 +68,7 @@ class Kiten : public KXmlGuiWindow
protected:
void setupActions();
void setupExportListDock();
virtual bool queryClose(); //overridden from KXmlGuiWindow (called@shutdown)
bool queryClose(); //overridden from KXmlGuiWindow (called@shutdown) Q_DECL_OVERRIDE
private slots:
void finishInit();
......
......@@ -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();
......
......@@ -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;
......
......@@ -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:
......
......@@ -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;
......
......@@ -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 );
......
......@@ -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;
......
......@@ -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;
......
......@@ -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 );
......
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment