diff options
Diffstat (limited to 'src/plugins/git')
47 files changed, 164 insertions, 164 deletions
diff --git a/src/plugins/git/annotationhighlighter.cpp b/src/plugins/git/annotationhighlighter.cpp index 886f4d24c0..67550ca231 100644 --- a/src/plugins/git/annotationhighlighter.cpp +++ b/src/plugins/git/annotationhighlighter.cpp @@ -32,7 +32,7 @@ #include "annotationhighlighter.h" -#include <QtCore/QDebug> +#include <QDebug> namespace Git { namespace Internal { diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index 1b4044312e..75d592612c 100644 --- a/src/plugins/git/branchdialog.cpp +++ b/src/plugins/git/branchdialog.cpp @@ -42,11 +42,11 @@ #include <utils/qtcassert.h> #include <vcsbase/vcsbaseoutputwindow.h> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QPushButton> -#include <QtGui/QMessageBox> +#include <QItemSelectionModel> +#include <QPushButton> +#include <QMessageBox> -#include <QtCore/QDebug> +#include <QDebug> namespace Git { namespace Internal { diff --git a/src/plugins/git/branchdialog.h b/src/plugins/git/branchdialog.h index 64be62e6da..4fe52665ee 100644 --- a/src/plugins/git/branchdialog.h +++ b/src/plugins/git/branchdialog.h @@ -33,8 +33,8 @@ #ifndef BRANCHDIALOG_H #define BRANCHDIALOG_H -#include <QtGui/QDialog> -#include <QtGui/QItemSelection> +#include <QDialog> +#include <QItemSelection> QT_BEGIN_NAMESPACE class QPushButton; diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index 20559c3fc0..7d14080f4c 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.cpp @@ -36,9 +36,9 @@ #include <utils/qtcassert.h> #include <vcsbase/vcsbaseoutputwindow.h> -#include <QtGui/QFont> -#include <QtCore/QRegExp> -#include <QtCore/QTimer> +#include <QFont> +#include <QRegExp> +#include <QTimer> namespace Git { namespace Internal { diff --git a/src/plugins/git/branchmodel.h b/src/plugins/git/branchmodel.h index 8872b67008..b8eceb6203 100644 --- a/src/plugins/git/branchmodel.h +++ b/src/plugins/git/branchmodel.h @@ -33,9 +33,9 @@ #ifndef BRANCHMODEL_H #define BRANCHMODEL_H -#include <QtCore/QAbstractListModel> -#include <QtCore/QList> -#include <QtCore/QVariant> +#include <QAbstractListModel> +#include <QList> +#include <QVariant> namespace Git { namespace Internal { diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index e3e07d0631..62c4c35a10 100644 --- a/src/plugins/git/changeselectiondialog.cpp +++ b/src/plugins/git/changeselectiondialog.cpp @@ -32,8 +32,8 @@ #include "changeselectiondialog.h" -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QFileDialog> +#include <QMessageBox> namespace Git { namespace Internal { diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h index 898d54c455..0020cdc724 100644 --- a/src/plugins/git/changeselectiondialog.h +++ b/src/plugins/git/changeselectiondialog.h @@ -33,7 +33,7 @@ #ifndef CHANGESELECTIONDIALOG_H #define CHANGESELECTIONDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> #include "ui_changeselectiondialog.h" diff --git a/src/plugins/git/clonewizard.cpp b/src/plugins/git/clonewizard.cpp index a28348e238..46441dff47 100644 --- a/src/plugins/git/clonewizard.cpp +++ b/src/plugins/git/clonewizard.cpp @@ -41,7 +41,7 @@ #include <vcsbase/vcsconfigurationpage.h> #include <utils/qtcassert.h> -#include <QtGui/QIcon> +#include <QIcon> namespace Git { namespace Internal { diff --git a/src/plugins/git/clonewizardpage.cpp b/src/plugins/git/clonewizardpage.cpp index ba6f441e9d..7bc78818e3 100644 --- a/src/plugins/git/clonewizardpage.cpp +++ b/src/plugins/git/clonewizardpage.cpp @@ -37,7 +37,7 @@ #include <vcsbase/checkoutjobs.h> #include <utils/qtcassert.h> -#include <QtGui/QCheckBox> +#include <QCheckBox> namespace Git { diff --git a/src/plugins/git/clonewizardpage.h b/src/plugins/git/clonewizardpage.h index 5d63fa95ae..6fc6129cc2 100644 --- a/src/plugins/git/clonewizardpage.h +++ b/src/plugins/git/clonewizardpage.h @@ -35,7 +35,7 @@ #include <vcsbase/basecheckoutwizardpage.h> -#include <QtCore/QSharedPointer> +#include <QSharedPointer> namespace VcsBase { class AbstractCheckoutJob; diff --git a/src/plugins/git/commitdata.cpp b/src/plugins/git/commitdata.cpp index d451791ba4..dc485e1410 100644 --- a/src/plugins/git/commitdata.cpp +++ b/src/plugins/git/commitdata.cpp @@ -33,9 +33,9 @@ #include "commitdata.h" #include <utils/qtcassert.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QRegExp> +#include <QCoreApplication> +#include <QDebug> +#include <QRegExp> namespace Git { namespace Internal { diff --git a/src/plugins/git/commitdata.h b/src/plugins/git/commitdata.h index bdc27fb93c..1d469ff7cc 100644 --- a/src/plugins/git/commitdata.h +++ b/src/plugins/git/commitdata.h @@ -33,8 +33,8 @@ #ifndef COMMITDATA_H #define COMMITDATA_H -#include <QtCore/QStringList> -#include <QtCore/QPair> +#include <QStringList> +#include <QPair> QT_BEGIN_NAMESPACE class QDebug; diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 1c4f06c013..9bf8a43440 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -65,18 +65,18 @@ #include <vcsbase/vcsbaseoutputwindow.h> #include <vcsbase/vcsbaseplugin.h> -#include <QtCore/QRegExp> -#include <QtCore/QTemporaryFile> -#include <QtCore/QTime> -#include <QtCore/QFileInfo> -#include <QtCore/QDir> -#include <QtCore/QSignalMapper> - -#include <QtGui/QComboBox> -#include <QtGui/QMainWindow> // for msg box parent -#include <QtGui/QMessageBox> -#include <QtGui/QToolButton> -#include <QtCore/QTextCodec> +#include <QRegExp> +#include <QTemporaryFile> +#include <QTime> +#include <QFileInfo> +#include <QDir> +#include <QSignalMapper> + +#include <QComboBox> +#include <QMainWindow> // for msg box parent +#include <QMessageBox> +#include <QToolButton> +#include <QTextCodec> static const char GIT_DIRECTORY[] = ".git"; diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 651f8bd2b4..cb5b6ab600 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -38,10 +38,10 @@ #include <coreplugin/editormanager/ieditor.h> #include <vcsbase/command.h> -#include <QtCore/QObject> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtGui/QWidget> +#include <QObject> +#include <QString> +#include <QStringList> +#include <QWidget> QT_BEGIN_NAMESPACE class QCheckBox; diff --git a/src/plugins/git/gitconstants.h b/src/plugins/git/gitconstants.h index 5bd3bf944b..fd3f59916e 100644 --- a/src/plugins/git/gitconstants.h +++ b/src/plugins/git/gitconstants.h @@ -33,7 +33,7 @@ #ifndef GIT_CONSTANTS_H #define GIT_CONSTANTS_H -#include <QtCore/QtGlobal> +#include <QtGlobal> namespace Git { namespace Constants { diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index e60ad3c344..aec04d9e5d 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -37,22 +37,22 @@ #include "gitplugin.h" #include "gitclient.h" #include "gitsettings.h" -#include <QtCore/QTextCodec> +#include <QTextCodec> #include <coreplugin/editormanager/editormanager.h> #include <utils/qtcassert.h> #include <vcsbase/diffhighlighter.h> #include <vcsbase/vcsbaseoutputwindow.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QRegExp> -#include <QtCore/QSet> -#include <QtCore/QTextStream> - -#include <QtGui/QTextCursor> -#include <QtGui/QTextEdit> -#include <QtGui/QTextBlock> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QRegExp> +#include <QSet> +#include <QTextStream> + +#include <QTextCursor> +#include <QTextEdit> +#include <QTextBlock> #define CHANGE_PATTERN_8C "[a-f0-9]{7,8}" #define CHANGE_PATTERN_40C "[a-f0-9]{40,40}" diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h index f254d4c94a..4ce7bf84a2 100644 --- a/src/plugins/git/giteditor.h +++ b/src/plugins/git/giteditor.h @@ -35,7 +35,7 @@ #include <vcsbase/vcsbaseeditor.h> -#include <QtCore/QRegExp> +#include <QRegExp> QT_BEGIN_NAMESPACE class QVariant; diff --git a/src/plugins/git/gitorious/gitorious.cpp b/src/plugins/git/gitorious/gitorious.cpp index 3d43330713..598d71ac29 100644 --- a/src/plugins/git/gitorious/gitorious.cpp +++ b/src/plugins/git/gitorious/gitorious.cpp @@ -32,12 +32,12 @@ #include "gitorious.h" -#include <QtCore/QDebug> -#include <QtCore/QCoreApplication> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QSettings> +#include <QDebug> +#include <QCoreApplication> +#include <QXmlStreamReader> +#include <QSettings> -#include <QtNetwork/QNetworkReply> +#include <QNetworkReply> #include <utils/qtcassert.h> #include <utils/networkaccessmanager.h> diff --git a/src/plugins/git/gitorious/gitorious.h b/src/plugins/git/gitorious/gitorious.h index 9f8793e3e6..f196109af2 100644 --- a/src/plugins/git/gitorious/gitorious.h +++ b/src/plugins/git/gitorious/gitorious.h @@ -33,10 +33,10 @@ #ifndef GITORIOUS_H #define GITORIOUS_H -#include <QtCore/QStringList> -#include <QtCore/QSharedPointer> -#include <QtCore/QUrl> -#include <QtCore/QObject> +#include <QStringList> +#include <QSharedPointer> +#include <QUrl> +#include <QObject> QT_BEGIN_NAMESPACE class QNetworkAccessManager; diff --git a/src/plugins/git/gitorious/gitoriousclonewizard.cpp b/src/plugins/git/gitorious/gitoriousclonewizard.cpp index 6f6dea9299..9718493d1c 100644 --- a/src/plugins/git/gitorious/gitoriousclonewizard.cpp +++ b/src/plugins/git/gitorious/gitoriousclonewizard.cpp @@ -44,8 +44,8 @@ #include <vcsbase/vcsconfigurationpage.h> #include <utils/qtcassert.h> -#include <QtCore/QUrl> -#include <QtGui/QIcon> +#include <QUrl> +#include <QIcon> namespace Gitorious { namespace Internal { diff --git a/src/plugins/git/gitorious/gitorioushostwidget.cpp b/src/plugins/git/gitorious/gitorioushostwidget.cpp index 0ff7379b3d..332d85486e 100644 --- a/src/plugins/git/gitorious/gitorioushostwidget.cpp +++ b/src/plugins/git/gitorious/gitorioushostwidget.cpp @@ -36,16 +36,16 @@ #include <coreplugin/coreconstants.h> -#include <QtCore/QUrl> -#include <QtCore/QDebug> -#include <QtCore/QTimer> - -#include <QtGui/QStandardItem> -#include <QtGui/QStandardItemModel> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QDesktopServices> -#include <QtGui/QIcon> -#include <QtGui/QStyle> +#include <QUrl> +#include <QDebug> +#include <QTimer> + +#include <QStandardItem> +#include <QStandardItemModel> +#include <QItemSelectionModel> +#include <QDesktopServices> +#include <QIcon> +#include <QStyle> enum { debug = 0 }; diff --git a/src/plugins/git/gitorious/gitorioushostwidget.h b/src/plugins/git/gitorious/gitorioushostwidget.h index 032a8c4d7b..95db0b78a3 100644 --- a/src/plugins/git/gitorious/gitorioushostwidget.h +++ b/src/plugins/git/gitorious/gitorioushostwidget.h @@ -33,8 +33,8 @@ #ifndef GITORIOUSHOSTWIDGET_H #define GITORIOUSHOSTWIDGET_H -#include <QtGui/QWizardPage> -#include <QtGui/QStandardItemModel> +#include <QWizardPage> +#include <QStandardItemModel> QT_BEGIN_NAMESPACE class QStandardItemModel; diff --git a/src/plugins/git/gitorious/gitorioushostwizardpage.cpp b/src/plugins/git/gitorious/gitorioushostwizardpage.cpp index 4191945e40..8eb4621a79 100644 --- a/src/plugins/git/gitorious/gitorioushostwizardpage.cpp +++ b/src/plugins/git/gitorious/gitorioushostwizardpage.cpp @@ -37,8 +37,8 @@ #include <coreplugin/icore.h> -#include <QtCore/QSettings> -#include <QtGui/QVBoxLayout> +#include <QSettings> +#include <QVBoxLayout> static const char settingsGroupC[] = "Gitorious"; static const char selectionKeyC[] = "/SelectedHost"; diff --git a/src/plugins/git/gitorious/gitorioushostwizardpage.h b/src/plugins/git/gitorious/gitorioushostwizardpage.h index f862461399..4af329a988 100644 --- a/src/plugins/git/gitorious/gitorioushostwizardpage.h +++ b/src/plugins/git/gitorious/gitorioushostwizardpage.h @@ -33,7 +33,7 @@ #ifndef GITORIOUSHOSTWIZARDPAGE_H #define GITORIOUSHOSTWIZARDPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> namespace Gitorious { namespace Internal { diff --git a/src/plugins/git/gitorious/gitoriousprojectwidget.cpp b/src/plugins/git/gitorious/gitoriousprojectwidget.cpp index 2fb3b110e6..e8e982b2d9 100644 --- a/src/plugins/git/gitorious/gitoriousprojectwidget.cpp +++ b/src/plugins/git/gitorious/gitoriousprojectwidget.cpp @@ -37,16 +37,16 @@ #include <utils/qtcassert.h> -#include <QtCore/QRegExp> -#include <QtCore/QDebug> +#include <QRegExp> +#include <QDebug> -#include <QtGui/QStandardItemModel> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QStandardItem> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QDesktopServices> -#include <QtGui/QIcon> -#include <QtGui/QStyle> +#include <QStandardItemModel> +#include <QSortFilterProxyModel> +#include <QStandardItem> +#include <QItemSelectionModel> +#include <QDesktopServices> +#include <QIcon> +#include <QStyle> enum { urlRole = Qt::UserRole + 1 // Project has a URL in the description diff --git a/src/plugins/git/gitorious/gitoriousprojectwidget.h b/src/plugins/git/gitorious/gitoriousprojectwidget.h index d2832b6e91..957318eefa 100644 --- a/src/plugins/git/gitorious/gitoriousprojectwidget.h +++ b/src/plugins/git/gitorious/gitoriousprojectwidget.h @@ -33,8 +33,8 @@ #ifndef GITORIOUSPROJECTWIDGET_H #define GITORIOUSPROJECTWIDGET_H -#include <QtCore/QSharedPointer> -#include <QtGui/QWidget> +#include <QSharedPointer> +#include <QWidget> QT_BEGIN_NAMESPACE class QStandardItemModel; diff --git a/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp b/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp index 96dfe08dfc..d0aaff5d74 100644 --- a/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp +++ b/src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp @@ -37,8 +37,8 @@ #include <utils/qtcassert.h> -#include <QtGui/QStackedWidget> -#include <QtGui/QVBoxLayout> +#include <QStackedWidget> +#include <QVBoxLayout> namespace Gitorious { namespace Internal { diff --git a/src/plugins/git/gitorious/gitoriousprojectwizardpage.h b/src/plugins/git/gitorious/gitoriousprojectwizardpage.h index 035ec7f869..9802ec4fb6 100644 --- a/src/plugins/git/gitorious/gitoriousprojectwizardpage.h +++ b/src/plugins/git/gitorious/gitoriousprojectwizardpage.h @@ -33,8 +33,8 @@ #ifndef GITORIOUSPROJECTWIZARDPAGE_H #define GITORIOUSPROJECTWIZARDPAGE_H -#include <QtCore/QSharedPointer> -#include <QtGui/QWizardPage> +#include <QSharedPointer> +#include <QWizardPage> QT_BEGIN_NAMESPACE class QStackedWidget; diff --git a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp index 8b1c693664..516b0d7432 100644 --- a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp +++ b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp @@ -38,12 +38,12 @@ #include <utils/qtcassert.h> -#include <QtCore/QDebug> +#include <QDebug> -#include <QtGui/QStandardItemModel> -#include <QtGui/QStandardItem> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QSortFilterProxyModel> +#include <QStandardItemModel> +#include <QStandardItem> +#include <QItemSelectionModel> +#include <QSortFilterProxyModel> enum { TypeRole = Qt::UserRole + 1}; enum { HeaderType, RepositoryType }; diff --git a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h index e6261a072f..c4df9e999a 100644 --- a/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h +++ b/src/plugins/git/gitorious/gitoriousrepositorywizardpage.h @@ -33,7 +33,7 @@ #ifndef GITORIOUSREPOSITORYWIZARDPAGE_H #define GITORIOUSREPOSITORYWIZARDPAGE_H -#include <QtGui/QWizardPage> +#include <QWizardPage> QT_BEGIN_NAMESPACE class QSortFilterProxyModel; diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 43a7600b86..5da760b77c 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -70,17 +70,17 @@ #include <vcsbase/cleandialog.h> #include <locator/commandlocator.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QTemporaryFile> -#include <QtCore/QtPlugin> - -#include <QtGui/QAction> -#include <QtGui/QFileDialog> -#include <QtGui/QMainWindow> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> +#include <QDebug> +#include <QDir> +#include <QFileInfo> +#include <QTemporaryFile> +#include <QtPlugin> + +#include <QAction> +#include <QFileDialog> +#include <QMainWindow> +#include <QMenu> +#include <QMessageBox> static const VcsBase::VcsBaseEditorParameters editorParameters[] = { { diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h index bf5d34a245..e8c3d15f0c 100644 --- a/src/plugins/git/gitplugin.h +++ b/src/plugins/git/gitplugin.h @@ -40,12 +40,12 @@ #include <coreplugin/editormanager/ieditorfactory.h> #include <extensionsystem/iplugin.h> -#include <QtCore/QObject> -#include <QtCore/QProcess> -#include <QtCore/QStringList> -#include <QtCore/QPointer> -#include <QtCore/QPair> -#include <QtCore/QVector> +#include <QObject> +#include <QProcess> +#include <QStringList> +#include <QPointer> +#include <QPair> +#include <QVector> QT_BEGIN_NAMESPACE class QFile; diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp index 31f289eb41..177d79a270 100644 --- a/src/plugins/git/gitsettings.cpp +++ b/src/plugins/git/gitsettings.cpp @@ -34,7 +34,7 @@ #include <utils/synchronousprocess.h> -#include <QtCore/QCoreApplication> +#include <QCoreApplication> namespace Git { namespace Internal { diff --git a/src/plugins/git/gitsettings.h b/src/plugins/git/gitsettings.h index e0c629ed74..e381dd014a 100644 --- a/src/plugins/git/gitsettings.h +++ b/src/plugins/git/gitsettings.h @@ -35,7 +35,7 @@ #include <vcsbase/vcsbaseclientsettings.h> -#include <QtCore/QStringList> +#include <QStringList> namespace Git { namespace Internal { diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index f55234d54b..6526f7202a 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -38,9 +38,9 @@ #include <utils/qtcassert.h> #include <vcsbase/submitfilemodel.h> -#include <QtCore/QDebug> -#include <QtCore/QStringList> -#include <QtCore/QTextCodec> +#include <QDebug> +#include <QStringList> +#include <QTextCodec> namespace Git { namespace Internal { diff --git a/src/plugins/git/gitsubmiteditor.h b/src/plugins/git/gitsubmiteditor.h index 7ebd9b1700..39545818d9 100644 --- a/src/plugins/git/gitsubmiteditor.h +++ b/src/plugins/git/gitsubmiteditor.h @@ -35,7 +35,7 @@ #include <vcsbase/vcsbasesubmiteditor.h> -#include <QtCore/QStringList> +#include <QStringList> namespace VcsBase { class SubmitFileModel; diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index b0b649c1f8..b3e782698e 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -38,14 +38,14 @@ #include <texteditor/texteditorconstants.h> #include <utils/qtcassert.h> -#include <QtGui/QLineEdit> -#include <QtGui/QRegExpValidator> -#include <QtGui/QSyntaxHighlighter> -#include <QtGui/QTextEdit> - -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QRegExp> +#include <QLineEdit> +#include <QRegExpValidator> +#include <QSyntaxHighlighter> +#include <QTextEdit> + +#include <QDebug> +#include <QDir> +#include <QRegExp> namespace Git { namespace Internal { diff --git a/src/plugins/git/gitutils.cpp b/src/plugins/git/gitutils.cpp index 7c5d634ea6..e7424eff69 100644 --- a/src/plugins/git/gitutils.cpp +++ b/src/plugins/git/gitutils.cpp @@ -32,10 +32,10 @@ #include "gitutils.h" -#include <QtCore/QDebug> -#include <QtCore/QStringList> -#include <QtGui/QInputDialog> -#include <QtGui/QLineEdit> +#include <QDebug> +#include <QStringList> +#include <QInputDialog> +#include <QLineEdit> namespace Git { namespace Internal { diff --git a/src/plugins/git/gitutils.h b/src/plugins/git/gitutils.h index da696a31e9..cdce9b4425 100644 --- a/src/plugins/git/gitutils.h +++ b/src/plugins/git/gitutils.h @@ -33,7 +33,7 @@ #ifndef GITUTILS_H #define GITUTILS_H -#include <QtCore/QString> +#include <QString> QT_BEGIN_NAMESPACE class QDebug; diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp index 2ac944385f..65f7e90f54 100644 --- a/src/plugins/git/gitversioncontrol.cpp +++ b/src/plugins/git/gitversioncontrol.cpp @@ -38,8 +38,8 @@ #include <utils/qtcassert.h> #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> +#include <QDebug> +#include <QFileInfo> static const char stashMessageKeywordC[] = "IVersionControl@"; static const char stashRevisionIdC[] = "revision"; diff --git a/src/plugins/git/remotedialog.cpp b/src/plugins/git/remotedialog.cpp index 4d2d614b59..7fedd292e7 100644 --- a/src/plugins/git/remotedialog.cpp +++ b/src/plugins/git/remotedialog.cpp @@ -41,9 +41,9 @@ #include <vcsbase/vcsbaseoutputwindow.h> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QPushButton> -#include <QtGui/QMessageBox> +#include <QItemSelectionModel> +#include <QPushButton> +#include <QMessageBox> namespace Git { namespace Internal { diff --git a/src/plugins/git/remotedialog.h b/src/plugins/git/remotedialog.h index 7d70585d18..238555849f 100644 --- a/src/plugins/git/remotedialog.h +++ b/src/plugins/git/remotedialog.h @@ -33,7 +33,7 @@ #ifndef REMOTEDIALOG_H #define REMOTEDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> namespace Git { namespace Internal { diff --git a/src/plugins/git/remotemodel.h b/src/plugins/git/remotemodel.h index 363585e1ca..c189ffa690 100644 --- a/src/plugins/git/remotemodel.h +++ b/src/plugins/git/remotemodel.h @@ -33,9 +33,9 @@ #ifndef REMOTEMODEL_H #define REMOTEMODEL_H -#include <QtCore/QAbstractTableModel> -#include <QtCore/QList> -#include <QtCore/QVariant> +#include <QAbstractTableModel> +#include <QList> +#include <QVariant> namespace Git { namespace Internal { diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp index e8ec9381bb..bcb3ecedd3 100644 --- a/src/plugins/git/settingspage.cpp +++ b/src/plugins/git/settingspage.cpp @@ -37,13 +37,13 @@ #include <vcsbase/vcsbaseconstants.h> -#include <QtCore/QCoreApplication> -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> -#include <QtCore/QTextStream> -#include <QtCore/QProcessEnvironment> -#include <QtGui/QMessageBox> +#include <QCoreApplication> +#include <QDir> +#include <QFileInfo> +#include <QDebug> +#include <QTextStream> +#include <QProcessEnvironment> +#include <QMessageBox> namespace Git { namespace Internal { diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h index 8a482e4126..28f178d2ad 100644 --- a/src/plugins/git/settingspage.h +++ b/src/plugins/git/settingspage.h @@ -33,8 +33,8 @@ #ifndef SETTINGSPAGE_H #define SETTINGSPAGE_H -#include <QtGui/QWidget> -#include <QtCore/QPointer> +#include <QWidget> +#include <QPointer> #include <vcsbase/vcsbaseoptionspage.h> diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp index 6f63aad0c8..60401364ee 100644 --- a/src/plugins/git/stashdialog.cpp +++ b/src/plugins/git/stashdialog.cpp @@ -39,15 +39,15 @@ #include <utils/qtcassert.h> #include <vcsbase/vcsbaseoutputwindow.h> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QModelIndex> -#include <QtCore/QDateTime> -#include <QtGui/QStandardItemModel> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QDebug> +#include <QDir> +#include <QModelIndex> +#include <QDateTime> +#include <QStandardItemModel> +#include <QSortFilterProxyModel> +#include <QItemSelectionModel> +#include <QMessageBox> +#include <QPushButton> enum { NameColumn, BranchColumn, MessageColumn, ColumnCount }; diff --git a/src/plugins/git/stashdialog.h b/src/plugins/git/stashdialog.h index 0c32328ed0..048a8e99e3 100644 --- a/src/plugins/git/stashdialog.h +++ b/src/plugins/git/stashdialog.h @@ -33,7 +33,7 @@ #ifndef STASHDIALOG_H #define STASHDIALOG_H -#include <QtGui/QDialog> +#include <QDialog> QT_BEGIN_NAMESPACE class QSortFilterProxyModel; |