Commit e8c0d0c1 authored by Friedemann Kleint's avatar Friedemann Kleint

Yet another include purging spree.

parent 0f21c8e6
......@@ -235,7 +235,7 @@ bool CppHoverHandler::matchDiagnosticMessage(const CPlusPlus::Document::Ptr &doc
const int line)
{
foreach (const Document::DiagnosticMessage &m, document->diagnosticMessages()) {
if (m.line() == line) {
if (m.line() == unsigned(line)) {
m_toolTip = m.text();
return true;
}
......@@ -246,7 +246,7 @@ bool CppHoverHandler::matchDiagnosticMessage(const CPlusPlus::Document::Ptr &doc
bool CppHoverHandler::matchIncludeFile(const CPlusPlus::Document::Ptr &document, const int line)
{
foreach (const Document::Include &includeFile, document->includes()) {
if (includeFile.line() == line) {
if (includeFile.line() == unsigned(line)) {
m_toolTip = QDir::toNativeSeparators(includeFile.fileName());
const QString &fileName = QFileInfo(includeFile.fileName()).fileName();
m_helpCandidates.append(HelpCandidate(fileName, fileName, HelpCandidate::Include));
......
......@@ -31,6 +31,7 @@
#include "project.h"
#include "runconfiguration.h"
#include "buildconfiguration.h"
#include "target.h"
#include <QtGui/QVBoxLayout>
#include <QtGui/QPushButton>
......
......@@ -38,6 +38,7 @@
#include <QtGui/QKeyEvent>
#include <QtGui/QIcon>
#include <QtGui/QTextCharFormat>
#include <QtGui/QTextBlock>
#include <QtGui/QTextCursor>
#include <QtGui/QTextEdit>
......
......@@ -34,11 +34,9 @@
#include <QtCore/QHash>
#include <QtGui/QColor>
#include <QtGui/QTextCharFormat>
QT_BEGIN_NAMESPACE
class QPlainTextEdit;
class QTextCharFormat;
QT_END_NAMESPACE
namespace ProjectExplorer {
......
......@@ -38,6 +38,7 @@
#include <utils/detailswidget.h>
#include <utils/pathchooser.h>
#include <QtCore/QDir>
#include <QtGui/QCheckBox>
#include <QtGui/QComboBox>
#include <QtGui/QDialog>
......
......@@ -30,6 +30,7 @@
#include "miniprojecttargetselector.h"
#include "buildconfigurationmodel.h"
#include "runconfigurationmodel.h"
#include "target.h"
#include <utils/qtcassert.h>
#include <utils/styledbar.h>
......
......@@ -33,6 +33,7 @@
#include "projectexplorersettings.h"
#include "runconfiguration.h"
#include "session.h"
#include "outputformatter.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
......@@ -56,6 +57,7 @@
#include <QtGui/QVBoxLayout>
#include <QtGui/QTabWidget>
#include <QtGui/QToolButton>
#include <QtGui/QShowEvent>
using namespace ProjectExplorer::Internal;
using namespace ProjectExplorer;
......
......@@ -31,12 +31,9 @@
#define OUTPUTWINDOW_H
#include <coreplugin/ioutputpane.h>
#include <projectexplorer/outputformatter.h>
#include <QtCore/QObject>
#include <QtCore/QHash>
#include <QtGui/QIcon>
#include <QtGui/QShowEvent>
#include <QtGui/QPlainTextEdit>
QT_BEGIN_NAMESPACE
......@@ -50,7 +47,7 @@ namespace Core {
}
namespace ProjectExplorer {
class OutputFormatter;
class RunControl;
namespace Constants {
......
......@@ -31,7 +31,6 @@
#define PROJECT_H
#include "projectexplorer_export.h"
#include "target.h"
#include <QtCore/QObject>
#include <QtCore/QSet>
......
......@@ -59,6 +59,7 @@
#include <QtGui/QScrollArea>
#include <QtGui/QLabel>
#include <QtGui/QPainter>
#include <QtGui/QStackedWidget>
#include <QtGui/QPaintEvent>
#include <QtGui/QMenu>
......
......@@ -30,22 +30,13 @@
#ifndef PROJECTWINDOW_H
#define PROJECTWINDOW_H
#include "iprojectproperties.h"
#include <QtCore/QPair>
#include <QtCore/QMap>
#include <QtGui/QApplication>
#include <QtGui/QComboBox>
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QtGui/QScrollArea>
#include <QtGui/QStackedWidget>
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
class QLabel;
class QGridLayout;
class QMenu;
class QStackedWidget;
QT_END_NAMESPACE
namespace ProjectExplorer {
......@@ -105,7 +96,6 @@ private:
QList<ProjectExplorer::Project *> m_tabIndexToProject;
};
} // namespace Internal
} // namespace ProjectExplorer
......
......@@ -33,7 +33,6 @@
#include "iprojectproperties.h"
#include <QtGui/QWidget>
#include <QtCore/QAbstractListModel>
QT_BEGIN_NAMESPACE
class QMenu;
......
......@@ -33,8 +33,6 @@
#include "projectconfiguration.h"
#include "projectexplorer_export.h"
#include <QtCore/QObject>
#include <QtGui/QFileSystemModel>
#include <QtGui/QIcon>
namespace ProjectExplorer {
......
......@@ -43,6 +43,7 @@
#include <QtGui/QMenu>
#include <QtGui/QMessageBox>
#include <QtGui/QVBoxLayout>
#include <QtGui/QStackedWidget>
using namespace ProjectExplorer;
using namespace ProjectExplorer::Internal;
......
......@@ -30,19 +30,18 @@
#ifndef TARGETSETTINGSPANEL_H
#define TARGETSETTINGSPANEL_H
#include "iprojectproperties.h"
#include <QtGui/QStackedWidget>
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
class QAction;
class QMenu;
class QStackedWidget;
QT_END_NAMESPACE
namespace ProjectExplorer {
class Target;
class Project;
namespace Internal {
......
......@@ -31,7 +31,7 @@
#define TASKHUB_H
#include "task.h"
#include "projectexplorer_export.h"
#include <QtCore/QObject>
#include <QtGui/QIcon>
......
......@@ -30,17 +30,17 @@
#ifndef TASKWINDOW_H
#define TASKWINDOW_H
#include "task.h"
#include <coreplugin/ioutputpane.h>
#include <QtGui/QIcon>
QT_BEGIN_NAMESPACE
class QAction;
class QModelIndex;
class QPoint;
QT_END_NAMESPACE
namespace ProjectExplorer {
class TaskHub;
class Task;
namespace Internal {
class TaskWindowPrivate;
......
......@@ -34,9 +34,6 @@
#include "itaskhandler.h"
#include <QtCore/QHash>
#include <QtCore/QString>
namespace Core {
class IVersionControl;
}
......
......@@ -30,7 +30,7 @@
#ifndef GETTINGSTARTEDWELCOMEPAGEWIDGET_H
#define GETTINGSTARTEDWELCOMEPAGEWIDGET_H
#include <QWidget>
#include <QtGui/QWidget>
namespace Qt4ProjectManager {
namespace Internal {
......
......@@ -35,6 +35,7 @@
#include "makestep.h"
#include "qt4buildconfiguration.h"
#include "qt4projectmanagerconstants.h"
#include "qtversionmanager.h"
#include "wizards/targetsetuppage.h"
......
......@@ -30,17 +30,13 @@
#ifndef PROJECTLOADWIZARD_H
#define PROJECTLOADWIZARD_H
#include "qtversionmanager.h"
#include <wizards/targetsetuppage.h>
#include <QtGui/QWizard>
namespace Qt4ProjectManager {
class Qt4Project;
namespace Internal {
class TargetsPage;
class TargetSetupPage;
class ProjectLoadWizard : public QWizard
{
......
......@@ -32,8 +32,6 @@
#include <projectexplorer/ioutputparser.h>
#include <QtCore/QRegExp>
namespace Qt4ProjectManager {
namespace Internal {
......
......@@ -37,6 +37,8 @@
#include <projectexplorer/target.h>
#include <projectexplorer/gnumakeparser.h>
#include <QtCore/QDir>
using namespace Qt4ProjectManager::Internal;
namespace {
......
......@@ -35,8 +35,6 @@
#include <QtCore/QFutureInterface>
#include <QtGui/QWidget>
#include <QtGui/QPixmap>
#include <QtGui/QIcon>
QT_BEGIN_NAMESPACE
class QTreeWidgetItem;
......
......@@ -30,8 +30,8 @@
#ifndef QTVERSIONMANAGER_H
#define QTVERSIONMANAGER_H
#include <projectexplorer/taskwindow.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/task.h>
#include <QtCore/QHash>
#include <QtCore/QSet>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment