From 36ff7e4a6bb3fa4a46968a91e10dd16a7d4a71be Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 20 Jan 2015 12:30:35 +0100 Subject: [PATCH] VcsBase: Move vcsconfigurationpage into wizard subfolder I will try to move all the wizard code that is still relevant there and then get rid of the rest. Change-Id: I3963f53fd39ef0f84c71218eb59b05213121cc90 Reviewed-by: Orgad Shaneh Reviewed-by: Tobias Hunger --- src/plugins/bazaar/clonewizard.cpp | 2 +- src/plugins/cvs/checkoutwizard.cpp | 2 +- src/plugins/git/clonewizard.cpp | 2 +- src/plugins/mercurial/clonewizard.cpp | 2 +- src/plugins/subversion/checkoutwizard.cpp | 2 +- src/plugins/vcsbase/vcsbase.pro | 4 ++-- src/plugins/vcsbase/vcsbase.qbs | 4 ++-- src/plugins/vcsbase/{ => wizard}/vcsconfigurationpage.cpp | 2 +- src/plugins/vcsbase/{ => wizard}/vcsconfigurationpage.h | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) rename src/plugins/vcsbase/{ => wizard}/vcsconfigurationpage.cpp (98%) rename src/plugins/vcsbase/{ => wizard}/vcsconfigurationpage.h (98%) diff --git a/src/plugins/bazaar/clonewizard.cpp b/src/plugins/bazaar/clonewizard.cpp index d1fb5735b1c..941622eea13 100644 --- a/src/plugins/bazaar/clonewizard.cpp +++ b/src/plugins/bazaar/clonewizard.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include diff --git a/src/plugins/cvs/checkoutwizard.cpp b/src/plugins/cvs/checkoutwizard.cpp index f87bdb8e3b4..e5cbaeebb24 100644 --- a/src/plugins/cvs/checkoutwizard.cpp +++ b/src/plugins/cvs/checkoutwizard.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include using namespace VcsBase; diff --git a/src/plugins/git/clonewizard.cpp b/src/plugins/git/clonewizard.cpp index 1e2f4c2f08a..7ba8249a7e9 100644 --- a/src/plugins/git/clonewizard.cpp +++ b/src/plugins/git/clonewizard.cpp @@ -35,7 +35,7 @@ #include "gitversioncontrol.h" #include -#include +#include #include using namespace VcsBase; diff --git a/src/plugins/mercurial/clonewizard.cpp b/src/plugins/mercurial/clonewizard.cpp index 295590ac029..339bc244bd2 100644 --- a/src/plugins/mercurial/clonewizard.cpp +++ b/src/plugins/mercurial/clonewizard.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include using namespace VcsBase; diff --git a/src/plugins/subversion/checkoutwizard.cpp b/src/plugins/subversion/checkoutwizard.cpp index 6ba31be58ec..45b7d439727 100644 --- a/src/plugins/subversion/checkoutwizard.cpp +++ b/src/plugins/subversion/checkoutwizard.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include using namespace Utils; diff --git a/src/plugins/vcsbase/vcsbase.pro b/src/plugins/vcsbase/vcsbase.pro index b90ae857c73..6524523abf9 100644 --- a/src/plugins/vcsbase/vcsbase.pro +++ b/src/plugins/vcsbase/vcsbase.pro @@ -2,7 +2,7 @@ DEFINES += VCSBASE_LIBRARY include(../../qtcreatorplugin.pri) HEADERS += vcsbase_global.h \ vcsbaseconstants.h \ - vcsconfigurationpage.h \ + wizard/vcsconfigurationpage.h \ vcsplugin.h \ corelistener.h \ vcsbaseplugin.h \ @@ -33,7 +33,7 @@ HEADERS += vcsbase_global.h \ SOURCES += vcsplugin.cpp \ vcsbaseplugin.cpp \ - vcsconfigurationpage.cpp \ + wizard/vcsconfigurationpage.cpp \ corelistener.cpp \ baseannotationhighlighter.cpp \ diffhighlighter.cpp \ diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs index c6a0bbe879a..44e379de043 100644 --- a/src/plugins/vcsbase/vcsbase.qbs +++ b/src/plugins/vcsbase/vcsbase.qbs @@ -72,8 +72,6 @@ QtcPlugin { "vcsbasesubmiteditor.h", "vcscommand.cpp", "vcscommand.h", - "vcsconfigurationpage.cpp", - "vcsconfigurationpage.h", "vcsoutputwindow.cpp", "vcsoutputwindow.h", "vcsplugin.cpp", @@ -81,5 +79,7 @@ QtcPlugin { "images/diff.png", "images/removesubmitfield.png", "images/submit.png", + "wizard/vcsconfigurationpage.cpp", + "wizard/vcsconfigurationpage.h", ] } diff --git a/src/plugins/vcsbase/vcsconfigurationpage.cpp b/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp similarity index 98% rename from src/plugins/vcsbase/vcsconfigurationpage.cpp rename to src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp index 81bce4a6bb7..e539d3df9ec 100644 --- a/src/plugins/vcsbase/vcsconfigurationpage.cpp +++ b/src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp @@ -30,7 +30,7 @@ #include "vcsconfigurationpage.h" -#include "vcsbaseconstants.h" +#include "../vcsbaseconstants.h" #include #include diff --git a/src/plugins/vcsbase/vcsconfigurationpage.h b/src/plugins/vcsbase/wizard/vcsconfigurationpage.h similarity index 98% rename from src/plugins/vcsbase/vcsconfigurationpage.h rename to src/plugins/vcsbase/wizard/vcsconfigurationpage.h index a749a664d5d..0f743265d04 100644 --- a/src/plugins/vcsbase/vcsconfigurationpage.h +++ b/src/plugins/vcsbase/wizard/vcsconfigurationpage.h @@ -31,7 +31,7 @@ #ifndef VCSCONFIGURATIONPAGE_H #define VCSCONFIGURATIONPAGE_H -#include "vcsbase_global.h" +#include "../vcsbase_global.h" #include