[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ktexteditor] /: Move emulatedcommandbar.cpp/.h into new emulatedcommandbar subdirectory.
From:       Simon St James <kdedevel () etotheipiplusone ! com>
Date:       2016-06-17 8:18:10
Message-ID: E1bDoyg-0002ZN-DW () scm ! kde ! org
[Download RAW message or body]

Git commit fb2be96b89bb103dfed8399a1b0227d7505d6854 by Simon St James.
Committed on 17/06/2016 at 08:14.
Pushed by sstjames into branch 'master'.

Move emulatedcommandbar.cpp/.h into new emulatedcommandbar subdirectory.

M  +1    -1    autotests/src/vimode/base.cpp
M  +1    -1    autotests/src/vimode/completion.cpp
M  +1    -1    autotests/src/vimode/emulatedcommandbar.cpp
M  +1    -1    autotests/src/vimode/emulatedcommandbarsetupandteardown.cpp
M  +1    -1    autotests/src/vimode/keys.cpp
M  +1    -1    src/CMakeLists.txt
M  +1    -1    src/inputmode/kateviinputmode.cpp
M  +1    -1    src/vimode/cmds.cpp
R  +6    -6    src/vimode/emulatedcommandbar/emulatedcommandbar.cpp [from: =
src/vimode/emulatedcommandbar.cpp - 099% similarity]
R  +1    -1    src/vimode/emulatedcommandbar/emulatedcommandbar.h [from: sr=
c/vimode/emulatedcommandbar.h - 099% similarity]
M  +1    -1    src/vimode/inputmodemanager.cpp
M  +1    -1    src/vimode/mappings.cpp
M  +1    -1    src/vimode/modes/normalvimode.cpp

http://commits.kde.org/ktexteditor/fb2be96b89bb103dfed8399a1b0227d7505d6854

diff --git a/autotests/src/vimode/base.cpp b/autotests/src/vimode/base.cpp
index 510ea8d..a3bcf24 100644
--- a/autotests/src/vimode/base.cpp
+++ b/autotests/src/vimode/base.cpp
@@ -22,7 +22,7 @@
 #include <kateconfig.h>
 #include <kateglobal.h>
 #include <kateundomanager.h>
-#include <vimode/emulatedcommandbar.h>
+#include <vimode/emulatedcommandbar/emulatedcommandbar.h>
 #include <inputmode/kateviinputmode.h>
 #include "base.h"
 #include "vimode/macros.h"
diff --git a/autotests/src/vimode/completion.cpp b/autotests/src/vimode/com=
pletion.cpp
index 097f59d..216b553 100644
--- a/autotests/src/vimode/completion.cpp
+++ b/autotests/src/vimode/completion.cpp
@@ -22,7 +22,7 @@
 #include <katecompletionwidget.h>
 #include <kateconfig.h>
 #include <kateglobal.h>
-#include <vimode/emulatedcommandbar.h>
+#include <vimode/emulatedcommandbar/emulatedcommandbar.h>
 #include <katewordcompletion.h>
 #include "completion.h"
 #include "fakecodecompletiontestmodel.h"
diff --git a/autotests/src/vimode/emulatedcommandbar.cpp b/autotests/src/vi=
mode/emulatedcommandbar.cpp
index 56d5d5c..34e196f 100644
--- a/autotests/src/vimode/emulatedcommandbar.cpp
+++ b/autotests/src/vimode/emulatedcommandbar.cpp
@@ -22,7 +22,7 @@
 #include <kateconfig.h>
 #include <katebuffer.h>
 #include "emulatedcommandbar.h"
-#include <vimode/emulatedcommandbar.h>
+#include <vimode/emulatedcommandbar/emulatedcommandbar.h>
 #include <vimode/history.h>
 #include <inputmode/kateviinputmode.h>
 #include "keys.h"
diff --git a/autotests/src/vimode/emulatedcommandbarsetupandteardown.cpp b/=
autotests/src/vimode/emulatedcommandbarsetupandteardown.cpp
index 75a26f2..86a69e6 100644
--- a/autotests/src/vimode/emulatedcommandbarsetupandteardown.cpp
+++ b/autotests/src/vimode/emulatedcommandbarsetupandteardown.cpp
@@ -3,7 +3,7 @@
 #include <kateconfig.h>
 #include <kateview.h>
 #include <inputmode/kateviinputmode.h>
-#include <vimode/emulatedcommandbar.h>
+#include <vimode/emulatedcommandbar/emulatedcommandbar.h>
 =

 #include <QMainWindow>
 #include <QApplication>
diff --git a/autotests/src/vimode/keys.cpp b/autotests/src/vimode/keys.cpp
index ceb8211..4f048f5 100644
--- a/autotests/src/vimode/keys.cpp
+++ b/autotests/src/vimode/keys.cpp
@@ -23,7 +23,7 @@
 #include <kateconfig.h>
 #include <vimode/keymapper.h>
 #include <vimode/keyparser.h>
-#include <vimode/emulatedcommandbar.h>
+#include <vimode/emulatedcommandbar/emulatedcommandbar.h>
 #include <inputmode/kateviinputmode.h>
 #include "keys.h"
 #include "emulatedcommandbarsetupandteardown.h"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1729254..a6056c0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -275,7 +275,7 @@ if (BUILD_VIMODE)
     vimode/range.cpp
     vimode/keyparser.cpp
     vimode/globalstate.cpp
-    vimode/emulatedcommandbar.cpp
+    vimode/emulatedcommandbar/emulatedcommandbar.cpp
     vimode/commandrangeexpressionparser.cpp
     vimode/keymapper.cpp
     vimode/marks.cpp
diff --git a/src/inputmode/kateviinputmode.cpp b/src/inputmode/kateviinputm=
ode.cpp
index b1eaaa1..557cec1 100644
--- a/src/inputmode/kateviinputmode.cpp
+++ b/src/inputmode/kateviinputmode.cpp
@@ -20,7 +20,7 @@
 #include "kateviewinternal.h"
 #include "kateconfig.h"
 #include <vimode/inputmodemanager.h>
-#include <vimode/emulatedcommandbar.h>
+#include <vimode/emulatedcommandbar/emulatedcommandbar.h>
 #include <vimode/modes/replacevimode.h>
 #include <vimode/modes/visualvimode.h>
 #include <vimode/marks.h>
diff --git a/src/vimode/cmds.cpp b/src/vimode/cmds.cpp
index dc91f56..92b989a 100644
--- a/src/vimode/cmds.cpp
+++ b/src/vimode/cmds.cpp
@@ -26,7 +26,7 @@
 #include "kateview.h"
 #include "kateglobal.h"
 #include <vimode/modes/normalvimode.h>
-#include <vimode/emulatedcommandbar.h>
+#include <vimode/emulatedcommandbar/emulatedcommandbar.h>
 #include "katecmd.h"
 #include "katepartdebug.h"
 #include "kateviinputmode.h"
diff --git a/src/vimode/emulatedcommandbar.cpp b/src/vimode/emulatedcommand=
bar/emulatedcommandbar.cpp
similarity index 99%
rename from src/vimode/emulatedcommandbar.cpp
rename to src/vimode/emulatedcommandbar/emulatedcommandbar.cpp
index 3bb88d9..5108b56 100644
--- a/src/vimode/emulatedcommandbar.cpp
+++ b/src/vimode/emulatedcommandbar/emulatedcommandbar.cpp
@@ -18,14 +18,14 @@
  *  Boston, MA 02110-1301, USA.
  */
 =

-#include <vimode/emulatedcommandbar.h>
+#include <vimode/emulatedcommandbar/emulatedcommandbar.h>
 =

 #include "kateconfig.h"
 #include "katedocument.h"
 #include "kateglobal.h"
-#include "commandrangeexpressionparser.h"
+#include "../commandrangeexpressionparser.h"
 #include "kateview.h"
-#include "globalstate.h"
+#include "../globalstate.h"
 #include <vimode/keyparser.h>
 #include <vimode/inputmodemanager.h>
 #include <vimode/modes/normalvimode.h>
@@ -33,12 +33,12 @@
 #include <vimode/cmds.h>
 #include <vimode/modes/visualvimode.h>
 #include <vimode/appcommands.h>
-#include "history.h"
+#include "../history.h"
 =

 #include "katecmds.h"
 #include "katescriptmanager.h"
-#include "registers.h"
-#include "searcher.h"
+#include "../registers.h"
+#include "../searcher.h"
 =

 #include <KColorScheme>
 #include <KLocalizedString>
diff --git a/src/vimode/emulatedcommandbar.h b/src/vimode/emulatedcommandba=
r/emulatedcommandbar.h
similarity index 99%
rename from src/vimode/emulatedcommandbar.h
rename to src/vimode/emulatedcommandbar/emulatedcommandbar.h
index fbdadd7..1dee727 100644
--- a/src/vimode/emulatedcommandbar.h
+++ b/src/vimode/emulatedcommandbar/emulatedcommandbar.h
@@ -27,7 +27,7 @@
 #include <ktexteditor/range.h>
 #include <ktexteditor/attribute.h>
 #include <ktexteditor/movingrange.h>
-#include "searcher.h"
+#include "../searcher.h"
 =

 #include <functional>
 =

diff --git a/src/vimode/inputmodemanager.cpp b/src/vimode/inputmodemanager.=
cpp
index 2266899..db06acf 100644
--- a/src/vimode/inputmodemanager.cpp
+++ b/src/vimode/inputmodemanager.cpp
@@ -41,7 +41,7 @@
 #include <vimode/modes/replacevimode.h>
 #include <vimode/keyparser.h>
 #include <vimode/keymapper.h>
-#include <vimode/emulatedcommandbar.h>
+#include <vimode/emulatedcommandbar/emulatedcommandbar.h>
 #include "kateviinputmode.h"
 #include "marks.h"
 #include "jumps.h"
diff --git a/src/vimode/mappings.cpp b/src/vimode/mappings.cpp
index 82db81b..1d60fa2 100644
--- a/src/vimode/mappings.cpp
+++ b/src/vimode/mappings.cpp
@@ -21,7 +21,7 @@
 #include <vimode/mappings.h>
 #include <vimode/keyparser.h>
 #include <vimode/inputmodemanager.h>
-#include <vimode/emulatedcommandbar.h>
+#include <vimode/emulatedcommandbar/emulatedcommandbar.h>
 =

 using namespace KateVi;
 =

diff --git a/src/vimode/modes/normalvimode.cpp b/src/vimode/modes/normalvim=
ode.cpp
index e7e42e2..b306376 100644
--- a/src/vimode/modes/normalvimode.cpp
+++ b/src/vimode/modes/normalvimode.cpp
@@ -29,7 +29,7 @@
 #include "katepartdebug.h"
 #include "kateundomanager.h"
 #include <vimode/command.h>
-#include <vimode/emulatedcommandbar.h>
+#include <vimode/emulatedcommandbar/emulatedcommandbar.h>
 #include "kateviewhelpers.h"
 #include "kateviewinternal.h"
 #include <vimode/globalstate.h>

[prev in list] [next in list] [prev in thread] [next in thread]