From 90d2181239761f8950b95768d3b037843e9e8b50 Mon Sep 17 00:00:00 2001 From: Teus Benschop Date: Fri, 6 Oct 2017 12:24:31 +0200 Subject: New upstream version 2.11.0 --- src/frontend/searchdialog/btsearchresultarea.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/frontend/searchdialog/btsearchresultarea.h') diff --git a/src/frontend/searchdialog/btsearchresultarea.h b/src/frontend/searchdialog/btsearchresultarea.h index e7a167d..4c0284d 100644 --- a/src/frontend/searchdialog/btsearchresultarea.h +++ b/src/frontend/searchdialog/btsearchresultarea.h @@ -4,7 +4,7 @@ * * This file is part of BibleTime's source code, http://www.bibletime.info/. * -* Copyright 1999-2014 by the BibleTime developers. +* Copyright 1999-2016 by the BibleTime developers. * The BibleTime source code is licensed under the GNU General Public License version 2.0. * **********/ @@ -95,7 +95,7 @@ class StrongsResultList: public QList { class BtSearchResultArea : public QWidget { Q_OBJECT public: /* Methods: */ - BtSearchResultArea(QWidget *parent = 0); + BtSearchResultArea(QWidget *parent = nullptr); inline ~BtSearchResultArea() { saveDialogSettings(); } /** @@ -104,17 +104,11 @@ class BtSearchResultArea : public QWidget { void setSearchResult( const CSwordModuleSearch::Results &results); - /** - Reimplemented from QWidget::sizeHint(). - */ - virtual QSize sizeHint() const { + QSize sizeHint() const override { return baseSize(); } - /** - Reimplemented from QWidget::minimumSizeHint(). - */ - virtual QSize minimumSizeHint() const { + QSize minimumSizeHint() const override { return minimumSize(); } -- cgit v1.2.3