Commit edb48935 authored by Friedemann Kleint's avatar Friedemann Kleint

Header cleanup in src, specify module name.

parent 2a10a810
......@@ -38,8 +38,8 @@
#include <Literals.h>
#include <Symbols.h>
#include <QFile>
#include <QtDebug>
#include <QtCore/QFile>
#include <QtCore/QtDebug>
using namespace CPlusPlus;
......
......@@ -32,8 +32,8 @@
**************************************************************************/
#include "colorbox.h"
#include <QPainter>
#include <QMouseEvent>
#include <QtGui/QPainter>
#include <QtGui/QMouseEvent>
static inline QString properName(const QColor &color)
{
......
......@@ -32,7 +32,7 @@
**************************************************************************/
#include "colorbutton.h"
#include <QPainter>
#include <QtGui/QPainter>
static inline QPixmap tilePixMap(int size)
{
......
......@@ -37,7 +37,7 @@
#include <qmljs/qmljspropertyreader.h>
#include <qmljs/qmljscheck.h>
#include <customcolordialog.h>
#include <QDebug>
#include <QtCore/QDebug>
namespace QmlEditorWidgets {
......
......@@ -32,18 +32,18 @@
**************************************************************************/
#include "customcolordialog.h"
#include <QHBoxLayout>
#include <QLabel>
#include <QPainter>
#include <QDoubleSpinBox>
#include <QGridLayout>
#include <QPushButton>
#include <QDialogButtonBox>
#include <QGraphicsEffect>
#include "huecontrol.h"
#include "colorbox.h"
#include <QtGui/QHBoxLayout>
#include <QtGui/QLabel>
#include <QtGui/QPainter>
#include <QtGui/QDoubleSpinBox>
#include <QtGui/QGridLayout>
#include <QtGui/QPushButton>
#include <QtGui/QDialogButtonBox>
#include <QtGui/QGraphicsEffect>
namespace QmlEditorWidgets {
CustomColorDialog::CustomColorDialog(QWidget *parent) : QFrame(parent )
......
......@@ -35,10 +35,10 @@
#include "ui_easingcontextpane.h"
#include <qmljs/qmljspropertyreader.h>
#include <QGraphicsPixmapItem>
#include <QGraphicsScene>
#include <QPropertyAnimation>
#include <QSequentialAnimationGroup>
#include <QtGui/QGraphicsPixmapItem>
#include <QtGui/QGraphicsScene>
#include <QtCore/QPropertyAnimation>
#include <QtCore/QSequentialAnimationGroup>
namespace QmlEditorWidgets {
......
......@@ -34,13 +34,12 @@
#ifndef EASINGCONTEXTPANE_H
#define EASINGCONTEXTPANE_H
#include <QWidget>
#include <QVariant>
#include "easinggraph.h"
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
class QVariant;
namespace Ui {
class EasingContextPane;
}
......
......@@ -33,69 +33,66 @@
#include "easinggraph.h"
#include <QPainter>
#include <QStyleOptionGraphicsItem>
#include <QtGui/QPainter>
#include <QtGui/QStyleOptionGraphicsItem>
#include <math.h>
QT_BEGIN_NAMESPACE
EasingGraph::EasingGraph(QWidget *parent):QWidget(parent)
EasingGraph::EasingGraph(QWidget *parent):QWidget(parent),
m_color(Qt::magenta), m_zeroColor(Qt::gray),m_duration(0),
m_easingExtremes(QLatin1String("In"))
{
// setFlag(QGraphicsItem::ItemHasNoContents, false);
// populate the hash
m_availableNames["Linear"]=QEasingCurve::Linear;
m_availableNames["InQuad"]=QEasingCurve::InQuad;
m_availableNames["OutQuad"]=QEasingCurve::OutQuad;
m_availableNames["InOutQuad"]=QEasingCurve::InOutQuad;
m_availableNames["OutInQuad"]=QEasingCurve::OutInQuad;
m_availableNames["InCubic"]=QEasingCurve::InCubic;
m_availableNames["OutCubic"]=QEasingCurve::OutCubic;
m_availableNames["InOutCubic"]=QEasingCurve::InOutCubic;
m_availableNames["OutInCubic"]=QEasingCurve::OutInCubic;
m_availableNames["InQuart"]=QEasingCurve::InQuart;
m_availableNames["OutQuart"]=QEasingCurve::OutQuart;
m_availableNames["InOutQuart"]=QEasingCurve::InOutQuart;
m_availableNames["OutInQuart"]=QEasingCurve::OutInQuart;
m_availableNames["InQuint"]=QEasingCurve::InQuint;
m_availableNames["OutQuint"]=QEasingCurve::OutQuint;
m_availableNames["InOutQuint"]=QEasingCurve::InOutQuint;
m_availableNames["OutInQuint"]=QEasingCurve::OutInQuint;
m_availableNames["InSine"]=QEasingCurve::InSine;
m_availableNames["OutSine"]=QEasingCurve::OutSine;
m_availableNames["InOutSine"]=QEasingCurve::InOutSine;
m_availableNames["OutInSine"]=QEasingCurve::OutInSine;
m_availableNames["InExpo"]=QEasingCurve::InExpo;
m_availableNames["OutExpo"]=QEasingCurve::OutExpo;
m_availableNames["InOutExpo"]=QEasingCurve::InOutExpo;
m_availableNames["OutInExpo"]=QEasingCurve::OutInExpo;
m_availableNames["InCirc"]=QEasingCurve::InCirc;
m_availableNames["OutCirc"]=QEasingCurve::OutCirc;
m_availableNames["InOutCirc"]=QEasingCurve::InOutCirc;
m_availableNames["OutInCirc"]=QEasingCurve::OutInCirc;
m_availableNames["InElastic"]=QEasingCurve::InElastic;
m_availableNames["OutElastic"]=QEasingCurve::OutElastic;
m_availableNames["InOutElastic"]=QEasingCurve::InOutElastic;
m_availableNames["OutInElastic"]=QEasingCurve::OutInElastic;
m_availableNames["InBack"]=QEasingCurve::InBack;
m_availableNames["OutBack"]=QEasingCurve::OutBack;
m_availableNames["InOutBack"]=QEasingCurve::InOutBack;
m_availableNames["OutInBack"]=QEasingCurve::OutInBack;
m_availableNames["InBounce"]=QEasingCurve::InBounce;
m_availableNames["OutBounce"]=QEasingCurve::OutBounce;
m_availableNames["InOutBounce"]=QEasingCurve::InOutBounce;
m_availableNames["OutInBounce"]=QEasingCurve::OutInBounce;
m_availableNames["InCurve"]=QEasingCurve::InCurve;
m_availableNames["OutCurve"]=QEasingCurve::OutCurve;
m_availableNames["SineCurve"]=QEasingCurve::SineCurve;
m_availableNames["CosineCurve"]=QEasingCurve::CosineCurve;
m_color = Qt::magenta;
m_zeroColor = Qt::gray;
m_easingExtremes = "In";
m_availableNames.insert(QLatin1String("Linear"), QEasingCurve::Linear);
m_availableNames.insert(QLatin1String("InQuad"), QEasingCurve::InQuad);
m_availableNames.insert(QLatin1String("OutQuad"), QEasingCurve::OutQuad);
m_availableNames.insert(QLatin1String("InOutQuad"), QEasingCurve::InOutQuad);
m_availableNames.insert(QLatin1String("OutInQuad"), QEasingCurve::OutInQuad);
m_availableNames.insert(QLatin1String("InCubic"), QEasingCurve::InCubic);
m_availableNames.insert(QLatin1String("OutCubic"), QEasingCurve::OutCubic);
m_availableNames.insert(QLatin1String("InOutCubic"), QEasingCurve::InOutCubic);
m_availableNames.insert(QLatin1String("OutInCubic"), QEasingCurve::OutInCubic);
m_availableNames.insert(QLatin1String("InQuart"), QEasingCurve::InQuart);
m_availableNames.insert(QLatin1String("OutQuart"), QEasingCurve::OutQuart);
m_availableNames.insert(QLatin1String("InOutQuart"), QEasingCurve::InOutQuart);
m_availableNames.insert(QLatin1String("OutInQuart"), QEasingCurve::OutInQuart);
m_availableNames.insert(QLatin1String("InQuint"), QEasingCurve::InQuint);
m_availableNames.insert(QLatin1String("OutQuint"), QEasingCurve::OutQuint);
m_availableNames.insert(QLatin1String("InOutQuint"), QEasingCurve::InOutQuint);
m_availableNames.insert(QLatin1String("OutInQuint"), QEasingCurve::OutInQuint);
m_availableNames.insert(QLatin1String("InSine"), QEasingCurve::InSine);
m_availableNames.insert(QLatin1String("OutSine"), QEasingCurve::OutSine);
m_availableNames.insert(QLatin1String("InOutSine"), QEasingCurve::InOutSine);
m_availableNames.insert(QLatin1String("OutInSine"), QEasingCurve::OutInSine);
m_availableNames.insert(QLatin1String("InExpo"), QEasingCurve::InExpo);
m_availableNames.insert(QLatin1String("OutExpo"), QEasingCurve::OutExpo);
m_availableNames.insert(QLatin1String("InOutExpo"), QEasingCurve::InOutExpo);
m_availableNames.insert(QLatin1String("OutInExpo"), QEasingCurve::OutInExpo);
m_availableNames.insert(QLatin1String("InCirc"), QEasingCurve::InCirc);
m_availableNames.insert(QLatin1String("OutCirc"), QEasingCurve::OutCirc);
m_availableNames.insert(QLatin1String("InOutCirc"), QEasingCurve::InOutCirc);
m_availableNames.insert(QLatin1String("OutInCirc"), QEasingCurve::OutInCirc);
m_availableNames.insert(QLatin1String("InElastic"), QEasingCurve::InElastic);
m_availableNames.insert(QLatin1String("OutElastic"), QEasingCurve::OutElastic);
m_availableNames.insert(QLatin1String("InOutElastic"), QEasingCurve::InOutElastic);
m_availableNames.insert(QLatin1String("OutInElastic"), QEasingCurve::OutInElastic);
m_availableNames.insert(QLatin1String("InBack"), QEasingCurve::InBack);
m_availableNames.insert(QLatin1String("OutBack"), QEasingCurve::OutBack);
m_availableNames.insert(QLatin1String("InOutBack"), QEasingCurve::InOutBack);
m_availableNames.insert(QLatin1String("OutInBack"), QEasingCurve::OutInBack);
m_availableNames.insert(QLatin1String("InBounce"), QEasingCurve::InBounce);
m_availableNames.insert(QLatin1String("OutBounce"), QEasingCurve::OutBounce);
m_availableNames.insert(QLatin1String("InOutBounce"), QEasingCurve::InOutBounce);
m_availableNames.insert(QLatin1String("OutInBounce"), QEasingCurve::OutInBounce);
m_availableNames.insert(QLatin1String("InCurve"), QEasingCurve::InCurve);
m_availableNames.insert(QLatin1String("OutCurve"), QEasingCurve::OutCurve);
m_availableNames.insert(QLatin1String("SineCurve"), QEasingCurve::SineCurve);
m_availableNames.insert(QLatin1String("CosineCurve"), QEasingCurve::CosineCurve);
}
EasingGraph::~EasingGraph()
{
}
......
......@@ -34,10 +34,9 @@
#ifndef EASINGGRAPH_H
#define EASINGGRAPH_H
//#include <QtDeclarative/qdeclarativeitem.h>
#include <QWidget>
#include <QEasingCurve>
#include <QHash>
#include <QtGui/QWidget>
#include <QtCore/QEasingCurve>
#include <QtCore/QHash>
QT_BEGIN_HEADER
......
......@@ -33,8 +33,8 @@
#include "fontsizespinbox.h"
#include <QLineEdit>
#include <QRegExpValidator>
#include <QtGui/QLineEdit>
#include <QtGui/QRegExpValidator>
namespace QmlEditorWidgets {
......
......@@ -32,8 +32,8 @@
**************************************************************************/
#include "gradientline.h"
#include <QPainter>
#include <QMouseEvent>
#include <QtGui/QPainter>
#include <QtGui/QMouseEvent>
static inline QPixmap tilePixMap(int size)
{
......
......@@ -32,8 +32,8 @@
**************************************************************************/
#include "huecontrol.h"
#include <QPainter>
#include <QMouseEvent>
#include <QtGui/QPainter>
#include <QtGui/QMouseEvent>
static inline int clamp(int x, int lower, int upper)
{
......
......@@ -45,7 +45,7 @@
#include "qmljsnodepool_p.h"
#include <qnumeric.h>
#include <QHash>
#include <QtCore/QHash>
QT_QML_BEGIN_NAMESPACE
......
......@@ -39,20 +39,18 @@
**
****************************************************************************/
#include <QtCore/QtDebug>
#include <QtGui/QApplication>
#include <string.h>
#include "qmljsparser_p.h"
#include "qmljsengine_p.h"
#include "qmljslexer_p.h"
#include "qmljsast_p.h"
#include "qmljsnodepool_p.h"
#include <QtCore/QtDebug>
#include <QtCore/QVarLengthArray>
#include <QtGui/QApplication>
#include "qmljsparser_p.h"
#include <QVarLengthArray>
#include <string.h>
//
// This file is automatically generated from qmljs.g.
......
......@@ -33,7 +33,7 @@
#include <qmljs/qmljsscanner.h>
#include <QTextCharFormat>
#include <QtGui/QTextCharFormat>
using namespace QmlJS;
......
......@@ -41,7 +41,7 @@
#include "qpacketprotocol_p.h"
#include <QBuffer>
#include <QtCore/QBuffer>
namespace QmlJsDebugClient {
......
......@@ -44,7 +44,7 @@
#include <utils/synchronousprocess.h>
#include <QtGui/QDesktopServices>
#include <QDebug>
#include <QtCore/QDebug>
namespace Utils {
......
......@@ -37,7 +37,7 @@
#include "utils_global.h"
#include <QtGui/QWidget>
#include <QVariant>
#include <QtCore/QVariant>
QT_FORWARD_DECLARE_CLASS(QResizeEvent)
......
......@@ -34,7 +34,7 @@
#include "fileinprojectfinder.h"
#include <utils/qtcassert.h>
#include <QFileInfo>
#include <QtCore/QFileInfo>
namespace Utils {
......
......@@ -32,15 +32,16 @@
**************************************************************************/
#include "historycompleter.h"
#include <QLineEdit>
#include <QCompleter>
#include <QAbstractListModel>
#include <QSettings>
#include <QKeyEvent>
#include <QItemDelegate>
#include <QListView>
#include <QPainter>
#include <QStyle>
#include <QtCore/QAbstractListModel>
#include <QtCore/QSettings>
#include <QtGui/QLineEdit>
#include <QtGui/QKeyEvent>
#include <QtGui/QItemDelegate>
#include <QtGui/QListView>
#include <QtGui/QPainter>
#include <QtGui/QStyle>
namespace Utils {
......
......@@ -34,7 +34,7 @@
#ifndef QTCPROCESS_H
#define QTCPROCESS_H
#include <QProcess>
#include <QtCore/QProcess>
#include "utils_global.h"
......
......@@ -35,7 +35,7 @@
#include <utils/stylehelper.h>
#include <utils/styledbar.h>
#include <QDebug>
#include <QtCore/QDebug>
#include <QtGui/QColorDialog>
#include <QtGui/QHBoxLayout>
......
......@@ -33,8 +33,8 @@
#include "flowlayout.h"
#include <QRect>
#include <QWidgetItem>
#include <QtCore/QRect>
#include <QtGui/QWidgetItem>
using namespace Core::Internal;
......
......@@ -42,7 +42,7 @@
#include <QtSql/QSqlDatabase>
#include <QtSql/QSqlError>
#include <QtSql/QSqlQuery>
#include <QDebug>
#include <QtCore/QDebug>
/*!
\class Core::SettingsDatabase
......
......@@ -31,9 +31,10 @@
**
**************************************************************************/
#include <QString>
#include "cppdoxygen.h"
#include <QtCore/QString>
using namespace CppTools;
/*
......
......@@ -33,6 +33,8 @@
#include "cpptools_global.h"
QT_FORWARD_DECLARE_CLASS(QChar)
namespace CppTools {
enum DoxygenReservedWord {
......
......@@ -43,9 +43,9 @@
#endif
#include <functional>
#include <QtConcurrentRun>
#include <QtCore/QtConcurrentRun>
#ifndef ICHECK_BUILD
# include <QFutureSynchronizer>
# include <QtCore/QFutureSynchronizer>
# include <qtconcurrent/runextensions.h>
# include <texteditor/itexteditor.h>
# include <texteditor/basetexteditor.h>
......@@ -59,7 +59,7 @@
# include <coreplugin/progressmanager/progressmanager.h>
# include <extensionsystem/pluginmanager.h>
#else
# include <QDir>
# include <QtCore/QDir>
#endif
#include <utils/qtcassert.h>
......
......@@ -39,9 +39,9 @@
#include "debuggercore.h"
#include "debuggerstringutils.h"
#include <QDir>
#include <QFile>
#include <QTemporaryFile>
#include <QtCore/QDir>
#include <QtCore/QFile>
#include <QtCore/QTemporaryFile>
#include <utils/qtcassert.h>
......
#include <QtCore/QCoreApplication>
#include <QtNetwork/QLocalSocket>
#include "lldbengineguest.h"
#include <cstdio>
#include <QSocketNotifier>
#include <QQueue>
#include <QtNetwork/QLocalSocket>
#include <QtCore/QCoreApplication>
#include <QtCore/QSocketNotifier>
#include <QtCore/QQueue>
#include <cstdio>
// #define DO_STDIO_DEBUG 1
#ifdef DO_STDIO_DEBUG
......
......@@ -38,12 +38,14 @@
#include "threaddata.h"
#include "debuggerstreamops.h"
#include <QSysInfo>
#include <QDebug>
#include <QFileInfo>
#include <QTimer>
#include <utils/qtcassert.h>
#include <QLocalSocket>
#include <QtNetwork/QLocalSocket>
#include <QtCore/QSysInfo>
#include <QtCore/QDebug>
#include <QtCore/QFileInfo>
#include <QtCore/QTimer>
#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
#define SET_NATIVE_BYTE_ORDER(x) x.setByteOrder(QDataStream::LittleEndian)
......
......@@ -51,11 +51,11 @@
#include <utils/qtcassert.h>
#include <QSysInfo>
#include <QDebug>
#include <QFileInfo>
#include <QTimer>
#include <QLocalSocket>
#include <QtCore/QSysInfo>
#include <QtCore/QDebug>
#include <QtCore/QFileInfo>
#include <QtCore/QTimer>
#include <QtNetwork/QLocalSocket>
#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
#define SET_NATIVE_BYTE_ORDER(x) x.setByteOrder(QDataStream::LittleEndian)
......
......@@ -34,7 +34,7 @@
#ifndef DEBUGGER_MODULESWINDOW_H
#define DEBUGGER_MODULESWINDOW_H
#include <QTreeView>
#include <QtGui/QTreeView>
namespace Debugger {
namespace Internal {
......
......@@ -44,10 +44,10 @@
#include <utils/qtcassert.h>
#include <QDesignerFormWindowInterface>
#include <QDesignerFormWindowManagerInterface>
#include <QDesignerFormEditorInterface>
#include <QDesignerPropertyEditorInterface>
#include <QtDesigner/QDesignerFormWindowInterface>
#include <QtDesigner/QDesignerFormWindowManagerInterface>
#include <QtDesigner/QDesignerFormEditorInterface>
#include <QtDesigner/QDesignerPropertyEditorInterface>
#include <QtCore/QDebug>
#include <QtCore/QVariant>
......
......@@ -34,12 +34,13 @@
#include "searchresulttreeitemdelegate.h"
#include "searchresulttreeitemroles.h"
#include <QModelIndex>
#include <QTextDocument>
#include <QPainter>
#include <QAbstractTextDocumentLayout>
#include <QApplication>
#include <QDebug>
#include <QtGui/QTextDocument>
#include <QtGui/QPainter>
#include <QtGui/QAbstractTextDocumentLayout>
#include <QtGui/QApplication>
#include <QtCore/QModelIndex>
#include <QtCore/QDebug>
#include <math.h>
......
......@@ -37,7 +37,7 @@
#include <coreplugin/ifile.h>
#include <projectexplorer/projectexplorer.h>
#include <QFileInfo>
#include <QtCore/QFileInfo>
using namespace GenericProjectManager;
using namespace GenericProjectManager::Internal;
......
......@@ -33,9 +33,9 @@
#include "pkgconfigtool.h"
#include <QProcess>
#include <QTextStream>
#include <QtDebug>
#include <QtCore/QProcess>
#include <QtCore/QTextStream>
#include <QtCore/QtDebug>
using namespace GenericProjectManager::Internal;
......
......@@ -32,6 +32,7 @@
**************************************************************************/
#include "macro.h"
#include "macroevent.h"
#include <coreplugin/coreconstants.h>
......
......@@ -34,21 +34,15 @@
#ifndef MACROSPLUGIN_MACRO_H
#define MACROSPLUGIN_MACRO_H
#include <coreplugin/uniqueidmanager.h>
#include <QList>
#include <QString>
#include <QShortcut>
#include "macroevent.h"
#include "macros_global.h"
#include "macroevent.h"
#include <QtCore/QList>
#include <QtCore/QString>
namespace Macros {
class MacroEvent;
class MACROS_EXPORT Macro
{