diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 37a0317e7fc07d56b98f566c96743edcf92fd39b..4f854b713815ba1fd48acd1f7b55b1c5c3377b94 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 e6760f4b240c54c7e7d2526acbeb80a2bb076f82..eab8a818483d81aafb22bb66ae0659417736279b 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 7539b91ee0cdb4b2bda8846f0b987ad835ef47b6..050e3ee3d62662b4c77d3c58ceb561f5c3aab484 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 c3db702b51d0d646f433258df13dca732da397a9..996ec8df944346c4584d9f3d9bda798e7a2da944 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 c8a8d173eaa66395e85a18c9a26bca0c5ed1a80a..23f2e6535c9805d1c04d7466c519da9f4dd49982 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 1767b88febf5553362c36c7a1e1256a67a241301..403644f9a4c2fe7f0f5f7111e0c7873116b2ba2a 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 e84147941095c9e97b239856d81b2458a33376ec..249073cd1e7baba8239f1c093189271869d5201e 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 c8aee5895e8a5e1a1106c272f7fc8cdcdc9f0ac7..47c0a3e1fafd6675f97f89f1293aab97701e5fc3 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 4920ff031ee96a2fa9d80262a37d9b0614f3cdf5..b47b2f3ae76afa4fc990d31bd598bda985778341 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 8cf549904aeef4e3c36863b5c94c5be28e1b91c1..a839c24be76b9acb50b0af8b91e4a67d3a89ef94 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 9287e3c6ba8722bee2258a5d30791704e24a8d12..430ab61a3f54841797c7162f41af13169af443b8 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 ffbd30dbb4f4704128e6a4a397738987e83041ee..df8f7352adbf6b28307223f4e3e7c55f5964ea9a 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 a7fd500acbd8570993c4d15247ceab383c14c2c3..cb18913f690e7d2a46be4210aa471d88c971ce4e 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 e1489eba8103e44a609143e4e8af0eb5be9d0438..27cbd4e9c3bb680427497e31e9aea8d697871117 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 8329d431addd439629a87349c1eb17b761f8c991..ff9975e013f0918792d35c7d24d27b71473d99e3 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 a4dadb51919075e8df2368e85959e97c86ca720f..b3ca55f0dc17e9fe36133f9e37038103f8b8fd48 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 ae4a434efc007c71a1d6f0107917de3a6c7bf2f4..a54687df7c07514352681b9b7b13d6150db56cd1 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 43243e5465cb0cada7a14ee27c993b02c993e33b..2be6d7c45be40f5d360e765c8460eff525f428cc 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 13b8c0ac3afb162181f2e896f42c7c9e840d7041..14bb84845710158ffff75d014b31505f5705abd2 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 f1cab5e314f636e003b290bed95528f855cf6c56..8985b3419c3efce9399a42e2e4805052f20a776a 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 504037661a57fa4e0a2175c3d86fef3f15cdcb73..56b7b233b4bc74bbab9923647f6919c81172d6cc 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 00f0e60da6aaac1b2273aa8920d3b32adfbd1cd0..ca4e2976741f6a61bf513275d3c0898c6c16a1cc 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