From 9ac01c930d36ed9ff1e59f7315f1adabf0f5aa18 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Sat, 17 May 2014 11:21:17 +0200
Subject: [PATCH] Drop DatabaseWidget::groupView() and entryView().

---
 src/gui/DatabaseWidget.cpp | 10 ----------
 src/gui/DatabaseWidget.h   |  2 --
 tests/gui/TestGui.cpp      | 16 ++++++++--------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 8173fe968..f3738c734 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -216,16 +216,6 @@ void DatabaseWidget::emitCurrentModeChanged()
     Q_EMIT currentModeChanged(currentMode());
 }
 
-GroupView* DatabaseWidget::groupView()
-{
-    return m_groupView;
-}
-
-EntryView* DatabaseWidget::entryView()
-{
-    return m_entryView;
-}
-
 Database* DatabaseWidget::database()
 {
     return m_db;
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index 628a344e9..4a5765df9 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -60,8 +60,6 @@ public:
 
     explicit DatabaseWidget(Database* db, QWidget* parent = Q_NULLPTR);
     ~DatabaseWidget();
-    GroupView* groupView();
-    EntryView* entryView();
     Database* database();
     bool dbHasKey() const;
     bool canDeleteCurrentGroup() const;
diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
index a4d04c5de..51dc39e5d 100644
--- a/tests/gui/TestGui.cpp
+++ b/tests/gui/TestGui.cpp
@@ -83,7 +83,7 @@ void TestGui::testTabs()
 
 void TestGui::testEditEntry()
 {
-    EntryView* entryView = m_dbWidget->entryView();
+    EntryView* entryView = m_dbWidget->findChild<EntryView*>("entryView");
     QModelIndex item = entryView->model()->index(0, 1);
     QRect itemRect = entryView->visualRect(item);
     QTest::mouseClick(entryView->viewport(), Qt::LeftButton, Qt::NoModifier, itemRect.center());
@@ -237,8 +237,8 @@ void TestGui::testSearch()
 
 void TestGui::testDeleteEntry()
 {
-    GroupView* groupView = m_dbWidget->groupView();
-    EntryView* entryView = m_dbWidget->entryView();
+    GroupView* groupView = m_dbWidget->findChild<GroupView*>("groupView");
+    EntryView* entryView = m_dbWidget->findChild<EntryView*>("entryView");
     QToolBar* toolBar = m_mainWindow->findChild<QToolBar*>("toolBar");
     QAction* entryDeleteAction = m_mainWindow->findChild<QAction*>("actionEntryDelete");
     QWidget* entryDeleteWidget = toolBar->widgetForAction(entryDeleteAction);
@@ -274,7 +274,7 @@ void TestGui::testDeleteEntry()
 
 void TestGui::testCloneEntry()
 {
-    EntryView* entryView = m_dbWidget->entryView();
+    EntryView* entryView = m_dbWidget->findChild<EntryView*>("entryView");
 
     QCOMPARE(entryView->model()->rowCount(), 1);
 
@@ -292,8 +292,8 @@ void TestGui::testCloneEntry()
 
 void TestGui::testDragAndDropEntry()
 {
-    EntryView* entryView = m_dbWidget->entryView();
-    GroupView* groupView = m_dbWidget->groupView();
+    EntryView* entryView = m_dbWidget->findChild<EntryView*>("entryView");
+    GroupView* groupView = m_dbWidget->findChild<GroupView*>("groupView");
     QAbstractItemModel* groupModel = groupView->model();
 
     QModelIndex sourceIndex = entryView->model()->index(0, 1);
@@ -314,7 +314,7 @@ void TestGui::testDragAndDropEntry()
 
 void TestGui::testDragAndDropGroup()
 {
-    QAbstractItemModel* groupModel = m_dbWidget->groupView()->model();
+    QAbstractItemModel* groupModel = m_dbWidget->findChild<GroupView*>("groupView")->model();
     QModelIndex rootIndex = groupModel->index(0, 0);
 
     dragAndDropGroup(groupModel->index(0, 0, rootIndex),
@@ -453,7 +453,7 @@ void TestGui::dragAndDropGroup(const QModelIndex& sourceIndex, const QModelIndex
     QVERIFY(sourceIndex.isValid());
     QVERIFY(targetIndex.isValid());
 
-    GroupModel* groupModel = qobject_cast<GroupModel*>(m_dbWidget->groupView()->model());
+    GroupModel* groupModel = qobject_cast<GroupModel*>(m_dbWidget->findChild<GroupView*>("groupView")->model());
 
     QMimeData mimeData;
     QByteArray encoded;