From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sat, 29 Dec 2012 18:51:41 +0000 (-0800)
Subject: Fix warning about hidden overloaded virtual, found by Clang
X-Git-Tag: accepted/tizen/20131212.181521~128^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6568f272dae8d42cd41029271af722d1499e49c8;p=platform%2Fupstream%2Fqttools.git

Fix warning about hidden overloaded virtual, found by Clang

qlayout_widget.cpp:1577:17: error: 'qdesigner_internal::<anonymous namespace>::QBoxLayoutSupport::findItemAt' hides overloaded virtual function [-Werror,-Woverloaded-virtual]
    virtual int findItemAt(int /*at_row*/, int /*at_column*/) const {    return -1; }
                ^
/Users/tjmaciei/src/qt/qt5/qttools/src/designer/src/lib/shared/qlayout_widget_p.h:198:17: note: hidden overloaded virtual function 'qdesigner_internal::QLayoutSupport::findItemAt' declared here
    virtual int findItemAt(const QPoint &pos) const;
                ^

Solve the problem by using the old functions, hence not hiding them.

Change-Id: I3af0c43fc7266ae74e8b05103e4306be740c618a
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---

diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp
index d6d58ad..2959be2 100644
--- a/src/designer/src/lib/shared/qlayout_widget.cpp
+++ b/src/designer/src/lib/shared/qlayout_widget.cpp
@@ -1575,6 +1575,7 @@ public:
     virtual void insertColumn(int /*column*/) {}
 
     virtual int findItemAt(int /*at_row*/, int /*at_column*/) const {    return -1; }
+    using QLayoutSupport::findItemAt;
 
 private:
     virtual void setCurrentCellFromIndicatorOnEmptyCell(int index);
@@ -1702,6 +1703,7 @@ public:
     void insertWidget(QWidget *widget, const QPair<int, int> &cell);
     virtual void removeWidget(QWidget *widget) { helper()->removeWidget(layout(), widget); }
     virtual int findItemAt(int row, int column) const;
+    using QLayoutSupport::findItemAt;
 
 protected:
     GridLikeLayout *gridLikeLayout() const {