diff --git a/src/plugins/vcprojectmanager/interfaces/iconfiguration.h b/src/plugins/vcprojectmanager/interfaces/iconfiguration.h index ea01ee51fda..8621a58e4be 100644 --- a/src/plugins/vcprojectmanager/interfaces/iconfiguration.h +++ b/src/plugins/vcprojectmanager/interfaces/iconfiguration.h @@ -32,7 +32,7 @@ #include #include -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/iconfigurationbuildtool.h b/src/plugins/vcprojectmanager/interfaces/iconfigurationbuildtool.h index 73a73cffd88..b27e155d273 100644 --- a/src/plugins/vcprojectmanager/interfaces/iconfigurationbuildtool.h +++ b/src/plugins/vcprojectmanager/interfaces/iconfigurationbuildtool.h @@ -31,7 +31,7 @@ #define VCPROJECTMANAGER_INTERNAL_ICONFIGURATIONBUILDTOOL_H #include -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/iconfigurations.h b/src/plugins/vcprojectmanager/interfaces/iconfigurations.h index fac2ebb26b4..6b315b8e21b 100644 --- a/src/plugins/vcprojectmanager/interfaces/iconfigurations.h +++ b/src/plugins/vcprojectmanager/interfaces/iconfigurations.h @@ -32,7 +32,7 @@ #include -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/idebuggertool.h b/src/plugins/vcprojectmanager/interfaces/idebuggertool.h index f47ed41efe8..1f919aff47d 100644 --- a/src/plugins/vcprojectmanager/interfaces/idebuggertool.h +++ b/src/plugins/vcprojectmanager/interfaces/idebuggertool.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_IDEBUGGERTOOL_H #define VCPROJECTMANAGER_INTERNAL_IDEBUGGERTOOL_H -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/ideploymenttool.h b/src/plugins/vcprojectmanager/interfaces/ideploymenttool.h index 7f83859e4a9..61a07dde033 100644 --- a/src/plugins/vcprojectmanager/interfaces/ideploymenttool.h +++ b/src/plugins/vcprojectmanager/interfaces/ideploymenttool.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_IDEPLOYMENTTOOL_H #define VCPROJECTMANAGER_INTERNAL_IDEPLOYMENTTOOL_H -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/ifile.h b/src/plugins/vcprojectmanager/interfaces/ifile.h index 033e1a70c07..bcf595b3a24 100644 --- a/src/plugins/vcprojectmanager/interfaces/ifile.h +++ b/src/plugins/vcprojectmanager/interfaces/ifile.h @@ -33,7 +33,7 @@ #include #include -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/ifilecontainer.h b/src/plugins/vcprojectmanager/interfaces/ifilecontainer.h index 9ba14d0ac19..a2b19469390 100644 --- a/src/plugins/vcprojectmanager/interfaces/ifilecontainer.h +++ b/src/plugins/vcprojectmanager/interfaces/ifilecontainer.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_IFILECONTAINER_H #define VCPROJECTMANAGER_INTERNAL_IFILECONTAINER_H -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/ifiles.h b/src/plugins/vcprojectmanager/interfaces/ifiles.h index 8c973e6156f..b493a8af3ec 100644 --- a/src/plugins/vcprojectmanager/interfaces/ifiles.h +++ b/src/plugins/vcprojectmanager/interfaces/ifiles.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_IFILEHANDLER_H #define VCPROJECTMANAGER_INTERNAL_IFILEHANDLER_H -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/iglobal.h b/src/plugins/vcprojectmanager/interfaces/iglobal.h index cc6317c0111..4158ba4880a 100644 --- a/src/plugins/vcprojectmanager/interfaces/iglobal.h +++ b/src/plugins/vcprojectmanager/interfaces/iglobal.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_IGLOBAL_H #define VCPROJECTMANAGER_INTERNAL_IGLOBAL_H -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" #include namespace VcProjectManager { diff --git a/src/plugins/vcprojectmanager/interfaces/iglobals.h b/src/plugins/vcprojectmanager/interfaces/iglobals.h index 3954172ae04..535b960e618 100644 --- a/src/plugins/vcprojectmanager/interfaces/iglobals.h +++ b/src/plugins/vcprojectmanager/interfaces/iglobals.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_IGLOBALHANDLER_H #define VCPROJECTMANAGER_INTERNAL_IGLOBALHANDLER_H -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/interfaces.pri b/src/plugins/vcprojectmanager/interfaces/interfaces.pri index 5ecea3df266..576734823c2 100644 --- a/src/plugins/vcprojectmanager/interfaces/interfaces.pri +++ b/src/plugins/vcprojectmanager/interfaces/interfaces.pri @@ -29,4 +29,5 @@ HEADERS += \ interfaces/iplatforms.h \ interfaces/ipublishingitem.h \ interfaces/ipublishingdata.h \ - interfaces/ivisualstudioproject.h + interfaces/ivisualstudioproject.h \ + interfaces/ivcprojectnodemodel.h diff --git a/src/plugins/vcprojectmanager/interfaces/iplatform.h b/src/plugins/vcprojectmanager/interfaces/iplatform.h index 623d97ef5a9..17c3474c73b 100644 --- a/src/plugins/vcprojectmanager/interfaces/iplatform.h +++ b/src/plugins/vcprojectmanager/interfaces/iplatform.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_IPLATFORM_H #define VCPROJECTMANAGER_INTERNAL_IPLATFORM_H -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" #include diff --git a/src/plugins/vcprojectmanager/interfaces/iplatforms.h b/src/plugins/vcprojectmanager/interfaces/iplatforms.h index 31499ab659a..9b8680834fd 100644 --- a/src/plugins/vcprojectmanager/interfaces/iplatforms.h +++ b/src/plugins/vcprojectmanager/interfaces/iplatforms.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_IPLATFORMHANDLER_H #define VCPROJECTMANAGER_INTERNAL_IPLATFORMHANDLER_H -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/ipublishingdata.h b/src/plugins/vcprojectmanager/interfaces/ipublishingdata.h index b29bc53d8ae..e65ab3722cf 100644 --- a/src/plugins/vcprojectmanager/interfaces/ipublishingdata.h +++ b/src/plugins/vcprojectmanager/interfaces/ipublishingdata.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_IPUBLISHINGDATA_H #define VCPROJECTMANAGER_INTERNAL_IPUBLISHINGDATA_H -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/ipublishingitem.h b/src/plugins/vcprojectmanager/interfaces/ipublishingitem.h index df912b3b05f..a8ef6c4f6f7 100644 --- a/src/plugins/vcprojectmanager/interfaces/ipublishingitem.h +++ b/src/plugins/vcprojectmanager/interfaces/ipublishingitem.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_IPUBLISHINGITEM_H #define VCPROJECTMANAGER_INTERNAL_IPUBLISHINGITEM_H -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/ireference.h b/src/plugins/vcprojectmanager/interfaces/ireference.h index 40d61b7d43e..6562da2f23a 100644 --- a/src/plugins/vcprojectmanager/interfaces/ireference.h +++ b/src/plugins/vcprojectmanager/interfaces/ireference.h @@ -32,7 +32,7 @@ #include -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/ireferences.h b/src/plugins/vcprojectmanager/interfaces/ireferences.h index 9ceffb5ba91..4a6aed7d72f 100644 --- a/src/plugins/vcprojectmanager/interfaces/ireferences.h +++ b/src/plugins/vcprojectmanager/interfaces/ireferences.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_IREFERENCEHANDLER_H #define VCPROJECTMANAGER_INTERNAL_IREFERENCEHANDLER_H -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/itoolfile.h b/src/plugins/vcprojectmanager/interfaces/itoolfile.h index 82c55058871..cb5cdf1f924 100644 --- a/src/plugins/vcprojectmanager/interfaces/itoolfile.h +++ b/src/plugins/vcprojectmanager/interfaces/itoolfile.h @@ -31,7 +31,7 @@ #define VCPROJECTMANAGER_INTERNAL_ITOOLFILE_H #include -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/interfaces/itoolfiles.h b/src/plugins/vcprojectmanager/interfaces/itoolfiles.h index dbf7540c4ff..ea4d397e965 100644 --- a/src/plugins/vcprojectmanager/interfaces/itoolfiles.h +++ b/src/plugins/vcprojectmanager/interfaces/itoolfiles.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_ITOOLFILES_H #define VCPROJECTMANAGER_INTERNAL_ITOOLFILES_H -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/ivcprojectnodemodel.h b/src/plugins/vcprojectmanager/interfaces/ivcprojectnodemodel.h similarity index 100% rename from src/plugins/vcprojectmanager/vcprojectmodel/ivcprojectnodemodel.h rename to src/plugins/vcprojectmanager/interfaces/ivcprojectnodemodel.h diff --git a/src/plugins/vcprojectmanager/interfaces/ivisualstudioproject.h b/src/plugins/vcprojectmanager/interfaces/ivisualstudioproject.h index 019ef7e5a55..62ba01e73c7 100644 --- a/src/plugins/vcprojectmanager/interfaces/ivisualstudioproject.h +++ b/src/plugins/vcprojectmanager/interfaces/ivisualstudioproject.h @@ -31,7 +31,7 @@ #define VCPROJECTMANAGER_INTERNAL_IVISUALSTUDIOPROJECT_H #include -#include "../vcprojectmodel/ivcprojectnodemodel.h" +#include "ivcprojectnodemodel.h" #include "../vcprojectmodel/vcprojectdocument_constants.h" namespace VcProjectManager { diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h b/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h index 1fe205779ee..c74910d80eb 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h +++ b/src/plugins/vcprojectmanager/vcprojectmodel/activexreference.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_ACTIVEXREFERENCE_H #define VCPROJECTMANAGER_INTERNAL_ACTIVEXREFERENCE_H -#include "ivcprojectnodemodel.h" +#include "../interfaces/ivcprojectnodemodel.h" #include "vcprojectdocument_constants.h" #include "configuration.h" #include "../interfaces/ireference.h" diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h index d88691fcc98..c2682ba0451 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h +++ b/src/plugins/vcprojectmanager/vcprojectmodel/configuration.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_CONFIGURATION_H #define VCPROJECTMANAGER_INTERNAL_CONFIGURATION_H -#include "ivcprojectnodemodel.h" +#include "../interfaces/ivcprojectnodemodel.h" #include "deploymenttool.h" #include "debuggertool.h" diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h index 966cc9657d4..b093fe07cad 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h +++ b/src/plugins/vcprojectmanager/vcprojectmodel/configurations.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_CONFIGURATIONS_H #define VCPROJECTMANAGER_INTERNAL_CONFIGURATIONS_H -#include "ivcprojectnodemodel.h" +#include "../interfaces/ivcprojectnodemodel.h" #include "configuration.h" #include "vcprojectdocument_constants.h" diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/files.h b/src/plugins/vcprojectmanager/vcprojectmodel/files.h index 617546a8e23..cc91317a8b3 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/files.h +++ b/src/plugins/vcprojectmanager/vcprojectmodel/files.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_FILES_H #define VCPROJECTMANAGER_INTERNAL_FILES_H -#include "ivcprojectnodemodel.h" +#include "../interfaces/ivcprojectnodemodel.h" #include "../interfaces/ifiles.h" #include "file.h" diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/filter.h b/src/plugins/vcprojectmanager/vcprojectmodel/filter.h index b31422281dc..8b796dc6e59 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/filter.h +++ b/src/plugins/vcprojectmanager/vcprojectmodel/filter.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_FILTER_H #define VCPROJECTMANAGER_INTERNAL_FILTER_H -#include "ivcprojectnodemodel.h" +#include "../interfaces/ivcprojectnodemodel.h" #include "file.h" #include "../interfaces/ifilecontainer.h" diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/ivcprojectnodemodel.cpp b/src/plugins/vcprojectmanager/vcprojectmodel/ivcprojectnodemodel.cpp index 523354ce131..e64237b4337 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/ivcprojectnodemodel.cpp +++ b/src/plugins/vcprojectmanager/vcprojectmodel/ivcprojectnodemodel.cpp @@ -27,7 +27,7 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ -#include "ivcprojectnodemodel.h" +#include "../interfaces/ivcprojectnodemodel.h" namespace VcProjectManager { namespace Internal { diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/tools/configurationtool.h b/src/plugins/vcprojectmanager/vcprojectmodel/tools/configurationtool.h index 98ea5cf695b..4b462e48720 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/tools/configurationtool.h +++ b/src/plugins/vcprojectmanager/vcprojectmodel/tools/configurationtool.h @@ -30,7 +30,7 @@ #ifndef VCPROJECTMANAGER_INTERNAL_ICONFIGURATIONTOOL_H #define VCPROJECTMANAGER_INTERNAL_ICONFIGURATIONTOOL_H -#include "../ivcprojectnodemodel.h" +#include "../../interfaces/ivcprojectnodemodel.h" #include "../../widgets/toolwidgets/toolsettingswidget.h" #include "../../interfaces/iconfigurationbuildtool.h" diff --git a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectmodel.pri b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectmodel.pri index 44543fb1e0c..255ac4cf31a 100644 --- a/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectmodel.pri +++ b/src/plugins/vcprojectmanager/vcprojectmodel/vcprojectmodel.pri @@ -25,7 +25,6 @@ HEADERS += \ vcprojectmodel/tools/tool_constants.h \ vcprojectmodel/tools/candcpptool_constants.h \ vcprojectmodel/vcdocumentmodel.h \ - vcprojectmodel/ivcprojectnodemodel.h \ vcprojectmodel/vcdocprojectnodes.h \ vcprojectmodel/tools/toolattributes/booltoolattribute.h \ vcprojectmodel/tools/toolattributes/stringtoolattribute.h \