summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/actionmanager
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/coreplugin/actionmanager
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/coreplugin/actionmanager')
-rw-r--r--src/plugins/coreplugin/actionmanager/actioncontainer.cpp8
-rw-r--r--src/plugins/coreplugin/actionmanager/actioncontainer.h2
-rw-r--r--src/plugins/coreplugin/actionmanager/actionmanager.cpp16
-rw-r--r--src/plugins/coreplugin/actionmanager/actionmanager.h4
-rw-r--r--src/plugins/coreplugin/actionmanager/actionmanager_p.h8
-rw-r--r--src/plugins/coreplugin/actionmanager/command.cpp10
-rw-r--r--src/plugins/coreplugin/actionmanager/command.h2
-rw-r--r--src/plugins/coreplugin/actionmanager/command_p.h10
-rw-r--r--src/plugins/coreplugin/actionmanager/commandmappings.cpp12
-rw-r--r--src/plugins/coreplugin/actionmanager/commandmappings.h2
-rw-r--r--src/plugins/coreplugin/actionmanager/commandsfile.cpp12
-rw-r--r--src/plugins/coreplugin/actionmanager/commandsfile.h8
12 files changed, 47 insertions, 47 deletions
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
index 30896c45f6..4cce3a656c 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
@@ -40,10 +40,10 @@
#include <utils/qtcassert.h>
-#include <QtCore/QDebug>
-#include <QtCore/QTimer>
-#include <QtGui/QAction>
-#include <QtGui/QMenuBar>
+#include <QDebug>
+#include <QTimer>
+#include <QAction>
+#include <QMenuBar>
Q_DECLARE_METATYPE(Core::Internal::MenuActionContainer*)
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.h b/src/plugins/coreplugin/actionmanager/actioncontainer.h
index 2071bdc9be..c05e53dde7 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.h
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.h
@@ -35,7 +35,7 @@
#include "coreplugin/id.h"
-#include <QtCore/QObject>
+#include <QObject>
QT_BEGIN_NAMESPACE
class QMenu;
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index a87592a368..a4c8a088f4 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -40,14 +40,14 @@
#include <coreplugin/icore.h>
#include <utils/qtcassert.h>
-#include <QtCore/QDebug>
-#include <QtCore/QSettings>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QLabel>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QShortcut>
-#include <QtGui/QMenuBar>
+#include <QDebug>
+#include <QSettings>
+#include <QDesktopWidget>
+#include <QLabel>
+#include <QMenu>
+#include <QAction>
+#include <QShortcut>
+#include <QMenuBar>
namespace {
enum { warnAboutFindFailures = 0 };
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h
index f4b3252aa0..61dc0f47a8 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.h
@@ -38,8 +38,8 @@
#include <coreplugin/actionmanager/command.h>
#include "coreplugin/icontext.h"
-#include <QtCore/QObject>
-#include <QtCore/QList>
+#include <QObject>
+#include <QList>
QT_BEGIN_NAMESPACE
class QAction;
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager_p.h b/src/plugins/coreplugin/actionmanager/actionmanager_p.h
index 8f40962c4e..12191ebbcd 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager_p.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h
@@ -37,10 +37,10 @@
#include <coreplugin/actionmanager/command_p.h>
#include <coreplugin/icontext.h>
-#include <QtCore/QMap>
-#include <QtCore/QHash>
-#include <QtCore/QMultiHash>
-#include <QtCore/QTimer>
+#include <QMap>
+#include <QHash>
+#include <QMultiHash>
+#include <QTimer>
QT_BEGIN_NAMESPACE
class QLabel;
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index fb171dee68..a7e8c4b695 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -36,12 +36,12 @@
#include "icontext.h"
#include "id.h"
-#include <QtCore/QDebug>
-#include <QtCore/QTextStream>
+#include <QDebug>
+#include <QTextStream>
-#include <QtGui/QAction>
-#include <QtGui/QShortcut>
-#include <QtGui/QMainWindow>
+#include <QAction>
+#include <QShortcut>
+#include <QMainWindow>
/*!
\class Core::Command
diff --git a/src/plugins/coreplugin/actionmanager/command.h b/src/plugins/coreplugin/actionmanager/command.h
index 7f04c4994c..c7c9dcaaae 100644
--- a/src/plugins/coreplugin/actionmanager/command.h
+++ b/src/plugins/coreplugin/actionmanager/command.h
@@ -36,7 +36,7 @@
#include <coreplugin/core_global.h>
#include <coreplugin/id.h>
-#include <QtCore/QObject>
+#include <QObject>
QT_BEGIN_NAMESPACE
class QAction;
diff --git a/src/plugins/coreplugin/actionmanager/command_p.h b/src/plugins/coreplugin/actionmanager/command_p.h
index 4e44c9e754..da61ee85e1 100644
--- a/src/plugins/coreplugin/actionmanager/command_p.h
+++ b/src/plugins/coreplugin/actionmanager/command_p.h
@@ -40,11 +40,11 @@
#include <utils/proxyaction.h>
-#include <QtCore/QList>
-#include <QtCore/QMultiMap>
-#include <QtCore/QPointer>
-#include <QtCore/QMap>
-#include <QtGui/QKeySequence>
+#include <QList>
+#include <QMultiMap>
+#include <QPointer>
+#include <QMap>
+#include <QKeySequence>
namespace Core {
namespace Internal {
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
index 69060ff2c9..7709fff66c 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
@@ -44,12 +44,12 @@
#include <utils/treewidgetcolumnstretcher.h>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QShortcut>
-#include <QtGui/QHeaderView>
-#include <QtGui/QTreeWidgetItem>
-#include <QtGui/QFileDialog>
-#include <QtCore/QCoreApplication>
+#include <QKeyEvent>
+#include <QShortcut>
+#include <QHeaderView>
+#include <QTreeWidgetItem>
+#include <QFileDialog>
+#include <QCoreApplication>
#include <QtDebug>
Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.h b/src/plugins/coreplugin/actionmanager/commandmappings.h
index d91ba1e6fc..91b89fdc95 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.h
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.h
@@ -35,7 +35,7 @@
#include <coreplugin/dialogs/ioptionspage.h>
-#include <QtCore/QObject>
+#include <QObject>
QT_BEGIN_NAMESPACE
class QLineEdit;
diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
index 05a662826e..24c5fbf4ea 100644
--- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
@@ -42,12 +42,12 @@
#include <utils/fileutils.h>
-#include <QtCore/QFile>
-#include <QtCore/QXmlStreamAttributes>
-#include <QtCore/QXmlStreamWriter>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QDebug>
-#include <QtCore/QDateTime>
+#include <QFile>
+#include <QXmlStreamAttributes>
+#include <QXmlStreamWriter>
+#include <QXmlStreamReader>
+#include <QDebug>
+#include <QDateTime>
namespace Core {
namespace Internal {
diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.h b/src/plugins/coreplugin/actionmanager/commandsfile.h
index 01077e317a..fed98dfc70 100644
--- a/src/plugins/coreplugin/actionmanager/commandsfile.h
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.h
@@ -33,10 +33,10 @@
#ifndef COMMANDSFILE_H
#define COMMANDSFILE_H
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QMap>
-#include <QtGui/QKeySequence>
+#include <QObject>
+#include <QString>
+#include <QMap>
+#include <QKeySequence>
namespace Core {
namespace Internal {