From 53eab0a51751ed470f6aabfef7ebac48a290abff Mon Sep 17 00:00:00 2001
From: Eberhard Graether <egraether@gmail.com>
Date: Tue, 10 Feb 2015 10:31:14 +0100
Subject: [PATCH] logic: fixed Searchbutton not searching and wrong destruction
 order in ComponentManager

---
 src/app/qt/element/QtSmartSearchBox.cpp | 12 ++++++------
 src/app/qt/element/QtSmartSearchBox.h   |  4 +++-
 src/lib/component/ComponentManager.cpp  |  2 +-
 src/lib/component/ComponentManager.h    |  3 ++-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/app/qt/element/QtSmartSearchBox.cpp b/src/app/qt/element/QtSmartSearchBox.cpp
index 505077b4..49f0febc 100644
--- a/src/app/qt/element/QtSmartSearchBox.cpp
+++ b/src/app/qt/element/QtSmartSearchBox.cpp
@@ -28,6 +28,12 @@ void QtQueryElement::onChecked(bool)
 }
 
 
+void QtSmartSearchBox::search()
+{
+	editTextToElement();
+	MessageSearch(utility::join(m_tokens, "") + text().toStdString()).dispatch();
+}
+
 QtSmartSearchBox::QtSmartSearchBox(QWidget* parent)
 	: QLineEdit(parent)
 	, m_allowTextChange(false)
@@ -82,12 +88,6 @@ void QtSmartSearchBox::setFocus()
 	layoutElements();
 }
 
-void QtSmartSearchBox::search()
-{
-	editTextToElement();
-	MessageSearch(utility::join(m_tokens, "") + text().toStdString()).dispatch();
-}
-
 bool QtSmartSearchBox::event(QEvent *event)
 {
 	if (event->type() == QEvent::KeyPress)
diff --git a/src/app/qt/element/QtSmartSearchBox.h b/src/app/qt/element/QtSmartSearchBox.h
index b4ac740d..9a825d85 100644
--- a/src/app/qt/element/QtSmartSearchBox.h
+++ b/src/app/qt/element/QtSmartSearchBox.h
@@ -31,6 +31,9 @@ class QtSmartSearchBox
 {
 	Q_OBJECT
 
+public slots:
+	void search();
+
 public:
 	QtSmartSearchBox(QWidget* parent);
 	virtual ~QtSmartSearchBox();
@@ -38,7 +41,6 @@ public:
 	void setAutocompletionList(const std::vector<SearchMatch>& autocompletionList);
 	void setQuery(const std::string& text);
 	void setFocus();
-	void search();
 
 protected:
 	virtual bool event(QEvent *event);
diff --git a/src/lib/component/ComponentManager.cpp b/src/lib/component/ComponentManager.cpp
index 47e078f9..2dcbea8d 100644
--- a/src/lib/component/ComponentManager.cpp
+++ b/src/lib/component/ComponentManager.cpp
@@ -32,7 +32,7 @@ void ComponentManager::setup(ViewLayout* viewLayout)
 
 	std::shared_ptr<CompositeView> compositeView =
 		m_componentFactory->getViewFactory()->createCompositeView(viewLayout, CompositeView::DIRECTION_HORIZONTAL);
-	m_views.push_back(compositeView);
+	m_compositeViews.push_back(compositeView);
 
 	std::shared_ptr<Component> undoRedoComponent = m_componentFactory->createUndoRedoComponent(compositeView.get());
 	m_components.push_back(undoRedoComponent);
diff --git a/src/lib/component/ComponentManager.h b/src/lib/component/ComponentManager.h
index 14c83e4e..52f9db8e 100644
--- a/src/lib/component/ComponentManager.h
+++ b/src/lib/component/ComponentManager.h
@@ -9,6 +9,7 @@
 #include "data/access/LocationAccess.h"
 #include "data/access/GraphAccess.h"
 
+class CompositeView;
 class View;
 class ViewFactory;
 class ViewLayout;
@@ -30,8 +31,8 @@ private:
 
 	std::shared_ptr<ComponentFactory> m_componentFactory;
 
+	std::vector<std::shared_ptr<CompositeView>> m_compositeViews;
 	std::vector<std::shared_ptr<Component>> m_components;
-	std::vector<std::shared_ptr<View>> m_views;
 };
 
 #endif // COMPONENT_MANAGER_H