Git commit 21f898f231335a217f57eb797e2b988f7f4862b9 by Thomas Fischer. Committed on 31/03/2017 at 19:29. Pushed by thomasfischer into branch 'master'. Modernizing C++ code: 'override' in addition to 'virtual' Modernizing code to use 'override' in addition to 'virtual'. Issues found and fixed by clang-tidy 3.9, using check 'modernize-use-override'. M +2 -2 src/data/comment.h M +2 -2 src/data/entry.h M +2 -2 src/data/macro.h M +8 -8 src/data/models/filemodel.h M +2 -2 src/data/preamble.h M +17 -17 src/data/value.h M +2 -2 src/gui/element/associatedfilesui.h M +2 -2 src/gui/element/elementeditor.cpp M +2 -2 src/gui/element/elementeditor.h M +1 -1 src/gui/element/elementwidgets.cpp M +55 -55 src/gui/element/elementwidgets.h M +2 -2 src/gui/element/findpdfui.h M +8 -8 src/gui/element/findpdfui_p.h M +7 -7 src/gui/field/colorlabelwidget.cpp M +1 -1 src/gui/field/colorlabelwidget.h M +1 -1 src/gui/field/fieldinput.h M +4 -4 src/gui/field/fieldlineedit.h M +12 -12 src/gui/field/fieldlistedit.h M +4 -4 src/gui/file/basicfileview.h M +2 -2 src/gui/file/clipboard.h M +1 -1 src/gui/file/filedelegate.h M +1 -1 src/gui/file/fileview.cpp M +7 -7 src/gui/file/fileview.h M +18 -18 src/gui/file/findduplicatesui.cpp M +3 -3 src/gui/file/findduplicatesui.h M +2 -2 src/gui/file/partwidget.h M +3 -3 src/gui/file/sortfilterfilemodel.h M +6 -6 src/gui/italictextitemmodel.h M +2 -2 src/gui/preferences/kbibtexpreferencesdialog.h M +4 -4 src/gui/preferences/settingscolorlabelwidget.cpp M +9 -9 src/gui/preferences/settingscolorlabelwidget.h M +9 -9 src/gui/preferences/settingscolorlabelwidget_p.h M +7 -7 src/gui/preferences/settingsfileexporterpdfpswidget.h M +7 -7 src/gui/preferences/settingsfileexporterwidget.h M +7 -7 src/gui/preferences/settingsgeneralwidget.h M +2 -2 src/gui/preferences/settingsglobalkeywordswidget.cpp M +7 -7 src/gui/preferences/settingsglobalkeywordswidget.h M +5 -5 src/gui/preferences/settingsidsuggestionseditor.cpp M +4 -4 src/gui/preferences/settingsidsuggestionseditor.h M +5 -5 src/gui/preferences/settingsidsuggestionswidget.cpp M +7 -7 src/gui/preferences/settingsidsuggestionswidget.h M +7 -7 src/gui/preferences/settingsuserinterfacewidget.h M +13 -13 src/gui/valuelistmodel.h M +2 -2 src/gui/widgets/filterbar.h M +2 -2 src/gui/widgets/menulineedit.cpp M +3 -3 src/gui/widgets/menulineedit.h M +5 -5 src/gui/widgets/radiobuttontreeview.h M +5 -5 src/gui/widgets/starrating.h M +3 -3 src/io/encoderlatex.h M +3 -3 src/io/encoderxml.h M +1 -1 src/io/fileexporter.h M +4 -4 src/io/fileexporterbibtex.h M +4 -4 src/io/fileexporterbibtex2html.h M +4 -4 src/io/fileexporterbibtexoutput.h M +3 -3 src/io/fileexporterbibutils.h M +4 -4 src/io/fileexporterpdf.h M +4 -4 src/io/fileexporterps.h M +4 -4 src/io/fileexporterris.h M +4 -4 src/io/fileexporterrtf.h M +1 -1 src/io/fileexportertoolchain.h M +4 -4 src/io/fileexporterxml.h M +4 -4 src/io/fileexporterxslt.h M +2 -2 src/io/fileimporter.h M +3 -3 src/io/fileimporterbibtex.h M +3 -3 src/io/fileimporterbibutils.h M +4 -4 src/io/fileimporterpdf.h M +4 -4 src/io/fileimporterris.h M +1 -1 src/networking/findpdf.h M +1 -1 src/networking/onlinesearch/onlinesearchabstract.h M +6 -6 src/networking/onlinesearch/onlinesearchacmportal.h M +2 -2 src/networking/onlinesearch/onlinesearcharxiv.cpp M +9 -9 src/networking/onlinesearch/onlinesearcharxiv.h M +2 -2 src/networking/onlinesearch/onlinesearchbibsonomy.cpp M +8 -8 src/networking/onlinesearch/onlinesearchbibsonomy.h M +6 -6 src/networking/onlinesearch/onlinesearchbiorxiv.h M +5 -5 src/networking/onlinesearch/onlinesearchcernds.h M +2 -2 src/networking/onlinesearch/onlinesearchdoi.cpp M +8 -8 src/networking/onlinesearch/onlinesearchdoi.h M +3 -3 src/networking/onlinesearch/onlinesearchgeneral.h M +6 -6 src/networking/onlinesearch/onlinesearchgooglescholar.h M +6 -6 src/networking/onlinesearch/onlinesearchideasrepec.h M +7 -7 src/networking/onlinesearch/onlinesearchieeexplore.h M +2 -2 src/networking/onlinesearch/onlinesearchingentaconnect.cpp M +8 -8 src/networking/onlinesearch/onlinesearchingentaconnect.h M +5 -5 src/networking/onlinesearch/onlinesearchinspirehep.h M +6 -6 src/networking/onlinesearch/onlinesearchisbndb.h M +7 -7 src/networking/onlinesearch/onlinesearchjstor.h M +7 -7 src/networking/onlinesearch/onlinesearchmathscinet.h M +6 -6 src/networking/onlinesearch/onlinesearchmrlookup.h M +6 -6 src/networking/onlinesearch/onlinesearchpubmed.h M +6 -6 src/networking/onlinesearch/onlinesearchsciencedirect.h M +2 -2 src/networking/onlinesearch/onlinesearchsimplebibtexdownload= .h M +6 -6 src/networking/onlinesearch/onlinesearchsoanasaads.h M +2 -2 src/networking/onlinesearch/onlinesearchspringerlink.cpp M +8 -8 src/networking/onlinesearch/onlinesearchspringerlink.h M +1 -1 src/networking/zotero/api.h M +2 -2 src/networking/zotero/collection.h M +6 -6 src/networking/zotero/collectionmodel.h M +1 -1 src/networking/zotero/groups.h M +1 -1 src/networking/zotero/items.h M +3 -3 src/networking/zotero/oauthwizard.cpp M +5 -5 src/networking/zotero/oauthwizard.h M +6 -6 src/networking/zotero/tagmodel.h M +1 -1 src/networking/zotero/tags.h M +2 -2 src/parts/browserextension.h M +7 -7 src/parts/part.h M +2 -2 src/processing/bibliographyservice.h M +2 -2 src/processing/findduplicates.h M +2 -2 src/processing/lyx.h M +2 -2 src/program/docklets/documentpreview.h M +2 -2 src/program/docklets/elementform.h M +2 -2 src/program/docklets/referencepreview.h M +2 -2 src/program/docklets/searchform.h M +2 -2 src/program/docklets/searchresults.h M +2 -2 src/program/docklets/statistics.h M +3 -3 src/program/docklets/valuelist.h M +2 -2 src/program/docklets/zoterobrowser.h M +8 -8 src/program/documentlist.h M +4 -4 src/program/mainwindow.h M +6 -6 src/program/mdiwidget.cpp M +2 -2 src/program/mdiwidget.h M +2 -2 src/program/openfileinfo.h https://commits.kde.org/kbibtex/21f898f231335a217f57eb797e2b988f7f4862b9 diff --git a/src/data/comment.h b/src/data/comment.h index 617db642..34ea8a55 100644 --- a/src/data/comment.h +++ b/src/data/comment.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -45,7 +45,7 @@ public: */ Comment(const Comment &other); = - virtual ~Comment(); + ~Comment() override; = /** * Assignment operator, working similar to a copy constructor, diff --git a/src/data/entry.h b/src/data/entry.h index aa1ddb74..c07ce702 100644 --- a/src/data/entry.h +++ b/src/data/entry.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -131,7 +131,7 @@ public: */ Entry(const Entry &other); = - virtual ~Entry(); + ~Entry() override; = /** * Assignment operator, working similar to a copy constructor, diff --git a/src/data/macro.h b/src/data/macro.h index 83daa28b..648585a7 100644 --- a/src/data/macro.h +++ b/src/data/macro.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -48,7 +48,7 @@ public: */ Macro(const Macro &other); = - virtual ~Macro(); + ~Macro() override; = /** * Assignment operator, working similar to a copy constructor, diff --git a/src/data/models/filemodel.h b/src/data/models/filemodel.h index 3ddbe7f1..e3e6bed6 100644 --- a/src/data/models/filemodel.h +++ b/src/data/models/filemodel.h @@ -52,13 +52,13 @@ public: File *bibliographyFile() const; virtual void setBibliographyFile(File *file); = - virtual QModelIndex parent(const QModelIndex &index) const; - virtual bool hasChildren(const QModelIndex &parent =3D QModelIndex()) = const; - virtual int rowCount(const QModelIndex &parent =3D QModelIndex()) cons= t; - virtual int columnCount(const QModelIndex &parent =3D QModelIndex()) c= onst; - virtual QVariant data(const QModelIndex &index, int role =3D Qt::Displ= ayRole) const; - virtual QVariant headerData(int section, Qt::Orientation orientation, = int role =3D Qt::DisplayRole) const; - virtual Qt::ItemFlags flags(const QModelIndex &index) const; + QModelIndex parent(const QModelIndex &index) const override; + bool hasChildren(const QModelIndex &parent =3D QModelIndex()) const ov= erride; + int rowCount(const QModelIndex &parent =3D QModelIndex()) const overri= de; + int columnCount(const QModelIndex &parent =3D QModelIndex()) const ove= rride; + QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const override; + QVariant headerData(int section, Qt::Orientation orientation, int role= =3D Qt::DisplayRole) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; = void clear(); virtual bool removeRow(int row, const QModelIndex &parent =3D QModelIn= dex()); @@ -70,7 +70,7 @@ public: /// Notifies the model that a given element has been modifed void elementChanged(int row); = - void notificationEvent(int eventId); + void notificationEvent(int eventId) override; = private: File *m_file; diff --git a/src/data/preamble.h b/src/data/preamble.h index c0de79f8..692164ae 100644 --- a/src/data/preamble.h +++ b/src/data/preamble.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -32,7 +32,7 @@ class KBIBTEXDATA_EXPORT Preamble : public Element public: explicit Preamble(const Value &value =3D Value()); Preamble(const Preamble &other); - ~Preamble(); + ~Preamble() override; = /** * Assignment operator, working similar to a copy constructor, diff --git a/src/data/value.h b/src/data/value.h index ca986a7b..fb94903c 100644 --- a/src/data/value.h +++ b/src/data/value.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -86,9 +86,9 @@ public: void setText(const QString &text); QString text() const; = - void replace(const QString &before, const QString &after, ValueItem::R= eplaceMode replaceMode); - bool containsPattern(const QString &pattern, Qt::CaseSensitivity caseS= ensitive =3D Qt::CaseInsensitive) const; - bool operator=3D=3D(const ValueItem &other) const; + void replace(const QString &before, const QString &after, ValueItem::R= eplaceMode replaceMode) override; + bool containsPattern(const QString &pattern, Qt::CaseSensitivity caseS= ensitive =3D Qt::CaseInsensitive) const override; + bool operator=3D=3D(const ValueItem &other) const override; = /** * Cheap and fast test if another ValueItem is a Keyword object. @@ -120,9 +120,9 @@ public: QString lastName() const; QString suffix() const; = - void replace(const QString &before, const QString &after, ValueItem::R= eplaceMode replaceMode); - bool containsPattern(const QString &pattern, Qt::CaseSensitivity caseS= ensitive =3D Qt::CaseInsensitive) const; - bool operator=3D=3D(const ValueItem &other) const; + void replace(const QString &before, const QString &after, ValueItem::R= eplaceMode replaceMode) override; + bool containsPattern(const QString &pattern, Qt::CaseSensitivity caseS= ensitive =3D Qt::CaseInsensitive) const override; + bool operator=3D=3D(const ValueItem &other) const override; = static QString transcribePersonName(const QString &formatting, const Q= String &firstName, const QString &lastName, const QString &suffix =3D QStri= ng()); static QString transcribePersonName(const Person *person, const QStrin= g &formatting); @@ -151,9 +151,9 @@ public: QString text() const; bool isValid(); = - void replace(const QString &before, const QString &after, ValueItem::R= eplaceMode replaceMode); - bool containsPattern(const QString &pattern, Qt::CaseSensitivity caseS= ensitive =3D Qt::CaseInsensitive) const; - bool operator=3D=3D(const ValueItem &other) const; + void replace(const QString &before, const QString &after, ValueItem::R= eplaceMode replaceMode) override; + bool containsPattern(const QString &pattern, Qt::CaseSensitivity caseS= ensitive =3D Qt::CaseInsensitive) const override; + bool operator=3D=3D(const ValueItem &other) const override; = /** * Cheap and fast test if another ValueItem is a MacroKey object. @@ -176,9 +176,9 @@ public: void setText(const QString &text); QString text() const; = - void replace(const QString &before, const QString &after, ValueItem::R= eplaceMode replaceMode); - bool containsPattern(const QString &pattern, Qt::CaseSensitivity caseS= ensitive =3D Qt::CaseInsensitive) const; - bool operator=3D=3D(const ValueItem &other) const; + void replace(const QString &before, const QString &after, ValueItem::R= eplaceMode replaceMode) override; + bool containsPattern(const QString &pattern, Qt::CaseSensitivity caseS= ensitive =3D Qt::CaseInsensitive) const override; + bool operator=3D=3D(const ValueItem &other) const override; = /** * Cheap and fast test if another ValueItem is a PlainText object. @@ -200,9 +200,9 @@ public: void setText(const QString &text); QString text() const; = - void replace(const QString &before, const QString &after, ValueItem::R= eplaceMode replaceMode); - bool containsPattern(const QString &pattern, Qt::CaseSensitivity caseS= ensitive =3D Qt::CaseInsensitive) const; - bool operator=3D=3D(const ValueItem &other) const; + void replace(const QString &before, const QString &after, ValueItem::R= eplaceMode replaceMode) override; + bool containsPattern(const QString &pattern, Qt::CaseSensitivity caseS= ensitive =3D Qt::CaseInsensitive) const override; + bool operator=3D=3D(const ValueItem &other) const override; = /** * Cheap and fast test if another ValueItem is a VerbatimText object. @@ -261,7 +261,7 @@ public: static QString text(const ValueItem &valueItem); static QString text(const QSharedPointer &valueItem); = - void notificationEvent(int eventId); + void notificationEvent(int eventId) override; = private: enum ValueItemType { VITOther =3D 0, VITPerson, VITKeyword}; diff --git a/src/gui/element/associatedfilesui.h b/src/gui/element/associat= edfilesui.h index 05f3b6b3..f2ec3b4a 100644 --- a/src/gui/element/associatedfilesui.h +++ b/src/gui/element/associatedfilesui.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -34,7 +34,7 @@ class KBIBTEXGUI_EXPORT AssociatedFilesUI: public QWidget Q_OBJECT = public: - ~AssociatedFilesUI(); + ~AssociatedFilesUI() override; = static bool associateUrl(const QUrl &url, QSharedPointer &entry= , const File *bibTeXfile, QWidget *parent); static QString associateUrl(const QUrl &url, const QString &entryId, c= onst File *bibTeXfile, QWidget *parent); diff --git a/src/gui/element/elementeditor.cpp b/src/gui/element/elementedi= tor.cpp index 0ba236c2..9e440c0c 100644 --- a/src/gui/element/elementeditor.cpp +++ b/src/gui/element/elementeditor.cpp @@ -82,7 +82,7 @@ public: createGUI(scrollable); } = - ~ElementEditorPrivate() { + ~ElementEditorPrivate() override { clearWidgets(); } = @@ -254,7 +254,7 @@ public: apply(element); } = - void apply(QSharedPointer element) { + void apply(QSharedPointer element) override { if (tab->currentWidget() =3D=3D sourceWidget) { /// Very simple if source view is active: BibTeX code contains /// all necessary data diff --git a/src/gui/element/elementeditor.h b/src/gui/element/elementedito= r.h index 4382f067..51381d4b 100644 --- a/src/gui/element/elementeditor.h +++ b/src/gui/element/elementeditor.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -44,7 +44,7 @@ public: }; = ElementEditor(bool scrollable, QWidget *parent); - ~ElementEditor(); + ~ElementEditor() override; = void setElement(QSharedPointer element, const File *file); void setElement(QSharedPointer element, const File *fil= e); diff --git a/src/gui/element/elementwidgets.cpp b/src/gui/element/elementwi= dgets.cpp index e5e660b8..d12a6ed1 100644 --- a/src/gui/element/elementwidgets.cpp +++ b/src/gui/element/elementwidgets.cpp @@ -1095,7 +1095,7 @@ public: } = protected: - virtual void dropEvent(QDropEvent *event) { + void dropEvent(QDropEvent *event) override { FileImporterBibTeX importer; FileExporterBibTeX exporter; const File *file =3D importer.fromString(event->mimeData()->text()= ); diff --git a/src/gui/element/elementwidgets.h b/src/gui/element/elementwidg= ets.h index 4f4481d4..41a669b6 100644 --- a/src/gui/element/elementwidgets.h +++ b/src/gui/element/elementwidgets.h @@ -101,18 +101,18 @@ private: = public: EntryConfiguredWidget(const QSharedPointer &entr= yTabLayout, QWidget *parent); - virtual ~EntryConfiguredWidget(); + ~EntryConfiguredWidget() override; = - bool apply(QSharedPointer element) const; - bool reset(QSharedPointer element); - void setReadOnly(bool isReadOnly); - void showReqOptWidgets(bool forceVisible, const QString &entryType); - QString label(); - QIcon icon(); + bool apply(QSharedPointer element) const override; + bool reset(QSharedPointer element) override; + void setReadOnly(bool isReadOnly) override; + void showReqOptWidgets(bool forceVisible, const QString &entryType) ov= erride; + QString label() override; + QIcon icon() override; = - virtual void setFile(const File *file); + void setFile(const File *file) override; = - bool canEdit(const Element *element); + bool canEdit(const Element *element) override; }; = class ReferenceWidget : public ElementWidget @@ -129,10 +129,10 @@ private: public: explicit ReferenceWidget(QWidget *parent); = - bool apply(QSharedPointer element) const; - bool reset(QSharedPointer element); - void setReadOnly(bool isReadOnly); - void showReqOptWidgets(bool, const QString &) {} + bool apply(QSharedPointer element) const override; + bool reset(QSharedPointer element) override; + void setReadOnly(bool isReadOnly) override; + void showReqOptWidgets(bool, const QString &) override {} void setApplyElementInterface(ElementEditor::ApplyElementInterface *ap= plyElement) { m_applyElement =3D applyElement; } @@ -140,10 +140,10 @@ public: void setOriginalElement(const QSharedPointer &orig); bool isDuplicateId() const; = - QString label(); - QIcon icon(); + QString label() override; + QIcon icon() override; = - bool canEdit(const Element *element); + bool canEdit(const Element *element) override; = public slots: void setEntryIdByDefault(); @@ -172,17 +172,17 @@ private: public: explicit FilesWidget(QWidget *parent); = - bool apply(QSharedPointer element) const; - bool reset(QSharedPointer element); - void setReadOnly(bool isReadOnly); - void showReqOptWidgets(bool, const QString &) {} + bool apply(QSharedPointer element) const override; + bool reset(QSharedPointer element) override; + void setReadOnly(bool isReadOnly) override; + void showReqOptWidgets(bool, const QString &) override {} = - QString label(); - QIcon icon(); + QString label() override; + QIcon icon() override; = - virtual void setFile(const File *file); + void setFile(const File *file) override; = - bool canEdit(const Element *element); + bool canEdit(const Element *element) override; = private: static const QStringList keyStart; @@ -210,16 +210,16 @@ private: = public: OtherFieldsWidget(const QStringList &blacklistedFields, QWidget *paren= t); - ~OtherFieldsWidget(); + ~OtherFieldsWidget() override; = - bool apply(QSharedPointer element) const; - bool reset(QSharedPointer element); - void setReadOnly(bool isReadOnly); - void showReqOptWidgets(bool, const QString &) {} - QString label(); - QIcon icon(); + bool apply(QSharedPointer element) const override; + bool reset(QSharedPointer element) override; + void setReadOnly(bool isReadOnly) override; + void showReqOptWidgets(bool, const QString &) override {} + QString label() override; + QIcon icon() override; = - bool canEdit(const Element *element); + bool canEdit(const Element *element) override; = private slots: void listElementExecuted(QTreeWidgetItem *item, int column); @@ -241,16 +241,16 @@ private: = public: explicit MacroWidget(QWidget *parent); - ~MacroWidget(); + ~MacroWidget() override; = - bool apply(QSharedPointer element) const; - bool reset(QSharedPointer element); - void setReadOnly(bool isReadOnly); - void showReqOptWidgets(bool, const QString &) {} - QString label(); - QIcon icon(); + bool apply(QSharedPointer element) const override; + bool reset(QSharedPointer element) override; + void setReadOnly(bool isReadOnly) override; + void showReqOptWidgets(bool, const QString &) override {} + QString label() override; + QIcon icon() override; = - bool canEdit(const Element *element); + bool canEdit(const Element *element) override; }; = class PreambleWidget : public ElementWidget @@ -265,14 +265,14 @@ private: public: explicit PreambleWidget(QWidget *parent); = - bool apply(QSharedPointer element) const; - bool reset(QSharedPointer element); - void setReadOnly(bool isReadOnly); - void showReqOptWidgets(bool, const QString &) {} - QString label(); - QIcon icon(); + bool apply(QSharedPointer element) const override; + bool reset(QSharedPointer element) override; + void setReadOnly(bool isReadOnly) override; + void showReqOptWidgets(bool, const QString &) override {} + QString label() override; + QIcon icon() override; = - bool canEdit(const Element *element); + bool canEdit(const Element *element) override; }; = class SourceWidget : public ElementWidget @@ -288,16 +288,16 @@ private: = public: explicit SourceWidget(QWidget *parent); - ~SourceWidget(); + ~SourceWidget() override; = - bool apply(QSharedPointer element) const; - bool reset(QSharedPointer element); - void setReadOnly(bool isReadOnly); - void showReqOptWidgets(bool, const QString &) {} - QString label(); - QIcon icon(); + bool apply(QSharedPointer element) const override; + bool reset(QSharedPointer element) override; + void setReadOnly(bool isReadOnly) override; + void showReqOptWidgets(bool, const QString &) override {} + QString label() override; + QIcon icon() override; = - bool canEdit(const Element *element); + bool canEdit(const Element *element) override; = private slots: void reset(); diff --git a/src/gui/element/findpdfui.h b/src/gui/element/findpdfui.h index 02b711ca..b8172f7a 100644 --- a/src/gui/element/findpdfui.h +++ b/src/gui/element/findpdfui.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -39,7 +39,7 @@ class KBIBTEXGUI_EXPORT FindPDFUI : public QWidget Q_OBJECT = public: - ~FindPDFUI(); + ~FindPDFUI() override; = /** * Show a modal dialog that allows the user to start searching for PDF= files, diff --git a/src/gui/element/findpdfui_p.h b/src/gui/element/findpdfui_p.h index ef60f567..f1d6c4a2 100644 --- a/src/gui/element/findpdfui_p.h +++ b/src/gui/element/findpdfui_p.h @@ -39,16 +39,16 @@ private: public: PDFItemDelegate(QListView *itemView, QObject *parent); = - virtual void paint(QPainter *painter, const QStyleOptionViewItem &opti= on, const QModelIndex &index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, cons= t QModelIndex &index) const override; = /// update the widgets - virtual void updateItemWidgets(const QList widgets, const Q= StyleOptionViewItem &option, const QPersistentModelIndex &index) const; + void updateItemWidgets(const QList widgets, const QStyleOpt= ionViewItem &option, const QPersistentModelIndex &index) const override; = - virtual QSize sizeHint(const QStyleOptionViewItem &option, const QMode= lIndex &) const; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &= ) const override; = protected: /// get the list of widgets - virtual QList createItemWidgets(const QModelIndex &index) c= onst; + QList createItemWidgets(const QModelIndex &index) const ove= rride; = private slots: void slotViewPDF(); @@ -68,10 +68,10 @@ class PDFListModel : public QAbstractListModel public: explicit PDFListModel(QList &resultList, QObject = *parent =3D nullptr); = - int rowCount(const QModelIndex &parent =3D QModelIndex()) const; - QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const; - bool setData(const QModelIndex &index, const QVariant &value, int role= =3D Qt::EditRole); - QVariant headerData(int section, Qt::Orientation orientation, int role= =3D Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent =3D QModelIndex()) const overri= de; + QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const override; + bool setData(const QModelIndex &index, const QVariant &value, int role= =3D Qt::EditRole) override; + QVariant headerData(int section, Qt::Orientation orientation, int role= =3D Qt::DisplayRole) const override; = private: QList &m_resultList; diff --git a/src/gui/field/colorlabelwidget.cpp b/src/gui/field/colorlabelw= idget.cpp index 0b1da09f..25edd615 100644 --- a/src/gui/field/colorlabelwidget.cpp +++ b/src/gui/field/colorlabelwidget.cpp @@ -52,7 +52,7 @@ public: NotificationHub::registerNotificationListener(this, NotificationHu= b::EventConfigurationChanged); } = - void notificationEvent(int eventId) { + void notificationEvent(int eventId) override { if (eventId =3D=3D NotificationHub::EventConfigurationChanged) readConfiguration(); } @@ -71,23 +71,23 @@ public: } } = - QModelIndex index(int row, int column, const QModelIndex &) const { + QModelIndex index(int row, int column, const QModelIndex &) const over= ride { return createIndex(row, column); } = - QModelIndex parent(const QModelIndex & =3D QModelIndex()) const { + QModelIndex parent(const QModelIndex & =3D QModelIndex()) const overri= de { return QModelIndex(); } = - virtual int rowCount(const QModelIndex &parent =3D QModelIndex()) cons= t { + int rowCount(const QModelIndex &parent =3D QModelIndex()) const overri= de { return parent =3D=3D QModelIndex() ? 2 + colorLabelPairs.count() := 0; } = - virtual int columnCount(const QModelIndex & =3D QModelIndex()) const { + int columnCount(const QModelIndex & =3D QModelIndex()) const override { return 1; } = - virtual QVariant data(const QModelIndex &index, int role =3D Qt::Displ= ayRole) const { + QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const override { if (role =3D=3D ColorRole) { if (index.row() =3D=3D 0) return QColor(Qt::black); @@ -113,7 +113,7 @@ public: return QVariant(); } = - virtual QVariant headerData(int section, Qt::Orientation orientation, = int role =3D Qt::DisplayRole) const { + QVariant headerData(int section, Qt::Orientation orientation, int role= =3D Qt::DisplayRole) const override { if (section !=3D 0 || orientation !=3D Qt::Horizontal || role !=3D= Qt::DisplayRole) return QVariant(); = diff --git a/src/gui/field/colorlabelwidget.h b/src/gui/field/colorlabelwid= get.h index cbedec10..92235b3d 100644 --- a/src/gui/field/colorlabelwidget.h +++ b/src/gui/field/colorlabelwidget.h @@ -33,7 +33,7 @@ class KBIBTEXGUI_EXPORT ColorLabelWidget : public KComboB= ox = public: explicit ColorLabelWidget(QWidget *parent =3D nullptr); - ~ColorLabelWidget(); + ~ColorLabelWidget() override; = void clear(); bool reset(const Value &value); diff --git a/src/gui/field/fieldinput.h b/src/gui/field/fieldinput.h index af1e8055..a129c9c3 100644 --- a/src/gui/field/fieldinput.h +++ b/src/gui/field/fieldinput.h @@ -36,7 +36,7 @@ class KBIBTEXGUI_EXPORT FieldInput : public QWidget = public: FieldInput(KBibTeX::FieldInputType fieldInputType, KBibTeX::TypeFlag p= referredTypeFlag, KBibTeX::TypeFlags typeFlags, QWidget *parent =3D nullptr= ); - ~FieldInput(); + ~FieldInput() override; = bool reset(const Value &value); bool apply(Value &value) const; diff --git a/src/gui/field/fieldlineedit.h b/src/gui/field/fieldlineedit.h index 116f5ec1..b8ae5091 100644 --- a/src/gui/field/fieldlineedit.h +++ b/src/gui/field/fieldlineedit.h @@ -39,19 +39,19 @@ class KBIBTEXGUI_EXPORT FieldLineEdit : public MenuLine= Edit = public: FieldLineEdit(KBibTeX::TypeFlag preferredTypeFlag, KBibTeX::TypeFlags = typeFlags, bool isMultiLine =3D false, QWidget *parent =3D nullptr); - ~FieldLineEdit(); + ~FieldLineEdit() override; = bool reset(const Value &value); bool apply(Value &value) const; - virtual void setReadOnly(bool); + void setReadOnly(bool) override; = void setFile(const File *file); void setElement(const Element *element); void setFieldKey(const QString &fieldKey); = protected: - void dragEnterEvent(QDragEnterEvent *event); - void dropEvent(QDropEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *event) override; = private: bool m_incompleteRepresentation; diff --git a/src/gui/field/fieldlistedit.h b/src/gui/field/fieldlistedit.h index d9b7a989..c42ab7e3 100644 --- a/src/gui/field/fieldlistedit.h +++ b/src/gui/field/fieldlistedit.h @@ -46,7 +46,7 @@ class FieldListEdit : public QWidget = public: FieldListEdit(KBibTeX::TypeFlag preferredTypeFlag, KBibTeX::TypeFlags = typeFlags, QWidget *parent =3D nullptr); - ~FieldListEdit(); + ~FieldListEdit() override; = virtual bool reset(const Value &value); virtual bool apply(Value &value) const; @@ -67,8 +67,8 @@ protected: virtual FieldLineEdit *addFieldLineEdit(); void addButton(QPushButton *button); void lineAdd(Value *value); - void dragEnterEvent(QDragEnterEvent *event); - void dropEvent(QDropEvent *); + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *) override; = const Element *m_element; = @@ -94,10 +94,10 @@ class PersonListEdit : public FieldListEdit public: PersonListEdit(KBibTeX::TypeFlag preferredTypeFlag, KBibTeX::TypeFlags= typeFlags, QWidget *parent =3D nullptr); = - virtual bool reset(const Value &value); - virtual bool apply(Value &value) const; + bool reset(const Value &value) override; + bool apply(Value &value) const override; = - virtual void setReadOnly(bool isReadOnly); + void setReadOnly(bool isReadOnly) override; = private slots: void slotAddNamesFromClipboard(); @@ -117,9 +117,9 @@ class UrlListEdit : public FieldListEdit = public: explicit UrlListEdit(QWidget *parent =3D nullptr); - ~UrlListEdit(); + ~UrlListEdit() override; = - virtual void setReadOnly(bool isReadOnly); + void setReadOnly(bool isReadOnly) override; = static QString askRelativeOrStaticFilename(QWidget *parent, const QStr= ing &filename, const QUrl &baseUrl); = @@ -127,7 +127,7 @@ public: static bool urlIsLocal(const QUrl &url); = protected: - virtual FieldLineEdit *addFieldLineEdit(); + FieldLineEdit *addFieldLineEdit() override; = private slots: void slotAddReference(); @@ -159,9 +159,9 @@ public: = explicit KeywordListEdit(QWidget *parent =3D nullptr); = - virtual void setReadOnly(bool isReadOnly); - virtual void setFile(const File *file); - virtual void setCompletionItems(const QStringList &items); + void setReadOnly(bool isReadOnly) override; + void setFile(const File *file) override; + void setCompletionItems(const QStringList &items) override; = private slots: void slotAddKeywordsFromList(); diff --git a/src/gui/file/basicfileview.h b/src/gui/file/basicfileview.h index a81ba132..5372762a 100644 --- a/src/gui/file/basicfileview.h +++ b/src/gui/file/basicfileview.h @@ -33,9 +33,9 @@ class KBIBTEXGUI_EXPORT BasicFileView : public QTreeView Q_OBJECT public: explicit BasicFileView(const QString &name, QWidget *parent =3D nullpt= r); - ~BasicFileView(); + ~BasicFileView() override; = - virtual void setModel(QAbstractItemModel *model); + void setModel(QAbstractItemModel *model) override; FileModel *fileModel(); QSortFilterProxyModel *sortFilterProxyModel(); = @@ -43,8 +43,8 @@ signals: void searchFor(const QString &); = protected: - virtual void keyPressEvent(QKeyEvent *event); - virtual void resizeEvent(QResizeEvent *event); + void keyPressEvent(QKeyEvent *event) override; + void resizeEvent(QResizeEvent *event) override; = protected slots: void columnMoved(); diff --git a/src/gui/file/clipboard.h b/src/gui/file/clipboard.h index d901e698..ba24dbca 100644 --- a/src/gui/file/clipboard.h +++ b/src/gui/file/clipboard.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -41,7 +41,7 @@ public: static const QString defaultCopyReferenceCommand; = explicit Clipboard(FileView *fileView); - ~Clipboard(); + ~Clipboard() override; = public slots: void cut(); diff --git a/src/gui/file/filedelegate.h b/src/gui/file/filedelegate.h index 0d6939e4..fd5beed8 100644 --- a/src/gui/file/filedelegate.h +++ b/src/gui/file/filedelegate.h @@ -32,7 +32,7 @@ public: /* nothing */ } = - void paint(QPainter *painter, const QStyleOptionViewItem &option, cons= t QModelIndex &index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, cons= t QModelIndex &index) const override; }; = #endif // KBIBTEX_GUI_FILEDELEGATE_H diff --git a/src/gui/file/fileview.cpp b/src/gui/file/fileview.cpp index d7f95bd6..f4e01e17 100644 --- a/src/gui/file/fileview.cpp +++ b/src/gui/file/fileview.cpp @@ -79,7 +79,7 @@ public: } = protected: - virtual void closeEvent(QCloseEvent *e) { + void closeEvent(QCloseEvent *e) override { /// strangely enough, close events have always to be rejected ... e->setAccepted(false); QDialog::closeEvent(e); diff --git a/src/gui/file/fileview.h b/src/gui/file/fileview.h index 9884c274..86f7eded 100644 --- a/src/gui/file/fileview.h +++ b/src/gui/file/fileview.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -77,13 +77,13 @@ public slots: protected: bool m_isReadOnly; = - void currentChanged(const QModelIndex ¤t, const QModelIndex &pre= vious); - void selectionChanged(const QItemSelection &selected, const QItemSelec= tion &deselected); + void currentChanged(const QModelIndex ¤t, const QModelIndex &pre= vious) override; + void selectionChanged(const QItemSelection &selected, const QItemSelec= tion &deselected) override; = - void mouseMoveEvent(QMouseEvent *event); - void dragEnterEvent(QDragEnterEvent *event); - void dragMoveEvent(QDragMoveEvent *event); - void dropEvent(QDropEvent *event); + void mouseMoveEvent(QMouseEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dropEvent(QDropEvent *event) override; = protected slots: void itemActivated(const QModelIndex &index); diff --git a/src/gui/file/findduplicatesui.cpp b/src/gui/file/findduplicate= sui.cpp index e8eba9c2..40e666a6 100644 --- a/src/gui/file/findduplicatesui.cpp +++ b/src/gui/file/findduplicatesui.cpp @@ -88,7 +88,7 @@ public: this->currentClique =3D currentClique; } = - QModelIndex index(int row, int column, const QModelIndex &parent =3D Q= ModelIndex()) const { + QModelIndex index(int row, int column, const QModelIndex &parent =3D Q= ModelIndex()) const override { if (parent =3D=3D QModelIndex()) return createIndex(row, column, noParentInternalId); else if (parent.parent() =3D=3D QModelIndex()) @@ -96,14 +96,14 @@ public: return QModelIndex(); } = - QModelIndex parent(const QModelIndex &index) const { + QModelIndex parent(const QModelIndex &index) const override { if (index.internalId() >=3D noParentInternalId) return QModelIndex(); else return createIndex(index.internalId(), 0, noParentInternalId); } = - int rowCount(const QModelIndex &parent =3D QModelIndex()) const { + int rowCount(const QModelIndex &parent =3D QModelIndex()) const overri= de { if (currentClique =3D=3D nullptr) return 0; = @@ -122,12 +122,12 @@ public: return 0; } = - int columnCount(const QModelIndex &) const { + int columnCount(const QModelIndex &) const override { /// only one column in use return 1; } = - QVariant headerData(int section, Qt::Orientation orientation, int role= =3D Qt::DisplayRole) const { + QVariant headerData(int section, Qt::Orientation orientation, int role= =3D Qt::DisplayRole) const override { Q_UNUSED(section) Q_UNUSED(orientation) = @@ -136,7 +136,7 @@ public: return QVariant(); } = - QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const { + QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const override { if (index.parent() =3D=3D QModelIndex()) { /// top-level elements showing field names like "Title", "Auth= ors", etc const QString fieldName =3D currentClique->fieldList().at(inde= x.row()).toLower(); @@ -232,7 +232,7 @@ public: return QVariant(); } = - bool setData(const QModelIndex &index, const QVariant &value, int role= =3D RadioButtonTreeView::RadioSelectedRole) { + bool setData(const QModelIndex &index, const QVariant &value, int role= =3D RadioButtonTreeView::RadioSelectedRole) override { if (index.parent() !=3D QModelIndex()) { bool isInt; int checkState =3D value.toInt(&isInt); @@ -316,12 +316,12 @@ public: return false; } = - bool hasChildren(const QModelIndex &parent =3D QModelIndex()) const { + bool hasChildren(const QModelIndex &parent =3D QModelIndex()) const ov= erride { /// depth-two tree return parent =3D=3D QModelIndex() || parent.parent() =3D=3D QMode= lIndex(); } = - virtual Qt::ItemFlags flags(const QModelIndex &index) const { + Qt::ItemFlags flags(const QModelIndex &index) const override { Qt::ItemFlags f =3D QAbstractItemModel::flags(index); if (index.parent() !=3D QModelIndex()) { QString fieldName =3D index.parent().data(FieldNameRole).toStr= ing(); @@ -353,7 +353,7 @@ public: // nothing } = - QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &, c= onst QModelIndex &index) const { + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &, c= onst QModelIndex &index) const override { if (index.parent() !=3D QModelIndex()) { /// Only second-level indices in the model can be edited /// (those are the actual values). @@ -365,14 +365,14 @@ public: return nullptr; } = - virtual void setEditorData(QWidget *editor, const QModelIndex &index) = const { + void setEditorData(QWidget *editor, const QModelIndex &index) const ov= erride { if (KLineEdit *lineEdit =3D qobject_cast(editor)) { /// Set line edit's default value to string fetched from model lineEdit->setText(index.data(Qt::EditRole).toString()); } } = - virtual void setModelData(QWidget *editor, QAbstractItemModel *model, = const QModelIndex &index) const { + void setModelData(QWidget *editor, QAbstractItemModel *model, const QM= odelIndex &index) const override { if (KLineEdit *lineEdit =3D qobject_cast(editor)) { /// Set user-entered text to model (and underlying value) model->setData(index, lineEdit->text(), UserInputRole); @@ -388,7 +388,7 @@ public: } } = - virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionV= iewItem &option, const QModelIndex &) const { + void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem = &option, const QModelIndex &) const override { QRect rect =3D option.rect; = // TODO better placement of editing widget? @@ -420,7 +420,7 @@ public: this->currentClique =3D cl.indexOf(currentClique); } = - virtual QVariant data(const QModelIndex &index, int role) const { + QVariant data(const QModelIndex &index, int role) const override { if (role =3D=3D Qt::CheckStateRole && index.column() =3D=3D 1) { QSharedPointer entry =3D element(index.row()).dynamicCa= st(); Q_ASSERT_X(!entry.isNull(), "CheckableFileModel::data", "entry= is NULL"); @@ -434,7 +434,7 @@ public: return FileModel::data(index, role); } = - virtual bool setData(const QModelIndex &index, const QVariant &value, = int role =3D Qt::EditRole) { + bool setData(const QModelIndex &index, const QVariant &value, int role= =3D Qt::EditRole) override { bool ok; int checkState =3D value.toInt(&ok); Q_ASSERT_X(ok, "CheckableFileModel::setData", QString("Could not c= onvert value " + value.toString()).toLatin1()); @@ -457,7 +457,7 @@ public: return false; } = - virtual Qt::ItemFlags flags(const QModelIndex &index) const { + Qt::ItemFlags flags(const QModelIndex &index) const override { Qt::ItemFlags f =3D FileModel::flags(index); if (index.column() =3D=3D 1) f |=3D Qt::ItemIsUserCheckable; @@ -487,13 +487,13 @@ public: invalidate(); } = - void setSourceModel(QAbstractItemModel *model) { + void setSourceModel(QAbstractItemModel *model) override { QSortFilterProxyModel::setSourceModel(model); internalModel =3D dynamic_cast(model); Q_ASSERT_X(internalModel !=3D nullptr, "FilterIdFileModel::setSour= ceModel(QAbstractItemModel *model)", "internalModel is NULL"); } = - bool filterAcceptsRow(int source_row, const QModelIndex &source_parent= ) const { + bool filterAcceptsRow(int source_row, const QModelIndex &source_parent= ) const override { Q_UNUSED(source_parent) = if (internalModel !=3D nullptr && currentClique !=3D nullptr) { diff --git a/src/gui/file/findduplicatesui.h b/src/gui/file/findduplicatesu= i.h index 2faeb65b..2306edc0 100644 --- a/src/gui/file/findduplicatesui.h +++ b/src/gui/file/findduplicatesui.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -45,7 +45,7 @@ class KBIBTEXGUI_EXPORT MergeWidget : public QWidget = public: MergeWidget(File *file, QList &cliques, QWidget *parent= ); - ~MergeWidget(); + ~MergeWidget() override; = void showCurrentClique(); = @@ -68,7 +68,7 @@ class KBIBTEXGUI_EXPORT FindDuplicatesUI : public QObject = public: FindDuplicatesUI(KParts::Part *part, FileView *fileView); - ~FindDuplicatesUI(); + ~FindDuplicatesUI() override; = private slots: void slotFindDuplicates(); diff --git a/src/gui/file/partwidget.h b/src/gui/file/partwidget.h index d4fad3ce..e436cbae 100644 --- a/src/gui/file/partwidget.h +++ b/src/gui/file/partwidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -33,7 +33,7 @@ class KBIBTEXGUI_EXPORT PartWidget : public QWidget { = public: explicit PartWidget(QWidget *parent); - ~PartWidget(); + ~PartWidget() override; = FileView *fileView(); FilterBar *filterBar(); diff --git a/src/gui/file/sortfilterfilemodel.h b/src/gui/file/sortfilterfi= lemodel.h index 917a8cf7..428ffe8a 100644 --- a/src/gui/file/sortfilterfilemodel.h +++ b/src/gui/file/sortfilterfilemodel.h @@ -42,15 +42,15 @@ public: = explicit SortFilterFileModel(QObject *parent =3D nullptr); = - virtual void setSourceModel(QAbstractItemModel *model); + void setSourceModel(QAbstractItemModel *model) override; FileModel *fileSourceModel() const; = public slots: void updateFilter(const SortFilterFileModel::FilterQuery &); = protected: - virtual bool lessThan(const QModelIndex &left, const QModelIndex &righ= t) const; - virtual bool filterAcceptsRow(int source_row, const QModelIndex &sourc= e_parent) const; + bool lessThan(const QModelIndex &left, const QModelIndex &right) const= override; + bool filterAcceptsRow(int source_row, const QModelIndex &source_parent= ) const override; = private: FileModel *m_internalModel; diff --git a/src/gui/italictextitemmodel.h b/src/gui/italictextitemmodel.h index 221720f8..dd0258ce 100644 --- a/src/gui/italictextitemmodel.h +++ b/src/gui/italictextitemmodel.h @@ -43,7 +43,7 @@ public: }; = explicit ItalicTextItemModel(QObject *parent =3D nullptr); - ~ItalicTextItemModel(); + ~ItalicTextItemModel() override; = /** * Add a new entry (pair of shown text and identifier) to this model. @@ -52,11 +52,11 @@ public: */ void addItem(const QString &shownText, const QString &identifier); = - QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const; - QModelIndex index(int row, int column, const QModelIndex &) const; - QModelIndex parent(const QModelIndex &) const; - int rowCount(const QModelIndex &) const; - int columnCount(const QModelIndex &) const; + QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const override; + QModelIndex index(int row, int column, const QModelIndex &) const over= ride; + QModelIndex parent(const QModelIndex &) const override; + int rowCount(const QModelIndex &) const override; + int columnCount(const QModelIndex &) const override; = private: class Private; diff --git a/src/gui/preferences/kbibtexpreferencesdialog.h b/src/gui/prefe= rences/kbibtexpreferencesdialog.h index 4cdcaceb..72cdbfe3 100644 --- a/src/gui/preferences/kbibtexpreferencesdialog.h +++ b/src/gui/preferences/kbibtexpreferencesdialog.h @@ -33,10 +33,10 @@ class KBIBTEXGUI_EXPORT KBibTeXPreferencesDialog : publ= ic KPageDialog = public: explicit KBibTeXPreferencesDialog(QWidget *parent, Qt::WindowFlags fla= gs =3D 0); - ~KBibTeXPreferencesDialog(); + ~KBibTeXPreferencesDialog() override; = protected: - virtual void hideEvent(QHideEvent *e); + void hideEvent(QHideEvent *e) override; = private: class KBibTeXPreferencesDialogPrivate; diff --git a/src/gui/preferences/settingscolorlabelwidget.cpp b/src/gui/pre= ferences/settingscolorlabelwidget.cpp index e04b9f67..0d3e58e8 100644 --- a/src/gui/preferences/settingscolorlabelwidget.cpp +++ b/src/gui/preferences/settingscolorlabelwidget.cpp @@ -49,7 +49,7 @@ public: /// nothing } = - virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewI= tem &, const QModelIndex &index) const { + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &, c= onst QModelIndex &index) const override { if (index.column() =3D=3D 0) /// Colors are to be edited in a color button return new KColorButton(parent); @@ -58,7 +58,7 @@ public: return new KLineEdit(parent); } = - void setEditorData(QWidget *editor, const QModelIndex &index) const { + void setEditorData(QWidget *editor, const QModelIndex &index) const ov= erride { if (index.column() =3D=3D 0) { KColorButton *colorButton =3D qobject_cast(edi= tor); /// Initialized color button with row's current color @@ -70,7 +70,7 @@ public: } } = - void setModelData(QWidget *editor, QAbstractItemModel *model, const QM= odelIndex &index) const { + void setModelData(QWidget *editor, QAbstractItemModel *model, const QM= odelIndex &index) const override { if (index.column() =3D=3D 0) { KColorButton *colorButton =3D qobject_cast(edi= tor); if (colorButton->color() !=3D Qt::black) @@ -84,7 +84,7 @@ public: } } = - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &= index) const { + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &= index) const override { QSize hint =3D QStyledItemDelegate::sizeHint(option, index); QFontMetrics fm =3D QFontMetrics(QFont()); /// Enforce minimum height of 4 times x-height diff --git a/src/gui/preferences/settingscolorlabelwidget.h b/src/gui/prefe= rences/settingscolorlabelwidget.h index ac65b50d..774389fb 100644 --- a/src/gui/preferences/settingscolorlabelwidget.h +++ b/src/gui/preferences/settingscolorlabelwidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -38,15 +38,15 @@ class KBIBTEXGUI_EXPORT SettingsColorLabelWidget : publ= ic SettingsAbstractWidget = public: explicit SettingsColorLabelWidget(QWidget *parent); - ~SettingsColorLabelWidget(); + ~SettingsColorLabelWidget() override; = - virtual QString label() const; - virtual QIcon icon() const; + QString label() const override; + QIcon icon() const override; = public slots: - void loadState(); - void saveState(); - void resetToDefaults(); + void loadState() override; + void saveState() override; + void resetToDefaults() override; = private slots: void addColor(); @@ -67,12 +67,12 @@ class KBIBTEXGUI_EXPORT ColorLabelContextMenu : public = QObject, private Notifica = public: explicit ColorLabelContextMenu(FileView *widget); - ~ColorLabelContextMenu(); + ~ColorLabelContextMenu() override; = KActionMenu *menuAction(); void setEnabled(bool); = - void notificationEvent(int eventId); + void notificationEvent(int eventId) override; = private slots: void colorActivated(const QString &colorString); diff --git a/src/gui/preferences/settingscolorlabelwidget_p.h b/src/gui/pre= ferences/settingscolorlabelwidget_p.h index 2e98ae15..e9e8d68a 100644 --- a/src/gui/preferences/settingscolorlabelwidget_p.h +++ b/src/gui/preferences/settingscolorlabelwidget_p.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -34,14 +34,14 @@ class ColorLabelSettingsModel : public QAbstractItemMod= el public: explicit ColorLabelSettingsModel(QObject *parent); = - virtual int rowCount(const QModelIndex &parent) const; - virtual int columnCount(const QModelIndex &parent) const; - virtual QModelIndex index(int row, int column, const QModelIndex &pare= nt) const; - virtual QModelIndex parent(const QModelIndex &) const; - virtual QVariant data(const QModelIndex &index, int role) const; - virtual bool setData(const QModelIndex &index, const QVariant &value, = int role); - virtual Qt::ItemFlags flags(const QModelIndex &index) const; - virtual QVariant headerData(int section, Qt::Orientation orientation, = int role) const; + int rowCount(const QModelIndex &parent) const override; + int columnCount(const QModelIndex &parent) const override; + QModelIndex index(int row, int column, const QModelIndex &parent) cons= t override; + QModelIndex parent(const QModelIndex &) const override; + QVariant data(const QModelIndex &index, int role) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role= ) override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role= ) const override; = void loadState(); void saveState(); diff --git a/src/gui/preferences/settingsfileexporterpdfpswidget.h b/src/gu= i/preferences/settingsfileexporterpdfpswidget.h index eed3b377..8afda3a8 100644 --- a/src/gui/preferences/settingsfileexporterpdfpswidget.h +++ b/src/gui/preferences/settingsfileexporterpdfpswidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -31,15 +31,15 @@ class KBIBTEXGUI_EXPORT SettingsFileExporterPDFPSWidget= : public SettingsAbstrac = public: explicit SettingsFileExporterPDFPSWidget(QWidget *parent); - ~SettingsFileExporterPDFPSWidget(); + ~SettingsFileExporterPDFPSWidget() override; = - virtual QString label() const; - virtual QIcon icon() const; + QString label() const override; + QIcon icon() const override; = public slots: - void loadState(); - void saveState(); - void resetToDefaults(); + void loadState() override; + void saveState() override; + void resetToDefaults() override; = private: class SettingsFileExporterPDFPSWidgetPrivate; diff --git a/src/gui/preferences/settingsfileexporterwidget.h b/src/gui/pre= ferences/settingsfileexporterwidget.h index 486146f4..04b93238 100644 --- a/src/gui/preferences/settingsfileexporterwidget.h +++ b/src/gui/preferences/settingsfileexporterwidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -33,15 +33,15 @@ class KBIBTEXGUI_EXPORT SettingsFileExporterWidget : pu= blic SettingsAbstractWidg = public: explicit SettingsFileExporterWidget(QWidget *parent); - ~SettingsFileExporterWidget(); + ~SettingsFileExporterWidget() override; = - virtual QString label() const; - virtual QIcon icon() const; + QString label() const override; + QIcon icon() const override; = public slots: - void loadState(); - void saveState(); - void resetToDefaults(); + void loadState() override; + void saveState() override; + void resetToDefaults() override; #ifdef QT_LSTAT void automaticLyXDetectionToggled(bool); #endif // QT_LSTAT diff --git a/src/gui/preferences/settingsgeneralwidget.h b/src/gui/preferen= ces/settingsgeneralwidget.h index d46907a0..e930506d 100644 --- a/src/gui/preferences/settingsgeneralwidget.h +++ b/src/gui/preferences/settingsgeneralwidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -31,15 +31,15 @@ class KBIBTEXGUI_EXPORT SettingsGeneralWidget : public = SettingsAbstractWidget = public: explicit SettingsGeneralWidget(QWidget *parent); - ~SettingsGeneralWidget(); + ~SettingsGeneralWidget() override; = - virtual QString label() const; - virtual QIcon icon() const; + QString label() const override; + QIcon icon() const override; = public slots: - void loadState(); - void saveState(); - void resetToDefaults(); + void loadState() override; + void saveState() override; + void resetToDefaults() override; = private: class SettingsGeneralWidgetPrivate; diff --git a/src/gui/preferences/settingsglobalkeywordswidget.cpp b/src/gui= /preferences/settingsglobalkeywordswidget.cpp index f34070ea..fe0a7cd6 100644 --- a/src/gui/preferences/settingsglobalkeywordswidget.cpp +++ b/src/gui/preferences/settingsglobalkeywordswidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -33,7 +33,7 @@ class DisallowEmptyStringListModel : public QStringListMo= del Q_OBJECT = public: - virtual bool setData(const QModelIndex &index, const QVariant &value, = int role =3D Qt::EditRole) { + bool setData(const QModelIndex &index, const QVariant &value, int role= =3D Qt::EditRole) override { if (role =3D=3D Qt::EditRole && value.canConvert() && val= ue.toString().isEmpty()) return false; /// do not accept values that are empty else diff --git a/src/gui/preferences/settingsglobalkeywordswidget.h b/src/gui/p= references/settingsglobalkeywordswidget.h index 8fde0cde..04476198 100644 --- a/src/gui/preferences/settingsglobalkeywordswidget.h +++ b/src/gui/preferences/settingsglobalkeywordswidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -33,15 +33,15 @@ class KBIBTEXGUI_EXPORT SettingsGlobalKeywordsWidget : = public SettingsAbstractWi = public: explicit SettingsGlobalKeywordsWidget(QWidget *parent); - ~SettingsGlobalKeywordsWidget(); + ~SettingsGlobalKeywordsWidget() override; = - virtual QString label() const; - virtual QIcon icon() const; + QString label() const override; + QIcon icon() const override; = public slots: - void loadState(); - void saveState(); - void resetToDefaults(); + void loadState() override; + void saveState() override; + void resetToDefaults() override; = private slots: void addKeyword(); diff --git a/src/gui/preferences/settingsidsuggestionseditor.cpp b/src/gui/= preferences/settingsidsuggestionseditor.cpp index 75fa71d2..76025551 100644 --- a/src/gui/preferences/settingsidsuggestionseditor.cpp +++ b/src/gui/preferences/settingsidsuggestionseditor.cpp @@ -174,7 +174,7 @@ public: connect(comboBoxDigits, static_cast(&KCom= boBox::currentIndexChanged), isew, &IdSuggestionsEditWidget::updatePreview); } = - QString toString() const { + QString toString() const override { const int year =3D comboBoxDigits->itemData(comboBoxDigits->curren= tIndex()).toInt(); QString result =3D year =3D=3D 4 ? QStringLiteral("Y") : QStringLi= teral("y"); = @@ -199,7 +199,7 @@ public: formLayout->addRow(i18n("Volume:"), labelCheckmark); } = - QString toString() const { + QString toString() const override { return QStringLiteral("v"); } }; @@ -221,7 +221,7 @@ public: formLayout->addRow(i18n("First page's number:"), labelCheckmark); } = - QString toString() const { + QString toString() const override { return QStringLiteral("p"); } }; @@ -372,7 +372,7 @@ public: connect(spinBoxLength, static_cast(&QSpinB= ox::valueChanged), isew, &IdSuggestionsEditWidget::updatePreview); } = - QString toString() const + QString toString() const override { QString result =3D QStringLiteral("j"); = @@ -410,7 +410,7 @@ public: connect(lineEditText, &KLineEdit::textEdited, isew, &IdSuggestions= EditWidget::updatePreview); } = - QString toString() const { + QString toString() const override { QString result =3D QStringLiteral("\"") + lineEditText->text(); return result; } diff --git a/src/gui/preferences/settingsidsuggestionseditor.h b/src/gui/pr= eferences/settingsidsuggestionseditor.h index 0a6c86b5..1570bb44 100644 --- a/src/gui/preferences/settingsidsuggestionseditor.h +++ b/src/gui/preferences/settingsidsuggestionseditor.h @@ -81,7 +81,7 @@ private slots: public: AuthorWidget(const struct IdSuggestions::IdSuggestionTokenInfo &info, = IdSuggestionsEditWidget *isew, QWidget *parent); = - QString toString() const; + QString toString() const override; }; = /** @@ -105,7 +105,7 @@ private slots: public: TitleWidget(const struct IdSuggestions::IdSuggestionTokenInfo &info, b= ool removeSmallWords, IdSuggestionsEditWidget *isew, QWidget *parent); = - QString toString() const; + QString toString() const override; }; = = @@ -117,7 +117,7 @@ class KBIBTEXGUI_EXPORT IdSuggestionsEditDialog : publi= c QDialog Q_OBJECT = public: - virtual ~IdSuggestionsEditDialog(); + ~IdSuggestionsEditDialog() override; = static QString editSuggestion(const Entry *previewEntry, const QString= &suggestion, QWidget *parent); protected: @@ -130,7 +130,7 @@ class IdSuggestionsEditWidget : public QWidget, public = IdSuggestions = public: explicit IdSuggestionsEditWidget(const Entry *previewEntry, QWidget *p= arent =3D nullptr, Qt::WindowFlags f =3D 0); - virtual ~IdSuggestionsEditWidget(); + ~IdSuggestionsEditWidget() override; = void setFormatString(const QString &formatString); QString formatString() const; diff --git a/src/gui/preferences/settingsidsuggestionswidget.cpp b/src/gui/= preferences/settingsidsuggestionswidget.cpp index 3875e951..f7eadc90 100644 --- a/src/gui/preferences/settingsidsuggestionswidget.cpp +++ b/src/gui/preferences/settingsidsuggestionswidget.cpp @@ -62,7 +62,7 @@ public: } } = - ~IdSuggestionsModel() { + ~IdSuggestionsModel() override { delete m_idSuggestions; } = @@ -88,14 +88,14 @@ public: return QString(); } = - int rowCount(const QModelIndex &parent =3D QModelIndex()) const { + int rowCount(const QModelIndex &parent =3D QModelIndex()) const overri= de { if (parent =3D=3D QModelIndex()) return m_formatStringList.count(); else return 0; } = - QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const { + QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const override { if (index.row() < 0 || index.row() >=3D m_formatStringList.count()) return QVariant(); = @@ -125,7 +125,7 @@ public: } } = - bool setData(const QModelIndex &idx, const QVariant &value, int role) { + bool setData(const QModelIndex &idx, const QVariant &value, int role) = override { if (idx.row() < 0 || idx.row() >=3D m_formatStringList.count()) return false; = @@ -162,7 +162,7 @@ public: return true; } = - QVariant headerData(int section, Qt::Orientation, int role =3D Qt::Dis= playRole) const { + QVariant headerData(int section, Qt::Orientation, int role =3D Qt::Dis= playRole) const override { if (role =3D=3D Qt::DisplayRole && section =3D=3D 0) return i18n("Id Suggestions"); = diff --git a/src/gui/preferences/settingsidsuggestionswidget.h b/src/gui/pr= eferences/settingsidsuggestionswidget.h index 9cbb8759..87597cf4 100644 --- a/src/gui/preferences/settingsidsuggestionswidget.h +++ b/src/gui/preferences/settingsidsuggestionswidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -30,15 +30,15 @@ class KBIBTEXGUI_EXPORT SettingsIdSuggestionsWidget : p= ublic SettingsAbstractWid Q_OBJECT public: explicit SettingsIdSuggestionsWidget(QWidget *parent); - ~SettingsIdSuggestionsWidget(); + ~SettingsIdSuggestionsWidget() override; = - virtual QString label() const; - virtual QIcon icon() const; + QString label() const override; + QIcon icon() const override; = public slots: - void loadState(); - void saveState(); - void resetToDefaults(); + void loadState() override; + void saveState() override; + void resetToDefaults() override; = private slots: void buttonClicked(); diff --git a/src/gui/preferences/settingsuserinterfacewidget.h b/src/gui/pr= eferences/settingsuserinterfacewidget.h index f5022e2c..07dc2986 100644 --- a/src/gui/preferences/settingsuserinterfacewidget.h +++ b/src/gui/preferences/settingsuserinterfacewidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -31,15 +31,15 @@ class KBIBTEXGUI_EXPORT SettingsUserInterfaceWidget : p= ublic SettingsAbstractWid = public: explicit SettingsUserInterfaceWidget(QWidget *parent); - ~SettingsUserInterfaceWidget(); + ~SettingsUserInterfaceWidget() override; = - virtual QString label() const; - virtual QIcon icon() const; + QString label() const override; + QIcon icon() const override; = public slots: - void loadState(); - void saveState(); - void resetToDefaults(); + void loadState() override; + void saveState() override; + void resetToDefaults() override; = private: class SettingsUserInterfaceWidgetPrivate; diff --git a/src/gui/valuelistmodel.h b/src/gui/valuelistmodel.h index 79f8c8dd..086cae8c 100644 --- a/src/gui/valuelistmodel.h +++ b/src/gui/valuelistmodel.h @@ -39,12 +39,12 @@ public: explicit ValueListDelegate(QTreeView *parent =3D nullptr) : QStyledItemDelegate(parent), m_fieldName(QString()), m_paren= t(parent) {} = - QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &, c= onst QModelIndex &index) const; - void setEditorData(QWidget *editor, const QModelIndex &index) const; - void setModelData(QWidget *editor, QAbstractItemModel *model, const QM= odelIndex &index) const; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &= index) const; - void initStyleOption(QStyleOptionViewItem *option, const QModelIndex &= index) const; - void paint(QPainter *painter, const QStyleOptionViewItem &option, cons= t QModelIndex &index) const; + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &, c= onst QModelIndex &index) const override; + void setEditorData(QWidget *editor, const QModelIndex &index) const ov= erride; + void setModelData(QWidget *editor, QAbstractItemModel *model, const QM= odelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &= index) const override; + void initStyleOption(QStyleOptionViewItem *option, const QModelIndex &= index) const override; + void paint(QPainter *painter, const QStyleOptionViewItem &option, cons= t QModelIndex &index) const override; = void setFieldName(const QString &fieldName) { m_fieldName =3D fieldName; @@ -88,18 +88,18 @@ private: public: ValueListModel(const File *bibtexFile, const QString &fieldName, QObje= ct *parent); = - virtual int rowCount(const QModelIndex &parent =3D QModelIndex()) cons= t; - virtual int columnCount(const QModelIndex &parent =3D QModelIndex()) c= onst; - virtual QVariant data(const QModelIndex &index, int role =3D Qt::Displ= ayRole) const; - virtual bool setData(const QModelIndex &index, const QVariant &value, = int role =3D Qt::EditRole); - virtual Qt::ItemFlags flags(const QModelIndex &index) const; - virtual QVariant headerData(int section, Qt::Orientation orientation, = int role =3D Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent =3D QModelIndex()) const overri= de; + int columnCount(const QModelIndex &parent =3D QModelIndex()) const ove= rride; + QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const override; + bool setData(const QModelIndex &index, const QVariant &value, int role= =3D Qt::EditRole) override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role= =3D Qt::DisplayRole) const override; void removeValue(const QModelIndex &index); = void setShowCountColumn(bool showCountColumn); void setSortBy(SortBy sortBy); = - void notificationEvent(int eventId); + void notificationEvent(int eventId) override; = private: void readConfiguration(); diff --git a/src/gui/widgets/filterbar.h b/src/gui/widgets/filterbar.h index fae07b70..73ed0154 100644 --- a/src/gui/widgets/filterbar.h +++ b/src/gui/widgets/filterbar.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -31,7 +31,7 @@ class KBIBTEXGUI_EXPORT FilterBar : public QWidget Q_OBJECT public: explicit FilterBar(QWidget *parent); - ~FilterBar(); + ~FilterBar() override; = SortFilterFileModel::FilterQuery filter(); = diff --git a/src/gui/widgets/menulineedit.cpp b/src/gui/widgets/menulineedi= t.cpp index 4a7f738a..a491cff3 100644 --- a/src/gui/widgets/menulineedit.cpp +++ b/src/gui/widgets/menulineedit.cpp @@ -57,14 +57,14 @@ public: setupUI(); } = - ~MenuLineEditPrivate() { + ~MenuLineEditPrivate() override { for (int i =3D hLayout->count() - 1; i >=3D 0; --i) { QWidget *w =3D hLayout->itemAt(i)->widget(); w->deleteLater(); } } = - virtual void notificationEvent(int eventId) { + void notificationEvent(int eventId) override { if (eventId =3D=3D MenuLineEdit::MenuLineConfigurationChangedEvent= ) { /// load setting limitKeyboardTabStops KSharedConfigPtr config(KSharedConfig::openConfig(QStringLiter= al("kbibtexrc"))); diff --git a/src/gui/widgets/menulineedit.h b/src/gui/widgets/menulineedit.h index e4e29ebf..2522ca78 100644 --- a/src/gui/widgets/menulineedit.h +++ b/src/gui/widgets/menulineedit.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -46,7 +46,7 @@ public: static const QString keyLimitKeyboardTabStops; = MenuLineEdit(bool isMultiLine, QWidget *parent); - ~MenuLineEdit(); + ~MenuLineEdit() override; = void setMenu(QMenu *menu); virtual void setReadOnly(bool); @@ -66,7 +66,7 @@ public: void setCompletionItems(const QStringList &items); = protected: - virtual void focusInEvent(QFocusEvent *event); + void focusInEvent(QFocusEvent *event) override; = signals: void textChanged(const QString &); diff --git a/src/gui/widgets/radiobuttontreeview.h b/src/gui/widgets/radiob= uttontreeview.h index f2847e35..332eee5c 100644 --- a/src/gui/widgets/radiobuttontreeview.h +++ b/src/gui/widgets/radiobuttontreeview.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -34,9 +34,9 @@ class RadioButtonItemDelegate : public QStyledItemDelegate public: explicit RadioButtonItemDelegate(QObject *p); = - void paint(QPainter *painter, const QStyleOptionViewItem &option, cons= t QModelIndex &index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, cons= t QModelIndex &index) const override; = - virtual QSize sizeHint(const QStyleOptionViewItem &option, const QMode= lIndex &index) const; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &= index) const override; }; = = @@ -68,8 +68,8 @@ public: explicit RadioButtonTreeView(QWidget *parent); = protected: - void mouseReleaseEvent(QMouseEvent *event); - void keyReleaseEvent(QKeyEvent *event); + void mouseReleaseEvent(QMouseEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; = private: void switchRadioFlag(QModelIndex &index); diff --git a/src/gui/widgets/starrating.h b/src/gui/widgets/starrating.h index 85a76071..55663b02 100644 --- a/src/gui/widgets/starrating.h +++ b/src/gui/widgets/starrating.h @@ -98,11 +98,11 @@ signals: void modified(); = protected: - void paintEvent(QPaintEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void leaveEvent(QEvent *); - bool eventFilter(QObject *obj, QEvent *event); + void paintEvent(QPaintEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void leaveEvent(QEvent *) override; + bool eventFilter(QObject *obj, QEvent *event) override; = private slots: void clear(); diff --git a/src/io/encoderlatex.h b/src/io/encoderlatex.h index 3520e8a7..19508e21 100644 --- a/src/io/encoderlatex.h +++ b/src/io/encoderlatex.h @@ -33,13 +33,13 @@ class KBIBTEXIO_EXPORT EncoderLaTeX: public Encoder { public: - virtual QString decode(const QString &text) const; - virtual QString encode(const QString &text, const TargetEncoding targe= tEncoding) const; + QString decode(const QString &text) const override; + QString encode(const QString &text, const TargetEncoding targetEncodin= g) const override; QString convertToPlainAscii(const QString &input) const; static bool containsOnlyAscii(const QString &text); = static const EncoderLaTeX &instance(); - ~EncoderLaTeX(); + ~EncoderLaTeX() override; = protected: EncoderLaTeX(); diff --git a/src/io/encoderxml.h b/src/io/encoderxml.h index 5585b6eb..0ead2d8d 100644 --- a/src/io/encoderxml.h +++ b/src/io/encoderxml.h @@ -33,10 +33,10 @@ class QRegExp; class KBIBTEXIO_EXPORT EncoderXML : public Encoder { public: - ~EncoderXML(); + ~EncoderXML() override; = - QString decode(const QString &text) const; - QString encode(const QString &text, const TargetEncoding targetEncodin= g) const; + QString decode(const QString &text) const override; + QString encode(const QString &text, const TargetEncoding targetEncodin= g) const override; = static const EncoderXML &instance(); = diff --git a/src/io/fileexporter.h b/src/io/fileexporter.h index eb8e1a84..674260f2 100644 --- a/src/io/fileexporter.h +++ b/src/io/fileexporter.h @@ -43,7 +43,7 @@ public: static const QString defaultFont; = FileExporter(); - ~FileExporter(); + ~FileExporter() override; = QString toString(const QSharedPointer element, const Fi= le *bibtexfile, QStringList *errorLog =3D nullptr); QString toString(const File *bibtexfile, QStringList *errorLog =3D nul= lptr); diff --git a/src/io/fileexporterbibtex.h b/src/io/fileexporterbibtex.h index 46216885..512a8b4f 100644 --- a/src/io/fileexporterbibtex.h +++ b/src/io/fileexporterbibtex.h @@ -42,12 +42,12 @@ public: enum UseLaTeXEncoding {leUTF8, leLaTeX, leRaw}; = FileExporterBibTeX(); - ~FileExporterBibTeX(); + ~FileExporterBibTeX() override; = void setEncoding(const QString &encoding); = - bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr); - bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr); + bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr) override; + bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr) override; = static QString valueToBibTeX(const Value &value, const QString &fieldT= ype =3D QString(), UseLaTeXEncoding useLaTeXEncoding =3D leLaTeX); = @@ -59,7 +59,7 @@ public: static bool isFileExporterBibTeX(const FileExporter &other); = public slots: - void cancel(); + void cancel() override; = private: class FileExporterBibTeXPrivate; diff --git a/src/io/fileexporterbibtex2html.h b/src/io/fileexporterbibtex2h= tml.h index 8690d579..f6949a52 100644 --- a/src/io/fileexporterbibtex2html.h +++ b/src/io/fileexporterbibtex2html.h @@ -28,12 +28,12 @@ class KBIBTEXIO_EXPORT FileExporterBibTeX2HTML: public = FileExporterToolchain = public: FileExporterBibTeX2HTML(); - ~FileExporterBibTeX2HTML(); + ~FileExporterBibTeX2HTML() override; = - void reloadConfig(); + void reloadConfig() override; = - bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr); - bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr); + bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr) override; + bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr) override; = void setLaTeXBibliographyStyle(const QString &bibStyle); = diff --git a/src/io/fileexporterbibtexoutput.h b/src/io/fileexporterbibtexo= utput.h index 09f7dbaf..7e3d2098 100644 --- a/src/io/fileexporterbibtexoutput.h +++ b/src/io/fileexporterbibtexoutput.h @@ -31,12 +31,12 @@ class KBIBTEXIO_EXPORT FileExporterBibTeXOutput : publi= c FileExporterToolchain public: enum OutputType {BibTeXLogFile, BibTeXBlockList}; explicit FileExporterBibTeXOutput(OutputType outputType); - ~FileExporterBibTeXOutput(); + ~FileExporterBibTeXOutput() override; = - void reloadConfig(); + void reloadConfig() override; = - bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr); - bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr); + bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr) override; + bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr) override; = void setLaTeXLanguage(const QString &language); void setLaTeXBibliographyStyle(const QString &bibStyle); diff --git a/src/io/fileexporterbibutils.h b/src/io/fileexporterbibutils.h index d554815a..96fd5049 100644 --- a/src/io/fileexporterbibutils.h +++ b/src/io/fileexporterbibutils.h @@ -30,10 +30,10 @@ class KBIBTEXIO_EXPORT FileExporterBibUtils : public Fi= leExporter, public BibUti = public: explicit FileExporterBibUtils(); - ~FileExporterBibUtils(); + ~FileExporterBibUtils() override; = - bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr); - bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr); + bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr) override; + bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr) override; = private: class Private; diff --git a/src/io/fileexporterpdf.h b/src/io/fileexporterpdf.h index 6ba23876..e2a47d24 100644 --- a/src/io/fileexporterpdf.h +++ b/src/io/fileexporterpdf.h @@ -31,12 +31,12 @@ class KBIBTEXIO_EXPORT FileExporterPDF : public FileExp= orterToolchain public: enum FileEmbedding { NoFileEmbedding =3D 0, EmbedBibTeXFile =3D 1, Emb= edReferences =3D 2, EmbedBibTeXFileAndReferences =3D EmbedBibTeXFile | Embe= dReferences}; explicit FileExporterPDF(FileEmbedding fileEmbedding =3D FileExporterP= DF::EmbedBibTeXFileAndReferences); - ~FileExporterPDF(); + ~FileExporterPDF() override; = - void reloadConfig(); + void reloadConfig() override; = - bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr); - bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr); + bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr) override; + bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr) override; = void setDocumentSearchPaths(const QStringList &searchPaths); = diff --git a/src/io/fileexporterps.h b/src/io/fileexporterps.h index c8ea5502..05822c5b 100644 --- a/src/io/fileexporterps.h +++ b/src/io/fileexporterps.h @@ -30,12 +30,12 @@ class KBIBTEXIO_EXPORT FileExporterPS : public FileExpo= rterToolchain = public: FileExporterPS(); - ~FileExporterPS(); + ~FileExporterPS() override; = - void reloadConfig(); + void reloadConfig() override; = - bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr); - bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr); + bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr) override; + bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr) override; = private: QString m_fileBasename; diff --git a/src/io/fileexporterris.h b/src/io/fileexporterris.h index cc886ba9..7af9a639 100644 --- a/src/io/fileexporterris.h +++ b/src/io/fileexporterris.h @@ -31,13 +31,13 @@ class KBIBTEXIO_EXPORT FileExporterRIS : public FileExp= orter = public: FileExporterRIS(); - ~FileExporterRIS(); + ~FileExporterRIS() override; = - bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr); - bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr); + bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr) override; + bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr) override; = public slots: - void cancel(); + void cancel() override; = private: bool m_cancelFlag; diff --git a/src/io/fileexporterrtf.h b/src/io/fileexporterrtf.h index 42ace189..af7b291e 100644 --- a/src/io/fileexporterrtf.h +++ b/src/io/fileexporterrtf.h @@ -30,12 +30,12 @@ class KBIBTEXIO_EXPORT FileExporterRTF : public FileExp= orterToolchain = public: FileExporterRTF(); - ~FileExporterRTF(); + ~FileExporterRTF() override; = - void reloadConfig(); + void reloadConfig() override; = - bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr); - bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr); + bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr) override; + bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr) override; = private: QString m_fileBasename; diff --git a/src/io/fileexportertoolchain.h b/src/io/fileexportertoolchain.h index 842d86dc..e57fc43f 100644 --- a/src/io/fileexportertoolchain.h +++ b/src/io/fileexportertoolchain.h @@ -47,7 +47,7 @@ public: static bool kpsewhich(const QString &filename); = public slots: - void cancel(); + void cancel() override; = protected: QTemporaryDir tempDir; diff --git a/src/io/fileexporterxml.h b/src/io/fileexporterxml.h index d93226ae..b5757e36 100644 --- a/src/io/fileexporterxml.h +++ b/src/io/fileexporterxml.h @@ -36,15 +36,15 @@ class KBIBTEXIO_EXPORT FileExporterXML : public FileExp= orter = public: FileExporterXML(); - ~FileExporterXML(); + ~FileExporterXML() override; = - bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr); - bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr); + bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr) override; + bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr) override; = static QString valueToXML(const Value &value, const QString &fieldType= =3D QString()); = public slots: - void cancel(); + void cancel() override; = private: bool m_cancelFlag; diff --git a/src/io/fileexporterxslt.h b/src/io/fileexporterxslt.h index 903e0ee7..5273c91d 100644 --- a/src/io/fileexporterxslt.h +++ b/src/io/fileexporterxslt.h @@ -36,15 +36,15 @@ class KBIBTEXIO_EXPORT FileExporterXSLT : public FileEx= porter = public: explicit FileExporterXSLT(const QString &xsltFilename =3D QString()); - ~FileExporterXSLT(); + ~FileExporterXSLT() override; = - bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr); - bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr); + bool save(QIODevice *iodevice, const File *bibtexfile, QStringList *er= rorLog =3D nullptr) override; + bool save(QIODevice *iodevice, const QSharedPointer ele= ment, const File *bibtexfile, QStringList *errorLog =3D nullptr) override; = void setXSLTFilename(const QString &xsltFilename); = public slots: - void cancel(); + void cancel() override; = private: bool m_cancelFlag; diff --git a/src/io/fileimporter.h b/src/io/fileimporter.h index 24a9535b..45348fb7 100644 --- a/src/io/fileimporter.h +++ b/src/io/fileimporter.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -35,7 +35,7 @@ class KBIBTEXIO_EXPORT FileImporter : public QObject = public: FileImporter(); - ~FileImporter(); + ~FileImporter() override; = File *fromString(const QString &text); virtual File *load(QIODevice *iodevice) =3D 0; diff --git a/src/io/fileimporterbibtex.h b/src/io/fileimporterbibtex.h index e2eb2467..ccd79404 100644 --- a/src/io/fileimporterbibtex.h +++ b/src/io/fileimporterbibtex.h @@ -59,7 +59,7 @@ public: * as all HTML content you be treated as comments otherwise. */ explicit FileImporterBibTeX(bool ignoreComments =3D true, KBibTeX::Cas= ing keywordCasing =3D KBibTeX::cLowerCase); - ~FileImporterBibTeX(); + ~FileImporterBibTeX() override; = /** * Read data from the given device and construct a File object holding @@ -67,7 +67,7 @@ public: * @param iodevice opened QIODevice instance ready to read from * @return @c valid File object with elements, @c NULL if reading fail= ed for some reason */ - File *load(QIODevice *iodevice); + File *load(QIODevice *iodevice) override; = /** TODO */ @@ -104,7 +104,7 @@ public: static void parsePersonList(const QString &text, Value &value); = public slots: - void cancel(); + void cancel() override; = private: enum Token { diff --git a/src/io/fileimporterbibutils.h b/src/io/fileimporterbibutils.h index 982612c4..fb414db6 100644 --- a/src/io/fileimporterbibutils.h +++ b/src/io/fileimporterbibutils.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -30,9 +30,9 @@ class KBIBTEXIO_EXPORT FileImporterBibUtils : public File= Importer, public BibUti = public: explicit FileImporterBibUtils(); - ~FileImporterBibUtils(); + ~FileImporterBibUtils() override; = - virtual File *load(QIODevice *iodevice); + File *load(QIODevice *iodevice) override; = private: class Private; diff --git a/src/io/fileimporterpdf.h b/src/io/fileimporterpdf.h index 1c809505..65b10f0b 100644 --- a/src/io/fileimporterpdf.h +++ b/src/io/fileimporterpdf.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -34,13 +34,13 @@ class KBIBTEXIO_EXPORT FileImporterPDF : public FileImp= orter = public: FileImporterPDF(); - ~FileImporterPDF(); + ~FileImporterPDF() override; = - File *load(QIODevice *iodevice); + File *load(QIODevice *iodevice) override; static bool guessCanDecode(const QString &text); = public slots: - void cancel(); + void cancel() override; = private: bool m_cancelFlag; diff --git a/src/io/fileimporterris.h b/src/io/fileimporterris.h index ba3e8c90..d8e14fd3 100644 --- a/src/io/fileimporterris.h +++ b/src/io/fileimporterris.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -29,13 +29,13 @@ class KBIBTEXIO_EXPORT FileImporterRIS : public FileImp= orter = public: FileImporterRIS(); - ~FileImporterRIS(); + ~FileImporterRIS() override; = - File *load(QIODevice *iodevice); + File *load(QIODevice *iodevice) override; static bool guessCanDecode(const QString &text); = public slots: - void cancel(); + void cancel() override; = private: class FileImporterRISPrivate; diff --git a/src/networking/findpdf.h b/src/networking/findpdf.h index 8eb34eb2..08c2e40b 100644 --- a/src/networking/findpdf.h +++ b/src/networking/findpdf.h @@ -60,7 +60,7 @@ public: } ResultItem; = explicit FindPDF(QObject *parent =3D nullptr); - ~FindPDF(); + ~FindPDF() override; = /** * Initiate a search for PDF files matching a given entry. diff --git a/src/networking/onlinesearch/onlinesearchabstract.h b/src/netwo= rking/onlinesearch/onlinesearchabstract.h index 049b916b..4ffdb4d3 100644 --- a/src/networking/onlinesearch/onlinesearchabstract.h +++ b/src/networking/onlinesearch/onlinesearchabstract.h @@ -48,7 +48,7 @@ public: // nothing } = - virtual ~OnlineSearchQueryFormAbstract() { + ~OnlineSearchQueryFormAbstract() override { /// nothing } = diff --git a/src/networking/onlinesearch/onlinesearchacmportal.h b/src/netw= orking/onlinesearch/onlinesearchacmportal.h index 96caedd4..5334fdc4 100644 --- a/src/networking/onlinesearch/onlinesearchacmportal.h +++ b/src/networking/onlinesearch/onlinesearchacmportal.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -34,14 +34,14 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchAcmPortal : = public OnlineSearchAbstra = public: explicit OnlineSearchAcmPortal(QWidget *parent); - ~OnlineSearchAcmPortal(); + ~OnlineSearchAcmPortal() override; = - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual QUrl homepage() const; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; + QString favIconUrl() const override; = private slots: void doneFetchingStartPage(); diff --git a/src/networking/onlinesearch/onlinesearcharxiv.cpp b/src/networ= king/onlinesearch/onlinesearcharxiv.cpp index 6e4262e0..2f0baa6e 100644 --- a/src/networking/onlinesearch/onlinesearcharxiv.cpp +++ b/src/networking/onlinesearch/onlinesearcharxiv.cpp @@ -78,11 +78,11 @@ public: loadState(); } = - bool readyToStart() const { + bool readyToStart() const override { return !lineEditFreeText->text().isEmpty(); } = - void copyFromEntry(const Entry &entry) { + void copyFromEntry(const Entry &entry) override { lineEditFreeText->setText(authorLastNames(entry).join(QStringLiter= al(" ")) + QLatin1Char(' ') + PlainTextValue::text(entry[Entry::ftTitle])); } = diff --git a/src/networking/onlinesearch/onlinesearcharxiv.h b/src/networki= ng/onlinesearch/onlinesearcharxiv.h index fbcdccae..684a5ff4 100644 --- a/src/networking/onlinesearch/onlinesearcharxiv.h +++ b/src/networking/onlinesearch/onlinesearcharxiv.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -28,17 +28,17 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchArXiv : publ= ic OnlineSearchAbstract = public: explicit OnlineSearchArXiv(QWidget *parent); - ~OnlineSearchArXiv(); + ~OnlineSearchArXiv() override; = - virtual void startSearchFromForm(); - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual OnlineSearchQueryFormAbstract *customWidget(QWidget *parent); - virtual QUrl homepage() const; + void startSearchFromForm() override; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + OnlineSearchQueryFormAbstract *customWidget(QWidget *parent) override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; - virtual void sanitizeEntry(QSharedPointer entry); + QString favIconUrl() const override; + void sanitizeEntry(QSharedPointer entry) override; = private: class OnlineSearchQueryFormArXiv; diff --git a/src/networking/onlinesearch/onlinesearchbibsonomy.cpp b/src/ne= tworking/onlinesearch/onlinesearchbibsonomy.cpp index 33711f14..d08f02f9 100644 --- a/src/networking/onlinesearch/onlinesearchbibsonomy.cpp +++ b/src/networking/onlinesearch/onlinesearchbibsonomy.cpp @@ -91,11 +91,11 @@ public: loadState(); } = - bool readyToStart() const { + bool readyToStart() const override { return !lineEditSearchTerm->text().isEmpty(); } = - void copyFromEntry(const Entry &entry) { + void copyFromEntry(const Entry &entry) override { comboBoxSearchWhere->setCurrentIndex(comboBoxSearchWhere->count() = - 1); lineEditSearchTerm->setText(authorLastNames(entry).join(QStringLit= eral(" ")) + QLatin1Char(' ') + PlainTextValue::text(entry[Entry::ftTitle])= ); } diff --git a/src/networking/onlinesearch/onlinesearchbibsonomy.h b/src/netw= orking/onlinesearch/onlinesearchbibsonomy.h index 55d09135..dbbab497 100644 --- a/src/networking/onlinesearch/onlinesearchbibsonomy.h +++ b/src/networking/onlinesearch/onlinesearchbibsonomy.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -33,16 +33,16 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchBibsonomy : = public OnlineSearchAbstra = public: explicit OnlineSearchBibsonomy(QWidget *parent); - ~OnlineSearchBibsonomy(); + ~OnlineSearchBibsonomy() override; = - virtual void startSearchFromForm(); - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual OnlineSearchQueryFormAbstract *customWidget(QWidget *parent); - virtual QUrl homepage() const; + void startSearchFromForm() override; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + OnlineSearchQueryFormAbstract *customWidget(QWidget *parent) override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; + QString favIconUrl() const override; = private: class OnlineSearchQueryFormBibsonomy; diff --git a/src/networking/onlinesearch/onlinesearchbiorxiv.h b/src/networ= king/onlinesearch/onlinesearchbiorxiv.h index e8d3a069..02e4d777 100644 --- a/src/networking/onlinesearch/onlinesearchbiorxiv.h +++ b/src/networking/onlinesearch/onlinesearchbiorxiv.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2016 by Thomas Fischer = * + * Copyright (C) 2016-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -29,14 +29,14 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchBioRxiv : pu= blic OnlineSearchAbstract = public: explicit OnlineSearchBioRxiv(QWidget *parent); - ~OnlineSearchBioRxiv(); + ~OnlineSearchBioRxiv() override; = - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual QUrl homepage() const; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; + QString favIconUrl() const override; = private slots: void resultsPageDone(); diff --git a/src/networking/onlinesearch/onlinesearchcernds.h b/src/network= ing/onlinesearch/onlinesearchcernds.h index a93370c6..9c996147 100644 --- a/src/networking/onlinesearch/onlinesearchcernds.h +++ b/src/networking/onlinesearch/onlinesearchcernds.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -30,12 +30,12 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchCERNDS : pub= lic OnlineSearchSimpleBib public: explicit OnlineSearchCERNDS(QWidget *parent); = - virtual QString label() const; - virtual QUrl homepage() const; + QString label() const override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; - virtual QUrl buildQueryUrl(const QMap &query, int nu= mResults); + QString favIconUrl() const override; + QUrl buildQueryUrl(const QMap &query, int numResults= ) override; }; = #endif // KBIBTEX_ONLINESEARCH_CERNDS_H diff --git a/src/networking/onlinesearch/onlinesearchdoi.cpp b/src/networki= ng/onlinesearch/onlinesearchdoi.cpp index badff8ef..dc9d657c 100644 --- a/src/networking/onlinesearch/onlinesearchdoi.cpp +++ b/src/networking/onlinesearch/onlinesearchdoi.cpp @@ -64,11 +64,11 @@ public: loadState(); } = - bool readyToStart() const { + bool readyToStart() const override { return !lineEditDoiNumber->text().isEmpty(); } = - void copyFromEntry(const Entry &entry) { + void copyFromEntry(const Entry &entry) override { lineEditDoiNumber->setText(PlainTextValue::text(entry[Entry::ftDOI= ])); } = diff --git a/src/networking/onlinesearch/onlinesearchdoi.h b/src/networking= /onlinesearch/onlinesearchdoi.h index d21cdd62..2a08a82f 100644 --- a/src/networking/onlinesearch/onlinesearchdoi.h +++ b/src/networking/onlinesearch/onlinesearchdoi.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -30,16 +30,16 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchDOI : public= OnlineSearchAbstract = public: explicit OnlineSearchDOI(QWidget *parent); - ~OnlineSearchDOI(); + ~OnlineSearchDOI() override; = - virtual void startSearchFromForm(); - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual OnlineSearchQueryFormAbstract *customWidget(QWidget *parent); - virtual QUrl homepage() const; + void startSearchFromForm() override; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + OnlineSearchQueryFormAbstract *customWidget(QWidget *parent) override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; + QString favIconUrl() const override; = private: class OnlineSearchQueryFormDOI; diff --git a/src/networking/onlinesearch/onlinesearchgeneral.h b/src/networ= king/onlinesearch/onlinesearchgeneral.h index b05792de..cf988ccc 100644 --- a/src/networking/onlinesearch/onlinesearchgeneral.h +++ b/src/networking/onlinesearch/onlinesearchgeneral.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -32,8 +32,8 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchQueryFormGener= al : public OnlineSearc public: explicit OnlineSearchQueryFormGeneral(QWidget *parent); = - bool readyToStart() const; - void copyFromEntry(const Entry &); + bool readyToStart() const override; + void copyFromEntry(const Entry &) override; = QMap getQueryTerms(); int getNumResults(); diff --git a/src/networking/onlinesearch/onlinesearchgooglescholar.h b/src/= networking/onlinesearch/onlinesearchgooglescholar.h index 1f0c1f81..522bf7d7 100644 --- a/src/networking/onlinesearch/onlinesearchgooglescholar.h +++ b/src/networking/onlinesearch/onlinesearchgooglescholar.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -29,14 +29,14 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchGoogleSchola= r : public OnlineSearchAb = public: explicit OnlineSearchGoogleScholar(QWidget *parent); - ~OnlineSearchGoogleScholar(); + ~OnlineSearchGoogleScholar() override; = - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual QUrl homepage() const; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; + QString favIconUrl() const override; = private slots: void doneFetchingStartPage(); diff --git a/src/networking/onlinesearch/onlinesearchideasrepec.h b/src/net= working/onlinesearch/onlinesearchideasrepec.h index 1027b60e..49860da3 100644 --- a/src/networking/onlinesearch/onlinesearchideasrepec.h +++ b/src/networking/onlinesearch/onlinesearchideasrepec.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -29,14 +29,14 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchIDEASRePEc := public OnlineSearchAbstr = public: explicit OnlineSearchIDEASRePEc(QWidget *parent); - ~OnlineSearchIDEASRePEc(); + ~OnlineSearchIDEASRePEc() override; = - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual QUrl homepage() const; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; + QString favIconUrl() const override; = private slots: void downloadListDone(); diff --git a/src/networking/onlinesearch/onlinesearchieeexplore.h b/src/net= working/onlinesearch/onlinesearchieeexplore.h index ee631b2e..0f3407c1 100644 --- a/src/networking/onlinesearch/onlinesearchieeexplore.h +++ b/src/networking/onlinesearch/onlinesearchieeexplore.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -29,15 +29,15 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchIEEEXplore := public OnlineSearchAbstr = public: explicit OnlineSearchIEEEXplore(QWidget *parent); - ~OnlineSearchIEEEXplore(); + ~OnlineSearchIEEEXplore() override; = - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual QUrl homepage() const; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; - virtual void sanitizeEntry(QSharedPointer entry); + QString favIconUrl() const override; + void sanitizeEntry(QSharedPointer entry) override; = private slots: void doneFetchingXML(); diff --git a/src/networking/onlinesearch/onlinesearchingentaconnect.cpp b/s= rc/networking/onlinesearch/onlinesearchingentaconnect.cpp index f761cc56..64ffd18f 100644 --- a/src/networking/onlinesearch/onlinesearchingentaconnect.cpp +++ b/src/networking/onlinesearch/onlinesearchingentaconnect.cpp @@ -118,11 +118,11 @@ public: numResultsField->setValue(10); } = - bool readyToStart() const { + bool readyToStart() const override { return !(lineEditFullText->text().isEmpty() && lineEditTitle->text= ().isEmpty() && lineEditAuthor->text().isEmpty() && lineEditAbstractKeyword= s->text().isEmpty() && lineEditPublication->text().isEmpty() && lineEditISS= NDOIISBN->text().isEmpty() && lineEditVolume->text().isEmpty() && lineEditI= ssue->text().isEmpty()); } = - void copyFromEntry(const Entry &entry) { + void copyFromEntry(const Entry &entry) override { lineEditTitle->setText(PlainTextValue::text(entry[Entry::ftTitle])= ); lineEditAuthor->setText(authorLastNames(entry).join(QStringLiteral= (" "))); lineEditVolume->setText(PlainTextValue::text(entry[Entry::ftVolume= ])); diff --git a/src/networking/onlinesearch/onlinesearchingentaconnect.h b/src= /networking/onlinesearch/onlinesearchingentaconnect.h index 5ff81e81..654371f4 100644 --- a/src/networking/onlinesearch/onlinesearchingentaconnect.h +++ b/src/networking/onlinesearch/onlinesearchingentaconnect.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -36,16 +36,16 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchIngentaConne= ct : public OnlineSearchA = public: explicit OnlineSearchIngentaConnect(QWidget *parent); - ~OnlineSearchIngentaConnect(); + ~OnlineSearchIngentaConnect() override; = - virtual void startSearchFromForm(); - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual OnlineSearchQueryFormAbstract *customWidget(QWidget *parent); - virtual QUrl homepage() const; + void startSearchFromForm() override; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + OnlineSearchQueryFormAbstract *customWidget(QWidget *parent) override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; + QString favIconUrl() const override; = private: class OnlineSearchQueryFormIngentaConnect; diff --git a/src/networking/onlinesearch/onlinesearchinspirehep.h b/src/net= working/onlinesearch/onlinesearchinspirehep.h index 9d36b9c7..e19b7c52 100644 --- a/src/networking/onlinesearch/onlinesearchinspirehep.h +++ b/src/networking/onlinesearch/onlinesearchinspirehep.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -30,12 +30,12 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchInspireHep := public OnlineSearchSimpl public: explicit OnlineSearchInspireHep(QWidget *parent); = - virtual QString label() const; - virtual QUrl homepage() const; + QString label() const override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; - virtual QUrl buildQueryUrl(const QMap &query, int nu= mResults); + QString favIconUrl() const override; + QUrl buildQueryUrl(const QMap &query, int numResults= ) override; }; = #endif // KBIBTEX_ONLINESEARCH_INSPIREHEP_H diff --git a/src/networking/onlinesearch/onlinesearchisbndb.h b/src/network= ing/onlinesearch/onlinesearchisbndb.h index 626dcfe8..c95d6d33 100644 --- a/src/networking/onlinesearch/onlinesearchisbndb.h +++ b/src/networking/onlinesearch/onlinesearchisbndb.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -28,14 +28,14 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchIsbnDB : pub= lic OnlineSearchAbstract = public: explicit OnlineSearchIsbnDB(QWidget *parent); - ~OnlineSearchIsbnDB(); + ~OnlineSearchIsbnDB() override; = - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual QUrl homepage() const; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; + QString favIconUrl() const override; = private: class OnlineSearchIsbnDBPrivate; diff --git a/src/networking/onlinesearch/onlinesearchjstor.h b/src/networki= ng/onlinesearch/onlinesearchjstor.h index 2dbeeb06..42d721cc 100644 --- a/src/networking/onlinesearch/onlinesearchjstor.h +++ b/src/networking/onlinesearch/onlinesearchjstor.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -28,15 +28,15 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchJStor : publ= ic OnlineSearchAbstract = public: explicit OnlineSearchJStor(QWidget *parent); - ~OnlineSearchJStor(); + ~OnlineSearchJStor() override; = - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual QUrl homepage() const; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; - virtual void sanitizeEntry(QSharedPointer entry); + QString favIconUrl() const override; + void sanitizeEntry(QSharedPointer entry) override; = private slots: void doneFetchingStartPage(); diff --git a/src/networking/onlinesearch/onlinesearchmathscinet.h b/src/net= working/onlinesearch/onlinesearchmathscinet.h index ce6936b8..26b5b3d0 100644 --- a/src/networking/onlinesearch/onlinesearchmathscinet.h +++ b/src/networking/onlinesearch/onlinesearchmathscinet.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -29,15 +29,15 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchMathSciNet := public OnlineSearchAbstr = public: explicit OnlineSearchMathSciNet(QWidget *parent); - ~OnlineSearchMathSciNet(); + ~OnlineSearchMathSciNet() override; = - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual QUrl homepage() const; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; - virtual void sanitizeEntry(QSharedPointer entry); + QString favIconUrl() const override; + void sanitizeEntry(QSharedPointer entry) override; = private slots: void doneFetchingQueryForm(); diff --git a/src/networking/onlinesearch/onlinesearchmrlookup.h b/src/netwo= rking/onlinesearch/onlinesearchmrlookup.h index 9dad1582..8c301ada 100644 --- a/src/networking/onlinesearch/onlinesearchmrlookup.h +++ b/src/networking/onlinesearch/onlinesearchmrlookup.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * 2014 Pavel Zorin-Kranich = * * = * * This program is free software; you can redistribute it and/or modify = * @@ -31,13 +31,13 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchMRLookup : p= ublic OnlineSearchAbstrac public: explicit OnlineSearchMRLookup(QWidget *parent); = - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual QUrl homepage() const; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; - virtual void sanitizeEntry(QSharedPointer entry); + QString favIconUrl() const override; + void sanitizeEntry(QSharedPointer entry) override; = private slots: void doneFetchingResultPage(); diff --git a/src/networking/onlinesearch/onlinesearchpubmed.h b/src/network= ing/onlinesearch/onlinesearchpubmed.h index 5f17b3ee..1c8da91a 100644 --- a/src/networking/onlinesearch/onlinesearchpubmed.h +++ b/src/networking/onlinesearch/onlinesearchpubmed.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -29,17 +29,17 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchPubMed : pub= lic OnlineSearchAbstract = public: explicit OnlineSearchPubMed(QWidget *parent); - ~OnlineSearchPubMed(); + ~OnlineSearchPubMed() override; = - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual QUrl homepage() const; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + QUrl homepage() const override; = static const int maxNumResults; static const uint queryChokeTimeout; = protected: - virtual QString favIconUrl() const; + QString favIconUrl() const override; = private slots: void eSearchDone(); diff --git a/src/networking/onlinesearch/onlinesearchsciencedirect.h b/src/= networking/onlinesearch/onlinesearchsciencedirect.h index 9093791f..49fd8ad9 100644 --- a/src/networking/onlinesearch/onlinesearchsciencedirect.h +++ b/src/networking/onlinesearch/onlinesearchsciencedirect.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -35,14 +35,14 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchScienceDirec= t : public OnlineSearchAb = public: explicit OnlineSearchScienceDirect(QWidget *parent); - ~OnlineSearchScienceDirect(); + ~OnlineSearchScienceDirect() override; = - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual QUrl homepage() const; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; + QString favIconUrl() const override; = private: class OnlineSearchScienceDirectPrivate; diff --git a/src/networking/onlinesearch/onlinesearchsimplebibtexdownload.h= b/src/networking/onlinesearch/onlinesearchsimplebibtexdownload.h index 5038b003..0929b814 100644 --- a/src/networking/onlinesearch/onlinesearchsimplebibtexdownload.h +++ b/src/networking/onlinesearch/onlinesearchsimplebibtexdownload.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -29,7 +29,7 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchSimpleBibTeXDo= wnload : public OnlineS public: explicit OnlineSearchSimpleBibTeXDownload(QWidget *parent); = - virtual void startSearch(const QMap &query, int numR= esults); + void startSearch(const QMap &query, int numResults) = override; = protected: virtual QUrl buildQueryUrl(const QMap &query, int nu= mResults) =3D 0; diff --git a/src/networking/onlinesearch/onlinesearchsoanasaads.h b/src/net= working/onlinesearch/onlinesearchsoanasaads.h index 5eec531b..1215d487 100644 --- a/src/networking/onlinesearch/onlinesearchsoanasaads.h +++ b/src/networking/onlinesearch/onlinesearchsoanasaads.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -29,13 +29,13 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchSOANASAADS := public OnlineSearchSimpl public: explicit OnlineSearchSOANASAADS(QWidget *parent); = - virtual QString label() const; - virtual QUrl homepage() const; + QString label() const override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; - virtual QUrl buildQueryUrl(const QMap &query, int nu= mResults); - virtual QString processRawDownload(const QString &download); + QString favIconUrl() const override; + QUrl buildQueryUrl(const QMap &query, int numResults= ) override; + QString processRawDownload(const QString &download) override; }; = #endif // KBIBTEX_ONLINESEARCH_SOANASAADS_H diff --git a/src/networking/onlinesearch/onlinesearchspringerlink.cpp b/src= /networking/onlinesearch/onlinesearchspringerlink.cpp index e52a9551..350ea4b4 100644 --- a/src/networking/onlinesearch/onlinesearchspringerlink.cpp +++ b/src/networking/onlinesearch/onlinesearchspringerlink.cpp @@ -112,11 +112,11 @@ public: loadState(); } = - bool readyToStart() const { + bool readyToStart() const override { return !(lineEditFreeText->text().isEmpty() && lineEditTitle->text= ().isEmpty() && lineEditBookTitle->text().isEmpty() && lineEditAuthorEditor= ->text().isEmpty()); } = - void copyFromEntry(const Entry &entry) { + void copyFromEntry(const Entry &entry) override { lineEditTitle->setText(PlainTextValue::text(entry[Entry::ftTitle])= ); QString bookTitle =3D PlainTextValue::text(entry[Entry::ftBookTitl= e]); if (bookTitle.isEmpty()) diff --git a/src/networking/onlinesearch/onlinesearchspringerlink.h b/src/n= etworking/onlinesearch/onlinesearchspringerlink.h index cff2520c..be87cd75 100644 --- a/src/networking/onlinesearch/onlinesearchspringerlink.h +++ b/src/networking/onlinesearch/onlinesearchspringerlink.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -40,16 +40,16 @@ class KBIBTEXNETWORKING_EXPORT OnlineSearchSpringerLink= : public OnlineSearchAbs = public: explicit OnlineSearchSpringerLink(QWidget *parent); - ~OnlineSearchSpringerLink(); + ~OnlineSearchSpringerLink() override; = - virtual void startSearchFromForm(); - virtual void startSearch(const QMap &query, int numR= esults); - virtual QString label() const; - virtual OnlineSearchQueryFormAbstract *customWidget(QWidget *parent); - virtual QUrl homepage() const; + void startSearchFromForm() override; + void startSearch(const QMap &query, int numResults) = override; + QString label() const override; + OnlineSearchQueryFormAbstract *customWidget(QWidget *parent) override; + QUrl homepage() const override; = protected: - virtual QString favIconUrl() const; + QString favIconUrl() const override; = private slots: void doneFetchingPAM(); diff --git a/src/networking/zotero/api.h b/src/networking/zotero/api.h index 24c81835..09d8b90f 100644 --- a/src/networking/zotero/api.h +++ b/src/networking/zotero/api.h @@ -57,7 +57,7 @@ public: */ explicit API(RequestScope requestScope, int userOrGroupPrefix, const Q= String &apiKey, QObject *parent =3D nullptr); = - ~API(); + ~API() override; = /** * Add a limit parameter to a given Zotero URL. diff --git a/src/networking/zotero/collection.h b/src/networking/zotero/col= lection.h index 55a475d6..d8573e3f 100644 --- a/src/networking/zotero/collection.h +++ b/src/networking/zotero/collection.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -39,7 +39,7 @@ class KBIBTEXNETWORKING_EXPORT Collection : public QObject Q_OBJECT public: Collection(QSharedPointer api, QObject *parent); - ~Collection(); + ~Collection() override; = bool initialized() const; bool busy() const; diff --git a/src/networking/zotero/collectionmodel.h b/src/networking/zoter= o/collectionmodel.h index f553a3d8..b8fc6f98 100644 --- a/src/networking/zotero/collectionmodel.h +++ b/src/networking/zotero/collectionmodel.h @@ -41,12 +41,12 @@ public: static const int CollectionIdRole; = explicit CollectionModel(Zotero::Collection *collection, QObject *pare= nt =3D nullptr); - QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const; - QModelIndex index(int row, int column, const QModelIndex &) const; - QModelIndex parent(const QModelIndex &) const; - int rowCount(const QModelIndex &) const; - int columnCount(const QModelIndex &) const; - bool hasChildren(const QModelIndex &parent =3D QModelIndex()) const; + QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const override; + QModelIndex index(int row, int column, const QModelIndex &) const over= ride; + QModelIndex parent(const QModelIndex &) const override; + int rowCount(const QModelIndex &) const override; + int columnCount(const QModelIndex &) const override; + bool hasChildren(const QModelIndex &parent =3D QModelIndex()) const ov= erride; = private slots: void fetchingDone(); diff --git a/src/networking/zotero/groups.h b/src/networking/zotero/groups.h index 118179fa..5caa1b36 100644 --- a/src/networking/zotero/groups.h +++ b/src/networking/zotero/groups.h @@ -37,7 +37,7 @@ class KBIBTEXNETWORKING_EXPORT Groups : public QObject Q_OBJECT public: explicit Groups(QSharedPointer api, QObject *parent =3D n= ullptr); - ~Groups(); + ~Groups() override; = bool initialized() const; bool busy() const; diff --git a/src/networking/zotero/items.h b/src/networking/zotero/items.h index 2c2e03d9..e1e12ca5 100644 --- a/src/networking/zotero/items.h +++ b/src/networking/zotero/items.h @@ -40,7 +40,7 @@ class KBIBTEXNETWORKING_EXPORT Items : public QObject Q_OBJECT public: explicit Items(QSharedPointer api, QObject *parent =3D nu= llptr); - ~Items(); + ~Items() override; = void retrieveItemsByCollection(const QString &collectionId); void retrieveItemsByTag(const QString &tag); diff --git a/src/networking/zotero/oauthwizard.cpp b/src/networking/zotero/= oauthwizard.cpp index 1d9129ee..2583d8e9 100644 --- a/src/networking/zotero/oauthwizard.cpp +++ b/src/networking/zotero/oauthwizard.cpp @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -90,12 +90,12 @@ public: connect(lineEditVerificationCode, &HexInputLineEdit::textEdited, t= his, &VerificationCodePage::completeChanged); } = - virtual bool isComplete() const { + bool isComplete() const override { return lineEditVerificationCode->hasAcceptableInput(); } = protected: - virtual void initializePage() { + void initializePage() override { lineEditVerificationCode->clear(); } }; diff --git a/src/networking/zotero/oauthwizard.h b/src/networking/zotero/oa= uthwizard.h index 85526eed..e34f18c5 100644 --- a/src/networking/zotero/oauthwizard.h +++ b/src/networking/zotero/oauthwizard.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -34,17 +34,17 @@ class KBIBTEXNETWORKING_EXPORT OAuthWizard : public QWi= zard = public: explicit OAuthWizard(QWidget *parent); - ~OAuthWizard(); + ~OAuthWizard() override; = - virtual int exec(); + int exec() override; = int userId() const; QString apiKey() const; QString username() const; = protected: - virtual void initializePage(int id); - virtual void accept(); + void initializePage(int id) override; + void accept() override; = private slots: void copyAuthorizationUrl(); diff --git a/src/networking/zotero/tagmodel.h b/src/networking/zotero/tagmo= del.h index ad8d793b..7bd900b1 100644 --- a/src/networking/zotero/tagmodel.h +++ b/src/networking/zotero/tagmodel.h @@ -41,12 +41,12 @@ public: enum Roles { TagRole =3D Qt::UserRole + 6685, TagCountRole =3D Qt::Use= rRole + 6686 }; = explicit TagModel(Zotero::Tags *tags, QObject *parent =3D nullptr); - QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const; - QModelIndex index(int row, int column, const QModelIndex &) const; - QModelIndex parent(const QModelIndex &) const; - int rowCount(const QModelIndex &) const; - int columnCount(const QModelIndex &) const; - bool hasChildren(const QModelIndex &parent =3D QModelIndex()) const; + QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const override; + QModelIndex index(int row, int column, const QModelIndex &) const over= ride; + QModelIndex parent(const QModelIndex &) const override; + int rowCount(const QModelIndex &) const override; + int columnCount(const QModelIndex &) const override; + bool hasChildren(const QModelIndex &parent =3D QModelIndex()) const ov= erride; = private slots: void fetchingDone(); diff --git a/src/networking/zotero/tags.h b/src/networking/zotero/tags.h index 7d12c8cb..af8dffbc 100644 --- a/src/networking/zotero/tags.h +++ b/src/networking/zotero/tags.h @@ -37,7 +37,7 @@ class KBIBTEXNETWORKING_EXPORT Tags : public QObject Q_OBJECT public: explicit Tags(QSharedPointer api, QObject *parent =3D nul= lptr); - ~Tags(); + ~Tags() override; = bool initialized() const; bool busy() const; diff --git a/src/parts/browserextension.h b/src/parts/browserextension.h index 74c22953..8b08299a 100644 --- a/src/parts/browserextension.h +++ b/src/parts/browserextension.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -25,7 +25,7 @@ class BrowserExtension : public KParts::BrowserExtension Q_OBJECT public: explicit BrowserExtension(KParts::ReadOnlyPart *); - ~BrowserExtension(); + ~BrowserExtension() override; = private: struct Private; diff --git a/src/parts/part.h b/src/parts/part.h index bcda5bbf..c628ff23 100644 --- a/src/parts/part.h +++ b/src/parts/part.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -34,16 +34,16 @@ class KBibTeXPart : public KParts::ReadWritePart, priva= te NotificationListener friend class KBibTeXBrowserExtension; = public: - KBibTeXPart(QWidget *parentWidget, QObject *parent, const QVariantList= & args); - virtual ~KBibTeXPart(); + KBibTeXPart(QWidget *parentWidget, QObject *parent, const QVariantList= &args); + ~KBibTeXPart() override; = - void setModified(bool modified); + void setModified(bool modified) override; = - virtual void notificationEvent(int eventId); + void notificationEvent(int eventId) override; = protected: - virtual bool openFile(); - virtual bool saveFile(); + bool openFile() override; + bool saveFile() override; = protected: void setupActions(); diff --git a/src/processing/bibliographyservice.h b/src/processing/bibliogr= aphyservice.h index 85871a26..230a2221 100644 --- a/src/processing/bibliographyservice.h +++ b/src/processing/bibliographyservice.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2015 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -36,7 +36,7 @@ class KBIBTEXPROC_EXPORT BibliographyService : public QOb= ject = public: explicit BibliographyService(QWidget *parentWidget); - ~BibliographyService(); + ~BibliographyService() override; = /** * Set KBibTeX as default editor for supported diff --git a/src/processing/findduplicates.h b/src/processing/findduplicate= s.h index 1aa4dffe..7e1d6f88 100644 --- a/src/processing/findduplicates.h +++ b/src/processing/findduplicates.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -78,7 +78,7 @@ class KBIBTEXPROC_EXPORT FindDuplicates : public QObject = public: explicit FindDuplicates(QWidget *parent, int sensitivity =3D 4000); - ~FindDuplicates(); + ~FindDuplicates() override; = bool findDuplicateEntries(File *file, QList &entryCliqu= eList); = diff --git a/src/processing/lyx.h b/src/processing/lyx.h index 1a39081f..c79c4669 100644 --- a/src/processing/lyx.h +++ b/src/processing/lyx.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -46,7 +46,7 @@ public: static const QString configGroupName; = LyX(KParts::ReadOnlyPart *part, QWidget *widget); - ~LyX(); + ~LyX() override; = void setReferences(const QStringList &references); = diff --git a/src/program/docklets/documentpreview.h b/src/program/docklets/= documentpreview.h index c2ebe855..0325dd3a 100644 --- a/src/program/docklets/documentpreview.h +++ b/src/program/docklets/documentpreview.h @@ -45,7 +45,7 @@ public: void setPixmap(const QPixmap &pixmap); = protected: - void resizeEvent(QResizeEvent *event); + void resizeEvent(QResizeEvent *event) override; = private: QPixmap m_pixmap; @@ -56,7 +56,7 @@ class DocumentPreview : public QWidget Q_OBJECT public: explicit DocumentPreview(QDockWidget *parent); - ~DocumentPreview(); + ~DocumentPreview() override; = public slots: void setElement(QSharedPointer, const File *); diff --git a/src/program/docklets/elementform.h b/src/program/docklets/elem= entform.h index d318301e..ad8c9217 100644 --- a/src/program/docklets/elementform.h +++ b/src/program/docklets/elementform.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -33,7 +33,7 @@ class ElementForm : public QWidget = public: ElementForm(MDIWidget *mdiWidget, QDockWidget *parent); - ~ElementForm(); + ~ElementForm() override; = public slots: void setElement(QSharedPointer, const File *); diff --git a/src/program/docklets/referencepreview.h b/src/program/docklets= /referencepreview.h index a950874c..a8fc647f 100644 --- a/src/program/docklets/referencepreview.h +++ b/src/program/docklets/referencepreview.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -30,7 +30,7 @@ class ReferencePreview : public QWidget Q_OBJECT public: explicit ReferencePreview(QWidget *parent); - ~ReferencePreview(); + ~ReferencePreview() override; = void setEnabled(bool); = diff --git a/src/program/docklets/searchform.h b/src/program/docklets/searc= hform.h index ca1e22bd..69173807 100644 --- a/src/program/docklets/searchform.h +++ b/src/program/docklets/searchform.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -46,7 +46,7 @@ public: * @param parent parent widget for this widget */ SearchForm(SearchResults *searchResults, QWidget *parent); - ~SearchForm(); + ~SearchForm() override; = signals: /** diff --git a/src/program/docklets/searchresults.h b/src/program/docklets/se= archresults.h index ed160c1b..4330ddc9 100644 --- a/src/program/docklets/searchresults.h +++ b/src/program/docklets/searchresults.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -31,7 +31,7 @@ class SearchResults : public QWidget = public: SearchResults(MDIWidget *mdiWidget, QWidget *parent); - ~SearchResults(); + ~SearchResults() override; = void clear(); bool insertElement(QSharedPointer element); diff --git a/src/program/docklets/statistics.h b/src/program/docklets/stati= stics.h index 936d6a4e..0f3f1b0c 100644 --- a/src/program/docklets/statistics.h +++ b/src/program/docklets/statistics.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -30,7 +30,7 @@ class Statistics : public QWidget = public: explicit Statistics(QWidget *parent); - ~Statistics(); + ~Statistics() override; = void setFileView(FileView *); = diff --git a/src/program/docklets/valuelist.h b/src/program/docklets/valuel= ist.h index fc60bb3f..a0f8cf82 100644 --- a/src/program/docklets/valuelist.h +++ b/src/program/docklets/valuelist.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -31,7 +31,7 @@ class ValueList : public QWidget = public: explicit ValueList(QWidget *parent); - ~ValueList(); + ~ValueList() override; = void setFileView(FileView *fileView); = @@ -39,7 +39,7 @@ public slots: void update(); = protected slots: - void resizeEvent(QResizeEvent *e); + void resizeEvent(QResizeEvent *e) override; = private slots: void listItemActivated(const QModelIndex &); diff --git a/src/program/docklets/zoterobrowser.h b/src/program/docklets/zo= terobrowser.h index d0929401..5c946a3d 100644 --- a/src/program/docklets/zoterobrowser.h +++ b/src/program/docklets/zoterobrowser.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -33,7 +33,7 @@ class ZoteroBrowser : public QWidget = public: explicit ZoteroBrowser(SearchResults *searchResults, QWidget *parent); - ~ZoteroBrowser(); + ~ZoteroBrowser() override; = public slots: void visibiltyChanged(bool); diff --git a/src/program/documentlist.h b/src/program/documentlist.h index 175ebc2d..f7e8eb9f 100644 --- a/src/program/documentlist.h +++ b/src/program/documentlist.h @@ -41,8 +41,8 @@ private: public: explicit DocumentListDelegate(QObject *parent =3D nullptr); = - void paint(QPainter *painter, const QStyleOptionViewItem &option, cons= t QModelIndex &index) const; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &= index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, cons= t QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &= index) const override; = }; = @@ -52,11 +52,11 @@ class DocumentListModel : public QAbstractListModel = public: explicit DocumentListModel(OpenFileInfo::StatusFlag statusFlag, QObjec= t *parent =3D nullptr); - ~DocumentListModel(); + ~DocumentListModel() override; = - int rowCount(const QModelIndex &parent =3D QModelIndex()) const; - QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const; - QVariant headerData(int section, Qt::Orientation orientation, int role= =3D Qt::DisplayRole) const; + int rowCount(const QModelIndex &parent =3D QModelIndex()) const overri= de; + QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const override; + QVariant headerData(int section, Qt::Orientation orientation, int role= =3D Qt::DisplayRole) const override; = private: class DocumentListModelPrivate; @@ -72,7 +72,7 @@ class DocumentListView : public QListView = public: DocumentListView(OpenFileInfo::StatusFlag statusFlag, QWidget *parent); - ~DocumentListView(); + ~DocumentListView() override; = private slots: void addToFavorites(); @@ -82,7 +82,7 @@ private slots: void closeFile(); = protected: - void currentChanged(const QModelIndex ¤t, const QModelIndex &pre= vious); + void currentChanged(const QModelIndex ¤t, const QModelIndex &pre= vious) override; = private: class DocumentListViewPrivate; diff --git a/src/program/mainwindow.h b/src/program/mainwindow.h index 8accf57a..a4e89ea4 100644 --- a/src/program/mainwindow.h +++ b/src/program/mainwindow.h @@ -37,15 +37,15 @@ class KBibTeXMainWindow : public KParts::MainWindow = public: explicit KBibTeXMainWindow(QWidget *parent =3D nullptr); - virtual ~KBibTeXMainWindow(); + ~KBibTeXMainWindow() override; = public slots: void openDocument(const QUrl &url); = protected: // KMainWindow API - void dragEnterEvent(QDragEnterEvent *event); - void dropEvent(QDropEvent *event); - void closeEvent(QCloseEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *event) override; + void closeEvent(QCloseEvent *event) override; = protected: void setupControllers(); diff --git a/src/program/mdiwidget.cpp b/src/program/mdiwidget.cpp index f6c9adcc..3e94a936 100644 --- a/src/program/mdiwidget.cpp +++ b/src/program/mdiwidget.cpp @@ -63,11 +63,11 @@ public: endResetModel(); } = - int columnCount(const QModelIndex &) const { + int columnCount(const QModelIndex &) const override { return 3; } = - QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const { + QVariant data(const QModelIndex &index, int role =3D Qt::DisplayRole) = const override { OpenFileInfoManager::OpenFileInfoList ofiList =3D ofim->filteredIt= ems(OpenFileInfo::RecentlyUsed); if (index.row() < ofiList.count()) { OpenFileInfo *ofiItem =3D ofiList[index.row()]; @@ -96,22 +96,22 @@ public: return QVariant(); } = - QVariant headerData(int section, Qt::Orientation , int role =3D Qt::Di= splayRole) const { + QVariant headerData(int section, Qt::Orientation , int role =3D Qt::Di= splayRole) const override { if (role !=3D Qt::DisplayRole || section > 2) return QVariant(); else if (section =3D=3D 0) return i18n("Filename"); else if (section =3D=3D 1) return i18n("Date/time of last use"); else return i18n("Full filename"); } = - QModelIndex index(int row, int column, const QModelIndex &) const { + QModelIndex index(int row, int column, const QModelIndex &) const over= ride { return createIndex(row, column, row); } = - QModelIndex parent(const QModelIndex &) const { + QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); } = - int rowCount(const QModelIndex &parent =3D QModelIndex()) const { + int rowCount(const QModelIndex &parent =3D QModelIndex()) const overri= de { if (parent =3D=3D QModelIndex()) return ofim->filteredItems(OpenFileInfo::RecentlyUsed).count(); else diff --git a/src/program/mdiwidget.h b/src/program/mdiwidget.h index adff9050..7475f1c8 100644 --- a/src/program/mdiwidget.h +++ b/src/program/mdiwidget.h @@ -1,5 +1,5 @@ /*************************************************************************= ** - * Copyright (C) 2004-2014 by Thomas Fischer = * + * Copyright (C) 2004-2017 by Thomas Fischer = * * = * * This program is free software; you can redistribute it and/or modify = * * it under the terms of the GNU General Public License as published by = * @@ -41,7 +41,7 @@ class MDIWidget : public QStackedWidget = public: explicit MDIWidget(QWidget *parent); - ~MDIWidget(); + ~MDIWidget() override; = FileView *fileView(); OpenFileInfo *currentFile(); diff --git a/src/program/openfileinfo.h b/src/program/openfileinfo.h index 628675ec..36415df0 100644 --- a/src/program/openfileinfo.h +++ b/src/program/openfileinfo.h @@ -48,7 +48,7 @@ public: }; Q_DECLARE_FLAGS(StatusFlags, StatusFlag) = - ~OpenFileInfo(); + ~OpenFileInfo() override; = KParts::ReadOnlyPart *part(QWidget *parent, KService::Ptr servicePtr = =3D KService::Ptr()); = @@ -106,7 +106,7 @@ public: typedef QVector OpenFileInfoList; = static OpenFileInfoManager *instance(); - ~OpenFileInfoManager(); + ~OpenFileInfoManager() override; = OpenFileInfo *createNew(const QString &mimeType =3D FileInfo::mimetype= BibTeX); =