diff --git a/src/qtgui/confgui/confguiindex.cpp b/src/qtgui/confgui/confguiindex.cpp index 8783d3fa..1ba8ef7e 100644 --- a/src/qtgui/confgui/confguiindex.cpp +++ b/src/qtgui/confgui/confguiindex.cpp @@ -166,7 +166,7 @@ static MyConfLinkFactRCL conflinkfactory; void ConfIndexW::showPrefs(bool modal) { delete m_conf; - if (((m_conf = m_rclconf->cloneMainConfig()) == 0)) { + if ((m_conf = m_rclconf->cloneMainConfig()) == 0) { return; } m_conf->holdWrites(true); diff --git a/src/query/docseq.h b/src/query/docseq.h index be73e42e..1bcdc225 100644 --- a/src/query/docseq.h +++ b/src/query/docseq.h @@ -184,7 +184,8 @@ public: {} virtual ~DocSeqModifier() {} - virtual bool getAbstract(Rcl::Doc& doc, std::vector& abs) { + virtual bool getAbstract(Rcl::Doc& doc, std::vector& abs) + override{ if (!m_seq) return false; return m_seq->getAbstract(doc, abs); @@ -196,46 +197,47 @@ public: return m_seq->getAbstract(doc, abs, maxlen, bypage); } /** Get duplicates. */ - virtual bool docDups(const Rcl::Doc& doc, std::vector& dups) { + virtual bool docDups(const Rcl::Doc& doc, std::vector& dups) + override { if (!m_seq) return false; return m_seq->docDups(doc, dups); } - virtual bool snippetsCapable() { + virtual bool snippetsCapable() override { if (!m_seq) return false; return m_seq->snippetsCapable(); } - virtual std::string getDescription() { + virtual std::string getDescription() override { if (!m_seq) return ""; return m_seq->getDescription(); } - virtual void getTerms(HighlightData& hld) { + virtual void getTerms(HighlightData& hld) override { if (!m_seq) return; m_seq->getTerms(hld); } - virtual bool getEnclosing(Rcl::Doc& doc, Rcl::Doc& pdoc) { + virtual bool getEnclosing(Rcl::Doc& doc, Rcl::Doc& pdoc) override { if (!m_seq) return false; return m_seq->getEnclosing(doc, pdoc); } - virtual std::string getReason() { + virtual std::string getReason() override { if (!m_seq) return string(); return m_seq->getReason(); } - virtual std::string title() { + virtual std::string title() override { return m_seq->title(); } - virtual std::shared_ptr getSourceSeq() { + virtual std::shared_ptr getSourceSeq() override { return m_seq; } protected: - virtual std::shared_ptr getDb() { + virtual std::shared_ptr getDb() override { if (!m_seq) return 0; return m_seq->getDb(); diff --git a/src/query/docseqdb.h b/src/query/docseqdb.h index c47ec465..370ae35f 100644 --- a/src/query/docseqdb.h +++ b/src/query/docseqdb.h @@ -30,38 +30,37 @@ class DocSequenceDb : public DocSequence { std::shared_ptr q, const std::string &t, std::shared_ptr sdata); virtual ~DocSequenceDb() {} - virtual bool getDoc(int num, Rcl::Doc &doc, std::string * = 0); - virtual int getResCnt(); - virtual void getTerms(HighlightData& hld); + virtual bool getDoc(int num, Rcl::Doc &doc, std::string * = 0) override; + virtual int getResCnt() override; + virtual void getTerms(HighlightData& hld) override; // Called to fill-up the snippets window. Ignoers // buildabstract/replaceabstract and syntabslen virtual bool getAbstract(Rcl::Doc &doc, std::vector&, int maxlen, bool sortbypage) override; - virtual bool getAbstract(Rcl::Doc &doc, std::vector&); - virtual int getFirstMatchPage(Rcl::Doc&, std::string& term); - virtual bool docDups(const Rcl::Doc& doc, std::vector& dups); - virtual std::string getDescription(); - virtual std::list expand(Rcl::Doc &doc); - virtual bool canFilter() {return true;} - virtual bool setFiltSpec(const DocSeqFiltSpec &filtspec); - virtual bool canSort() {return true;} - virtual bool setSortSpec(const DocSeqSortSpec &sortspec); - virtual void setAbstractParams(bool qba, bool qra) - { + virtual bool getAbstract(Rcl::Doc &doc, std::vector&) override; + virtual int getFirstMatchPage(Rcl::Doc&, std::string& term) override; + virtual bool docDups(const Rcl::Doc& doc, std::vector& dups) + override; + virtual std::string getDescription() override; + virtual std::list expand(Rcl::Doc &doc) override; + virtual bool canFilter() override {return true;} + virtual bool setFiltSpec(const DocSeqFiltSpec &filtspec) override; + virtual bool canSort() override {return true;} + virtual bool setSortSpec(const DocSeqSortSpec &sortspec) override; + virtual void setAbstractParams(bool qba, bool qra) { m_queryBuildAbstract = qba; m_queryReplaceAbstract = qra; } - virtual bool snippetsCapable() - { + virtual bool snippetsCapable() override { return true; } - virtual std::string title(); + virtual std::string title() override; protected: - virtual std::shared_ptr getDb() { + virtual std::shared_ptr getDb() override { return m_db; } private: