Importing clones PART 1

I apologies for this "strange" way of importing code.
But we have 3 (or 4) different ideas about UIs.. and I have
to decide one.
So, best way I found is importing manually changes.

I'll write something about that soon. We basically need to better
learn git cooperation (I'm first).
Anyway, thank you a lot for your time and your ideas. I really
apprecciate your efforts ;)

1 files changed, 6 insertions, 3 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index c9bec75e..c12f8fce 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -64,6 +64,7 @@ private:
     void setupActions();
     void setupHistoryMenu();
     void setupTabBar();
+    void setupToolBars();
 
 public slots:
     void slotHome();
@@ -71,7 +72,7 @@ public slots:
     void slotUpdateBrowser();
 
 private slots:
-    void slotUpdateConf();
+    void slotUpdateConfiguration();
     void slotLoadProgress(int);
     void slotUpdateStatusbar(const QString &string);
     void slotUpdateActions();
@@ -114,20 +115,22 @@ private slots:
     void slotPreferences();
 
 private:
-    SearchBar *m_searchBar;
-    FindBar *m_findBar;
     KMenu *m_historyBackMenu;
     KMenu *m_windowMenu;
+
     KAction *m_stopReloadAction;
     KAction *m_stopAction;
     KAction *m_reloadAction;
     KAction *m_historyBackAction;
     KAction *m_historyForwardAction;
+
     QString m_lastSearch;
     QString m_homePage;
 
     MainView *m_view;
     BookmarksProvider *m_bookmarksProvider;
+    FindBar *m_findBar;
+    SearchBar *m_searchBar;
 };
 
 #endif // MAINWINDOW_H