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

List:       kde-commits
Subject:    [kdev-clang-tidy] /: Simplify project structure a bit
From:       Kevin Funk <kfunk () kde ! org>
Date:       2016-11-30 21:45:02
Message-ID: E1cCCgY-0004QC-Hw () code ! kde ! org
[Download RAW message or body]

Git commit c9b42c36fefdc771f3df59402c995894b4fa40e8 by Kevin Funk.
Committed on 30/11/2016 at 21:44.
Pushed by kfunk into branch 'master'.

Simplify project structure a bit

Move files from src/plugin & src/qCDebug into src/

M  +5    -3    CMakeLists.txt
R  +0    -0    src/debug.cpp [from: src/qCDebug/debug.cpp - 100% similarity]
R  +0    -0    src/debug.h [from: src/qCDebug/debug.h - 100% similarity]
R  +0    -0    src/job.cpp [from: src/plugin/job.cpp - 100% similarity]
R  +2    -1    src/job.h [from: src/plugin/job.h - 098% similarity]
M  +2    -1    src/parsers/replacementparser.cpp
R  +0    -0    src/plugin.cpp [from: src/plugin/plugin.cpp - 100% similarit=
y]
R  +1    -1    src/plugin.h [from: src/plugin/plugin.h - 099% similarity]
R  +0    -0    src/plugin.h.in [from: src/plugin/plugin.h.in - 100% similar=
ity]
M  +4    -4    tests/CMakeLists.txt
M  +1    -1    tests/test_clangtidyjob.cpp

https://commits.kde.org/kdev-clang-tidy/c9b42c36fefdc771f3df59402c995894b4f=
a40e8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c30e89d..b215ac5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,12 +40,14 @@ include_directories(
 )
 =

 set(kdevclangtidy_PART_SRCS
-    src/qCDebug/debug.cpp
-    src/plugin/job.cpp
-    src/plugin/plugin.cpp
+    src/debug.cpp
+    src/job.cpp
+    src/plugin.cpp
+
     src/config/configgroup.cpp
     src/config/perprojectconfigpage.cpp
     src/config/clangtidypreferences.cpp
+
     src/parsers/clangtidyparser.cpp
     src/parsers/replacementparser.cpp
 )
diff --git a/src/qCDebug/debug.cpp b/src/debug.cpp
similarity index 100%
rename from src/qCDebug/debug.cpp
rename to src/debug.cpp
diff --git a/src/qCDebug/debug.h b/src/debug.h
similarity index 100%
rename from src/qCDebug/debug.h
rename to src/debug.h
diff --git a/src/plugin/job.cpp b/src/job.cpp
similarity index 100%
rename from src/plugin/job.cpp
rename to src/job.cpp
diff --git a/src/plugin/job.h b/src/job.h
similarity index 98%
rename from src/plugin/job.h
rename to src/job.h
index 05165e1..2d62f28 100644
--- a/src/plugin/job.h
+++ b/src/job.h
@@ -22,7 +22,8 @@
 #ifndef JOB_H
 #define JOB_H
 =

-#include "qCDebug/debug.h"
+#include "debug.h"
+
 #include <interfaces/iproblem.h>
 #include <outputview/outputexecutejob.h>
 =

diff --git a/src/parsers/replacementparser.cpp b/src/parsers/replacementpar=
ser.cpp
index bb787ea..ca444f3 100644
--- a/src/parsers/replacementparser.cpp
+++ b/src/parsers/replacementparser.cpp
@@ -20,7 +20,8 @@
  */
 =

 #include "replacementparser.h"
-#include "qCDebug/debug.h"
+#include "debug.h"
+
 // See <https://github.com/CarlosNihelton/kdev-clang-tidy/issues/1>
 #include <algorithm>
 #include <fstream>
diff --git a/src/plugin/plugin.cpp b/src/plugin.cpp
similarity index 100%
rename from src/plugin/plugin.cpp
rename to src/plugin.cpp
diff --git a/src/plugin/plugin.h b/src/plugin.h
similarity index 99%
rename from src/plugin/plugin.h
rename to src/plugin.h
index 5044401..aa86af4 100644
--- a/src/plugin/plugin.h
+++ b/src/plugin.h
@@ -34,7 +34,7 @@
 #include <shell/problemmodel.h>
 =

 #include "config/configgroup.h"
-#include "qCDebug/debug.h"
+#include "debug.h"
 =

 class KJob;
 =

diff --git a/src/plugin/plugin.h.in b/src/plugin.h.in
similarity index 100%
rename from src/plugin/plugin.h.in
rename to src/plugin.h.in
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 68dbdbe..61917e6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,22 +3,22 @@ file(COPY "${PROJECT_SOURCE_DIR}/tests/data"
 =

 ecm_add_test(   test_replacementparser.cpp =

                 ../src/parsers/replacementparser.cpp
-                ../src/qCDebug/debug.cpp
+                ../src/debug.cpp
                 TEST_NAME test_replacementparser
                 LINK_LIBRARIES Qt5::Test KDev::Tests
                 )     =

      =

 ecm_add_test(   test_clangtidyparser.cpp
                 ../src/parsers/clangtidyparser.cpp
-                ../src/qCDebug/debug.cpp
+                ../src/debug.cpp
                 TEST_NAME test_clangtidyparser
                 LINK_LIBRARIES Qt5::Test KDev::Tests
                 )
 =

 ecm_add_test(   test_clangtidyjob.cpp
-                ../src/plugin/job.cpp
+                ../src/job.cpp
+                ../src/debug.cpp
                 ../src/parsers/clangtidyparser.cpp
-                ../src/qCDebug/debug.cpp
                 TEST_NAME test_clangtidyjob
                 LINK_LIBRARIES Qt5::Test KDev::Tests
                 )
diff --git a/tests/test_clangtidyjob.cpp b/tests/test_clangtidyjob.cpp
index d7da075..6925f0a 100644
--- a/tests/test_clangtidyjob.cpp
+++ b/tests/test_clangtidyjob.cpp
@@ -23,7 +23,7 @@
 #include <tests/autotestshell.h>
 #include <tests/testcore.h>
 =

-#include "plugin/job.h"
+#include "job.h"
 #include "test_clangtidyjob.h"
 =

 using namespace KDevelop;
[prev in list] [next in list] [prev in thread] [next in thread]