From a658efe557045b89bb958e999389bfa6b7ba2a68 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 14 Jul 2015 11:49:41 +0200
Subject: [PATCH] improving consistency of subview layouts

---
 apps/opencs/view/tools/searchsubview.cpp  | 20 +++++++++-----------
 apps/opencs/view/world/previewsubview.cpp |  2 --
 apps/opencs/view/world/scenesubview.cpp   |  2 --
 apps/opencs/view/world/tablesubview.cpp   |  3 ---
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/apps/opencs/view/tools/searchsubview.cpp b/apps/opencs/view/tools/searchsubview.cpp
index dc670af40..8b35db6ae 100644
--- a/apps/opencs/view/tools/searchsubview.cpp
+++ b/apps/opencs/view/tools/searchsubview.cpp
@@ -16,7 +16,7 @@ void CSVTools::SearchSubView::replace (bool selection)
 {
     if (mLocked)
         return;
-        
+
     std::vector<int> indices = mTable->getReplaceIndices (selection);
 
     std::string replace = mSearchBox.getReplaceText();
@@ -29,7 +29,7 @@ void CSVTools::SearchSubView::replace (bool selection)
 
     CSMTools::Search search (mSearch);
     CSMWorld::IdTableBase *currentTable = 0;
-        
+
     // We are running through the indices in reverse order to avoid messing up multiple results
     // in a single string.
     for (std::vector<int>::const_reverse_iterator iter (indices.rbegin()); iter!=indices.rend(); ++iter)
@@ -46,7 +46,7 @@ void CSVTools::SearchSubView::replace (bool selection)
             search.configure (table);
             currentTable = table;
         }
-            
+
         std::string hint = model.getHint (*iter);
 
         if (search.verify (mDocument, table, id, hint))
@@ -63,7 +63,7 @@ void CSVTools::SearchSubView::replace (bool selection)
 void CSVTools::SearchSubView::showEvent (QShowEvent *event)
 {
     CSVDoc::SubView::showEvent (event);
-    mSearchBox.focus();    
+    mSearchBox.focus();
 }
 
 CSVTools::SearchSubView::SearchSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
@@ -71,25 +71,23 @@ CSVTools::SearchSubView::SearchSubView (const CSMWorld::UniversalId& id, CSMDoc:
 {
     QVBoxLayout *layout = new QVBoxLayout;
 
-    layout->setContentsMargins (QMargins (0, 0, 0, 0));
-
     layout->addWidget (&mSearchBox);
-    
+
     layout->addWidget (mTable = new ReportTable (document, id, true), 2);
 
     QWidget *widget = new QWidget;
-    
+
     widget->setLayout (layout);
 
     setWidget (widget);
 
     stateChanged (document.getState(), &document);
-    
+
     connect (mTable, SIGNAL (editRequest (const CSMWorld::UniversalId&, const std::string&)),
         SIGNAL (focusId (const CSMWorld::UniversalId&, const std::string&)));
 
     connect (mTable, SIGNAL (replaceRequest()), this, SLOT (replaceRequest()));
-       
+
     connect (&document, SIGNAL (stateChanged (int, CSMDoc::Document *)),
         this, SLOT (stateChanged (int, CSMDoc::Document *)));
 
@@ -124,7 +122,7 @@ void CSVTools::SearchSubView::startSearch (const CSMTools::Search& search)
 
     mSearch = search;
     mSearch.setPadding (paddingBefore, paddingAfter);
-    
+
     mTable->clear();
     mDocument.runSearch (getUniversalId(), mSearch);
 }
diff --git a/apps/opencs/view/world/previewsubview.cpp b/apps/opencs/view/world/previewsubview.cpp
index 1c2d6b95c..756e79fe6 100644
--- a/apps/opencs/view/world/previewsubview.cpp
+++ b/apps/opencs/view/world/previewsubview.cpp
@@ -13,8 +13,6 @@ CSVWorld::PreviewSubView::PreviewSubView (const CSMWorld::UniversalId& id, CSMDo
 {
     QHBoxLayout *layout = new QHBoxLayout;
 
-    layout->setContentsMargins (QMargins (0, 0, 0, 0));
-
     if (document.getData().getReferenceables().searchId (id.getId())==-1)
     {
         std::string referenceableId =
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index 397d24929..b7a795e23 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -31,8 +31,6 @@ CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::D
 {
     QVBoxLayout *layout = new QVBoxLayout;
 
-    layout->setContentsMargins (QMargins (0, 0, 0, 0));
-
     layout->addWidget (mBottom = new TableBottomBox (NullCreatorFactory(), document, id, this), 0);
 
     mLayout->setContentsMargins (QMargins (0, 0, 0, 0));
diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp
index 8ffcb620c..ca551c53f 100644
--- a/apps/opencs/view/world/tablesubview.cpp
+++ b/apps/opencs/view/world/tablesubview.cpp
@@ -26,8 +26,6 @@ CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::D
 {
     QVBoxLayout *layout = new QVBoxLayout;
 
-    layout->setContentsMargins (QMargins (0, 0, 0, 0));
-
     layout->addWidget (mBottom =
         new TableBottomBox (creatorFactory, document, id, this), 0);
 
@@ -185,4 +183,3 @@ bool CSVWorld::TableSubView::eventFilter (QObject* object, QEvent* event)
     }
     return false;
 }
-