From 6a88525aa367e09e6982b6c107685c8f37d8f388 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Thu, 16 Jul 2009 17:34:04 +0200
Subject: [PATCH] Some more QToolBar changes.

---
 src/plugins/bineditor/bineditorplugin.cpp     |  1 +
 .../actionmanager/actioncontainer.cpp         |  1 -
 .../actionmanager/actioncontainer.h           |  1 -
 .../coreplugin/editormanager/editorview.h     |  1 -
 .../coreplugin/editormanager/ieditor.h        |  4 ----
 src/plugins/coreplugin/fancytabwidget.cpp     | 22 ++++++++++---------
 src/plugins/coreplugin/mainwindow.cpp         |  1 -
 src/plugins/coreplugin/navigationwidget.h     |  1 -
 src/plugins/coreplugin/outputpane.cpp         |  1 -
 src/plugins/coreplugin/outputpane.h           |  1 -
 .../scriptmanager/metatypedeclarations.h      |  2 --
 .../scriptmanager/qworkbench_wrapper.cpp      |  1 -
 .../scriptmanager/scriptmanager.cpp           |  1 -
 src/plugins/coreplugin/welcomemode.cpp        |  5 +++--
 src/plugins/cppeditor/cppeditor.cpp           |  1 +
 src/plugins/debugger/debuggermanager.cpp      |  1 -
 src/plugins/debugger/script/scriptengine.h    |  1 -
 src/plugins/designer/formwindoweditor.h       |  1 +
 src/plugins/duieditor/duieditor.cpp           |  1 +
 src/plugins/find/findtoolbar.h                |  1 -
 src/plugins/projectexplorer/projectwindow.cpp |  4 ++--
 src/plugins/qtscripteditor/qtscripteditor.cpp |  1 +
 22 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 37a0317e7fc..4f854b71381 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -37,6 +37,7 @@
 #include <QtGui/QAction>
 #include <QtGui/QMainWindow>
 #include <QtGui/QHBoxLayout>
+#include <QtGui/QToolBar>
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
index e6760f4b240..eab8a818483 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
@@ -37,7 +37,6 @@
 
 #include <QtCore/QDebug>
 #include <QtGui/QAction>
-#include <QtGui/QToolBar>
 #include <QtGui/QMenuBar>
 
 Q_DECLARE_METATYPE(Core::Internal::MenuActionContainer*)
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.h b/src/plugins/coreplugin/actionmanager/actioncontainer.h
index 7539b91ee0c..050e3ee3d62 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.h
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.h
@@ -32,7 +32,6 @@
 
 #include <QtCore/QObject>
 #include <QtGui/QMenu>
-#include <QtGui/QToolBar>
 #include <QtGui/QMenuBar>
 #include <QtGui/QAction>
 
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index c3db702b51d..996ec8df944 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -46,7 +46,6 @@
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
-class QToolBar;
 class QToolButton;
 class QLabel;
 class QStackedWidget;
diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h
index c8a8d173eaa..23f2e6535c9 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.h
+++ b/src/plugins/coreplugin/editormanager/ieditor.h
@@ -34,10 +34,6 @@
 #include <coreplugin/icontext.h>
 #include <coreplugin/ifile.h>
 
-QT_BEGIN_NAMESPACE
-class QToolBar;
-QT_END_NAMESPACE
-
 namespace Core {
 
 class CORE_EXPORT IEditor : public IContext
diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp
index 1767b88febf..403644f9a4c 100644
--- a/src/plugins/coreplugin/fancytabwidget.cpp
+++ b/src/plugins/coreplugin/fancytabwidget.cpp
@@ -29,6 +29,7 @@
 
 #include "fancytabwidget.h"
 #include <utils/stylehelper.h>
+#include <utils/styledbar.h>
 
 #include <QDebug>
 
@@ -41,7 +42,6 @@
 #include <QtGui/QSplitter>
 #include <QtGui/QStackedLayout>
 #include <QtGui/QStatusBar>
-#include <QtGui/QToolBar>
 #include <QtGui/QToolButton>
 #include <QtGui/QToolTip>
 
@@ -298,9 +298,11 @@ FancyTabWidget::FancyTabWidget(QWidget *parent)
     selectionLayout->setSpacing(0);
     selectionLayout->setMargin(0);
 
-    QToolBar *bar = new QToolBar;
-    bar->addWidget(new FancyColorButton(this));
-    bar->setFixedHeight(StyleHelper::navigationWidgetHeight());
+    Core::Utils::StyledBar *bar = new Core::Utils::StyledBar;
+    QHBoxLayout *layout = new QHBoxLayout(bar);
+    layout->setMargin(0);
+    layout->setSpacing(0);
+    layout->addWidget(new FancyColorButton(this));
     selectionLayout->addWidget(bar);
 
     selectionLayout->addWidget(m_tabBar, 1);
@@ -329,12 +331,12 @@ FancyTabWidget::FancyTabWidget(QWidget *parent)
     vlayout->addLayout(m_modesStack);
     vlayout->addWidget(m_statusBar);
 
-    QHBoxLayout *layout = new QHBoxLayout;
-    layout->setMargin(0);
-    layout->setSpacing(1);
-    layout->addWidget(m_selectionWidget);
-    layout->addLayout(vlayout);
-    setLayout(layout);
+    QHBoxLayout *mainLayout = new QHBoxLayout;
+    mainLayout->setMargin(0);
+    mainLayout->setSpacing(1);
+    mainLayout->addWidget(m_selectionWidget);
+    mainLayout->addLayout(vlayout);
+    setLayout(mainLayout);
 
     connect(m_tabBar, SIGNAL(currentChanged(int)), this, SLOT(showWidget(int)));
 }
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index e8414794109..249073cd1e7 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -84,7 +84,6 @@
 #include <QtGui/QPrinter>
 #include <QtGui/QShortcut>
 #include <QtGui/QStatusBar>
-#include <QtGui/QToolBar>
 #include <QtGui/QWizard>
 
 /*
diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h
index c8aee5895e8..47c0a3e1faf 100644
--- a/src/plugins/coreplugin/navigationwidget.h
+++ b/src/plugins/coreplugin/navigationwidget.h
@@ -36,7 +36,6 @@
 #include <QtGui/QWidget>
 #include <QtGui/QComboBox>
 #include <QtGui/QSplitter>
-#include <QtGui/QToolBar>
 #include <QtGui/QToolButton>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 4920ff031ee..b47b2f3ae76 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -52,7 +52,6 @@
 #include <QtGui/QMenu>
 #include <QtGui/QPainter>
 #include <QtGui/QPushButton>
-#include <QtGui/QToolBar>
 #include <QtGui/QToolButton>
 #include <QtGui/QStackedWidget>
 
diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h
index 8cf549904ae..a839c24be76 100644
--- a/src/plugins/coreplugin/outputpane.h
+++ b/src/plugins/coreplugin/outputpane.h
@@ -39,7 +39,6 @@ QT_BEGIN_NAMESPACE
 class QAction;
 class QComboBox;
 class QToolButton;
-class QToolBar;
 class QStackedWidget;
 class QPushButton;
 QT_END_NAMESPACE
diff --git a/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h b/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h
index 9287e3c6ba8..430ab61a3f5 100644
--- a/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h
+++ b/src/plugins/coreplugin/scriptmanager/metatypedeclarations.h
@@ -43,7 +43,6 @@
 QT_BEGIN_NAMESPACE
 class QMainWindow;
 class QStatusBar;
-class QToolBar;
 class QSettings;
 QT_END_NAMESPACE
 
@@ -60,7 +59,6 @@ Q_DECLARE_METATYPE(Core::ICore*)
 
 Q_DECLARE_METATYPE(QMainWindow*)
 Q_DECLARE_METATYPE(QStatusBar*)
-Q_DECLARE_METATYPE(QToolBar*)
 Q_DECLARE_METATYPE(QSettings*)
 
 #endif // METATYPEDECLARATIONS_H
diff --git a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
index ffbd30dbb4f..df8f7352adb 100644
--- a/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
+++ b/src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
@@ -39,7 +39,6 @@
 #include <QtCore/QSettings>
 
 #include <QtGui/QMainWindow>
-#include <QtGui/QToolBar>
 
 #include <QtScript/QScriptEngine>
 
diff --git a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
index a7fd500acbd..cb18913f690 100644
--- a/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
+++ b/src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
@@ -247,7 +247,6 @@ void ScriptManagerPrivate::ensureEngineInitialized()
     // register QObjects that occur as properties
     SharedTools::registerQObject<QMainWindow>(m_engine);
     SharedTools::registerQObject<QStatusBar>(m_engine);
-    SharedTools::registerQObject<QToolBar>(m_engine);
     SharedTools::registerQObject<QSettings>(m_engine);
     // WB interfaces
 //    SharedTools::registerQObjectInterface<Core::MessageManager, MessageManagerPrototype>(m_engine);
diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index e1489eba810..27cbd4e9c3b 100644
--- a/src/plugins/coreplugin/welcomemode.cpp
+++ b/src/plugins/coreplugin/welcomemode.cpp
@@ -36,7 +36,8 @@
 #include "newdialog.h"
 #include "rssfetcher.h"
 
-#include <QtGui/QToolBar>
+#include <utils/styledbar.h>
+
 #include <QtGui/QDesktopServices>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QScrollArea>
@@ -121,7 +122,7 @@ WelcomeMode::WelcomeMode() :
     QVBoxLayout *l = new QVBoxLayout(m_d->m_widget);
     l->setMargin(0);
     l->setSpacing(0);
-    l->addWidget(new QToolBar(m_d->m_widget));
+    l->addWidget(new Core::Utils::StyledBar(m_d->m_widget));
     m_d->rssFetcher = new RSSFetcher(7, this);
     m_d->m_welcomePage = new QWidget(m_d->m_widget);
     m_d->ui.setupUi(m_d->m_welcomePage);
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 8329d431add..ff9975e013f 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -80,6 +80,7 @@
 #include <QtGui/QShortcut>
 #include <QtGui/QTextEdit>
 #include <QtGui/QComboBox>
+#include <QtGui/QToolBar>
 #include <QtGui/QTreeView>
 #include <QtGui/QSortFilterProxyModel>
 
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index a4dadb51919..b3ca55f0dc1 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -80,7 +80,6 @@
 #include <QtGui/QStatusBar>
 #include <QtGui/QTextBlock>
 #include <QtGui/QTextCursor>
-#include <QtGui/QToolBar>
 #include <QtGui/QToolButton>
 #include <QtGui/QToolTip>
 
diff --git a/src/plugins/debugger/script/scriptengine.h b/src/plugins/debugger/script/scriptengine.h
index ae4a434efc0..a54687df7c0 100644
--- a/src/plugins/debugger/script/scriptengine.h
+++ b/src/plugins/debugger/script/scriptengine.h
@@ -43,7 +43,6 @@ QT_BEGIN_NAMESPACE
 class QAction;
 class QAbstractItemModel;
 class QSplitter;
-class QToolBar;
 class QScriptEngine;
 class QScriptValue;
 QT_END_NAMESPACE
diff --git a/src/plugins/designer/formwindoweditor.h b/src/plugins/designer/formwindoweditor.h
index 43243e5465c..2be6d7c45be 100644
--- a/src/plugins/designer/formwindoweditor.h
+++ b/src/plugins/designer/formwindoweditor.h
@@ -41,6 +41,7 @@ QT_BEGIN_NAMESPACE
 class QDesignerFormWindowInterface;
 class QDesignerFormWindowManagerInterface;
 class QFile;
+class QToolBar;
 QT_END_NAMESPACE
 
 namespace ProjectExplorer {
diff --git a/src/plugins/duieditor/duieditor.cpp b/src/plugins/duieditor/duieditor.cpp
index 13b8c0ac3af..14bb8484571 100644
--- a/src/plugins/duieditor/duieditor.cpp
+++ b/src/plugins/duieditor/duieditor.cpp
@@ -56,6 +56,7 @@
 #include <QtGui/QComboBox>
 #include <QtGui/QInputDialog>
 #include <QtGui/QMainWindow>
+#include <QtGui/QToolBar>
 
 enum {
 	UPDATE_DOCUMENT_DEFAULT_INTERVAL = 250
diff --git a/src/plugins/find/findtoolbar.h b/src/plugins/find/findtoolbar.h
index f1cab5e314f..8985b3419c3 100644
--- a/src/plugins/find/findtoolbar.h
+++ b/src/plugins/find/findtoolbar.h
@@ -38,7 +38,6 @@
 
 #include <QtGui/QStringListModel>
 #include <QtGui/QWidget>
-#include <QtGui/QToolBar>
 #include <QtGui/QLabel>
 
 namespace Find {
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index 504037661a5..56b7b233b4b 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -40,6 +40,7 @@
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/icore.h>
 #include <extensionsystem/pluginmanager.h>
+#include <utils/styledbar.h>
 
 #include <QtCore/QDebug>
 #include <QtGui/QApplication>
@@ -47,7 +48,6 @@
 #include <QtGui/QComboBox>
 #include <QtGui/QScrollArea>
 #include <QtGui/QTabWidget>
-#include <QtGui/QToolBar>
 #include <QtGui/QTreeWidget>
 #include <QtGui/QHeaderView>
 
@@ -106,7 +106,7 @@ ProjectWindow::ProjectWindow(QWidget *parent)
     QVBoxLayout *dummyLayout = new QVBoxLayout(dummy);
     dummyLayout->setMargin(0);
     dummyLayout->setSpacing(0);
-    dummyLayout->addWidget(new QToolBar(dummy));
+    dummyLayout->addWidget(new Core::Utils::StyledBar(dummy));
     dummyLayout->addWidget(m_treeWidget);
 
     QSplitter *splitter = new Core::MiniSplitter;
diff --git a/src/plugins/qtscripteditor/qtscripteditor.cpp b/src/plugins/qtscripteditor/qtscripteditor.cpp
index 00f0e60da6a..ca4e2976741 100644
--- a/src/plugins/qtscripteditor/qtscripteditor.cpp
+++ b/src/plugins/qtscripteditor/qtscripteditor.cpp
@@ -55,6 +55,7 @@
 #include <QtGui/QComboBox>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QMenu>
+#include <QtGui/QToolBar>
 
 enum {
     UPDATE_DOCUMENT_DEFAULT_INTERVAL = 100
-- 
GitLab