diff options
author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2012-02-15 10:42:41 +0100 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2012-02-15 16:24:46 +0100 |
commit | 3fa55b7ab9b1d6ae10fac1c9bcc653e9000157f8 (patch) | |
tree | e31dbd1b4605530e59c9864166f155b4edabc721 /src/shared | |
parent | 9a9ba12028ab0a6b1a248be612d5c576d39f69d6 (diff) | |
download | qt-creator-3fa55b7ab9b1d6ae10fac1c9bcc653e9000157f8.tar.gz |
Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.
Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/shared')
69 files changed, 281 insertions, 281 deletions
diff --git a/src/shared/cpaster/cgi.cpp b/src/shared/cpaster/cgi.cpp index bc9d73bcc7..c92a92a526 100644 --- a/src/shared/cpaster/cgi.cpp +++ b/src/shared/cpaster/cgi.cpp @@ -32,7 +32,7 @@ #include "cgi.h" -#include <QtCore/QByteArray> +#include <QByteArray> const char cgi_chars[] = "0123456789abcdef"; // RFC 1738 suggests lower-case to be optimal diff --git a/src/shared/cpaster/cgi.h b/src/shared/cpaster/cgi.h index 37a92b9609..b73ebda71f 100644 --- a/src/shared/cpaster/cgi.h +++ b/src/shared/cpaster/cgi.h @@ -33,7 +33,7 @@ #ifndef CGI_H #define CGI_H -#include <QtCore/QString> +#include <QString> class CGI { diff --git a/src/shared/cpaster/splitter.cpp b/src/shared/cpaster/splitter.cpp index 8bb08718a4..4d4b2f96f8 100644 --- a/src/shared/cpaster/splitter.cpp +++ b/src/shared/cpaster/splitter.cpp @@ -32,7 +32,7 @@ #include "splitter.h" -#include <QtCore/QRegExp> +#include <QRegExp> FileDataList splitDiffToFiles(const QString &strData) { diff --git a/src/shared/cpaster/splitter.h b/src/shared/cpaster/splitter.h index 4f332b2301..23c42df6ff 100644 --- a/src/shared/cpaster/splitter.h +++ b/src/shared/cpaster/splitter.h @@ -33,9 +33,9 @@ #ifndef SPLITTER_H #define SPLITTER_H -#include <QtCore/QByteArray> -#include <QtCore/QList> -#include <QtCore/QString> +#include <QByteArray> +#include <QList> +#include <QString> struct FileData { diff --git a/src/shared/designerintegrationv2/formresizer.cpp b/src/shared/designerintegrationv2/formresizer.cpp index 6108cce499..958dcc9735 100644 --- a/src/shared/designerintegrationv2/formresizer.cpp +++ b/src/shared/designerintegrationv2/formresizer.cpp @@ -34,14 +34,14 @@ #include "sizehandlerect.h" #include "widgethostconstants.h" -#include <QtCore/QDebug> +#include <QDebug> -#include <QtDesigner/QDesignerFormWindowInterface> +#include <QDesignerFormWindowInterface> -#include <QtGui/QResizeEvent> -#include <QtGui/QPalette> -#include <QtGui/QLayout> -#include <QtGui/QFrame> +#include <QResizeEvent> +#include <QPalette> +#include <QLayout> +#include <QFrame> enum { debugFormResizer = 0 }; diff --git a/src/shared/designerintegrationv2/formresizer.h b/src/shared/designerintegrationv2/formresizer.h index 16211dc940..93e62f2d23 100644 --- a/src/shared/designerintegrationv2/formresizer.h +++ b/src/shared/designerintegrationv2/formresizer.h @@ -34,8 +34,8 @@ #include "widgethostconstants.h" -#include <QtGui/QWidget> -#include <QtCore/QVector> +#include <QWidget> +#include <QVector> QT_FORWARD_DECLARE_CLASS(QDesignerFormWindowInterface) QT_FORWARD_DECLARE_CLASS(QFrame) diff --git a/src/shared/designerintegrationv2/sizehandlerect.cpp b/src/shared/designerintegrationv2/sizehandlerect.cpp index d9a2737d3f..8692cf64db 100644 --- a/src/shared/designerintegrationv2/sizehandlerect.cpp +++ b/src/shared/designerintegrationv2/sizehandlerect.cpp @@ -32,12 +32,12 @@ #include "sizehandlerect.h" #include "widgethostconstants.h" -#include <QtDesigner/QDesignerFormWindowInterface> +#include <QDesignerFormWindowInterface> -#include <QtGui/QMouseEvent> -#include <QtGui/QPainter> -#include <QtGui/QFrame> -#include <QtCore/QDebug> +#include <QMouseEvent> +#include <QPainter> +#include <QFrame> +#include <QDebug> enum { debugSizeHandle = 0 }; diff --git a/src/shared/designerintegrationv2/sizehandlerect.h b/src/shared/designerintegrationv2/sizehandlerect.h index 652a41b968..021a8ee9ed 100644 --- a/src/shared/designerintegrationv2/sizehandlerect.h +++ b/src/shared/designerintegrationv2/sizehandlerect.h @@ -34,8 +34,8 @@ #include "widgethostconstants.h" -#include <QtGui/QWidget> -#include <QtCore/QPoint> +#include <QWidget> +#include <QPoint> namespace SharedTools { namespace Internal { diff --git a/src/shared/designerintegrationv2/widgethost.cpp b/src/shared/designerintegrationv2/widgethost.cpp index 2c8fad031b..65aa26c935 100644 --- a/src/shared/designerintegrationv2/widgethost.cpp +++ b/src/shared/designerintegrationv2/widgethost.cpp @@ -34,14 +34,14 @@ #include "formresizer.h" #include "widgethostconstants.h" -#include <QtDesigner/QDesignerFormWindowInterface> -#include <QtDesigner/QDesignerFormWindowCursorInterface> +#include <QDesignerFormWindowInterface> +#include <QDesignerFormWindowCursorInterface> -#include <QtGui/QPalette> -#include <QtGui/QLayout> -#include <QtGui/QFrame> -#include <QtGui/QResizeEvent> -#include <QtCore/QDebug> +#include <QPalette> +#include <QLayout> +#include <QFrame> +#include <QResizeEvent> +#include <QDebug> using namespace SharedTools; diff --git a/src/shared/designerintegrationv2/widgethost.h b/src/shared/designerintegrationv2/widgethost.h index 10bf73ad93..350ff3a9ce 100644 --- a/src/shared/designerintegrationv2/widgethost.h +++ b/src/shared/designerintegrationv2/widgethost.h @@ -33,7 +33,7 @@ #ifndef WIDGETHOST_H #define WIDGETHOST_H -#include <QtGui/QScrollArea> +#include <QScrollArea> QT_FORWARD_DECLARE_CLASS(QDesignerFormWindowInterface) diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp index 78d8c47f0f..48d41cdd2f 100644 --- a/src/shared/help/bookmarkmanager.cpp +++ b/src/shared/help/bookmarkmanager.cpp @@ -39,24 +39,24 @@ #include <utils/filterlineedit.h> #include <utils/styledbar.h> -#include <QtGui/QMenu> -#include <QtGui/QIcon> -#include <QtGui/QStyle> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtCore/QEvent> -#include <QtGui/QComboBox> -#include <QtGui/QKeyEvent> -#include <QtGui/QLineEdit> -#include <QtGui/QMessageBox> -#include <QtGui/QHeaderView> -#include <QtGui/QToolButton> -#include <QtGui/QPushButton> -#include <QtGui/QApplication> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QSortFilterProxyModel> - -#include <QtHelp/QHelpEngine> +#include <QMenu> +#include <QIcon> +#include <QStyle> +#include <QLabel> +#include <QLayout> +#include <QEvent> +#include <QComboBox> +#include <QKeyEvent> +#include <QLineEdit> +#include <QMessageBox> +#include <QHeaderView> +#include <QToolButton> +#include <QPushButton> +#include <QApplication> +#include <QDialogButtonBox> +#include <QSortFilterProxyModel> + +#include <QHelpEngine> using namespace Help::Internal; diff --git a/src/shared/help/bookmarkmanager.h b/src/shared/help/bookmarkmanager.h index 8ea052bb0e..98b22d3b6a 100644 --- a/src/shared/help/bookmarkmanager.h +++ b/src/shared/help/bookmarkmanager.h @@ -35,17 +35,17 @@ #include "ui_bookmarkdialog.h" -#include <QtCore/QUrl> -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QByteArray> -#include <QtCore/QDataStream> - -#include <QtGui/QIcon> -#include <QtGui/QDialog> -#include <QtGui/QWidget> -#include <QtGui/QTreeView> -#include <QtGui/QStandardItemModel> +#include <QUrl> +#include <QObject> +#include <QString> +#include <QByteArray> +#include <QDataStream> + +#include <QIcon> +#include <QDialog> +#include <QWidget> +#include <QTreeView> +#include <QStandardItemModel> QT_BEGIN_NAMESPACE diff --git a/src/shared/help/contentwindow.cpp b/src/shared/help/contentwindow.cpp index 735aeaa388..c88713cf65 100644 --- a/src/shared/help/contentwindow.cpp +++ b/src/shared/help/contentwindow.cpp @@ -37,12 +37,12 @@ #include "localhelpmanager.h" #include "openpagesmanager.h" -#include <QtGui/QLayout> -#include <QtGui/QFocusEvent> -#include <QtGui/QMenu> +#include <QLayout> +#include <QFocusEvent> +#include <QMenu> -#include <QtHelp/QHelpEngine> -#include <QtHelp/QHelpContentWidget> +#include <QHelpEngine> +#include <QHelpContentWidget> using namespace Help::Internal; diff --git a/src/shared/help/contentwindow.h b/src/shared/help/contentwindow.h index e9d3980310..6ec4c115ac 100644 --- a/src/shared/help/contentwindow.h +++ b/src/shared/help/contentwindow.h @@ -33,9 +33,9 @@ #ifndef CONTENTWINDOW_H #define CONTENTWINDOW_H -#include <QtCore/QUrl> -#include <QtCore/QModelIndex> -#include <QtGui/QWidget> +#include <QUrl> +#include <QModelIndex> +#include <QWidget> QT_BEGIN_NAMESPACE diff --git a/src/shared/help/filternamedialog.cpp b/src/shared/help/filternamedialog.cpp index a8e572d44c..9e5ac1b0ca 100644 --- a/src/shared/help/filternamedialog.cpp +++ b/src/shared/help/filternamedialog.cpp @@ -30,7 +30,7 @@ ** **************************************************************************/ -#include <QtGui/QPushButton> +#include <QPushButton> #include "filternamedialog.h" diff --git a/src/shared/help/filternamedialog.h b/src/shared/help/filternamedialog.h index c8bdc290a4..6736a52ce1 100644 --- a/src/shared/help/filternamedialog.h +++ b/src/shared/help/filternamedialog.h @@ -33,7 +33,7 @@ #ifndef FILTERNAMEDIALOG_H #define FILTERNAMEDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> #include "ui_filternamedialog.h" class FilterNameDialog : public QDialog diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp index da06268e1b..d888c3e8db 100644 --- a/src/shared/help/indexwindow.cpp +++ b/src/shared/help/indexwindow.cpp @@ -41,16 +41,16 @@ #include <utils/filterlineedit.h> #include <utils/styledbar.h> -#include <QtGui/QLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QKeyEvent> -#include <QtGui/QMenu> -#include <QtGui/QContextMenuEvent> -#include <QtGui/QListWidgetItem> - -#include <QtHelp/QHelpEngine> -#include <QtHelp/QHelpIndexWidget> +#include <QLayout> +#include <QLabel> +#include <QLineEdit> +#include <QKeyEvent> +#include <QMenu> +#include <QContextMenuEvent> +#include <QListWidgetItem> + +#include <QHelpEngine> +#include <QHelpIndexWidget> using namespace Help::Internal; diff --git a/src/shared/help/indexwindow.h b/src/shared/help/indexwindow.h index 55b84c1ffd..6da8f51838 100644 --- a/src/shared/help/indexwindow.h +++ b/src/shared/help/indexwindow.h @@ -33,9 +33,9 @@ #ifndef INDEXWINDOW_H #define INDEXWINDOW_H -#include <QtCore/QUrl> -#include <QtGui/QWidget> -#include <QtGui/QLineEdit> +#include <QUrl> +#include <QWidget> +#include <QLineEdit> QT_BEGIN_NAMESPACE diff --git a/src/shared/help/topicchooser.cpp b/src/shared/help/topicchooser.cpp index 79bd892e88..9a101fa504 100644 --- a/src/shared/help/topicchooser.cpp +++ b/src/shared/help/topicchooser.cpp @@ -32,12 +32,12 @@ #include "topicchooser.h" -#include <QtCore/QMap> -#include <QtCore/QUrl> +#include <QMap> +#include <QUrl> -#include <QtGui/QKeyEvent> -#include <QtGui/QStandardItemModel> -#include <QtGui/QSortFilterProxyModel> +#include <QKeyEvent> +#include <QStandardItemModel> +#include <QSortFilterProxyModel> TopicChooser::TopicChooser(QWidget *parent, const QString &keyword, const QMap<QString, QUrl> &links) diff --git a/src/shared/help/topicchooser.h b/src/shared/help/topicchooser.h index 39f98face2..2cc29aa790 100644 --- a/src/shared/help/topicchooser.h +++ b/src/shared/help/topicchooser.h @@ -35,12 +35,12 @@ #include "ui_topicchooser.h" -#include <QtCore/QUrl> -#include <QtCore/QMap> -#include <QtCore/QModelIndex> -#include <QtCore/QString> +#include <QUrl> +#include <QMap> +#include <QModelIndex> +#include <QString> -#include <QtGui/QDialog> +#include <QDialog> QT_FORWARD_DECLARE_CLASS(QSortFilterProxyModel) diff --git a/src/shared/json/json.cpp b/src/shared/json/json.cpp index bc653af694..32969ea0e2 100644 --- a/src/shared/json/json.cpp +++ b/src/shared/json/json.cpp @@ -36,11 +36,11 @@ #include <utils/qtcassert.h> #endif // TODO_USE_CREATOR -#include <QtCore/QByteArray> -#include <QtCore/QTextStream> -#include <QtCore/QDebug> -#include <QtCore/QStringList> -#include <QtCore/QVariant> +#include <QByteArray> +#include <QTextStream> +#include <QDebug> +#include <QStringList> +#include <QVariant> #include <ctype.h> diff --git a/src/shared/json/json.h b/src/shared/json/json.h index 0470799d0a..b518b879fc 100644 --- a/src/shared/json/json.h +++ b/src/shared/json/json.h @@ -35,9 +35,9 @@ #include "json_global.h" -#include <QtCore/QByteArray> -#include <QtCore/QStringList> -#include <QtCore/QVector> +#include <QByteArray> +#include <QStringList> +#include <QVector> namespace Json { diff --git a/src/shared/json/json_global.h b/src/shared/json/json_global.h index 804422c6a9..cdd5b01a96 100644 --- a/src/shared/json/json_global.h +++ b/src/shared/json/json_global.h @@ -33,7 +33,7 @@ #ifndef JSON_GLOBAL_H #define JSON_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(JSON_BUILD_LIB) # define JSON_EXPORT Q_DECL_EXPORT diff --git a/src/shared/modeltest/modeltest.h b/src/shared/modeltest/modeltest.h index 32aba9a62c..b59c8cac48 100644 --- a/src/shared/modeltest/modeltest.h +++ b/src/shared/modeltest/modeltest.h @@ -33,9 +33,9 @@ #ifndef MODELTEST_H #define MODELTEST_H -#include <QtCore/QAbstractItemModel> -#include <QtCore/QObject> -#include <QtCore/QStack> +#include <QAbstractItemModel> +#include <QObject> +#include <QStack> class ModelTest : public QObject { diff --git a/src/shared/proparser/ioutils.cpp b/src/shared/proparser/ioutils.cpp index b1c24c2046..eaaf18e698 100644 --- a/src/shared/proparser/ioutils.cpp +++ b/src/shared/proparser/ioutils.cpp @@ -32,8 +32,8 @@ #include "ioutils.h" -#include <QtCore/QDir> -#include <QtCore/QFile> +#include <QDir> +#include <QFile> #ifdef Q_OS_WIN # include <windows.h> diff --git a/src/shared/proparser/ioutils.h b/src/shared/proparser/ioutils.h index c00fbda4f9..b3f98ba53b 100644 --- a/src/shared/proparser/ioutils.h +++ b/src/shared/proparser/ioutils.h @@ -33,7 +33,7 @@ #ifndef IOUTILS_H #define IOUTILS_H -#include <QtCore/QString> +#include <QString> QT_USE_NAMESPACE diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index 511b73d645..078f6aadba 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -35,21 +35,21 @@ #include "profileparser.h" #include "ioutils.h" -#include <QtCore/QByteArray> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QList> -#include <QtCore/QRegExp> -#include <QtCore/QSet> -#include <QtCore/QStack> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QTextStream> +#include <QByteArray> +#include <QDateTime> +#include <QDebug> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QList> +#include <QRegExp> +#include <QSet> +#include <QStack> +#include <QString> +#include <QStringList> +#include <QTextStream> #ifdef PROEVALUATOR_THREAD_SAFE -# include <QtCore/QThreadPool> +# include <QThreadPool> #endif #ifdef Q_OS_UNIX diff --git a/src/shared/proparser/profileevaluator.h b/src/shared/proparser/profileevaluator.h index 98f426ae9d..8866efb810 100644 --- a/src/shared/proparser/profileevaluator.h +++ b/src/shared/proparser/profileevaluator.h @@ -36,14 +36,14 @@ #include "proparser_global.h" #include "proitems.h" -#include <QtCore/QHash> -#include <QtCore/QStringList> +#include <QHash> +#include <QStringList> #ifndef QT_BOOTSTRAPPED -# include <QtCore/QProcess> +# include <QProcess> #endif #ifdef PROEVALUATOR_THREAD_SAFE -# include <QtCore/QMutex> -# include <QtCore/QWaitCondition> +# include <QMutex> +# include <QWaitCondition> #endif QT_BEGIN_NAMESPACE diff --git a/src/shared/proparser/profileparser.cpp b/src/shared/proparser/profileparser.cpp index 1b99380201..c1aae00d7e 100644 --- a/src/shared/proparser/profileparser.cpp +++ b/src/shared/proparser/profileparser.cpp @@ -35,9 +35,9 @@ #include "ioutils.h" using namespace ProFileEvaluatorInternal; -#include <QtCore/QFile> +#include <QFile> #ifdef PROPARSER_THREAD_SAFE -# include <QtCore/QThreadPool> +# include <QThreadPool> #endif QT_BEGIN_NAMESPACE diff --git a/src/shared/proparser/profileparser.h b/src/shared/proparser/profileparser.h index cd5f1da07c..fbea7e2e87 100644 --- a/src/shared/proparser/profileparser.h +++ b/src/shared/proparser/profileparser.h @@ -35,11 +35,11 @@ #include "proparser_global.h" #include "proitems.h" -#include <QtCore/QHash> -#include <QtCore/QStack> +#include <QHash> +#include <QStack> #ifdef PROPARSER_THREAD_SAFE -# include <QtCore/QMutex> -# include <QtCore/QWaitCondition> +# include <QMutex> +# include <QWaitCondition> #endif // Be fast even for debug builds diff --git a/src/shared/proparser/proitems.cpp b/src/shared/proparser/proitems.cpp index e324bb5569..3502bd761a 100644 --- a/src/shared/proparser/proitems.cpp +++ b/src/shared/proparser/proitems.cpp @@ -32,8 +32,8 @@ #include "proitems.h" -#include <QtCore/QFileInfo> -#include <QtCore/QSet> +#include <QFileInfo> +#include <QSet> QT_BEGIN_NAMESPACE diff --git a/src/shared/proparser/proitems.h b/src/shared/proparser/proitems.h index b599f66638..63ead684d0 100644 --- a/src/shared/proparser/proitems.h +++ b/src/shared/proparser/proitems.h @@ -34,8 +34,8 @@ #define PROITEMS_H #include "proparser_global.h" -#include <QtCore/QString> -#include <QtCore/QVector> +#include <QString> +#include <QVector> QT_BEGIN_NAMESPACE diff --git a/src/shared/proparser/proparser_global.h b/src/shared/proparser/proparser_global.h index e3c52175e8..ac639bbd98 100644 --- a/src/shared/proparser/proparser_global.h +++ b/src/shared/proparser/proparser_global.h @@ -33,7 +33,7 @@ #ifndef PROPARSER_GLOBAL_H #define PROPARSER_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(PROPARSER_AS_LIBRARY) # if defined(PROPARSER_LIBRARY) diff --git a/src/shared/proparser/prowriter.cpp b/src/shared/proparser/prowriter.cpp index 4bf1b76e33..984f60683f 100644 --- a/src/shared/proparser/prowriter.cpp +++ b/src/shared/proparser/prowriter.cpp @@ -33,8 +33,8 @@ #include "proitems.h" #include "prowriter.h" -#include <QtCore/QDir> -#include <QtCore/QPair> +#include <QDir> +#include <QPair> using namespace Qt4ProjectManager::Internal; diff --git a/src/shared/proparser/prowriter.h b/src/shared/proparser/prowriter.h index b7e0135e32..7608529ba7 100644 --- a/src/shared/proparser/prowriter.h +++ b/src/shared/proparser/prowriter.h @@ -34,7 +34,7 @@ #define PROWRITER_H #include "proparser_global.h" -#include <QtCore/QStringList> +#include <QStringList> QT_BEGIN_NAMESPACE class QDir; diff --git a/src/shared/qrceditor/qrceditor.cpp b/src/shared/qrceditor/qrceditor.cpp index f8af0c85b5..0896574e28 100644 --- a/src/shared/qrceditor/qrceditor.cpp +++ b/src/shared/qrceditor/qrceditor.cpp @@ -33,11 +33,11 @@ #include "qrceditor.h" #include "undocommands_p.h" -#include <QtCore/QDebug> -#include <QtCore/QScopedPointer> -#include <QtGui/QMenu> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QScopedPointer> +#include <QMenu> +#include <QFileDialog> +#include <QMessageBox> using namespace SharedTools; diff --git a/src/shared/qrceditor/qrceditor.h b/src/shared/qrceditor/qrceditor.h index 8bada5560c..1804a388db 100644 --- a/src/shared/qrceditor/qrceditor.h +++ b/src/shared/qrceditor/qrceditor.h @@ -35,8 +35,8 @@ #include "ui_qrceditor.h" #include "resourceview.h" -#include <QtGui/QWidget> -#include <QtGui/QUndoStack> +#include <QWidget> +#include <QUndoStack> namespace SharedTools { diff --git a/src/shared/qrceditor/resourcefile.cpp b/src/shared/qrceditor/resourcefile.cpp index 2caf203d6d..3d67e1f2d4 100644 --- a/src/shared/qrceditor/resourcefile.cpp +++ b/src/shared/qrceditor/resourcefile.cpp @@ -32,18 +32,18 @@ #include "resourcefile_p.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QMimeData> -#include <QtCore/QtAlgorithms> -#include <QtCore/QTextStream> - -#include <QtGui/QIcon> -#include <QtGui/QImageReader> - -#include <QtXml/QDomDocument> +#include <QCoreApplication> +#include <QDebug> +#include <QDir> +#include <QFile> +#include <QMimeData> +#include <QtAlgorithms> +#include <QTextStream> + +#include <QIcon> +#include <QImageReader> + +#include <QDomDocument> QT_BEGIN_NAMESPACE diff --git a/src/shared/qrceditor/resourcefile_p.h b/src/shared/qrceditor/resourcefile_p.h index e4fc4cff71..10956cd086 100644 --- a/src/shared/qrceditor/resourcefile_p.h +++ b/src/shared/qrceditor/resourcefile_p.h @@ -33,11 +33,11 @@ #ifndef RESOURCEFILE_P_H #define RESOURCEFILE_P_H -#include <QtCore/QAbstractItemModel> -#include <QtCore/QMap> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtGui/QIcon> +#include <QAbstractItemModel> +#include <QMap> +#include <QString> +#include <QStringList> +#include <QIcon> QT_BEGIN_NAMESPACE diff --git a/src/shared/qrceditor/resourceview.cpp b/src/shared/qrceditor/resourceview.cpp index 60dffc01d2..7590af1abe 100644 --- a/src/shared/qrceditor/resourceview.cpp +++ b/src/shared/qrceditor/resourceview.cpp @@ -34,16 +34,16 @@ #include "undocommands_p.h" -#include <QtCore/QDebug> - -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QFileDialog> -#include <QtGui/QHeaderView> -#include <QtGui/QInputDialog> -#include <QtGui/QMenu> -#include <QtGui/QMouseEvent> -#include <QtGui/QUndoStack> +#include <QDebug> + +#include <QAction> +#include <QApplication> +#include <QFileDialog> +#include <QHeaderView> +#include <QInputDialog> +#include <QMenu> +#include <QMouseEvent> +#include <QUndoStack> namespace SharedTools { diff --git a/src/shared/qrceditor/resourceview.h b/src/shared/qrceditor/resourceview.h index 10201d866a..5cda89c904 100644 --- a/src/shared/qrceditor/resourceview.h +++ b/src/shared/qrceditor/resourceview.h @@ -35,8 +35,8 @@ #include "resourcefile_p.h" -#include <QtGui/QTreeView> -#include <QtCore/QPoint> +#include <QTreeView> +#include <QPoint> using namespace qdesigner_internal; diff --git a/src/shared/qrceditor/undocommands.cpp b/src/shared/qrceditor/undocommands.cpp index 3e5fd2566d..c08a60f7a7 100644 --- a/src/shared/qrceditor/undocommands.cpp +++ b/src/shared/qrceditor/undocommands.cpp @@ -32,7 +32,7 @@ #include "undocommands_p.h" -#include <QtCore/QModelIndex> +#include <QModelIndex> namespace SharedTools { diff --git a/src/shared/qrceditor/undocommands_p.h b/src/shared/qrceditor/undocommands_p.h index 8210005cc0..8363211a32 100644 --- a/src/shared/qrceditor/undocommands_p.h +++ b/src/shared/qrceditor/undocommands_p.h @@ -35,8 +35,8 @@ #include "resourceview.h" -#include <QtCore/QString> -#include <QtGui/QUndoCommand> +#include <QString> +#include <QUndoCommand> QT_BEGIN_NAMESPACE class QModelIndex; diff --git a/src/shared/qtcreator_gui_pch.h b/src/shared/qtcreator_gui_pch.h index 0d47d24ebb..7f938a68ad 100644 --- a/src/shared/qtcreator_gui_pch.h +++ b/src/shared/qtcreator_gui_pch.h @@ -39,17 +39,17 @@ #if defined __cplusplus -#include <QtCore/QEvent> -#include <QtCore/QTimer> -#include <QtGui/QApplication> -#include <QtGui/QBitmap> -#include <QtGui/QCursor> -#include <QtGui/QDesktopWidget> -#include <QtGui/QImage> -#include <QtGui/QLayout> -#include <QtGui/QPainter> -#include <QtGui/QPixmap> -#include <QtGui/QStyle> -#include <QtGui/QWidget> +#include <QEvent> +#include <QTimer> +#include <QApplication> +#include <QBitmap> +#include <QCursor> +#include <QDesktopWidget> +#include <QImage> +#include <QLayout> +#include <QPainter> +#include <QPixmap> +#include <QStyle> +#include <QWidget> #endif diff --git a/src/shared/qtcreator_pch.h b/src/shared/qtcreator_pch.h index c8bb96a5dc..d210804eb7 100644 --- a/src/shared/qtcreator_pch.h +++ b/src/shared/qtcreator_pch.h @@ -36,7 +36,7 @@ */ #if defined __cplusplus -#include <QtCore/QtGlobal> +#include <QtGlobal> #ifdef Q_WS_WIN # define _POSIX_ @@ -44,18 +44,18 @@ # undef _POSIX_ #endif -#include <QtCore/QCoreApplication> -#include <QtCore/QList> -#include <QtCore/QVariant> -#include <QtCore/QObject> -#include <QtCore/QRegExp> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QTextCodec> -#include <QtCore/QPointer> -#include <QtCore/QScopedPointer> -#include <QtCore/QSharedPointer> -#include <QtCore/QDebug> +#include <QCoreApplication> +#include <QList> +#include <QVariant> +#include <QObject> +#include <QRegExp> +#include <QString> +#include <QStringList> +#include <QTextCodec> +#include <QPointer> +#include <QScopedPointer> +#include <QSharedPointer> +#include <QDebug> #include <stdlib.h> #endif diff --git a/src/shared/qtlockedfile/qtlockedfile.h b/src/shared/qtlockedfile/qtlockedfile.h index 286d2544a5..e803850898 100644 --- a/src/shared/qtlockedfile/qtlockedfile.h +++ b/src/shared/qtlockedfile/qtlockedfile.h @@ -33,7 +33,7 @@ #ifndef QTLOCKEDFILE_H #define QTLOCKEDFILE_H -#include <QtCore/QFile> +#include <QFile> #if defined(Q_OS_WIN) # if !defined(QT_QTLOCKEDFILE_EXPORT) && !defined(QT_QTLOCKEDFILE_IMPORT) diff --git a/src/shared/qtlockedfile/qtlockedfile_win.cpp b/src/shared/qtlockedfile/qtlockedfile_win.cpp index 50eeaf6b39..6f237be0bb 100644 --- a/src/shared/qtlockedfile/qtlockedfile_win.cpp +++ b/src/shared/qtlockedfile/qtlockedfile_win.cpp @@ -33,7 +33,7 @@ #include "qtlockedfile.h" #include <qt_windows.h> -#include <QtCore/QFileInfo> +#include <QFileInfo> namespace SharedTools { diff --git a/src/shared/qtsingleapplication/qtlocalpeer.cpp b/src/shared/qtsingleapplication/qtlocalpeer.cpp index ea034f3fe2..1b1619aafd 100644 --- a/src/shared/qtsingleapplication/qtlocalpeer.cpp +++ b/src/shared/qtsingleapplication/qtlocalpeer.cpp @@ -32,12 +32,12 @@ #include "qtlocalpeer.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QTime> +#include <QCoreApplication> +#include <QTime> #if defined(Q_OS_WIN) -#include <QtCore/QLibrary> -#include <QtCore/qt_windows.h> +#include <QLibrary> +#include <qt_windows.h> typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*); static PProcessIdToSessionId pProcessIdToSessionId = 0; #endif diff --git a/src/shared/qtsingleapplication/qtlocalpeer.h b/src/shared/qtsingleapplication/qtlocalpeer.h index 628f5f462b..7a56e013c1 100644 --- a/src/shared/qtsingleapplication/qtlocalpeer.h +++ b/src/shared/qtsingleapplication/qtlocalpeer.h @@ -32,9 +32,9 @@ #include "qtlockedfile.h" -#include <QtNetwork/QLocalServer> -#include <QtNetwork/QLocalSocket> -#include <QtCore/QDir> +#include <QLocalServer> +#include <QLocalSocket> +#include <QDir> namespace SharedTools { diff --git a/src/shared/qtsingleapplication/qtsingleapplication.cpp b/src/shared/qtsingleapplication/qtsingleapplication.cpp index 44d4542a99..ab669720e4 100644 --- a/src/shared/qtsingleapplication/qtsingleapplication.cpp +++ b/src/shared/qtsingleapplication/qtsingleapplication.cpp @@ -33,8 +33,8 @@ #include "qtsingleapplication.h" #include "qtlocalpeer.h" -#include <QtGui/QWidget> -#include <QtGui/QFileOpenEvent> +#include <QWidget> +#include <QFileOpenEvent> namespace SharedTools { diff --git a/src/shared/qtsingleapplication/qtsingleapplication.h b/src/shared/qtsingleapplication/qtsingleapplication.h index 9b44626916..02db811b14 100644 --- a/src/shared/qtsingleapplication/qtsingleapplication.h +++ b/src/shared/qtsingleapplication/qtsingleapplication.h @@ -30,7 +30,7 @@ ** **************************************************************************/ -#include <QtGui/QApplication> +#include <QApplication> namespace SharedTools { diff --git a/src/shared/qtsingleapplication/qtsinglecoreapplication.h b/src/shared/qtsingleapplication/qtsinglecoreapplication.h index 15728fd687..98f6cc3fd5 100644 --- a/src/shared/qtsingleapplication/qtsinglecoreapplication.h +++ b/src/shared/qtsingleapplication/qtsinglecoreapplication.h @@ -30,7 +30,7 @@ ** **************************************************************************/ -#include <QtCore/QCoreApplication> +#include <QCoreApplication> namespace SharedTools { diff --git a/src/shared/registryaccess/registryaccess.cpp b/src/shared/registryaccess/registryaccess.cpp index 60b57cc73b..4d1ffbe76c 100644 --- a/src/shared/registryaccess/registryaccess.cpp +++ b/src/shared/registryaccess/registryaccess.cpp @@ -32,10 +32,10 @@ #include "registryaccess.h" -#include <QtGui/QApplication> +#include <QApplication> -#include <QtCore/QDir> -#include <QtCore/QTextStream> +#include <QDir> +#include <QTextStream> namespace RegistryAccess { diff --git a/src/shared/registryaccess/registryaccess.h b/src/shared/registryaccess/registryaccess.h index 5c7d98b197..8004005912 100644 --- a/src/shared/registryaccess/registryaccess.h +++ b/src/shared/registryaccess/registryaccess.h @@ -37,8 +37,8 @@ #ifndef REGISTRYACCESS_H #define REGISTRYACCESS_H -#include <QtCore/QString> -#include <QtCore/QLatin1String> +#include <QString> +#include <QLatin1String> #include <Windows.h> diff --git a/src/shared/scriptwrapper/interface_wrap_helpers.h b/src/shared/scriptwrapper/interface_wrap_helpers.h index 945d7ad392..7d71393269 100644 --- a/src/shared/scriptwrapper/interface_wrap_helpers.h +++ b/src/shared/scriptwrapper/interface_wrap_helpers.h @@ -33,7 +33,7 @@ #ifndef INTERFACE_WRAP_HELPERS_H #define INTERFACE_WRAP_HELPERS_H -#include <QtScript/QScriptEngine> +#include <QScriptEngine> namespace SharedTools { diff --git a/src/shared/scriptwrapper/wrap_helpers.h b/src/shared/scriptwrapper/wrap_helpers.h index 9049824f72..79dc7751d4 100644 --- a/src/shared/scriptwrapper/wrap_helpers.h +++ b/src/shared/scriptwrapper/wrap_helpers.h @@ -33,9 +33,9 @@ #ifndef WRAP_HELPERS_H #define WRAP_HELPERS_H -#include <QtScript/QScriptEngine> -#include <QtScript/QScriptContext> -#include <QtScript/QScriptValue> +#include <QScriptEngine> +#include <QScriptContext> +#include <QScriptValue> namespace SharedTools { diff --git a/src/shared/symbianutils/codadevice.cpp b/src/shared/symbianutils/codadevice.cpp index 748b57bae7..7775e4fb09 100644 --- a/src/shared/symbianutils/codadevice.cpp +++ b/src/shared/symbianutils/codadevice.cpp @@ -34,13 +34,13 @@ #include "json.h" #include "codautils.h" -#include <QtNetwork/QAbstractSocket> -#include <QtCore/QDebug> -#include <QtCore/QVector> -#include <QtCore/QQueue> -#include <QtCore/QTextStream> -#include <QtCore/QDateTime> -#include <QtCore/QFileInfo> +#include <QAbstractSocket> +#include <QDebug> +#include <QVector> +#include <QQueue> +#include <QTextStream> +#include <QDateTime> +#include <QFileInfo> enum { debug = 0 }; diff --git a/src/shared/symbianutils/codadevice.h b/src/shared/symbianutils/codadevice.h index 5f01d6aa30..de61bfa40d 100644 --- a/src/shared/symbianutils/codadevice.h +++ b/src/shared/symbianutils/codadevice.h @@ -38,12 +38,12 @@ #include "callback.h" #include "json.h" -#include <QtCore/QObject> -#include <QtCore/QSharedPointer> -#include <QtCore/QVector> -#include <QtCore/QVariant> -#include <QtCore/QStringList> -#include <QtCore/QDateTime> +#include <QObject> +#include <QSharedPointer> +#include <QVector> +#include <QVariant> +#include <QStringList> +#include <QDateTime> QT_BEGIN_NAMESPACE class QIODevice; diff --git a/src/shared/symbianutils/codamessage.cpp b/src/shared/symbianutils/codamessage.cpp index fe12fae853..dbaffaa982 100644 --- a/src/shared/symbianutils/codamessage.cpp +++ b/src/shared/symbianutils/codamessage.cpp @@ -33,8 +33,8 @@ #include "codamessage.h" #include "json.h" -#include <QtCore/QString> -#include <QtCore/QTextStream> +#include <QString> +#include <QTextStream> // Names matching the enum static const char *serviceNamesC[] = diff --git a/src/shared/symbianutils/codamessage.h b/src/shared/symbianutils/codamessage.h index bec936d46e..7585affef1 100644 --- a/src/shared/symbianutils/codamessage.h +++ b/src/shared/symbianutils/codamessage.h @@ -36,8 +36,8 @@ #include "symbianutils_global.h" #include "json_global.h" -#include <QtCore/QStringList> -#include <QtCore/QVector> +#include <QStringList> +#include <QVector> QT_BEGIN_NAMESPACE class QTextStream; diff --git a/src/shared/symbianutils/codautils.cpp b/src/shared/symbianutils/codautils.cpp index 54b7b0496e..d3ab91a710 100644 --- a/src/shared/symbianutils/codautils.cpp +++ b/src/shared/symbianutils/codautils.cpp @@ -33,11 +33,11 @@ #include "codautils.h" #include <ctype.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QDate> -#include <QtCore/QDateTime> -#include <QtCore/QTime> +#include <QCoreApplication> +#include <QDebug> +#include <QDate> +#include <QDateTime> +#include <QTime> #define logMessage(s) do { qDebug() << "CODACLIENT: " << s; } while (0) diff --git a/src/shared/symbianutils/codautils.h b/src/shared/symbianutils/codautils.h index 2626df17ec..8480b99d00 100644 --- a/src/shared/symbianutils/codautils.h +++ b/src/shared/symbianutils/codautils.h @@ -35,10 +35,10 @@ #include "symbianutils_global.h" -#include <QtCore/QByteArray> -#include <QtCore/QHash> -#include <QtCore/QStringList> -#include <QtCore/QVariant> +#include <QByteArray> +#include <QHash> +#include <QStringList> +#include <QVariant> QT_BEGIN_NAMESPACE class QDateTime; diff --git a/src/shared/symbianutils/symbiandevicemanager.cpp b/src/shared/symbianutils/symbiandevicemanager.cpp index d056d4cdd8..c25ffdeaa0 100644 --- a/src/shared/symbianutils/symbiandevicemanager.cpp +++ b/src/shared/symbianutils/symbiandevicemanager.cpp @@ -34,19 +34,19 @@ #include "codadevice.h" #include "virtualserialdevice.h" -#include <QtCore/QCoreApplication> -#include <QtCore/QEvent> -#include <QtCore/QSettings> -#include <QtCore/QStringList> -#include <QtCore/QFileInfo> -#include <QtCore/QtDebug> -#include <QtCore/QTextStream> -#include <QtCore/QSharedData> -#include <QtCore/QScopedPointer> -#include <QtCore/QSignalMapper> -#include <QtCore/QThread> -#include <QtCore/QWaitCondition> -#include <QtCore/QTimer> +#include <QCoreApplication> +#include <QEvent> +#include <QSettings> +#include <QStringList> +#include <QFileInfo> +#include <QtDebug> +#include <QTextStream> +#include <QSharedData> +#include <QScopedPointer> +#include <QSignalMapper> +#include <QThread> +#include <QWaitCondition> +#include <QTimer> #ifdef Q_OS_MACX #include <CoreFoundation/CoreFoundation.h> diff --git a/src/shared/symbianutils/symbiandevicemanager.h b/src/shared/symbianutils/symbiandevicemanager.h index 96da967f4c..27ba86aa4d 100644 --- a/src/shared/symbianutils/symbiandevicemanager.h +++ b/src/shared/symbianutils/symbiandevicemanager.h @@ -35,9 +35,9 @@ #include "symbianutils_global.h" -#include <QtCore/QIODevice> -#include <QtCore/QExplicitlySharedDataPointer> -#include <QtCore/QSharedPointer> +#include <QIODevice> +#include <QExplicitlySharedDataPointer> +#include <QSharedPointer> QT_BEGIN_NAMESPACE class QDebug; diff --git a/src/shared/symbianutils/symbianutils_global.h b/src/shared/symbianutils/symbianutils_global.h index 0550c64d31..d7c83fd8c2 100644 --- a/src/shared/symbianutils/symbianutils_global.h +++ b/src/shared/symbianutils/symbianutils_global.h @@ -33,7 +33,7 @@ #ifndef SYMBIANUTILS_GLOBAL_H #define SYMBIANUTILS_GLOBAL_H -#include <QtCore/qglobal.h> +#include <qglobal.h> #if defined(SYMBIANUTILS_BUILD_LIB) # define SYMBIANUTILS_EXPORT Q_DECL_EXPORT diff --git a/src/shared/symbianutils/virtualserialdevice.cpp b/src/shared/symbianutils/virtualserialdevice.cpp index fdf81ebcbe..84eff45d57 100644 --- a/src/shared/symbianutils/virtualserialdevice.cpp +++ b/src/shared/symbianutils/virtualserialdevice.cpp @@ -31,8 +31,8 @@ **************************************************************************/ #include "virtualserialdevice.h" -#include <QtCore/QThread> -#include <QtCore/QWaitCondition> +#include <QThread> +#include <QWaitCondition> namespace SymbianUtils { diff --git a/src/shared/symbianutils/virtualserialdevice.h b/src/shared/symbianutils/virtualserialdevice.h index 6ea9a9d53d..3cbe9156b2 100644 --- a/src/shared/symbianutils/virtualserialdevice.h +++ b/src/shared/symbianutils/virtualserialdevice.h @@ -33,9 +33,9 @@ #ifndef VIRTUALSERIALPORT_H #define VIRTUALSERIALPORT_H -#include <QtCore/QIODevice> -#include <QtCore/QString> -#include <QtCore/QMutex> +#include <QIODevice> +#include <QString> +#include <QMutex> QT_BEGIN_NAMESPACE class QWaitCondition; diff --git a/src/shared/symbianutils/virtualserialdevice_posix.cpp b/src/shared/symbianutils/virtualserialdevice_posix.cpp index 694ae0f736..709196be26 100644 --- a/src/shared/symbianutils/virtualserialdevice_posix.cpp +++ b/src/shared/symbianutils/virtualserialdevice_posix.cpp @@ -36,10 +36,10 @@ #include <termios.h> #include <sys/ioctl.h> #include <unistd.h> -#include <QtCore/QSocketNotifier> -#include <QtCore/QTimer> -#include <QtCore/QThread> -#include <QtCore/QWaitCondition> +#include <QSocketNotifier> +#include <QTimer> +#include <QThread> +#include <QWaitCondition> #include "virtualserialdevice.h" namespace SymbianUtils { diff --git a/src/shared/symbianutils/virtualserialdevice_win.cpp b/src/shared/symbianutils/virtualserialdevice_win.cpp index edc55f19aa..e0ca69a595 100644 --- a/src/shared/symbianutils/virtualserialdevice_win.cpp +++ b/src/shared/symbianutils/virtualserialdevice_win.cpp @@ -33,12 +33,12 @@ #include "virtualserialdevice.h" #include <windows.h> #if QT_VERSION >= 0x050000 -# include <QtCore/QWinEventNotifier> +# include <QWinEventNotifier> #else -# include <QtCore/private/qwineventnotifier_p.h> +# include <private/qwineventnotifier_p.h> #endif -#include <QtCore/QThread> -#include <QtCore/QWaitCondition> +#include <QThread> +#include <QWaitCondition> namespace SymbianUtils { |