Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
6a88525a
Commit
6a88525a
authored
Jul 16, 2009
by
con
Browse files
Some more QToolBar changes.
parent
64262ee6
Changes
22
Hide whitespace changes
Inline
Side-by-side
src/plugins/bineditor/bineditorplugin.cpp
View file @
6a88525a
...
...
@@ -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>
...
...
src/plugins/coreplugin/actionmanager/actioncontainer.cpp
View file @
6a88525a
...
...
@@ -37,7 +37,6 @@
#include <QtCore/QDebug>
#include <QtGui/QAction>
#include <QtGui/QToolBar>
#include <QtGui/QMenuBar>
Q_DECLARE_METATYPE
(
Core
::
Internal
::
MenuActionContainer
*
)
...
...
src/plugins/coreplugin/actionmanager/actioncontainer.h
View file @
6a88525a
...
...
@@ -32,7 +32,6 @@
#include <QtCore/QObject>
#include <QtGui/QMenu>
#include <QtGui/QToolBar>
#include <QtGui/QMenuBar>
#include <QtGui/QAction>
...
...
src/plugins/coreplugin/editormanager/editorview.h
View file @
6a88525a
...
...
@@ -46,7 +46,6 @@
QT_BEGIN_NAMESPACE
class
QComboBox
;
class
QToolBar
;
class
QToolButton
;
class
QLabel
;
class
QStackedWidget
;
...
...
src/plugins/coreplugin/editormanager/ieditor.h
View file @
6a88525a
...
...
@@ -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
...
...
src/plugins/coreplugin/fancytabwidget.cpp
View file @
6a88525a
...
...
@@ -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
*
l
ayout
=
new
QHBoxLayout
;
l
ayout
->
setMargin
(
0
);
l
ayout
->
setSpacing
(
1
);
l
ayout
->
addWidget
(
m_selectionWidget
);
l
ayout
->
addLayout
(
vlayout
);
setLayout
(
l
ayout
);
QHBoxLayout
*
mainL
ayout
=
new
QHBoxLayout
;
mainL
ayout
->
setMargin
(
0
);
mainL
ayout
->
setSpacing
(
1
);
mainL
ayout
->
addWidget
(
m_selectionWidget
);
mainL
ayout
->
addLayout
(
vlayout
);
setLayout
(
mainL
ayout
);
connect
(
m_tabBar
,
SIGNAL
(
currentChanged
(
int
)),
this
,
SLOT
(
showWidget
(
int
)));
}
...
...
src/plugins/coreplugin/mainwindow.cpp
View file @
6a88525a
...
...
@@ -84,7 +84,6 @@
#include <QtGui/QPrinter>
#include <QtGui/QShortcut>
#include <QtGui/QStatusBar>
#include <QtGui/QToolBar>
#include <QtGui/QWizard>
/*
...
...
src/plugins/coreplugin/navigationwidget.h
View file @
6a88525a
...
...
@@ -36,7 +36,6 @@
#include <QtGui/QWidget>
#include <QtGui/QComboBox>
#include <QtGui/QSplitter>
#include <QtGui/QToolBar>
#include <QtGui/QToolButton>
QT_BEGIN_NAMESPACE
...
...
src/plugins/coreplugin/outputpane.cpp
View file @
6a88525a
...
...
@@ -52,7 +52,6 @@
#include <QtGui/QMenu>
#include <QtGui/QPainter>
#include <QtGui/QPushButton>
#include <QtGui/QToolBar>
#include <QtGui/QToolButton>
#include <QtGui/QStackedWidget>
...
...
src/plugins/coreplugin/outputpane.h
View file @
6a88525a
...
...
@@ -39,7 +39,6 @@ QT_BEGIN_NAMESPACE
class
QAction
;
class
QComboBox
;
class
QToolButton
;
class
QToolBar
;
class
QStackedWidget
;
class
QPushButton
;
QT_END_NAMESPACE
...
...
src/plugins/coreplugin/scriptmanager/metatypedeclarations.h
View file @
6a88525a
...
...
@@ -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
src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
View file @
6a88525a
...
...
@@ -39,7 +39,6 @@
#include <QtCore/QSettings>
#include <QtGui/QMainWindow>
#include <QtGui/QToolBar>
#include <QtScript/QScriptEngine>
...
...
src/plugins/coreplugin/scriptmanager/scriptmanager.cpp
View file @
6a88525a
...
...
@@ -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);
...
...
src/plugins/coreplugin/welcomemode.cpp
View file @
6a88525a
...
...
@@ -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
QTool
Bar
(
m_d
->
m_widget
));
l
->
addWidget
(
new
Core
::
Utils
::
Styled
Bar
(
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
);
...
...
src/plugins/cppeditor/cppeditor.cpp
View file @
6a88525a
...
...
@@ -80,6 +80,7 @@
#include <QtGui/QShortcut>
#include <QtGui/QTextEdit>
#include <QtGui/QComboBox>
#include <QtGui/QToolBar>
#include <QtGui/QTreeView>
#include <QtGui/QSortFilterProxyModel>
...
...
src/plugins/debugger/debuggermanager.cpp
View file @
6a88525a
...
...
@@ -80,7 +80,6 @@
#include <QtGui/QStatusBar>
#include <QtGui/QTextBlock>
#include <QtGui/QTextCursor>
#include <QtGui/QToolBar>
#include <QtGui/QToolButton>
#include <QtGui/QToolTip>
...
...
src/plugins/debugger/script/scriptengine.h
View file @
6a88525a
...
...
@@ -43,7 +43,6 @@ QT_BEGIN_NAMESPACE
class
QAction
;
class
QAbstractItemModel
;
class
QSplitter
;
class
QToolBar
;
class
QScriptEngine
;
class
QScriptValue
;
QT_END_NAMESPACE
...
...
src/plugins/designer/formwindoweditor.h
View file @
6a88525a
...
...
@@ -41,6 +41,7 @@ QT_BEGIN_NAMESPACE
class
QDesignerFormWindowInterface
;
class
QDesignerFormWindowManagerInterface
;
class
QFile
;
class
QToolBar
;
QT_END_NAMESPACE
namespace
ProjectExplorer
{
...
...
src/plugins/duieditor/duieditor.cpp
View file @
6a88525a
...
...
@@ -56,6 +56,7 @@
#include <QtGui/QComboBox>
#include <QtGui/QInputDialog>
#include <QtGui/QMainWindow>
#include <QtGui/QToolBar>
enum
{
UPDATE_DOCUMENT_DEFAULT_INTERVAL
=
250
...
...
src/plugins/find/findtoolbar.h
View file @
6a88525a
...
...
@@ -38,7 +38,6 @@
#include <QtGui/QStringListModel>
#include <QtGui/QWidget>
#include <QtGui/QToolBar>
#include <QtGui/QLabel>
namespace
Find
{
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment