summaryrefslogtreecommitdiff
path: root/src/plugins/mercurial
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2012-02-15 10:42:41 +0100
committerErik Verbruggen <erik.verbruggen@nokia.com>2012-02-15 16:24:46 +0100
commit3fa55b7ab9b1d6ae10fac1c9bcc653e9000157f8 (patch)
treee31dbd1b4605530e59c9864166f155b4edabc721 /src/plugins/mercurial
parent9a9ba12028ab0a6b1a248be612d5c576d39f69d6 (diff)
downloadqt-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/mercurial')
-rw-r--r--src/plugins/mercurial/annotationhighlighter.h2
-rw-r--r--src/plugins/mercurial/clonewizard.h2
-rw-r--r--src/plugins/mercurial/commiteditor.cpp4
-rw-r--r--src/plugins/mercurial/commiteditor.h2
-rw-r--r--src/plugins/mercurial/mercurialclient.cpp10
-rw-r--r--src/plugins/mercurial/mercurialcommitwidget.cpp8
-rw-r--r--src/plugins/mercurial/mercurialcontrol.cpp8
-rw-r--r--src/plugins/mercurial/mercurialeditor.cpp12
-rw-r--r--src/plugins/mercurial/mercurialeditor.h2
-rw-r--r--src/plugins/mercurial/mercurialplugin.cpp20
-rw-r--r--src/plugins/mercurial/mercurialsettings.cpp2
-rw-r--r--src/plugins/mercurial/optionspage.cpp2
-rw-r--r--src/plugins/mercurial/optionspage.h4
-rw-r--r--src/plugins/mercurial/revertdialog.h2
-rw-r--r--src/plugins/mercurial/srcdestdialog.h2
15 files changed, 41 insertions, 41 deletions
diff --git a/src/plugins/mercurial/annotationhighlighter.h b/src/plugins/mercurial/annotationhighlighter.h
index d6379ecfd1..6dbbe948cd 100644
--- a/src/plugins/mercurial/annotationhighlighter.h
+++ b/src/plugins/mercurial/annotationhighlighter.h
@@ -34,7 +34,7 @@
#define ANNOTATIONHIGHLIGHTER_H
#include <vcsbase/baseannotationhighlighter.h>
-#include <QtCore/QRegExp>
+#include <QRegExp>
namespace Mercurial {
namespace Internal {
diff --git a/src/plugins/mercurial/clonewizard.h b/src/plugins/mercurial/clonewizard.h
index eea2b38196..d78c99f050 100644
--- a/src/plugins/mercurial/clonewizard.h
+++ b/src/plugins/mercurial/clonewizard.h
@@ -35,7 +35,7 @@
#include <vcsbase/basecheckoutwizard.h>
-#include <QtGui/QIcon>
+#include <QIcon>
namespace Mercurial {
namespace Internal {
diff --git a/src/plugins/mercurial/commiteditor.cpp b/src/plugins/mercurial/commiteditor.cpp
index b174da8e35..daaaf1dd9f 100644
--- a/src/plugins/mercurial/commiteditor.cpp
+++ b/src/plugins/mercurial/commiteditor.cpp
@@ -35,8 +35,8 @@
#include <vcsbase/submitfilemodel.h>
-#include <QtCore/QDebug>
-#include <QtCore/QDir> //TODO REMOVE WHEN BASE FILE CHANGES ARE PULLED
+#include <QDebug>
+#include <QDir> //TODO REMOVE WHEN BASE FILE CHANGES ARE PULLED
using namespace Mercurial::Internal;
using namespace VcsBase;
diff --git a/src/plugins/mercurial/commiteditor.h b/src/plugins/mercurial/commiteditor.h
index ea9a8a24cc..8bd0a45451 100644
--- a/src/plugins/mercurial/commiteditor.h
+++ b/src/plugins/mercurial/commiteditor.h
@@ -36,7 +36,7 @@
#include <vcsbase/vcsbaseclient.h>
#include <vcsbase/vcsbasesubmiteditor.h>
-#include <QtCore/QFileInfo>
+#include <QFileInfo>
namespace VcsBase {
class SubmitFileModel;
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index 13343d208c..5a8117a726 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -42,11 +42,11 @@
#include <utils/fileutils.h>
#include <utils/qtcassert.h>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextCodec>
-#include <QtCore/QTextStream>
-#include <QtCore/QVariant>
+#include <QDir>
+#include <QFileInfo>
+#include <QTextCodec>
+#include <QTextStream>
+#include <QVariant>
namespace Mercurial {
namespace Internal {
diff --git a/src/plugins/mercurial/mercurialcommitwidget.cpp b/src/plugins/mercurial/mercurialcommitwidget.cpp
index 76601c9a4f..81f7cb468c 100644
--- a/src/plugins/mercurial/mercurialcommitwidget.cpp
+++ b/src/plugins/mercurial/mercurialcommitwidget.cpp
@@ -37,11 +37,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/mercurial/mercurialcontrol.cpp b/src/plugins/mercurial/mercurialcontrol.cpp
index 9dcf57fb5b..bbb42a8905 100644
--- a/src/plugins/mercurial/mercurialcontrol.cpp
+++ b/src/plugins/mercurial/mercurialcontrol.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 Mercurial::Internal;
diff --git a/src/plugins/mercurial/mercurialeditor.cpp b/src/plugins/mercurial/mercurialeditor.cpp
index 34d4d6c978..b47c5b9d0e 100644
--- a/src/plugins/mercurial/mercurialeditor.cpp
+++ b/src/plugins/mercurial/mercurialeditor.cpp
@@ -39,12 +39,12 @@
#include <coreplugin/editormanager/editormanager.h>
#include <vcsbase/diffhighlighter.h>
-#include <QtCore/QString>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextBlock>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDebug>
+#include <QString>
+#include <QTextCursor>
+#include <QTextBlock>
+#include <QDir>
+#include <QFileInfo>
+#include <QDebug>
using namespace Mercurial::Internal;
using namespace Mercurial;
diff --git a/src/plugins/mercurial/mercurialeditor.h b/src/plugins/mercurial/mercurialeditor.h
index 8cd7b7e781..3261b17d95 100644
--- a/src/plugins/mercurial/mercurialeditor.h
+++ b/src/plugins/mercurial/mercurialeditor.h
@@ -35,7 +35,7 @@
#include <vcsbase/vcsbaseeditor.h>
-#include <QtCore/QRegExp>
+#include <QRegExp>
namespace Mercurial {
namespace Internal {
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 48305082f5..9633f22830 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -62,16 +62,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 Mercurial::Internal;
diff --git a/src/plugins/mercurial/mercurialsettings.cpp b/src/plugins/mercurial/mercurialsettings.cpp
index aa9abef307..22020abca8 100644
--- a/src/plugins/mercurial/mercurialsettings.cpp
+++ b/src/plugins/mercurial/mercurialsettings.cpp
@@ -33,7 +33,7 @@
#include "mercurialsettings.h"
#include "constants.h"
-#include <QtCore/QSettings>
+#include <QSettings>
namespace Mercurial {
namespace Internal {
diff --git a/src/plugins/mercurial/optionspage.cpp b/src/plugins/mercurial/optionspage.cpp
index e212435d24..a6b189f6d1 100644
--- a/src/plugins/mercurial/optionspage.cpp
+++ b/src/plugins/mercurial/optionspage.cpp
@@ -38,7 +38,7 @@
#include <utils/pathchooser.h>
#include <vcsbase/vcsbaseconstants.h>
-#include <QtCore/QTextStream>
+#include <QTextStream>
using namespace Mercurial::Internal;
using namespace Mercurial;
diff --git a/src/plugins/mercurial/optionspage.h b/src/plugins/mercurial/optionspage.h
index 23fc70c653..6ec6c8799b 100644
--- a/src/plugins/mercurial/optionspage.h
+++ b/src/plugins/mercurial/optionspage.h
@@ -37,8 +37,8 @@
#include <vcsbase/vcsbaseoptionspage.h>
-#include <QtGui/QWidget>
-#include <QtCore/QPointer>
+#include <QWidget>
+#include <QPointer>
namespace Mercurial {
namespace Internal {
diff --git a/src/plugins/mercurial/revertdialog.h b/src/plugins/mercurial/revertdialog.h
index 3ff1bc3b3e..3f1abfa115 100644
--- a/src/plugins/mercurial/revertdialog.h
+++ b/src/plugins/mercurial/revertdialog.h
@@ -35,7 +35,7 @@
#include "ui_revertdialog.h"
-#include <QtGui/QDialog>
+#include <QDialog>
namespace Mercurial {
namespace Internal {
diff --git a/src/plugins/mercurial/srcdestdialog.h b/src/plugins/mercurial/srcdestdialog.h
index 9463f931ab..c7ce9149fb 100644
--- a/src/plugins/mercurial/srcdestdialog.h
+++ b/src/plugins/mercurial/srcdestdialog.h
@@ -34,7 +34,7 @@
#define SRCDESTDIALOG_H
#include <utils/pathchooser.h>
-#include <QtGui/QDialog>
+#include <QDialog>
namespace Mercurial {
namespace Internal {