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/plugins/bazaar | |
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/plugins/bazaar')
-rw-r--r-- | src/plugins/bazaar/annotationhighlighter.h | 2 | ||||
-rw-r--r-- | src/plugins/bazaar/bazaarclient.cpp | 8 | ||||
-rw-r--r-- | src/plugins/bazaar/bazaarcommitwidget.cpp | 8 | ||||
-rw-r--r-- | src/plugins/bazaar/bazaarcontrol.cpp | 8 | ||||
-rw-r--r-- | src/plugins/bazaar/bazaareditor.cpp | 14 | ||||
-rw-r--r-- | src/plugins/bazaar/bazaareditor.h | 2 | ||||
-rw-r--r-- | src/plugins/bazaar/bazaarplugin.cpp | 20 | ||||
-rw-r--r-- | src/plugins/bazaar/bazaarplugin.h | 6 | ||||
-rw-r--r-- | src/plugins/bazaar/bazaarsettings.cpp | 2 | ||||
-rw-r--r-- | src/plugins/bazaar/branchinfo.h | 2 | ||||
-rw-r--r-- | src/plugins/bazaar/cloneoptionspanel.cpp | 2 | ||||
-rw-r--r-- | src/plugins/bazaar/cloneoptionspanel.h | 2 | ||||
-rw-r--r-- | src/plugins/bazaar/clonewizard.cpp | 2 | ||||
-rw-r--r-- | src/plugins/bazaar/clonewizard.h | 2 | ||||
-rw-r--r-- | src/plugins/bazaar/commiteditor.cpp | 2 | ||||
-rw-r--r-- | src/plugins/bazaar/optionspage.cpp | 2 | ||||
-rw-r--r-- | src/plugins/bazaar/optionspage.h | 4 | ||||
-rw-r--r-- | src/plugins/bazaar/pullorpushdialog.h | 2 |
18 files changed, 45 insertions, 45 deletions
diff --git a/src/plugins/bazaar/annotationhighlighter.h b/src/plugins/bazaar/annotationhighlighter.h index ddae833556..bea25e8a56 100644 --- a/src/plugins/bazaar/annotationhighlighter.h +++ b/src/plugins/bazaar/annotationhighlighter.h @@ -34,7 +34,7 @@ #define ANNOTATIONHIGHLIGHTER_H #include <vcsbase/baseannotationhighlighter.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp index 96fea24540..d148d07623 100644 --- a/src/plugins/bazaar/bazaarclient.cpp +++ b/src/plugins/bazaar/bazaarclient.cpp @@ -40,10 +40,10 @@ #include <utils/qtcassert.h> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> -#include <QtCore/QtDebug> +#include <QDir> +#include <QFileInfo> +#include <QTextStream> +#include <QtDebug> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/bazaarcommitwidget.cpp b/src/plugins/bazaar/bazaarcommitwidget.cpp index 805e4e028c..f419b587db 100644 --- a/src/plugins/bazaar/bazaarcommitwidget.cpp +++ b/src/plugins/bazaar/bazaarcommitwidget.cpp @@ -38,11 +38,11 @@ #include <texteditor/texteditorconstants.h> #include <utils/qtcassert.h> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QTextEdit> +#include <QSyntaxHighlighter> +#include <QTextEdit> -#include <QtCore/QDebug> -#include <QtCore/QRegExp> +#include <QDebug> +#include <QRegExp> //see the git submit widget for details of the syntax Highlighter diff --git a/src/plugins/bazaar/bazaarcontrol.cpp b/src/plugins/bazaar/bazaarcontrol.cpp index c853a76d2d..a348a6c611 100644 --- a/src/plugins/bazaar/bazaarcontrol.cpp +++ b/src/plugins/bazaar/bazaarcontrol.cpp @@ -36,10 +36,10 @@ #include <vcsbase/vcsbaseclientsettings.h> #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QFileInfo> -#include <QtCore/QVariant> -#include <QtCore/QStringList> -#include <QtCore/QDir> +#include <QFileInfo> +#include <QVariant> +#include <QStringList> +#include <QDir> using namespace Bazaar::Internal; diff --git a/src/plugins/bazaar/bazaareditor.cpp b/src/plugins/bazaar/bazaareditor.cpp index b0b7917ec3..414a43de7f 100644 --- a/src/plugins/bazaar/bazaareditor.cpp +++ b/src/plugins/bazaar/bazaareditor.cpp @@ -40,13 +40,13 @@ #include <utils/qtcassert.h> #include <vcsbase/diffhighlighter.h> -#include <QtCore/QRegExp> -#include <QtCore/QString> -#include <QtGui/QTextCursor> -#include <QtGui/QTextBlock> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <QRegExp> +#include <QString> +#include <QTextCursor> +#include <QTextBlock> +#include <QDir> +#include <QFileInfo> +#include <QDebug> #define BZR_CHANGE_PATTERN "[0-9]+" diff --git a/src/plugins/bazaar/bazaareditor.h b/src/plugins/bazaar/bazaareditor.h index 333ab59d09..3c80e2402b 100644 --- a/src/plugins/bazaar/bazaareditor.h +++ b/src/plugins/bazaar/bazaareditor.h @@ -35,7 +35,7 @@ #include <vcsbase/vcsbaseeditor.h> -#include <QtCore/QRegExp> +#include <QRegExp> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 8d259d3598..248ef882bc 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -64,16 +64,16 @@ #include <vcsbase/vcsbaseeditor.h> #include <vcsbase/vcsbaseoutputwindow.h> -#include <QtCore/QtPlugin> -#include <QtGui/QAction> -#include <QtGui/QMenu> -#include <QtGui/QMainWindow> -#include <QtCore/QtDebug> -#include <QtCore/QtGlobal> -#include <QtCore/QDir> -#include <QtGui/QDialog> -#include <QtGui/QFileDialog> -#include <QtCore/QTemporaryFile> +#include <QtPlugin> +#include <QAction> +#include <QMenu> +#include <QMainWindow> +#include <QtDebug> +#include <QtGlobal> +#include <QDir> +#include <QDialog> +#include <QFileDialog> +#include <QTemporaryFile> using namespace Bazaar::Internal; diff --git a/src/plugins/bazaar/bazaarplugin.h b/src/plugins/bazaar/bazaarplugin.h index e22588d1bd..dff7611977 100644 --- a/src/plugins/bazaar/bazaarplugin.h +++ b/src/plugins/bazaar/bazaarplugin.h @@ -40,9 +40,9 @@ #include <vcsbase/vcsbaseplugin.h> #include <coreplugin/icontext.h> -#include <QtCore/QFileInfo> -#include <QtCore/QHash> -#include <QtCore/qglobal.h> +#include <QFileInfo> +#include <QHash> +#include <qglobal.h> QT_BEGIN_NAMESPACE class QAction; diff --git a/src/plugins/bazaar/bazaarsettings.cpp b/src/plugins/bazaar/bazaarsettings.cpp index 0c6d79086b..3ef1d0a989 100644 --- a/src/plugins/bazaar/bazaarsettings.cpp +++ b/src/plugins/bazaar/bazaarsettings.cpp @@ -33,7 +33,7 @@ #include "bazaarsettings.h" #include "constants.h" -#include <QtCore/QSettings> +#include <QSettings> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/branchinfo.h b/src/plugins/bazaar/branchinfo.h index 0841ad6f5a..90b5fcbb3a 100644 --- a/src/plugins/bazaar/branchinfo.h +++ b/src/plugins/bazaar/branchinfo.h @@ -33,7 +33,7 @@ #ifndef BRANCHINFO_H #define BRANCHINFO_H -#include <QtCore/QString> +#include <QString> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/cloneoptionspanel.cpp b/src/plugins/bazaar/cloneoptionspanel.cpp index febcecd8ba..30258cab57 100644 --- a/src/plugins/bazaar/cloneoptionspanel.cpp +++ b/src/plugins/bazaar/cloneoptionspanel.cpp @@ -33,7 +33,7 @@ #include "cloneoptionspanel.h" #include "ui_cloneoptionspanel.h" -#include <QtCore/QtDebug> +#include <QtDebug> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/cloneoptionspanel.h b/src/plugins/bazaar/cloneoptionspanel.h index 440ac734c4..6a4345d516 100644 --- a/src/plugins/bazaar/cloneoptionspanel.h +++ b/src/plugins/bazaar/cloneoptionspanel.h @@ -33,7 +33,7 @@ #ifndef CLONEOPTIONSPANEL_H #define CLONEOPTIONSPANEL_H -#include <QtGui/QWidget> +#include <QWidget> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/clonewizard.cpp b/src/plugins/bazaar/clonewizard.cpp index d967f37e9f..711b5c37ce 100644 --- a/src/plugins/bazaar/clonewizard.cpp +++ b/src/plugins/bazaar/clonewizard.cpp @@ -42,7 +42,7 @@ #include <vcsbase/vcsbaseconstants.h> #include <vcsbase/vcsconfigurationpage.h> -#include <QtCore/QDebug> +#include <QDebug> using namespace Bazaar::Internal; diff --git a/src/plugins/bazaar/clonewizard.h b/src/plugins/bazaar/clonewizard.h index 4e96b35d67..d9b7f6816b 100644 --- a/src/plugins/bazaar/clonewizard.h +++ b/src/plugins/bazaar/clonewizard.h @@ -35,7 +35,7 @@ #include <vcsbase/basecheckoutwizard.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/commiteditor.cpp b/src/plugins/bazaar/commiteditor.cpp index 63d876024f..64648174df 100644 --- a/src/plugins/bazaar/commiteditor.cpp +++ b/src/plugins/bazaar/commiteditor.cpp @@ -36,7 +36,7 @@ #include <vcsbase/submitfilemodel.h> -#include <QtCore/QDebug> +#include <QDebug> #include <QDir> //TODO REMOVE WHEN BASE FILE CHANGES ARE PULLED diff --git a/src/plugins/bazaar/optionspage.cpp b/src/plugins/bazaar/optionspage.cpp index 48515718bb..088116e562 100644 --- a/src/plugins/bazaar/optionspage.cpp +++ b/src/plugins/bazaar/optionspage.cpp @@ -39,7 +39,7 @@ #include <utils/pathchooser.h> #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QTextStream> +#include <QTextStream> using namespace Bazaar::Internal; using namespace Bazaar; diff --git a/src/plugins/bazaar/optionspage.h b/src/plugins/bazaar/optionspage.h index 9523bcd8b3..be58d10e39 100644 --- a/src/plugins/bazaar/optionspage.h +++ b/src/plugins/bazaar/optionspage.h @@ -37,8 +37,8 @@ #include <vcsbase/vcsbaseoptionspage.h> -#include <QtGui/QWidget> -#include <QtCore/QPointer> +#include <QWidget> +#include <QPointer> namespace Bazaar { namespace Internal { diff --git a/src/plugins/bazaar/pullorpushdialog.h b/src/plugins/bazaar/pullorpushdialog.h index f0f0367469..b9ca693ec3 100644 --- a/src/plugins/bazaar/pullorpushdialog.h +++ b/src/plugins/bazaar/pullorpushdialog.h @@ -33,7 +33,7 @@ #ifndef PULLORPUSHDIALOG_H #define PULLORPUSHDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> namespace Bazaar { namespace Internal { |