Commit a9a5e3ea authored by Friedemann Kleint's avatar Friedemann Kleint

Exported header cleanup.

parent 4aca1742
......@@ -35,9 +35,10 @@
#include "SimpleLexer.h"
#include <QtGui/QTextCursor>
#include <QtGui/QTextBlock>
QT_FORWARD_DECLARE_CLASS(QTextCursor)
namespace CPlusPlus {
class CPLUSPLUS_EXPORT BackwardsScanner
......
......@@ -35,7 +35,7 @@
#define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
#include "CPlusPlusForwardDeclarations.h"
#include <QList>
#include <QtCore/QList>
QT_BEGIN_NAMESPACE
class QString;
......
......@@ -36,7 +36,7 @@
#include "CPlusPlusForwardDeclarations.h"
#include <QIcon>
#include <QtGui/QIcon>
namespace CPlusPlus {
......
......@@ -55,9 +55,9 @@
#include <CPlusPlusForwardDeclarations.h>
#include <QByteArray>
#include <QVector>
#include <QString>
#include <QtCore/QByteArray>
#include <QtCore/QVector>
#include <QtCore/QString>
namespace CPlusPlus {
......
......@@ -36,6 +36,9 @@
#include <Token.h>
#include <QtGui/QTextDocument>
#include <QtGui/QTextCursor>
#include <QtCore/QChar>
#include <QtCore/QtDebug>
using namespace CPlusPlus;
......
......@@ -34,7 +34,9 @@
#define CPLUSPLUS_MATCHINGTEXT_H
#include <CPlusPlusForwardDeclarations.h>
#include <QtGui/QTextCursor>
QT_FORWARD_DECLARE_CLASS(QTextCursor)
QT_FORWARD_DECLARE_CLASS(QChar)
namespace CPlusPlus {
......
......@@ -35,7 +35,7 @@
#define CPLUSPLUS_NAMEPRETTYPRINTER_H
#include <NameVisitor.h>
#include <QString>
#include <QtCore/QString>
namespace CPlusPlus {
......
......@@ -35,7 +35,9 @@
#define CPLUSPLUS_OVERVIEW_H
#include <CPlusPlusForwardDeclarations.h>
#include <QString>
#include <QtCore/QList>
#include <QtCore/QString>
namespace CPlusPlus {
......
......@@ -38,8 +38,7 @@
#include "Overview.h"
#include "Icons.h"
#include <QAbstractItemModel>
#include <QIcon>
#include <QtCore/QAbstractItemModel>
namespace CPlusPlus {
......
......@@ -39,6 +39,7 @@
#include "iplugin.h"
#include "plugincollection.h"
#include <QtCore/QEventLoop>
#include <QtCore/QDateTime>
#include <QtCore/QDir>
#include <QtCore/QMetaProperty>
......
......@@ -36,16 +36,15 @@
#include "pluginspec.h"
#include <QtCore/QList>
#include <QtCore/QSet>
#include <QtCore/QStringList>
#include <QtCore/QObject>
#include <QtCore/QScopedPointer>
#include <QtCore/QEventLoop>
QT_BEGIN_NAMESPACE
class QTime;
class QSettings;
class QEventLoop;
QT_END_NAMESPACE
namespace ExtensionSystem {
......
......@@ -36,8 +36,7 @@
#include <qmleditorwidgets_global.h>
#include <QtGui/QWidget>
#include <QToolButton>
#include <qdeclarative.h>
#include <QtDeclarative/qdeclarative.h>
namespace QmlEditorWidgets {
......
......@@ -35,9 +35,8 @@
#define COLORBUTTON_H
#include <qmleditorwidgets_global.h>
#include <QtGui/QWidget>
#include <QToolButton>
#include <qdeclarative.h>
#include <QtGui/QToolButton>
#include <QtDeclarative/qdeclarative.h>
namespace QmlEditorWidgets {
......
......@@ -35,16 +35,6 @@
#define COLORWIDGET_H
#include <qmleditorwidgets_global.h>
#include <QWeakPointer>
#include <QtGui/QWidget>
#include <QLabel>
#include <QToolButton>
#include <QMouseEvent>
QT_BEGIN_NAMESPACE
class QToolButton;
QT_END_NAMESPACE
namespace QmlEditorWidgets {
......@@ -52,11 +42,8 @@ class QMLEDITORWIDGETS_EXPORT ColorWidgets {
public:
static void registerDeclarativeTypes();
};
} //QmlDesigner
} // namespace QmlEditorWidgets
#endif //COLORWIDGET_H
......@@ -36,8 +36,8 @@
#include "customcolordialog.h"
#include "ui_contextpanetext.h"
#include <qmljs/qmljspropertyreader.h>
#include <QTimerEvent>
#include <QtCore/QTimerEvent>
#include <QtCore/QVariant>
namespace QmlEditorWidgets {
ContextPaneTextWidget::ContextPaneTextWidget(QWidget *parent) :
......
......@@ -35,10 +35,10 @@
#define CONTEXTPANETEXTWIDGET_H
#include <qmleditorwidgets_global.h>
#include <QWidget>
#include <QVariant>
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
class QVariant;
namespace Ui {
class ContextPaneTextWidget;
}
......
......@@ -32,17 +32,19 @@
**************************************************************************/
#include "contextpanewidget.h"
#include <QFontComboBox>
#include <QComboBox>
#include <QSpinBox>
#include <QToolButton>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QLabel>
#include <QMouseEvent>
#include <QGridLayout>
#include <QToolButton>
#include <QAction>
#include <QtGui/QToolButton>
#include <QtGui/QFontComboBox>
#include <QtGui/QComboBox>
#include <QtGui/QSpinBox>
#include <QtGui/QToolButton>
#include <QtGui/QHBoxLayout>
#include <QtGui/QVBoxLayout>
#include <QtGui/QLabel>
#include <QtGui/QMouseEvent>
#include <QtGui/QGridLayout>
#include <QtGui/QToolButton>
#include <QtGui/QGraphicsEffect>
#include <QtGui/QAction>
#include "contextpanetextwidget.h"
#include "easingcontextpane.h"
#include "contextpanewidgetimage.h"
......
......@@ -35,11 +35,15 @@
#define CONTEXTPANEWIDGET_H
#include <qmleditorwidgets_global.h>
#include <QFrame>
#include <QVariant>
#include <QGraphicsEffect>
#include <QWeakPointer>
#include <QToolButton>
#include <QtGui/QFrame>
#include <QtCore/QWeakPointer>
QT_BEGIN_NAMESPACE
class QToolButton;
class QVariant;
class QGraphicsDropShadowEffect;
class QGraphicsOpacityEffect;
QT_END_NAMESPACE
namespace QmlJS {
class PropertyReader;
......
......@@ -35,16 +35,17 @@
#include "ui_contextpanewidgetimage.h"
#include "ui_contextpanewidgetborderimage.h"
#include <qmljs/qmljspropertyreader.h>
#include <QFile>
#include <QFileInfo>
#include <QDir>
#include <QPixmap>
#include <QPainter>
#include <QGraphicsEffect>
#include <QMouseEvent>
#include <QScrollArea>
#include <QSlider>
#include <QDebug>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QDir>
#include <QtGui/QPixmap>
#include <QtGui/QPainter>
#include <QtGui/QGraphicsEffect>
#include <QtGui/QMouseEvent>
#include <QtGui/QScrollArea>
#include <QtGui/QSlider>
#include <QtGui/QToolButton>
#include <QtCore/QDebug>
namespace QmlEditorWidgets {
......
......@@ -35,11 +35,9 @@
#define CONTEXTPANEWIDGETIMAGE_H
#include <qmleditorwidgets_global.h>
#include <QWidget>
#include <QFrame>
#include <QLabel>
#include <qdrawutil.h>
#include <QtGui/QLabel>
#include <contextpanewidget.h>
#include <qdrawutil.h>
QT_BEGIN_NAMESPACE
namespace Ui {
......
......@@ -35,7 +35,7 @@
#define CONTEXTPANEWIDGETRECTANGLE_H
#include <qmleditorwidgets_global.h>
#include <QWidget>
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
namespace Ui {
......
......@@ -35,8 +35,7 @@
#define CUSTOMCOLORDIALOG_H
#include <qmleditorwidgets_global.h>
#include <QFrame>
#include <QDialog>
#include <QtGui/QFrame>
QT_BEGIN_NAMESPACE
class QDoubleSpinBox;
......
......@@ -32,12 +32,17 @@
**************************************************************************/
#include "filewidget.h"
#include <QHBoxLayout>
#include <QFont>
#include <QFileDialog>
#include <QDirIterator>
#include <QDebug>
#include <QtGui/QLabel>
#include <QtGui/QToolButton>
#include <QtGui/QLineEdit>
#include <QtGui/QComboBox>
#include <QtGui/QHBoxLayout>
#include <QtGui/QFont>
#include <QtGui/QFileDialog>
#include <QtCore/QDirIterator>
#include <QtCore/QDebug>
namespace QmlEditorWidgets {
......
......@@ -36,12 +36,17 @@
#define FILEWIDGET_H
#include <qmleditorwidgets_global.h>
#include <QtGui/QWidget>
#include <QLabel>
#include <QToolButton>
#include <QLineEdit>
#include <QComboBox>
#include <QUrl>
#include <QtCore/QUrl>
QT_BEGIN_NAMESPACE
class QLabel;
class QToolButton;
class QLineEdit;
class QComboBox;
QT_END_NAMESPACE
namespace QmlEditorWidgets {
......
......@@ -35,7 +35,7 @@
#define FONTSIZESPINBOX_H
#include <qmleditorwidgets_global.h>
#include <QAbstractSpinBox>
#include <QtGui/QAbstractSpinBox>
namespace QmlEditorWidgets {
......
......@@ -36,8 +36,7 @@
#include <qmleditorwidgets_global.h>
#include <QtGui/QWidget>
#include <QToolButton>
#include <QLinearGradient>
#include <QtGui/QLinearGradient>
namespace QmlEditorWidgets {
......
......@@ -36,8 +36,7 @@
#include <qmleditorwidgets_global.h>
#include <QtGui/QWidget>
#include <QToolButton>
#include <qdeclarative.h>
#include <QtDeclarative/qdeclarative.h>
namespace QmlEditorWidgets {
......
......@@ -38,11 +38,9 @@
#include "qmljsscanner.h"
#include <QtCore/QChar>
#include <QtCore/QStack>
#include <QtCore/QList>
#include <QtCore/QVector>
#include <QtCore/QPointer>
QT_BEGIN_NAMESPACE
class QTextDocument;
......
......@@ -34,21 +34,19 @@
#ifndef QMLJSICONTEXTPANE_H
#define QMLJSICONTEXTPANE_H
#include <QObject>
#include <QtCore/QObject>
#include "qmljs_global.h"
#include <qmljs/parser/qmljsastfwd_p.h>
#include <qmljs/qmljslookupcontext.h>
namespace TextEditor {
class BaseTextEditorEditable;
} //TextEditor
namespace QmlJS {
class QMLJS_EXPORT IContextPane : public QObject
{
Q_OBJECT
......
......@@ -72,7 +72,8 @@
#include <qmljs/qmljsindenter.h>
#include <qmljs/qmljsscanner.h>
#include <QtDebug>
#include <QtCore/QtDebug>
#include <QtGui/QTextBlock>
using namespace QmlJS;
......
......@@ -35,12 +35,11 @@
#define QMLJSINDENTER_H
#include <qmljs/qmljs_global.h>
#include <qmljs/qmljsscanner.h>
#include <qmljs/qmljslineinfo.h>
#include <QtCore/QRegExp>
#include <QtCore/QStringList>
#include <QtGui/QTextBlock>
QT_FORWARD_DECLARE_CLASS(QTextBlock)
namespace QmlJS {
......
......@@ -38,9 +38,7 @@
#include <qmljs/qmljsscanner.h>
#include <QtCore/QRegExp>
#include <QtCore/QStringList>
#include <QtGui/QTextBlock>
#include <QtGui/QTextCursor>
namespace QmlJS {
......
......@@ -38,9 +38,6 @@
#include <qmljs/qmljsinterpreter.h>
#include <qmljs/parser/qmljsastfwd_p.h>
#include <QtCore/QList>
#include <QtCore/QHash>
#include <QtCore/QStringList>
#include <QtCore/QCoreApplication>
namespace QmlJS {
......
......@@ -39,10 +39,9 @@
#include <utils/environment.h>
#include <QObject>
#include <QStringList>
#include <QSharedPointer>
#include <QPointer>
#include <QtCore/QObject>
#include <QtCore/QStringList>
#include <QtCore/QPointer>
namespace ProjectExplorer {
class Project;
......
......@@ -36,6 +36,8 @@
#include <qmljs/parser/qmljsast_p.h>
#include <qmljs/qmljscheck.h>
#include <QtGui/QLinearGradient>
namespace QmlJS {
using namespace AST;
......
......@@ -38,12 +38,11 @@
#include <qmljs/parser/qmljsastfwd_p.h>
#include <qmljs/qmljsdocument.h>
#include <QHash>
#include <QList>
#include <QVariant>
#include <QString>
#include <QStringList>
#include <QLinearGradient>
#include <QtCore/QHash>
#include <QtCore/QVariant>
#include <QtCore/QStringList>
QT_FORWARD_DECLARE_CLASS(QLinearGradient)
namespace QmlJS {
......
......@@ -36,9 +36,7 @@
#include <qmljs/qmljs_global.h>
#include <QtCore/QList>
#include <QtCore/QSet>
#include <QtCore/QString>
#include <QtCore/QStringList>
namespace QmlJS {
......
......@@ -37,7 +37,6 @@
#include "utils_global.h"
#include <QtCore/QString>
#include <QtCore/QSize>
#include <QtGui/QStyledItemDelegate>
namespace Utils {
......
......@@ -3,7 +3,7 @@
#include "utils_global.h"
#include <QString>
#include <QtCore/QString>
QT_FORWARD_DECLARE_CLASS(QFileInfo)
......
......@@ -41,6 +41,8 @@
#include "changeset.h"
#include <QtGui/QTextCursor>
namespace Utils {
ChangeSet::ChangeSet()
......
......@@ -46,8 +46,8 @@
#include <QtCore/QString>
#include <QtCore/QList>
#include <QtCore/QSharedPointer>
#include <QtGui/QTextCursor>
QT_FORWARD_DECLARE_CLASS(QTextCursor)
namespace Utils {
......
......@@ -32,13 +32,15 @@
**************************************************************************/
#include "wizard.h"
#include <QLabel>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QMap>
#include <QHash>
#include <QVariant>
#include <QStyle>
#include <QtCore/QMap>
#include <QtCore/QHash>
#include <QtCore/QVariant>
#include <QtGui/QLabel>
#include <QtGui/QVBoxLayout>
#include <QtGui/QHBoxLayout>
#include <QtGui/QStyle>
namespace Utils {
......
......@@ -34,8 +34,6 @@
#ifndef WIZARD_H
#define WIZARD_H
#include <QWizard>
#include "utils_global.h"
#include <QtGui/QWizard>
......@@ -65,7 +63,7 @@ public:
signals:
void nextClicked(); /* workaround for QWizard behavior where page->initialize is
called before currentIdChanged */
* called before currentIdChanged */
private slots:
void _q_currentPageChanged(int pageId);
......
......@@ -50,6 +50,7 @@
#include <cpptools/cpprefactoringchanges.h>
#include <QtGui/QTextBlock>
#include <QtCore/QFileInfo>
using namespace CppEditor;
using namespace CppEditor::Internal;
......
......@@ -61,6 +61,7 @@
#include <cpptools/insertionpointlocator.h>
#include <extensionsystem/iplugin.h>
#include <QtCore/QFileInfo>
#include <QtGui/QApplication>
#include <QtGui/QTextBlock>
#include <QtGui/QTextCursor>
......
......@@ -32,7 +32,10 @@
**************************************************************************/
#include "uicodecompletionsupport.h"
#include <QtCore/QProcess>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
enum { debug = 0 };
......
......@@ -42,6 +42,7 @@
#include <QtCore/QDebug>
#include <QtGui/QTextCursor>
#include <QtGui/QTextBlock>
namespace CVS {
namespace Internal {
......
......@@ -373,6 +373,11 @@ QStringListModel *FindPlugin::replaceCompletionModel() const
return d->m_replaceCompletionModel;
}
QKeySequence IFindFilter::defaultShortcut() const
{
return QKeySequence();
}
} // namespace Find
// declared in textfindconstants.h
......
......@@ -37,12 +37,10 @@
#include "find_global.h"
#include "textfindconstants.h"
#include <QtGui/QTextDocument>
#include <QtGui/QKeySequence>
QT_BEGIN_NAMESPACE
class QWidget;
class QSettings;
class QKeySequence;
QT_END_NAMESPACE
namespace Find {
......@@ -60,7 +58,7 @@ public:
virtual bool isEnabled() const = 0;
virtual bool canCancel() const = 0;
virtual void cancel() = 0;
virtual QKeySequence defaultShortcut() const { return QKeySequence(); }
virtual QKeySequence defaultShortcut() const;
virtual bool isReplaceSupported() const { return false; }
virtual FindFlags supportedFindFlags() const;
......
......@@ -39,7 +39,6 @@
#include <QtCore/QObject>