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>

src/plugins/cpptools/abstracteditorsupport.cpp

@@ -44,7 +44,7 @@
 #include <Scope.h>
 
 #include <coreplugin/icore.h>
-#include <QtCore/QDebug>
+#include <QDebug>
 
 using namespace CPlusPlus;
 

src/plugins/cpptools/abstracteditorsupport.h

@@ -35,7 +35,7 @@
 
 #include "cpptools_global.h"
 
-#include <QtCore/QString>
+#include <QString>
 
 namespace CPlusPlus {
 class CppModelManagerInterface;

src/plugins/cpptools/commentssettings.cpp

@@ -1,6 +1,6 @@
 #include "commentssettings.h"
 
-#include <QtCore/QSettings>
+#include <QSettings>
 
 using namespace CppTools;
 

src/plugins/cpptools/completionsettingspage.cpp

@@ -38,8 +38,8 @@
 #include <extensionsystem/pluginmanager.h>
 #include <texteditor/texteditorsettings.h>
 
-#include <QtCore/QTextStream>
-#include <QtCore/QCoreApplication>
+#include <QTextStream>
+#include <QCoreApplication>
 
 using namespace CppTools;
 using namespace CppTools::Internal;

src/plugins/cpptools/cppchecksymbols.cpp

@@ -45,9 +45,9 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QThreadPool>
-#include <QtCore/QDebug>
+#include <QCoreApplication>
+#include <QThreadPool>
+#include <QDebug>
 
 #include <utils/runextensions.h>
 

src/plugins/cpptools/cppchecksymbols.h

@@ -42,9 +42,9 @@
 #include <texteditor/semantichighlighter.h>
 
 #include <ASTVisitor.h>
-#include <QtCore/QSet>
-#include <QtCore/QFuture>
-#include <QtCore/QtConcurrentRun>
+#include <QSet>
+#include <QFuture>
+#include <QtConcurrentRun>
 
 namespace CPlusPlus {
 

src/plugins/cpptools/cppcodeformatter.cpp

@@ -39,11 +39,11 @@
 #include <texteditor/tabsettings.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QMetaEnum>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextBlock>
+#include <QDebug>
+#include <QMetaEnum>
+#include <QTextDocument>
+#include <QTextCursor>
+#include <QTextBlock>
 
 #include "cppcodestylesettingspage.h"
 

src/plugins/cpptools/cppcodeformatter.h

@@ -40,11 +40,11 @@
 #include <texteditor/tabsettings.h>
 #include <cpptools/cppcodestylesettings.h>
 
-#include <QtCore/QChar>
-#include <QtCore/QStack>
-#include <QtCore/QList>
-#include <QtCore/QVector>
-#include <QtCore/QPointer>
+#include <QChar>
+#include <QStack>
+#include <QList>
+#include <QVector>
+#include <QPointer>
 
 QT_BEGIN_NAMESPACE
 class QTextDocument;

src/plugins/cpptools/cppcodestylepreferencesfactory.cpp

@@ -40,7 +40,7 @@
 #include <texteditor/tabsettings.h>
 #include <texteditor/snippets/isnippetprovider.h>
 #include <cppeditor/cppeditorconstants.h>
-#include <QtGui/QLayout>
+#include <QLayout>
 
 using namespace CppTools;
 

src/plugins/cpptools/cppcodestylesettings.h

@@ -35,8 +35,8 @@
 
 #include "cpptools_global.h"
 
-#include <QtCore/QMetaType>
-#include <QtCore/QVariant>
+#include <QMetaType>
+#include <QVariant>
 
 QT_BEGIN_NAMESPACE
 class QSettings;

src/plugins/cpptools/cppcodestylesettingspage.cpp

@@ -45,8 +45,8 @@
 #include <extensionsystem/pluginmanager.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <coreplugin/icore.h>
-#include <QtGui/QTextBlock>
-#include <QtCore/QTextStream>
+#include <QTextBlock>
+#include <QTextStream>
 
 static const char *defaultCodeStyleSnippets[] = {
     "#include <math.h>\n"

src/plugins/cpptools/cppcodestylesettingspage.h

@@ -36,11 +36,11 @@
 #include "cpptools_global.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
-#include <QtGui/QWidget>
-#include <QtCore/QPointer>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QVariant>
-#include <QtCore/QStringList>
+#include <QWidget>
+#include <QPointer>
+#include <QSharedPointer>
+#include <QVariant>
+#include <QStringList>
 
 #include "cppcodestylesettings.h"
 #include "cppcodeformatter.h"

src/plugins/cpptools/cppcompletionassist.cpp

@@ -71,10 +71,10 @@
 #include <texteditor/completionsettings.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QLatin1String>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextDocument>
-#include <QtGui/QIcon>
+#include <QLatin1String>
+#include <QTextCursor>
+#include <QTextDocument>
+#include <QIcon>
 
 using namespace CPlusPlus;
 using namespace CppEditor;

src/plugins/cpptools/cppcompletionassist.h

@@ -47,8 +47,8 @@
 #include <texteditor/snippets/snippetassistcollector.h>
 #include <texteditor/codeassist/defaultassistinterface.h>
 
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
+#include <QStringList>
+#include <QVariant>
 
 QT_BEGIN_NAMESPACE
 class QTextCursor;

src/plugins/cpptools/cppcurrentdocumentfilter.cpp

@@ -35,7 +35,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <cplusplus/CppDocument.h>
 
-#include <QtCore/QStringMatcher>
+#include <QStringMatcher>
 
 using namespace CppTools::Internal;
 using namespace CPlusPlus;

src/plugins/cpptools/cppdoxygen.cpp

@@ -32,7 +32,7 @@
 
 #include "cppdoxygen.h"
 
-#include <QtCore/QString>
+#include <QString>
 
 using namespace CppTools;
 

src/plugins/cpptools/cppfilesettingspage.cpp

@@ -43,18 +43,18 @@
 
 #include <utils/fileutils.h>
 
-#include <QtCore/QSettings>
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDate>
-#include <QtCore/QLocale>
-#include <QtCore/QTextCodec>
-#include <QtCore/QTextStream>
+#include <QSettings>
+#include <QDebug>
+#include <QFile>
+#include <QFileInfo>
+#include <QCoreApplication>
+#include <QDate>
+#include <QLocale>
+#include <QTextCodec>
+#include <QTextStream>
 
-#include <QtGui/QFileDialog>
-#include <QtGui/QMessageBox>
+#include <QFileDialog>
+#include <QMessageBox>
 
 static const char headerSuffixKeyC[] = "HeaderSuffix";
 static const char sourceSuffixKeyC[] = "SourceSuffix";

src/plugins/cpptools/cppfilesettingspage.h

@@ -35,9 +35,9 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
-#include <QtCore/QPointer>
-#include <QtCore/QSharedPointer>
-#include <QtGui/QWidget>
+#include <QPointer>
+#include <QSharedPointer>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QSettings;

src/plugins/cpptools/cppfindreferences.cpp

@@ -60,12 +60,12 @@
 #include <cplusplus/Overview.h>
 #include <cplusplus/FindUsages.h>
 
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
-#include <QtCore/QtConcurrentRun>
-#include <QtCore/QtConcurrentMap>
-#include <QtCore/QDir>
-#include <QtGui/QApplication>
+#include <QTime>
+#include <QTimer>
+#include <QtConcurrentRun>
+#include <QtConcurrentMap>
+#include <QDir>
+#include <QApplication>
 #include <utils/runextensions.h>
 
 #include <functional>

src/plugins/cpptools/cppfindreferences.h

@@ -38,12 +38,12 @@
 #include <cplusplus/DependencyTable.h>
 #include <cplusplus/FindUsages.h>
 
-#include <QtCore/QMutex>
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtCore/QFuture>
-#include <QtCore/QFutureWatcher>
-#include <QtCore/QMetaType>
+#include <QMutex>
+#include <QObject>
+#include <QPointer>
+#include <QFuture>
+#include <QFutureWatcher>
+#include <QMetaType>
 
 QT_FORWARD_DECLARE_CLASS(QTimer)
 

src/plugins/cpptools/cpphighlightingsupport.h

@@ -38,7 +38,7 @@
 #include <cplusplus/CppDocument.h>
 #include <texteditor/semantichighlighter.h>
 
-#include <QtCore/QFuture>
+#include <QFuture>
 
 namespace CppTools {
 namespace Internal {

src/plugins/cpptools/cpplocatorfilter.cpp

@@ -36,7 +36,7 @@
 #include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
 
-#include <QtCore/QStringMatcher>
+#include <QStringMatcher>
 
 using namespace CppTools::Internal;
 

src/plugins/cpptools/cppmodelmanager.cpp

@@ -42,9 +42,9 @@
 #endif
 
 #include <functional>
-#include <QtCore/QtConcurrentRun>
+#include <QtConcurrentRun>
 #ifndef ICHECK_BUILD
-#  include <QtCore/QFutureSynchronizer>
+#  include <QFutureSynchronizer>
 #  include <utils/runextensions.h>
 #  include <texteditor/itexteditor.h>
 #  include <texteditor/basetexteditor.h>
@@ -58,7 +58,7 @@
 #  include <coreplugin/progressmanager/progressmanager.h>
 #  include <extensionsystem/pluginmanager.h>
 #else
-#  include <QtCore/QDir>
+#  include <QDir>
 #endif
 
 #include <utils/qtcassert.h>
@@ -78,14 +78,14 @@
 #include <Control.h>
 #include <CoreTypes.h>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QMutexLocker>
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QMutexLocker>
+#include <QTime>
+#include <QTimer>
 #include <QtConcurrentMap>
 
-#include <QtGui/QTextBlock>
+#include <QTextBlock>
 
 #include <iostream>
 #include <sstream>

src/plugins/cpptools/cppmodelmanager.h

@@ -49,12 +49,12 @@
 #ifdef ICHECK_BUILD
 #  include "parsemanager.h"
 #else
-#  include <QtCore/QHash>
-#  include <QtCore/QFutureInterface>
-#  include <QtCore/QFutureSynchronizer>
-#  include <QtCore/QMutex>
-#  include <QtCore/QTimer>
-#  include <QtGui/QTextEdit> // for QTextEdit::ExtraSelection
+#  include <QHash>
+#  include <QFutureInterface>
+#  include <QFutureSynchronizer>
+#  include <QMutex>
+#  include <QTimer>
+#  include <QTextEdit> // for QTextEdit::ExtraSelection
 #endif
 
 namespace Core {

src/plugins/cpptools/cppqtstyleindenter.cpp

@@ -39,10 +39,10 @@
 #include <texteditor/tabsettings.h>
 #include <texteditor/texteditorsettings.h>
 
-#include <QtCore/QChar>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextCursor>
+#include <QChar>
+#include <QTextDocument>
+#include <QTextBlock>
+#include <QTextCursor>
 
 using namespace CppTools;
 

src/plugins/cpptools/cpprefactoringchanges.cpp

@@ -45,7 +45,7 @@
 #include <projectexplorer/editorconfiguration.h>
 #include <utils/qtcassert.h>
 
-#include <QtGui/QTextBlock>
+#include <QTextBlock>
 
 using namespace CPlusPlus;
 using namespace CppTools;

src/plugins/cpptools/cppsemanticinfo.h

@@ -38,7 +38,7 @@
 #include <cplusplus/CppDocument.h>
 #include <cplusplus/LookupContext.h>
 #include <texteditor/semantichighlighter.h>
-#include <QtCore/QHash>
+#include <QHash>
 
 namespace CppTools {
 

src/plugins/cpptools/cpptoolsconstants.h

@@ -33,7 +33,7 @@
 #ifndef CPPTOOLSCONSTANTS_H
 #define CPPTOOLSCONSTANTS_H
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 
 namespace CppTools {
 namespace Constants {

src/plugins/cpptools/cpptoolseditorsupport.cpp

@@ -44,7 +44,7 @@
 #include <ASTVisitor.h>
 #include <TranslationUnit.h>
 
-#include <QtCore/QTimer>
+#include <QTimer>
 
 using namespace CppTools;
 using namespace CppTools::Internal;

src/plugins/cpptools/cpptoolseditorsupport.h

@@ -33,13 +33,13 @@
 #ifndef CPPTOOLSEDITORSUPPORT_H
 #define CPPTOOLSEDITORSUPPORT_H
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtCore/QFuture>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QSharedPointer>
+#include <QObject>
+#include <QPointer>
+#include <QFuture>
+#include <QScopedPointer>
+#include <QSharedPointer>
 
-#include <QtGui/QTextCursor>
+#include <QTextCursor>
 
 #include <cplusplus/CppDocument.h>
 

src/plugins/cpptools/cpptoolsplugin.cpp

@@ -59,8 +59,8 @@
 #include <coreplugin/filemanager.h>
 #include <cppeditor/cppeditorconstants.h>
 
-#include <QtCore/QtConcurrentRun>
-#include <QtCore/QFutureSynchronizer>
+#include <QtConcurrentRun>
+#include <QFutureSynchronizer>
 #include <utils/runextensions.h>
 
 #include <find/ifindfilter.h>
@@ -68,13 +68,13 @@
 #include <utils/filesearch.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QtPlugin>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
-#include <QtCore/QSettings>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
+#include <QtPlugin>
+#include <QFileInfo>
+#include <QDir>
+#include <QDebug>
+#include <QSettings>
+#include <QMenu>
+#include <QAction>
 
 #include <sstream>
 

src/plugins/cpptools/cpptoolsplugin.h

@@ -38,13 +38,13 @@
 #include <find/ifindfilter.h>
 #include <utils/filesearch.h>
 
-#include <QtGui/QTextDocument>
-#include <QtGui/QKeySequence>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QFutureInterface>
-#include <QtCore/QPointer>
-#include <QtCore/QFutureWatcher>
-#include <QtCore/QHash>
+#include <QTextDocument>
+#include <QKeySequence>
+#include <QSharedPointer>
+#include <QFutureInterface>
+#include <QPointer>
+#include <QFutureWatcher>
+#include <QHash>
 
 QT_BEGIN_NAMESPACE
 class QFileInfo;

src/plugins/cpptools/cpptoolsreuse.cpp

@@ -37,9 +37,9 @@
 #include <cplusplus/Overview.h>
 #include <cplusplus/LookupContext.h>
 
-#include <QtCore/QSet>
-#include <QtGui/QTextDocument>
-#include <QtGui/QTextCursor>
+#include <QSet>
+#include <QTextDocument>
+#include <QTextCursor>
 
 using namespace CPlusPlus;
 

src/plugins/cpptools/cpptoolssettings.cpp

@@ -46,7 +46,7 @@
 #include <utils/settingsutils.h>
 #include <utils/qtcassert.h>
 #include <coreplugin/icore.h>
-#include <QtCore/QSettings>
+#include <QSettings>
 
 static const char *idKey = "CppGlobal";
 

src/plugins/cpptools/cpptoolssettings.h

@@ -35,7 +35,7 @@
 
 #include "cpptools_global.h"
 
-#include <QtCore/QObject>
+#include <QObject>
 
 namespace CppTools
 {

src/plugins/cpptools/doxygengenerator.cpp

@@ -12,8 +12,8 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QStringBuilder>
-#include <QtGui/QTextDocument>
+#include <QStringBuilder>
+#include <QTextDocument>
 #include <QDebug>
 
 using namespace CppTools;

src/plugins/cpptools/doxygengenerator.h

@@ -5,8 +5,8 @@
 
 #include <cplusplus/Overview.h>
 
-#include <QtCore/QLatin1String>
-#include <QtGui/QTextCursor>
+#include <QLatin1String>
+#include <QTextCursor>
 
 namespace CPlusPlus {
 class DeclarationAST;

src/plugins/cpptools/searchsymbols.h

@@ -41,11 +41,11 @@
 #include <Symbols.h>
 #include <SymbolVisitor.h>
 
-#include <QtGui/QIcon>
-#include <QtCore/QMetaType>
-#include <QtCore/QString>
-#include <QtCore/QSet>
-#include <QtCore/QHash>
+#include <QIcon>
+#include <QMetaType>
+#include <QString>
+#include <QSet>
+#include <QHash>
 
 #include <functional>
 

src/plugins/cpptools/symbolfinder.cpp

@@ -11,7 +11,7 @@
 #include <Control.h>
 #include <LookupContext.h>
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include <utils/qtcassert.h>
 

src/plugins/cpptools/symbolfinder.h

@@ -6,10 +6,10 @@
 #include <CppDocument.h>
 #include <CPlusPlusForwardDeclarations.h>
 
-#include <QtCore/QHash>
-#include <QtCore/QStringList>
-#include <QtCore/QMultiMap>
-#include <QtCore/QSet>
+#include <QHash>
+#include <QStringList>
+#include <QMultiMap>
+#include <QSet>
 
 namespace CppTools {
 

src/plugins/cpptools/symbolsfindfilter.cpp

@@ -44,11 +44,11 @@
 #include <projectexplorer/project.h>
 #include <utils/qtcassert.h>
 
-#include <QtCore/QSet>
-#include <QtCore/QRegExp>
-#include <QtGui/QGridLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QButtonGroup>
+#include <QSet>
+#include <QRegExp>
+#include <QGridLayout>
+#include <QLabel>
+#include <QButtonGroup>
 
 using namespace CppTools;
 using namespace CppTools::Internal;

src/plugins/cpptools/symbolsfindfilter.h

@@ -38,12 +38,12 @@
 #include <find/ifindfilter.h>
 #include <find/searchresultwindow.h>
 
-#include <QtCore/QFutureInterface>
-#include <QtCore/QFutureWatcher>
-#include <QtCore/QPointer>
-#include <QtGui/QWidget>
-#include <QtGui/QCheckBox>
-#include <QtGui/QRadioButton>
+#include <QFutureInterface>
+#include <QFutureWatcher>
+#include <QPointer>
+#include <QWidget>
+#include <QCheckBox>
+#include <QRadioButton>
 
 namespace CppTools {
 namespace Internal {

src/plugins/cpptools/uicodecompletionsupport.cpp

@@ -32,9 +32,9 @@
 
 #include "uicodecompletionsupport.h"
 
-#include <QtCore/QProcess>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <QProcess>
+#include <QFile>
+#include <QFileInfo>
 
 enum { debug = 0 };
 

src/plugins/cpptools/uicodecompletionsupport.h

@@ -39,7 +39,7 @@
 
 #include <cplusplus/ModelManagerInterface.h>
 
-#include <QtCore/QDateTime>
+#include <QDateTime>
 
 namespace CppTools {