summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-06-01 22:48:02 +0200
committerMontel Laurent <[email protected]>2017-06-01 22:48:02 +0200
commitbc30282d4802ffae67a6d1e3e335a5698ed9641b (patch)
tree70ab8e287aad1f022c9e861fd51e65cea146eb33
parent97a272cfb3c5636777b6d344c8aa9e31ffd7ce42 (diff)
Use Q_DECLARE_OVERRIDE
-rw-r--r--kmouth.h2
-rw-r--r--phrasebook/phrasebookdialog.h2
-rw-r--r--phrasebook/phrasebookparser.h20
-rw-r--r--phraselist.h2
-rw-r--r--wordcompletion/dictionarycreationwizard.h6
-rw-r--r--wordcompletion/wordcompletion.h2
-rw-r--r--wordcompletion/wordlist.h20
7 files changed, 27 insertions, 27 deletions
diff --git a/kmouth.h b/kmouth.h
index 4ee946d..7dd3f63 100644
--- a/kmouth.h
+++ b/kmouth.h
@@ -97,7 +97,7 @@ protected:
* @see KMainWindow#queryClose
* @see KMainWindow#closeEvent
*/
- virtual bool queryClose();
+ bool queryClose() Q_DECL_OVERRIDE;
public slots:
/** open a file and load it into the history */
diff --git a/phrasebook/phrasebookdialog.h b/phrasebook/phrasebookdialog.h
index d27cdad..d6efd1b 100644
--- a/phrasebook/phrasebookdialog.h
+++ b/phrasebook/phrasebookdialog.h
@@ -82,7 +82,7 @@ public:
/** Destructor. */
~PhraseBookDialog();
- bool queryClose();
+ bool queryClose() Q_DECL_OVERRIDE;
public slots:
void slotTextChanged(const QString &s);
diff --git a/phrasebook/phrasebookparser.h b/phrasebook/phrasebookparser.h
index e18e441..d55a390 100644
--- a/phrasebook/phrasebookparser.h
+++ b/phrasebook/phrasebookparser.h
@@ -38,29 +38,29 @@ public:
PhraseBookParser();
~PhraseBookParser();
- bool warning(const QXmlParseException &exception);
- bool error(const QXmlParseException &exception);
- bool fatalError(const QXmlParseException &exception);
- QString errorString() const;
+ bool warning(const QXmlParseException &exception) Q_DECL_OVERRIDE;
+ bool error(const QXmlParseException &exception) Q_DECL_OVERRIDE;
+ bool fatalError(const QXmlParseException &exception) Q_DECL_OVERRIDE;
+ QString errorString() const Q_DECL_OVERRIDE;
/** Processes the start of the document. */
- bool startDocument();
+ bool startDocument() Q_DECL_OVERRIDE;
/** Processes the start tag of an element. */
bool startElement(const QString &, const QString &, const QString &name,
- const QXmlAttributes &attributes);
+ const QXmlAttributes &attributes) Q_DECL_OVERRIDE;
/** Processes a chunk of normal character data. */
- bool characters(const QString &ch);
+ bool characters(const QString &ch) Q_DECL_OVERRIDE;
/** Processes whitespace. */
- bool ignorableWhitespace(const QString &ch);
+ bool ignorableWhitespace(const QString &ch) Q_DECL_OVERRIDE;
/** Processes the end tag of an element. */
- bool endElement(const QString &, const QString &, const QString &name);
+ bool endElement(const QString &, const QString &, const QString &name) Q_DECL_OVERRIDE;
/** Processes the end of the document. */
- bool endDocument();
+ bool endDocument() Q_DECL_OVERRIDE;
/** returns a list of phrase book entries */
PhraseBookEntryList getPhraseList();
diff --git a/phraselist.h b/phraselist.h
index fd99294..b611f3b 100644
--- a/phraselist.h
+++ b/phraselist.h
@@ -95,7 +95,7 @@ protected slots:
void contextMenuRequested(const QPoint &pos);
void textChanged(const QString &s);
void selectionChanged();
- void keyPressEvent(QKeyEvent *e);
+ void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
void configureCompletionCombo(const QStringList &list);
private:
diff --git a/wordcompletion/dictionarycreationwizard.h b/wordcompletion/dictionarycreationwizard.h
index a5839ee..96db7b4 100644
--- a/wordcompletion/dictionarycreationwizard.h
+++ b/wordcompletion/dictionarycreationwizard.h
@@ -48,7 +48,7 @@ public:
connect(emptyButton, &QAbstractButton::toggled, this, &CreationSourceWidget::emptyToggled);
}
- virtual int nextId() const;
+ int nextId() const Q_DECL_OVERRIDE;
private slots:
void emptyToggled(bool checked);
};
@@ -63,7 +63,7 @@ public:
setupUi(this);
setObjectName(QLatin1String(name));
}
- virtual int nextId() const
+ int nextId() const Q_DECL_OVERRIDE
{
return -1;
}
@@ -83,7 +83,7 @@ public:
ooDictURL->setFilter(QStringLiteral("*.dic"));
}
- virtual int nextId() const
+ int nextId() const Q_DECL_OVERRIDE
{
return -1;
}
diff --git a/wordcompletion/wordcompletion.h b/wordcompletion/wordcompletion.h
index 5379a6b..e2df447 100644
--- a/wordcompletion/wordcompletion.h
+++ b/wordcompletion/wordcompletion.h
@@ -58,7 +58,7 @@ public:
/**
* Finds completions to the given text.
*/
- virtual QString makeCompletion(const QString&);
+ QString makeCompletion(const QString&) Q_DECL_OVERRIDE;
static bool isConfigured();
diff --git a/wordcompletion/wordlist.h b/wordcompletion/wordlist.h
index 4e20316..6a65cc1 100644
--- a/wordcompletion/wordlist.h
+++ b/wordcompletion/wordlist.h
@@ -57,29 +57,29 @@ public:
XMLParser();
~XMLParser();
- bool warning(const QXmlParseException &exception);
- bool error(const QXmlParseException &exception);
- bool fatalError(const QXmlParseException &exception);
- QString errorString() const;
+ bool warning(const QXmlParseException &exception) Q_DECL_OVERRIDE;
+ bool error(const QXmlParseException &exception) Q_DECL_OVERRIDE;
+ bool fatalError(const QXmlParseException &exception) Q_DECL_OVERRIDE;
+ QString errorString() const Q_DECL_OVERRIDE;
/** Processes the start of the document. */
- bool startDocument();
+ bool startDocument() Q_DECL_OVERRIDE;
/** Processes the start tag of an element. */
bool startElement(const QString &, const QString &, const QString &name,
- const QXmlAttributes &attributes);
+ const QXmlAttributes &attributes) Q_DECL_OVERRIDE;
/** Processes a chunk of normal character data. */
- bool characters(const QString &ch);
+ bool characters(const QString &ch) Q_DECL_OVERRIDE;
/** Processes whitespace. */
- bool ignorableWhitespace(const QString &ch);
+ bool ignorableWhitespace(const QString &ch) Q_DECL_OVERRIDE;
/** Processes the end tag of an element. */
- bool endElement(const QString &, const QString &, const QString &name);
+ bool endElement(const QString &, const QString &, const QString &name) Q_DECL_OVERRIDE;
/** Processes the end of the document. */
- bool endDocument();
+ bool endDocument() Q_DECL_OVERRIDE;
/** returns a list of words */
WordMap getList();