Commit c74a366d authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Nim: Cleanup includes and qbs dependencies

Change-Id: I1b6ef9d875a2b0c440e52148340337a3e3c25477
Reviewed-by: default avatarFilippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: default avatarhjk <hjk@theqtcompany.com>
parent 15997606
......@@ -23,12 +23,12 @@
**
****************************************************************************/
#include "editor/nimeditorfactory.h"
#include "nimeditorfactory.h"
#include "nimindenter.h"
#include "nimhighlighter.h"
#include "nimconstants.h"
#include "nimplugin.h"
#include "editor/nimindenter.h"
#include "editor/nimhighlighter.h"
#include "../nimconstants.h"
#include "../nimplugin.h"
#include <texteditor/texteditoractionhandler.h>
#include <texteditor/texteditorconstants.h>
......
......@@ -23,9 +23,9 @@
**
****************************************************************************/
#include "editor/nimhighlighter.h"
#include "nimhighlighter.h"
#include "tools/nimlexer.h"
#include "../tools/nimlexer.h"
#include <texteditor/textdocument.h>
#include <texteditor/texteditorconstants.h>
......
......@@ -25,7 +25,7 @@
#pragma once
#include "tools/nimlexer.h"
#include "../tools/nimlexer.h"
#include <texteditor/syntaxhighlighter.h>
......
......@@ -23,9 +23,9 @@
**
****************************************************************************/
#include "editor/nimindenter.h"
#include "nimindenter.h"
#include "tools/nimlexer.h"
#include "../tools/nimlexer.h"
#include <texteditor/icodestylepreferences.h>
#include <texteditor/tabsettings.h>
......
......@@ -8,11 +8,7 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "QtSupport" }
Depends { name: "ProjectExplorer" }
Depends { name: "cpp" }
cpp.includePaths: ['.']
Group {
name: "General"
......
......@@ -23,12 +23,12 @@
**
****************************************************************************/
#include "project/nimbuildconfiguration.h"
#include "nimbuildconfiguration.h"
#include "nimbuildconfigurationwidget.h"
#include "nimcompilerbuildstep.h"
#include "nimproject.h"
#include "nimconstants.h"
#include "project/nimproject.h"
#include "project/nimbuildconfigurationwidget.h"
#include "project/nimcompilerbuildstep.h"
#include "../nimconstants.h"
#include <projectexplorer/namedwidget.h>
#include <projectexplorer/projectexplorerconstants.h>
......
......@@ -23,14 +23,14 @@
**
****************************************************************************/
#include "project/nimbuildconfigurationfactory.h"
#include "nimconstants.h"
#include "project/nimbuildconfiguration.h"
#include "project/nimbuildinfo.h"
#include "project/nimcompilerbuildstep.h"
#include "project/nimcompilercleanstep.h"
#include "project/nimproject.h"
#include "nimbuildconfigurationfactory.h"
#include "nimbuildconfiguration.h"
#include "nimbuildinfo.h"
#include "nimcompilerbuildstep.h"
#include "nimcompilercleanstep.h"
#include "nimproject.h"
#include "../nimconstants.h"
#include <coreplugin/documentmanager.h>
#include <projectexplorer/buildinfo.h>
......
......@@ -23,10 +23,10 @@
**
****************************************************************************/
#include "project/nimbuildconfigurationwidget.h"
#include "nimbuildconfigurationwidget.h"
#include "nimbuildconfiguration.h"
#include "nimconstants.h"
#include "project/nimbuildconfiguration.h"
#include "../nimconstants.h"
#include <utils/pathchooser.h>
#include <utils/detailswidget.h>
......
......@@ -23,9 +23,8 @@
**
****************************************************************************/
#include "project/nimbuildinfo.h"
#include "project/nimbuildconfigurationfactory.h"
#include "nimbuildinfo.h"
#include "nimbuildconfigurationfactory.h"
using namespace ProjectExplorer;
......
......@@ -23,11 +23,11 @@
**
****************************************************************************/
#include "project/nimcompilerbuildstep.h"
#include "nimcompilerbuildstep.h"
#include "nimbuildconfiguration.h"
#include "nimcompilerbuildstepconfigwidget.h"
#include "nimconstants.h"
#include "project/nimbuildconfiguration.h"
#include "project/nimcompilerbuildstepconfigwidget.h"
#include "../nimconstants.h"
#include <projectexplorer/buildconfiguration.h>
#include <utils/qtcassert.h>
......
......@@ -23,13 +23,13 @@
**
****************************************************************************/
#include "project/nimcompilerbuildstepconfigwidget.h"
#include "nimcompilerbuildstepconfigwidget.h"
#include "ui_nimcompilerbuildstepconfigwidget.h"
#include "nimconstants.h"
#include "nimbuildconfiguration.h"
#include "nimcompilerbuildstep.h"
#include "nimproject.h"
#include "project/nimbuildconfiguration.h"
#include "project/nimcompilerbuildstep.h"
#include "../nimconstants.h"
#include <utils/qtcassert.h>
......
......@@ -23,11 +23,11 @@
**
****************************************************************************/
#include "project/nimcompilerbuildstepfactory.h"
#include "nimbuildconfiguration.h"
#include "nimcompilerbuildstep.h"
#include "nimcompilerbuildstepfactory.h"
#include "nimconstants.h"
#include "project/nimbuildconfiguration.h"
#include "project/nimcompilerbuildstep.h"
#include "../nimconstants.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <utils/qtcassert.h>
......
......@@ -23,11 +23,11 @@
**
****************************************************************************/
#include "project/nimcompilercleanstep.h"
#include "nimcompilercleanstep.h"
#include "nimbuildconfiguration.h"
#include "nimcompilercleanstepconfigwidget.h"
#include "nimconstants.h"
#include "project/nimbuildconfiguration.h"
#include "project/nimcompilercleanstepconfigwidget.h"
#include "../nimconstants.h"
#include <utils/qtcassert.h>
......
......@@ -23,11 +23,11 @@
**
****************************************************************************/
#include "project/nimcompilercleanstepconfigwidget.h"
#include "nimcompilercleanstepconfigwidget.h"
#include "ui_nimcompilercleanstepconfigwidget.h"
#include "nimcompilercleanstep.h"
#include "nimconstants.h"
#include "project/nimcompilercleanstep.h"
#include "../nimconstants.h"
#include "projectexplorer/buildconfiguration.h"
......
......@@ -23,11 +23,11 @@
**
****************************************************************************/
#include "project/nimcompilercleanstepfactory.h"
#include "nimcompilercleanstepfactory.h"
#include "nimbuildconfiguration.h"
#include "nimcompilercleanstep.h"
#include "nimconstants.h"
#include "project/nimbuildconfiguration.h"
#include "project/nimcompilercleanstep.h"
#include "../nimconstants.h"
#include <projectexplorer/projectexplorerconstants.h>
......
......@@ -23,12 +23,12 @@
**
****************************************************************************/
#include "project/nimproject.h"
#include "nimproject.h"
#include "nimbuildconfiguration.h"
#include "nimprojectnode.h"
#include "nimprojectmanager.h"
#include "nimconstants.h"
#include "project/nimbuildconfiguration.h"
#include "project/nimprojectnode.h"
#include "project/nimprojectmanager.h"
#include "../nimconstants.h"
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/kit.h>
......@@ -36,10 +36,8 @@
#include <projectexplorer/target.h>
#include <texteditor/textdocument.h>
#include <QDebug>
#include <QFileInfo>
#include <QQueue>
#include <QThread>
using namespace ProjectExplorer;
using namespace Utils;
......
......@@ -23,10 +23,10 @@
**
****************************************************************************/
#include "project/nimprojectmanager.h"
#include "nimprojectmanager.h"
#include "nimproject.h"
#include "nimconstants.h"
#include "project/nimproject.h"
#include "../nimconstants.h"
using namespace ProjectExplorer;
......
......@@ -23,9 +23,8 @@
**
****************************************************************************/
#include "project/nimprojectnode.h"
#include "project/nimproject.h"
#include "nimprojectnode.h"
#include "nimproject.h"
using namespace ProjectExplorer;
using namespace Utils;
......
......@@ -23,11 +23,11 @@
**
****************************************************************************/
#include "project/nimrunconfiguration.h"
#include "nimrunconfiguration.h"
#include "nimbuildconfiguration.h"
#include "nimrunconfigurationwidget.h"
#include "nimconstants.h"
#include "project/nimbuildconfiguration.h"
#include "project/nimrunconfigurationwidget.h"
#include "../nimconstants.h"
#include <projectexplorer/runnables.h>
#include <projectexplorer/localenvironmentaspect.h>
......
......@@ -23,11 +23,11 @@
**
****************************************************************************/
#include "project/nimrunconfigurationfactory.h"
#include "nimrunconfigurationfactory.h"
#include "nimproject.h"
#include "nimrunconfiguration.h"
#include "nimconstants.h"
#include "project/nimproject.h"
#include "project/nimrunconfiguration.h"
#include "../nimconstants.h"
#include <debugger/debuggerrunconfigurationaspect.h>
#include <projectexplorer/target.h>
......
......@@ -23,9 +23,8 @@
**
****************************************************************************/
#include "project/nimrunconfigurationwidget.h"
#include "project/nimrunconfiguration.h"
#include "nimrunconfigurationwidget.h"
#include "nimrunconfiguration.h"
#include <projectexplorer/runconfigurationaspects.h>
......
......@@ -23,9 +23,8 @@
**
****************************************************************************/
#include "project/nimruncontrol.h"
#include "project/nimrunconfiguration.h"
#include "nimruncontrol.h"
#include "nimrunconfiguration.h"
#include <projectexplorer/runnables.h>
#include <utils/qtcprocess.h>
......
......@@ -23,10 +23,9 @@
**
****************************************************************************/
#include "project/nimruncontrolfactory.h"
#include "project/nimrunconfiguration.h"
#include "project/nimruncontrol.h"
#include "nimruncontrolfactory.h"
#include "nimrunconfiguration.h"
#include "nimruncontrol.h"
namespace Nim {
......
......@@ -23,11 +23,11 @@
**
****************************************************************************/
#include "settings/nimcodestylepreferencesfactory.h"
#include "nimcodestylepreferencesfactory.h"
#include "nimcodestylepreferenceswidget.h"
#include "nimconstants.h"
#include "editor/nimindenter.h"
#include "settings/nimcodestylepreferenceswidget.h"
#include "../nimconstants.h"
#include "../editor/nimindenter.h"
#include <coreplugin/id.h>
#include <texteditor/simplecodestylepreferences.h>
......
......@@ -26,7 +26,7 @@
#include "nimcodestylepreferenceswidget.h"
#include "ui_nimcodestylepreferenceswidget.h"
#include "nimconstants.h"
#include "../nimconstants.h"
#include <extensionsystem/pluginmanager.h>
#include <texteditor/displaysettings.h>
......
......@@ -24,10 +24,10 @@
****************************************************************************/
#include "nimcodestylesettingspage.h"
#include "nimcodestylepreferencesfactory.h"
#include "nimsettings.h"
#include "nimconstants.h"
#include "settings/nimcodestylepreferencesfactory.h"
#include "settings/nimsettings.h"
#include "../nimconstants.h"
#include <extensionsystem/pluginmanager.h>
#include <texteditor/simplecodestylepreferences.h>
......
......@@ -24,9 +24,9 @@
****************************************************************************/
#include "nimsettings.h"
#include "nimcodestylepreferencesfactory.h"
#include "nimconstants.h"
#include "settings/nimcodestylepreferencesfactory.h"
#include "../nimconstants.h"
#include <texteditor/icodestylepreferencesfactory.h>
#include <texteditor/texteditorsettings.h>
......@@ -35,14 +35,11 @@
#include <texteditor/tabsettings.h>
#include <coreplugin/icore.h>
#include <QDebug>
using namespace TextEditor;
namespace Nim {
TextEditor::SimpleCodeStylePreferences *m_globalCodeStyle = nullptr;
SimpleCodeStylePreferences *m_globalCodeStyle = nullptr;
NimSettings::NimSettings(QObject *parent)
: QObject(parent)
......
......@@ -25,9 +25,9 @@
#include "nimsnippetprovider.h"
#include "nimconstants.h"
#include "editor/nimhighlighter.h"
#include "editor/nimindenter.h"
#include "../nimconstants.h"
#include "../editor/nimhighlighter.h"
#include "../editor/nimindenter.h"
#include <texteditor/textdocument.h>
#include <texteditor/snippets/snippeteditor.h>
......
......@@ -23,9 +23,8 @@
**
****************************************************************************/
#include "tools/nimlexer.h"
#include "tools/sourcecodestream.h"
#include "nimlexer.h"
#include "sourcecodestream.h"
#include <QRegularExpression>
#include <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