diff options
83 files changed, 42 insertions, 194 deletions
diff --git a/src/libs/utils/annotateditemdelegate.cpp b/src/libs/utils/annotateditemdelegate.cpp index c70b77368b7..0fd4bc0dd1b 100644 --- a/src/libs/utils/annotateditemdelegate.cpp +++ b/src/libs/utils/annotateditemdelegate.cpp @@ -29,12 +29,7 @@ #include "annotateditemdelegate.h" -#include <QSize> -#include <QModelIndex> -#include <QStandardItemModel> #include <QPainter> -#include <QStyle> -#include <QStyleOptionViewItemV4> #include <QApplication> using namespace Utils; diff --git a/src/libs/utils/annotateditemdelegate.h b/src/libs/utils/annotateditemdelegate.h index b224864d3d0..4ea5c9dc60d 100644 --- a/src/libs/utils/annotateditemdelegate.h +++ b/src/libs/utils/annotateditemdelegate.h @@ -32,7 +32,6 @@ #include "utils_global.h" -#include <QString> #include <QStyledItemDelegate> namespace Utils { diff --git a/src/libs/utils/basevalidatinglineedit.h b/src/libs/utils/basevalidatinglineedit.h index 9d71c9906f6..4e84352f130 100644 --- a/src/libs/utils/basevalidatinglineedit.h +++ b/src/libs/utils/basevalidatinglineedit.h @@ -30,8 +30,6 @@ #ifndef BASEVALIDATINGLINEEDIT_H #define BASEVALIDATINGLINEEDIT_H -#include "utils_global.h" - #include "fancylineedit.h" namespace Utils { diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp index 3c7a51bc81e..6037e1d357a 100644 --- a/src/libs/utils/buildablehelperlibrary.cpp +++ b/src/libs/utils/buildablehelperlibrary.cpp @@ -28,20 +28,11 @@ ****************************************************************************/ #include "buildablehelperlibrary.h" +#include "hostosinfo.h" +#include "synchronousprocess.h" -#include <QFileInfo> -#include <QCoreApplication> -#include <QHash> -#include <QProcess> #include <QDir> #include <QDateTime> - -#include <utils/environment.h> -#include <utils/fileutils.h> -#include <utils/hostosinfo.h> -#include <utils/synchronousprocess.h> - -#include <QDesktopServices> #include <QDebug> namespace Utils { diff --git a/src/libs/utils/buildablehelperlibrary.h b/src/libs/utils/buildablehelperlibrary.h index fe06d7d7d80..2fb4ba2c3ee 100644 --- a/src/libs/utils/buildablehelperlibrary.h +++ b/src/libs/utils/buildablehelperlibrary.h @@ -30,18 +30,13 @@ #ifndef BUILDABLEHELPERLIBRARY_H #define BUILDABLEHELPERLIBRARY_H -#include "utils_global.h" -#include <utils/environment.h> -#include <utils/fileutils.h> - -#include <QString> +#include "environment.h" +#include "fileutils.h" QT_FORWARD_DECLARE_CLASS(QFileInfo) namespace Utils { -class Environment; - class QTCREATOR_UTILS_EXPORT BuildableHelperLibrary { public: diff --git a/src/libs/utils/checkablemessagebox.cpp b/src/libs/utils/checkablemessagebox.cpp index 155f487d3f1..ffed23c0cb4 100644 --- a/src/libs/utils/checkablemessagebox.cpp +++ b/src/libs/utils/checkablemessagebox.cpp @@ -29,22 +29,11 @@ #include "checkablemessagebox.h" -#include <QDebug> -#include <QVariant> - #include <QPushButton> -#include <QAction> -#include <QApplication> -#include <QButtonGroup> #include <QCheckBox> -#include <QDialog> -#include <QDialogButtonBox> #include <QHBoxLayout> -#include <QHeaderView> #include <QLabel> -#include <QSpacerItem> -#include <QVBoxLayout> - +#include <QDebug> /*! \class Utils::CheckableMessageBox diff --git a/src/libs/utils/checkablemessagebox.h b/src/libs/utils/checkablemessagebox.h index 6530f457617..ced2847a1c1 100644 --- a/src/libs/utils/checkablemessagebox.h +++ b/src/libs/utils/checkablemessagebox.h @@ -34,7 +34,6 @@ #include <QDialogButtonBox> #include <QMessageBox> -#include <QDialog> namespace Utils { diff --git a/src/libs/utils/classnamevalidatinglineedit.h b/src/libs/utils/classnamevalidatinglineedit.h index 0d3298401dc..42ef62e109b 100644 --- a/src/libs/utils/classnamevalidatinglineedit.h +++ b/src/libs/utils/classnamevalidatinglineedit.h @@ -30,7 +30,6 @@ #ifndef CLASSNAMEVALIDATINGLINEEDIT_H #define CLASSNAMEVALIDATINGLINEEDIT_H -#include "utils_global.h" #include "basevalidatinglineedit.h" namespace Utils { diff --git a/src/libs/utils/codegeneration.h b/src/libs/utils/codegeneration.h index c58cd3b0afb..f2010fa7d33 100644 --- a/src/libs/utils/codegeneration.h +++ b/src/libs/utils/codegeneration.h @@ -31,7 +31,6 @@ #define CODEGENERATION_H #include "utils_global.h" -#include <QString> QT_BEGIN_NAMESPACE class QTextStream; diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp index 630783fa18d..fdb2356c044 100644 --- a/src/libs/utils/consoleprocess.cpp +++ b/src/libs/utils/consoleprocess.cpp @@ -29,8 +29,6 @@ #include "consoleprocess_p.h" -#include <utils/hostosinfo.h> - #include <QSettings> namespace Utils { diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h index 8dcff02bf13..5224a157cc3 100644 --- a/src/libs/utils/consoleprocess.h +++ b/src/libs/utils/consoleprocess.h @@ -32,11 +32,6 @@ #include "utils_global.h" -#include "environment.h" - -#include <QObject> -#include <QString> -#include <QStringList> #include <QProcess> QT_BEGIN_NAMESPACE @@ -44,6 +39,7 @@ class QSettings; QT_END_NAMESPACE namespace Utils { +class Environment; struct ConsoleProcessPrivate; class QTCREATOR_UTILS_EXPORT ConsoleProcess : public QObject diff --git a/src/libs/utils/consoleprocess_p.h b/src/libs/utils/consoleprocess_p.h index 2a08b6d9335..5f888f06c80 100644 --- a/src/libs/utils/consoleprocess_p.h +++ b/src/libs/utils/consoleprocess_p.h @@ -31,6 +31,7 @@ #define CONSOLEPROCESS_P_H #include "consoleprocess.h" +#include "environment.h" #include <QTemporaryFile> diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp index 367a0abfa64..2c1c05a645f 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp @@ -29,14 +29,11 @@ #include "consoleprocess_p.h" -#include "environment.h" #include "qtcprocess.h" #include <utils/hostosinfo.h> #include <QCoreApplication> -#include <QDir> -#include <QSettings> #include <QTimer> #include <sys/stat.h> diff --git a/src/libs/utils/crumblepath.cpp b/src/libs/utils/crumblepath.cpp index fca5cc3dc58..2ee3d5b2018 100644 --- a/src/libs/utils/crumblepath.cpp +++ b/src/libs/utils/crumblepath.cpp @@ -31,14 +31,10 @@ #include "qtcassert.h" #include "stylehelper.h" -#include <QList> -#include <QHBoxLayout> #include <QPushButton> #include <QMenu> -#include <QStyle> #include <QResizeEvent> #include <QPainter> -#include <QImage> namespace Utils { diff --git a/src/libs/utils/detailsbutton.cpp b/src/libs/utils/detailsbutton.cpp index c8999506158..66bf24172ed 100644 --- a/src/libs/utils/detailsbutton.cpp +++ b/src/libs/utils/detailsbutton.cpp @@ -30,8 +30,8 @@ #include "detailsbutton.h" #include <utils/hostosinfo.h> -#include <utils/stylehelper.h> +#include <QGraphicsOpacityEffect> #include <QPropertyAnimation> #include <QPaintEvent> #include <QPainter> diff --git a/src/libs/utils/detailsbutton.h b/src/libs/utils/detailsbutton.h index 99c3f94e48e..1748d19f1da 100644 --- a/src/libs/utils/detailsbutton.h +++ b/src/libs/utils/detailsbutton.h @@ -33,9 +33,6 @@ #include "utils_global.h" #include <QAbstractButton> -#include <QPixmap> - -#include <QGraphicsOpacityEffect> QT_FORWARD_DECLARE_CLASS(QGraphicsOpacityEffect) diff --git a/src/libs/utils/detailswidget.cpp b/src/libs/utils/detailswidget.cpp index cf4f89f5989..91ecd22e298 100644 --- a/src/libs/utils/detailswidget.cpp +++ b/src/libs/utils/detailswidget.cpp @@ -31,9 +31,6 @@ #include "detailsbutton.h" #include "hostosinfo.h" -#include <QStack> -#include <QPropertyAnimation> - #include <QGridLayout> #include <QLabel> #include <QCheckBox> diff --git a/src/libs/utils/elfreader.cpp b/src/libs/utils/elfreader.cpp index c85d261b7f7..dc3314729c2 100644 --- a/src/libs/utils/elfreader.cpp +++ b/src/libs/utils/elfreader.cpp @@ -30,9 +30,7 @@ #include "elfreader.h" #include "qtcassert.h" -#include <QFile> #include <QDir> -#include <QLibrary> #include <QDebug> namespace Utils { diff --git a/src/libs/utils/elfreader.h b/src/libs/utils/elfreader.h index 2155bfcd4b6..d9ac9ece9b4 100644 --- a/src/libs/utils/elfreader.h +++ b/src/libs/utils/elfreader.h @@ -33,7 +33,6 @@ #include "utils_global.h" #include <qendian.h> -#include <qstring.h> #include <qvector.h> #include <qcoreapplication.h> diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp index 08548d9e53c..4145cf3b063 100644 --- a/src/libs/utils/environment.cpp +++ b/src/libs/utils/environment.cpp @@ -32,9 +32,7 @@ #include "hostosinfo.h" #include <QDir> -#include <QProcess> #include <QProcessEnvironment> -#include <QString> #include <QCoreApplication> class SystemEnvironment : public Utils::Environment diff --git a/src/libs/utils/environment.h b/src/libs/utils/environment.h index dcadb13a777..b0d5941ff51 100644 --- a/src/libs/utils/environment.h +++ b/src/libs/utils/environment.h @@ -32,12 +32,11 @@ #include "utils_global.h" -#include <QList> #include <QMap> -#include <QProcessEnvironment> -#include <QString> #include <QStringList> +QT_FORWARD_DECLARE_CLASS(QProcessEnvironment) + namespace Utils { class QTCREATOR_UTILS_EXPORT EnvironmentItem diff --git a/src/libs/utils/environmentmodel.cpp b/src/libs/utils/environmentmodel.cpp index 1e4424ad608..a1357160963 100644 --- a/src/libs/utils/environmentmodel.cpp +++ b/src/libs/utils/environmentmodel.cpp @@ -32,8 +32,8 @@ #include <utils/environment.h> #include <utils/hostosinfo.h> +#include <QTextDocument> // Qt::escape() in Qt 4 #include <QFont> -#include <QTextEdit> namespace Utils { namespace Internal { diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp index 83802be857c..6456af90424 100644 --- a/src/libs/utils/fancylineedit.cpp +++ b/src/libs/utils/fancylineedit.cpp @@ -31,18 +31,12 @@ #include "historycompleter.h" #include "qtcassert.h" -#include <QEvent> #include <QDebug> -#include <QString> #include <QPropertyAnimation> #include <QApplication> #include <QMenu> -#include <QMouseEvent> -#include <QLabel> -#include <QAbstractButton> #include <QPainter> #include <QStyle> -#include <QPaintEvent> #include <QDesktopWidget> /*! Opens a menu at the specified widget position. diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp index 0311b18005b..6b90dce13c3 100644 --- a/src/libs/utils/fancymainwindow.cpp +++ b/src/libs/utils/fancymainwindow.cpp @@ -31,10 +31,6 @@ #include "qtcassert.h" -#include <QList> -#include <QHash> - -#include <QAction> #include <QContextMenuEvent> #include <QMenu> #include <QDockWidget> diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp index 03024c5362d..572ce17848d 100644 --- a/src/libs/utils/filesearch.cpp +++ b/src/libs/utils/filesearch.cpp @@ -30,9 +30,6 @@ #include "filesearch.h" #include <cctype> -#include <QBuffer> -#include <QFile> -#include <QtConcurrentRun> #include <QRegExp> #include <QCoreApplication> #include <QTextCodec> diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h index bf5bd4a9a6f..3dd0aa8b9fd 100644 --- a/src/libs/utils/filesearch.h +++ b/src/libs/utils/filesearch.h @@ -32,7 +32,6 @@ #include "utils_global.h" -#include <QStringList> #include <QFuture> #include <QMap> #include <QStack> diff --git a/src/libs/utils/filesystemwatcher.cpp b/src/libs/utils/filesystemwatcher.cpp index adcdfc19b0d..5d3f3540236 100644 --- a/src/libs/utils/filesystemwatcher.cpp +++ b/src/libs/utils/filesystemwatcher.cpp @@ -31,7 +31,6 @@ #include <QDebug> #include <QDir> -#include <QFileInfo> #include <QFileSystemWatcher> #include <QDateTime> diff --git a/src/libs/utils/filesystemwatcher.h b/src/libs/utils/filesystemwatcher.h index e0858e0b38a..13f6bed1367 100644 --- a/src/libs/utils/filesystemwatcher.h +++ b/src/libs/utils/filesystemwatcher.h @@ -33,7 +33,6 @@ #include "utils_global.h" #include <QObject> -#include <QStringList> namespace Utils { class FileSystemWatcherPrivate; diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index cd3848aa67c..5ad3fb809e6 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -35,11 +35,7 @@ #include <QDir> #include <QDebug> -#include <QFileInfo> -#include <QTemporaryFile> #include <QDateTime> -#include <QDataStream> -#include <QTextStream> #include <QMessageBox> namespace Utils { diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h index 6f328d74bb0..dec02723aca 100644 --- a/src/libs/utils/fileutils.h +++ b/src/libs/utils/fileutils.h @@ -33,9 +33,7 @@ #include "utils_global.h" #include <QCoreApplication> -#include <QIODevice> #include <QXmlStreamWriter> // Mac. -#include <QFileInfo> #include <QMetaType> QT_BEGIN_NAMESPACE @@ -45,6 +43,8 @@ class QWidget; class QTextStream; class QDataStream; class QDateTime; +class QFileInfo; +class QDir; QT_END_NAMESPACE namespace Utils { diff --git a/src/libs/utils/filewizarddialog.h b/src/libs/utils/filewizarddialog.h index 34a9d2319e8..2b02e0c4035 100644 --- a/src/libs/utils/filewizarddialog.h +++ b/src/libs/utils/filewizarddialog.h @@ -30,7 +30,6 @@ #ifndef FILEWIZARDDIALOG_H #define FILEWIZARDDIALOG_H -#include "utils_global.h" #include "wizard.h" namespace Utils { diff --git a/src/libs/utils/flowlayout.cpp b/src/libs/utils/flowlayout.cpp index aa5e4bc39da..e407313c929 100644 --- a/src/libs/utils/flowlayout.cpp +++ b/src/libs/utils/flowlayout.cpp @@ -29,8 +29,6 @@ #include "flowlayout.h" -#include <QRect> -#include <QWidgetItem> #include <QWidget> using namespace Utils; diff --git a/src/libs/utils/historycompleter.cpp b/src/libs/utils/historycompleter.cpp index 942cca8ee4f..65a54d47e07 100644 --- a/src/libs/utils/historycompleter.cpp +++ b/src/libs/utils/historycompleter.cpp @@ -31,7 +31,6 @@ #include "qtcassert.h" -#include <QAbstractListModel> #include <QSettings> #include <QItemDelegate> @@ -39,7 +38,6 @@ #include <QLineEdit> #include <QListView> #include <QPainter> -#include <QStyle> namespace Utils { namespace Internal { diff --git a/src/libs/utils/htmldocextractor.cpp b/src/libs/utils/htmldocextractor.cpp index 7edc4d2a635..3de7f2c6e1d 100644 --- a/src/libs/utils/htmldocextractor.cpp +++ b/src/libs/utils/htmldocextractor.cpp @@ -29,8 +29,6 @@ #include "htmldocextractor.h" -#include <QLatin1String> -#include <QLatin1Char> #include <QStringList> #include <QRegExp> diff --git a/src/libs/utils/htmldocextractor.h b/src/libs/utils/htmldocextractor.h index 26e7a331712..f8b563b327d 100644 --- a/src/libs/utils/htmldocextractor.h +++ b/src/libs/utils/htmldocextractor.h @@ -32,8 +32,6 @@ #include "utils_global.h" -#include <QString> - namespace Utils { class QTCREATOR_UTILS_EXPORT HtmlDocExtractor diff --git a/src/libs/utils/ipaddresslineedit.h b/src/libs/utils/ipaddresslineedit.h index 38dd2915cea..be21f124dcd 100644 --- a/src/libs/utils/ipaddresslineedit.h +++ b/src/libs/utils/ipaddresslineedit.h @@ -30,7 +30,6 @@ #ifndef IPADDRESSLINEEDIT_H #define IPADDRESSLINEEDIT_H -#include "utils_global.h" #include "basevalidatinglineedit.h" namespace Utils { diff --git a/src/libs/utils/iwelcomepage.cpp b/src/libs/utils/iwelcomepage.cpp index ec5f8b75739..da9a6d9bd69 100644 --- a/src/libs/utils/iwelcomepage.cpp +++ b/src/libs/utils/iwelcomepage.cpp @@ -29,6 +29,8 @@ #include "iwelcomepage.h" +#include <QUrl> + namespace Utils { IWelcomePage::IWelcomePage() @@ -40,3 +42,5 @@ IWelcomePage::~IWelcomePage() } } // namespace Utils + +#include "moc_iwelcomepage.cpp" diff --git a/src/libs/utils/iwelcomepage.h b/src/libs/utils/iwelcomepage.h index 01029f14ef1..5b4cae0036c 100644 --- a/src/libs/utils/iwelcomepage.h +++ b/src/libs/utils/iwelcomepage.h @@ -33,8 +33,8 @@ #include "utils_global.h" #include <QObject> -#include <QUrl> +QT_FORWARD_DECLARE_CLASS(QUrl) QT_FORWARD_DECLARE_CLASS(QDeclarativeEngine) namespace Utils { diff --git a/src/libs/utils/json.cpp b/src/libs/utils/json.cpp index bfb39a88f79..781983aa918 100644 --- a/src/libs/utils/json.cpp +++ b/src/libs/utils/json.cpp @@ -33,11 +33,8 @@ #include <utils/fileutils.h> #include <QDir> -#include <QFileInfo> -#include <QFile> #include <QStringBuilder> #include <QDebug> -#include <QVariant> #include <QScriptEngine> using namespace Utils; diff --git a/src/libs/utils/networkaccessmanager.cpp b/src/libs/utils/networkaccessmanager.cpp index 35c921000d0..889db9c644a 100644 --- a/src/libs/utils/networkaccessmanager.cpp +++ b/src/libs/utils/networkaccessmanager.cpp @@ -31,7 +31,6 @@ #include <QCoreApplication> #include <QLocale> -#include <QUrl> #include <QNetworkReply> #ifdef Q_OS_UNIX diff --git a/src/libs/utils/newclasswidget.cpp b/src/libs/utils/newclasswidget.cpp index 9a66819cd14..244613d376c 100644 --- a/src/libs/utils/newclasswidget.cpp +++ b/src/libs/utils/newclasswidget.cpp @@ -30,12 +30,8 @@ #include "newclasswidget.h" #include "ui_newclasswidget.h" -#include <utils/filewizardpage.h> #include <QFileDialog> -#include <QFileInfo> -#include <QStringList> -#include <QDir> #include <QDebug> #include <QRegExp> diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp index e036d750713..81649e80be5 100644 --- a/src/libs/utils/outputformatter.cpp +++ b/src/libs/utils/outputformatter.cpp @@ -30,9 +30,6 @@ #include "outputformatter.h" #include <QPlainTextEdit> -#include <QColor> - -#include <QString> using namespace Utils; diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index 256599e1644..f3530940eaa 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -29,6 +29,7 @@ #include "pathchooser.h" +#include "fancylineedit.h" #include "basevalidatinglineedit.h" #include "environment.h" #include "qtcassert.h" @@ -38,15 +39,9 @@ #include <QDebug> #include <QDesktopServices> -#include <QDir> -#include <QEvent> #include <QFileDialog> -#include <QFileInfo> #include <QHBoxLayout> -#include <QLineEdit> -#include <QProcess> #include <QPushButton> -#include <QSettings> /*! \class Utils::PathChooser diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h index dcb43ed8c1d..0dbb08dbae7 100644 --- a/src/libs/utils/pathchooser.h +++ b/src/libs/utils/pathchooser.h @@ -30,10 +30,7 @@ #ifndef PATHCHOOSER_H #define PATHCHOOSER_H -#include "utils_global.h" - #include "fileutils.h" -#include "fancylineedit.h" #include <QWidget> @@ -45,6 +42,7 @@ QT_END_NAMESPACE namespace Utils { +class FancyLineEdit; class Environment; class PathChooserPrivate; diff --git a/src/libs/utils/pathlisteditor.cpp b/src/libs/utils/pathlisteditor.cpp index 58ecee520ba..7bd9c70010c 100644 --- a/src/libs/utils/pathlisteditor.cpp +++ b/src/libs/utils/pathlisteditor.cpp @@ -32,20 +32,15 @@ #include "hostosinfo.h" #include <QVBoxLayout> -#include <QHBoxLayout> #include <QPlainTextEdit> #include <QToolButton> -#include <QSpacerItem> #include <QFileDialog> -#include <QTextCursor> #include <QTextBlock> #include <QMenu> -#include <QAction> #include <QSignalMapper> #include <QMimeData> #include <QSharedPointer> -#include <QDir> #include <QDebug> /*! diff --git a/src/libs/utils/pathlisteditor.h b/src/libs/utils/pathlisteditor.h index b12c5a85ccd..2601257a290 100644 --- a/src/libs/utils/pathlisteditor.h +++ b/src/libs/utils/pathlisteditor.h @@ -33,7 +33,6 @@ #include "utils_global.h" #include <QWidget> -#include <QStringList> namespace Utils { diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp index f6e57eef67f..2acf1927d9b 100644 --- a/src/libs/utils/persistentsettings.cpp +++ b/src/libs/utils/persistentsettings.cpp @@ -29,12 +29,8 @@ #include "persistentsettings.h" -#include <utils/fileutils.h> - #include <QDebug> -#include <QFile> #include <QDir> -#include <QVariant> #include <QStack> #include <QXmlStreamAttributes> #include <QXmlStreamReader> diff --git a/src/libs/utils/persistentsettings.h b/src/libs/utils/persistentsettings.h index c771f6badfc..eb393c667e5 100644 --- a/src/libs/utils/persistentsettings.h +++ b/src/libs/utils/persistentsettings.h @@ -30,11 +30,8 @@ #ifndef PERSISTENTSETTINGS_H #define PERSISTENTSETTINGS_H -#include "utils_global.h" - #include "fileutils.h" -#include <QMap> #include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/libs/utils/portlist.cpp b/src/libs/utils/portlist.cpp index 94e376abd15..aa5f7e08001 100644 --- a/src/libs/utils/portlist.cpp +++ b/src/libs/utils/portlist.cpp @@ -29,9 +29,9 @@ #include "portlist.h" -#include <QList> #include <QPair> #include <QString> +#include <QStringList> #include <cctype> diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp index dc1ae6b806b..f238a8145b4 100644 --- a/src/libs/utils/projectintropage.cpp +++ b/src/libs/utils/projectintropage.cpp @@ -28,13 +28,9 @@ ****************************************************************************/ #include "projectintropage.h" -#include "filewizardpage.h" #include "ui_projectintropage.h" -#include <QMessageBox> #include <QDir> -#include <QFileInfo> - /*! \class Utils::ProjectIntroPage diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index 80f4477959b..2da53dacdea 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -30,12 +30,10 @@ #ifndef QTCPROCESS_H #define QTCPROCESS_H -#include <QProcess> - -#include "utils_global.h" - #include "environment.h" +#include <QProcess> + namespace Utils { class AbstractMacroExpander; diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp index 70723112d31..04f110f46dd 100644 --- a/src/libs/utils/reloadpromptutils.cpp +++ b/src/libs/utils/reloadpromptutils.cpp @@ -33,7 +33,6 @@ #include <QDir> #include <QMessageBox> #include <QPushButton> -#include <QAbstractButton> using namespace Utils; diff --git a/src/libs/utils/savedaction.cpp b/src/libs/utils/savedaction.cpp index fbc061e7986..07068ce326b 100644 --- a/src/libs/utils/savedaction.cpp +++ b/src/libs/utils/savedaction.cpp @@ -36,12 +36,8 @@ #include <QSettings> #include <QAbstractButton> -#include <QAction> -#include <QActionGroup> -#include <QCheckBox> #include <QGroupBox> #include <QLineEdit> -#include <QRadioButton> #include <QSpinBox> #include <QTextEdit> diff --git a/src/libs/utils/savedaction.h b/src/libs/utils/savedaction.h index 1dd32b9e51c..d0c2ccc8ebf 100644 --- a/src/libs/utils/savedaction.h +++ b/src/libs/utils/savedaction.h @@ -32,10 +32,6 @@ #include "utils_global.h" -#include <QString> -#include <QVariant> -#include <QList> - #include <QAction> QT_BEGIN_NAMESPACE diff --git a/src/libs/utils/settingsselector.cpp b/src/libs/utils/settingsselector.cpp index ea062c4a518..4451d4b46d9 100644 --- a/src/libs/utils/settingsselector.cpp +++ b/src/libs/utils/settingsselector.cpp @@ -29,18 +29,12 @@ #include "settingsselector.h" -#include <QAbstractItemModel> -#include <QVariant> - -#include <QAction> #include <QComboBox> #include <QHBoxLayout> #include <QInputDialog> #include <QLabel> -#include <QMenu> #include <QMessageBox> #include <QPushButton> -#include <QSpacerItem> namespace Utils { diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp index a9d6a3d1127..1387a5c79ad 100644 --- a/src/libs/utils/stringutils.cpp +++ b/src/libs/utils/stringutils.cpp @@ -31,9 +31,6 @@ #include "hostosinfo.h" -#include <QString> -#include <QStringList> -#include <QFileInfo> #include <QDir> #include <limits.h> diff --git a/src/libs/utils/styledbar.cpp b/src/libs/utils/styledbar.cpp index f3aca0421ab..5ab0c9e4d5e 100644 --- a/src/libs/utils/styledbar.cpp +++ b/src/libs/utils/styledbar.cpp @@ -29,12 +29,7 @@ #include "styledbar.h" -#include "stylehelper.h" - -#include <QVariant> #include <QPainter> -#include <QPixmapCache> -#include <QStyle> #include <QStyleOption> using namespace Utils; diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp index edc5f089bfe..1a24d3786c1 100644 --- a/src/libs/utils/stylehelper.cpp +++ b/src/libs/utils/stylehelper.cpp @@ -32,13 +32,9 @@ #include "hostosinfo.h" #include <QPixmapCache> -#include <QWidget> -#include <QRect> #include <QPainter> #include <QApplication> -#include <QPalette> #include <QStyleOption> -#include <QObject> // Clamps float color values within (0, 255) static int clamp(float x) diff --git a/src/libs/utils/stylehelper.h b/src/libs/utils/stylehelper.h index e5234f4b7c6..4559db5b93d 100644 --- a/src/libs/utils/stylehelper.h +++ b/src/libs/utils/stylehelper.h @@ -32,7 +32,6 @@ #include "utils_global.h" -#include <QColor> #include <QStyle> QT_BEGIN_NAMESPACE diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp index efbe7fd87a5..1d68bc41d74 100644 --- a/src/libs/utils/synchronousprocess.cpp +++ b/src/libs/utils/synchronousprocess.cpp @@ -33,9 +33,7 @@ #include <QDebug> #include <QTimer> -#include <QEventLoop> #include <QTextCodec> -#include <QFileInfo> #include <QDir> #include <QMessageBox> diff --git a/src/libs/utils/synchronousprocess.h b/src/libs/utils/synchronousprocess.h index 4563588e3c1..b90c6604684 100644 --- a/src/libs/utils/synchronousprocess.h +++ b/src/libs/utils/synchronousprocess.h @@ -32,9 +32,7 @@ #include "utils_global.h" -#include <QObject> #include <QProcess> -#include <QStringList> #include <QSharedPointer> QT_BEGIN_NAMESPACE diff --git a/src/libs/utils/tcpportsgatherer.cpp b/src/libs/utils/tcpportsgatherer.cpp index 9c414fcacfa..447af431c02 100644 --- a/src/libs/utils/tcpportsgatherer.cpp +++ b/src/libs/utils/tcpportsgatherer.cpp @@ -33,7 +33,6 @@ #include <QDebug> #include <QFile> #include <QProcess> -#include <QStringList> #ifdef Q_OS_WIN #include <QLibrary> diff --git a/src/libs/utils/textfileformat.cpp b/src/libs/utils/textfileformat.cpp index cbb58f9adca..c4c33cd6521 100644 --- a/src/libs/utils/textfileformat.cpp +++ b/src/libs/utils/textfileformat.cpp @@ -33,13 +33,10 @@ #include <QTextCodec> #include <QStringList> -#include <QCoreApplication> #include <QDebug> enum { debug = 0 }; -#include <exception> - namespace Utils { QDebug operator<<(QDebug d, const TextFileFormat &format) diff --git a/src/libs/utils/textfileformat.h b/src/libs/utils/textfileformat.h index 451ab116a54..9f3825b51fa 100644 --- a/src/libs/utils/textfileformat.h +++ b/src/libs/utils/textfileformat.h @@ -32,8 +32,6 @@ #include "utils_global.h" -#include <QtGlobal> - QT_BEGIN_NAMESPACE class QTextCodec; class QStringList; diff --git a/src/libs/utils/uncommentselection.cpp b/src/libs/utils/uncommentselection.cpp index 0d7b4974b4d..26159c043f2 100644 --- a/src/libs/utils/uncommentselection.cpp +++ b/src/libs/utils/uncommentselection.cpp @@ -28,11 +28,8 @@ ****************************************************************************/ #include "uncommentselection.h" -#include <QtGlobal> #include <QPlainTextEdit> -#include <QTextCursor> #include <QTextBlock> -#include <QTextDocument> using namespace Utils; diff --git a/src/libs/utils/unixutils.cpp b/src/libs/utils/unixutils.cpp index 1c75b3fb42c..07e85701a00 100644 --- a/src/libs/utils/unixutils.cpp +++ b/src/libs/utils/unixutils.cpp @@ -30,7 +30,6 @@ #include "unixutils.h" #include <QSettings> -#include <QObject> #include <QFileInfo> #include <QCoreApplication> diff --git a/src/libs/utils/unixutils.h b/src/libs/utils/unixutils.h index 281e5fdc6ab..99b41a38e2f 100644 --- a/src/libs/utils/unixutils.h +++ b/src/libs/utils/unixutils.h @@ -32,8 +32,6 @@ #include "utils_global.h" -#include <QString> - QT_BEGIN_NAMESPACE class QSettings; QT_END_NAMESPACE diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp index fbef9fcd95a..860c69e78f2 100644 --- a/src/libs/utils/wizard.cpp +++ b/src/libs/utils/wizard.cpp @@ -31,11 +31,9 @@ #include <QMap> #include <QHash> -#include <QVariant> #include <QLabel> #include <QVBoxLayout> -#include <QHBoxLayout> #include <QStyle> /*! \class Utils::Wizard diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index 84c2ec28611..7ae4dc801b6 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -33,6 +33,7 @@ #include <utils/hostosinfo.h> #include <utils/qtcassert.h> #include <utils/qtcprocess.h> +#include <utils/fancylineedit.h> #include <coreplugin/coreconstants.h> #include <coreplugin/variablechooser.h> diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index 7eb5a0b8488..901bc46701f 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -41,6 +41,7 @@ #include <projectexplorer/kitinformation.h> #include <utils/historycompleter.h> #include <utils/pathchooser.h> +#include <utils/fancylineedit.h> #include <utils/qtcassert.h> #include <utils/synchronousprocess.h> diff --git a/src/plugins/debugger/gdb/startgdbserverdialog.cpp b/src/plugins/debugger/gdb/startgdbserverdialog.cpp index d49b71a7589..f3057e32aba 100644 --- a/src/plugins/debugger/gdb/startgdbserverdialog.cpp +++ b/src/plugins/debugger/gdb/startgdbserverdialog.cpp @@ -50,6 +50,7 @@ #include <QVariant> #include <QMessageBox> +#include <QFileInfo> using namespace Core; using namespace ProjectExplorer; diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.cpp b/src/plugins/debugger/qml/qmlinspectoradapter.cpp index 3ec79f92ef0..f827136d020 100644 --- a/src/plugins/debugger/qml/qmlinspectoradapter.cpp +++ b/src/plugins/debugger/qml/qmlinspectoradapter.cpp @@ -50,6 +50,8 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> +#include <QFileInfo> + using namespace QmlDebug; namespace Debugger { diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp index 01666405a2a..9b6e203081e 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.cpp +++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp @@ -39,6 +39,7 @@ #include <utils/qtcassert.h> #include <utils/savedaction.h> #include <QElapsedTimer> +#include <QFileInfo> using namespace QmlDebug; using namespace QmlDebug::Constants; diff --git a/src/plugins/projectexplorer/kitinformation.cpp b/src/plugins/projectexplorer/kitinformation.cpp index bb64cc97c41..3fec250f0fa 100644 --- a/src/plugins/projectexplorer/kitinformation.cpp +++ b/src/plugins/projectexplorer/kitinformation.cpp @@ -46,6 +46,7 @@ #include <QHBoxLayout> #include <QLabel> #include <QPushButton> +#include <QFileInfo> namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp index 5ee3f6483b9..82fa7d69504 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp @@ -41,6 +41,7 @@ #include <coreplugin/icore.h> #include <extensionsystem/pluginmanager.h> #include <utils/pathchooser.h> +#include <utils/fancylineedit.h> #include <QComboBox> #include <QLabel> diff --git a/src/plugins/qnx/bardescriptoreditorwidget.cpp b/src/plugins/qnx/bardescriptoreditorwidget.cpp index e17b9d05401..7be20dd9675 100644 --- a/src/plugins/qnx/bardescriptoreditorwidget.cpp +++ b/src/plugins/qnx/bardescriptoreditorwidget.cpp @@ -42,6 +42,7 @@ #include <qtsupport/qtversionmanager.h> #include <texteditor/plaintexteditor.h> #include <utils/qtcassert.h> +#include <utils/fancylineedit.h> #include <QFileDialog> #include <QInputDialog> diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp index a8f172c021c..48c47d59ebf 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp +++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp @@ -37,6 +37,7 @@ #include <ssh/sshconnection.h> #include <utils/pathchooser.h> +#include <utils/fancylineedit.h> #include <QProgressDialog> #include <QMessageBox> diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp index 9961fcc37ae..d7d3d5a4c2e 100644 --- a/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp +++ b/src/plugins/qnx/blackberrydeviceconfigurationwizardpages.cpp @@ -39,6 +39,7 @@ #include <QFormLayout> #include <QMessageBox> +#include <QFileInfo> using namespace ProjectExplorer; using namespace Qnx; diff --git a/src/plugins/qnx/blackberryqtversionfactory.cpp b/src/plugins/qnx/blackberryqtversionfactory.cpp index 04a79d0d06a..33b500b2d92 100644 --- a/src/plugins/qnx/blackberryqtversionfactory.cpp +++ b/src/plugins/qnx/blackberryqtversionfactory.cpp @@ -37,6 +37,8 @@ #include <qtsupport/profilereader.h> +#include <QFileInfo> + using namespace Qnx; using namespace Qnx::Internal; diff --git a/src/plugins/qnx/blackberryrunconfiguration.cpp b/src/plugins/qnx/blackberryrunconfiguration.cpp index 165b45cc233..a6c960b0c43 100644 --- a/src/plugins/qnx/blackberryrunconfiguration.cpp +++ b/src/plugins/qnx/blackberryrunconfiguration.cpp @@ -39,6 +39,8 @@ #include <projectexplorer/target.h> #include <ssh/sshconnection.h> +#include <QFileInfo> + using namespace Qnx; using namespace Qnx::Internal; diff --git a/src/plugins/qnx/pathchooserdelegate.cpp b/src/plugins/qnx/pathchooserdelegate.cpp index cb0685be1fd..fab72ef1ac5 100644 --- a/src/plugins/qnx/pathchooserdelegate.cpp +++ b/src/plugins/qnx/pathchooserdelegate.cpp @@ -32,8 +32,7 @@ #include "pathchooserdelegate.h" #include <utils/pathchooser.h> - -#include <QLineEdit> +#include <utils/fancylineedit.h> using namespace Qnx; using namespace Qnx::Internal; diff --git a/src/plugins/qnx/qnxqtversionfactory.cpp b/src/plugins/qnx/qnxqtversionfactory.cpp index f16d29ccaaf..e43a506ad51 100644 --- a/src/plugins/qnx/qnxqtversionfactory.cpp +++ b/src/plugins/qnx/qnxqtversionfactory.cpp @@ -37,6 +37,8 @@ #include <qtsupport/profilereader.h> +#include <QFileInfo> + using namespace Qnx; using namespace Qnx::Internal; diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp index a23caac9a6d..cfe734ec07e 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp @@ -31,6 +31,7 @@ #include "ui_genericlinuxdeviceconfigurationwidget.h" #include <utils/portlist.h> +#include <utils/fancylineedit.h> #include <ssh/sshconnection.h> #include <ssh/sshkeycreationdialog.h> |