From 8bbce4608fcf65c7c683bb6b23daffe21d080d15 Mon Sep 17 00:00:00 2001
From: Nikita Baryshnikov <nib952051@gmail.com>
Date: Wed, 15 Oct 2014 12:46:18 +0400
Subject: [PATCH] Remove probably outdated QShortcut include

Also take care about sibling include statements

Change-Id: I513893ef710107310b63187cd5fa82c5e52fae0a
Reviewed-by: hjk <hjk121@nokiamail.com>
---
 .../coreplugin/actionmanager/actionmanager.cpp   |  1 -
 .../coreplugin/actionmanager/actionmanager.h     |  1 -
 src/plugins/coreplugin/actionmanager/command.cpp |  7 -------
 src/plugins/coreplugin/actionmanager/command.h   |  1 -
 src/plugins/fakevim/fakevimplugin.cpp            | 16 +++++-----------
 src/plugins/macros/actionmacrohandler.cpp        |  3 ---
 src/plugins/macros/macrooptionswidget.cpp        |  8 --------
 src/plugins/macros/texteditormacrohandler.cpp    |  2 --
 8 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 52900beff74..5508254919c 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -42,7 +42,6 @@
 #include <QLabel>
 #include <QMenu>
 #include <QAction>
-#include <QShortcut>
 #include <QMenuBar>
 
 namespace {
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h
index 75de8debc03..3f83b81018b 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.h
@@ -41,7 +41,6 @@
 QT_BEGIN_NAMESPACE
 class QAction;
 class QSettings;
-class QShortcut;
 class QString;
 QT_END_NAMESPACE
 
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index 8f39effbcb8..70b60d5c6c2 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -36,7 +36,6 @@
 #include <utils/hostosinfo.h>
 
 #include <QAction>
-#include <QShortcut>
 #include <QToolButton>
 #include <QTextStream>
 
@@ -153,12 +152,6 @@
     no active action for the current context.
 */
 
-/*!
-    \fn QShortcut *Command::shortcut() const
-    Returns the shortcut for this Command.
-    If the Command represents an action, it returns null.
-*/
-
 /*!
     \fn void Command::setAttribute(CommandAttribute attribute)
     Adds \a attribute to the attributes of this Command.
diff --git a/src/plugins/coreplugin/actionmanager/command.h b/src/plugins/coreplugin/actionmanager/command.h
index 1a5fc3df62a..3bd25ececf1 100644
--- a/src/plugins/coreplugin/actionmanager/command.h
+++ b/src/plugins/coreplugin/actionmanager/command.h
@@ -39,7 +39,6 @@
 QT_BEGIN_NAMESPACE
 class QAction;
 class QKeySequence;
-class QShortcut;
 class QToolButton;
 QT_END_NAMESPACE
 
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 12871b370e4..89b22c82d41 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -87,19 +87,13 @@
 #include <QAbstractTableModel>
 #include <QDebug>
 #include <QFile>
-#include <QFileDialog>
-#include <QtPlugin>
-#include <QObject>
-#include <QPainter>
-#include <QPointer>
-#include <QSettings>
-#include <QScrollBar>
-#include <QStackedWidget>
-#include <QTextStream>
-
 #include <QItemDelegate>
+#include <QPainter>
 #include <QPlainTextEdit>
-#include <QShortcut>
+#include <QPointer>
+#include <QScrollBar>
+#include <QSettings>
+#include <QStackedWidget>
 #include <QStandardPaths>
 #include <QTextBlock>
 #include <QTextCursor>
diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp
index 6b4f5dfacdc..8c3c0f194d2 100644
--- a/src/plugins/macros/actionmacrohandler.cpp
+++ b/src/plugins/macros/actionmacrohandler.cpp
@@ -43,10 +43,7 @@
 
 #include <QAction>
 #include <QEvent>
-#include <QObject>
-#include <QShortcut>
 #include <QSignalMapper>
-#include <QStringList>
 
 using namespace Core;
 
diff --git a/src/plugins/macros/macrooptionswidget.cpp b/src/plugins/macros/macrooptionswidget.cpp
index e0ad77011d3..0f95b9e6474 100644
--- a/src/plugins/macros/macrooptionswidget.cpp
+++ b/src/plugins/macros/macrooptionswidget.cpp
@@ -42,16 +42,8 @@
 
 #include <QDir>
 #include <QFileInfo>
-
-#include <QShortcut>
-#include <QButtonGroup>
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QHeaderView>
-#include <QRegExpValidator>
-#include <QLineEdit>
 
 namespace {
     int NAME_ROLE = Qt::UserRole;
diff --git a/src/plugins/macros/texteditormacrohandler.cpp b/src/plugins/macros/texteditormacrohandler.cpp
index bcecb5a4ab2..916b047dde7 100644
--- a/src/plugins/macros/texteditormacrohandler.cpp
+++ b/src/plugins/macros/texteditormacrohandler.cpp
@@ -42,10 +42,8 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/id.h>
 
-#include <QWidget>
 #include <QKeyEvent>
 #include <QApplication>
-#include <QShortcut>
 
 using namespace Macros;
 using namespace Macros::Internal;