[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kproperty] /: Remove kproperty prefix to avoid conflicts with KProperty file on Windows
From: Jaroslaw Staniek <staniek () kde ! org>
Date: 2015-07-25 9:26:49
Message-ID: E1ZIvjF-0001v1-Ch () scm ! kde ! org
[Download RAW message or body]
Git commit 9d20148d569b2361feb6b9ee9c9153c57a619f49 by Jaroslaw Staniek.
Committed on 25/07/2015 at 09:24.
Pushed by staniek into branch 'master'.
Remove kproperty prefix to avoid conflicts with KProperty file on Windows
M +1 -1 autotests/headers/KProperty.h_HeaderTest.cpp
M +1 -1 autotests/headers/KPropertyEditorDataModel.h_HeaderTest.cpp
M +1 -1 autotests/headers/KPropertyEditorView.h_HeaderTest.cpp
M +1 -1 autotests/headers/KPropertyFactory.h_HeaderTest.cpp
M +1 -1 autotests/headers/KPropertySet.h_HeaderTest.cpp
M +1 -1 autotests/headers/KPropertyStringEditor.h_HeaderTest.cpp
M +1 -1 autotests/headers/KPropertyUtils.h_HeaderTest.cpp
M +1 -1 autotests/headers/booledit.h_HeaderTest.cpp
M +1 -1 autotests/headers/coloredit.h_HeaderTest.cpp
M +1 -1 autotests/headers/combobox.h_HeaderTest.cpp
M +1 -1 autotests/headers/cursoredit.h_HeaderTest.cpp
M +1 -1 autotests/headers/dateedit.h_HeaderTest.cpp
M +1 -1 autotests/headers/datetimeedit.h_HeaderTest.cpp
M +1 -1 autotests/headers/fontedit.h_HeaderTest.cpp
M +2 -2 autotests/headers/generate_HeadersTest.sh
M +1 -1 autotests/headers/linestyleedit.h_HeaderTest.cpp
M +1 -1 autotests/headers/pixmapedit.h_HeaderTest.cpp
M +1 -1 autotests/headers/pointedit.h_HeaderTest.cpp
M +1 -1 autotests/headers/rectedit.h_HeaderTest.cpp
M +1 -1 autotests/headers/sizeedit.h_HeaderTest.cpp
M +1 -1 autotests/headers/sizepolicyedit.h_HeaderTest.cpp
M +1 -1 autotests/headers/spinbox.h_HeaderTest.cpp
M +1 -1 autotests/headers/timeedit.h_HeaderTest.cpp
M +1 -1 autotests/headers/utils.h_HeaderTest.cpp
M +1 -2 src/CMakeLists.txt
M +1 -3 src/editors/CMakeLists.txt
http://commits.kde.org/kproperty/9d20148d569b2361feb6b9ee9c9153c57a619f49
diff --git a/autotests/headers/KProperty.h_HeaderTest.cpp \
b/autotests/headers/KProperty.h_HeaderTest.cpp index a559fa9..ecbf47e 100644
--- a/autotests/headers/KProperty.h_HeaderTest.cpp
+++ b/autotests/headers/KProperty.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/KProperty.h>
+#include <KProperty.h>
diff --git a/autotests/headers/KPropertyEditorDataModel.h_HeaderTest.cpp \
b/autotests/headers/KPropertyEditorDataModel.h_HeaderTest.cpp index dfa22e1..62e742b \
100644
--- a/autotests/headers/KPropertyEditorDataModel.h_HeaderTest.cpp
+++ b/autotests/headers/KPropertyEditorDataModel.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/KPropertyEditorDataModel.h>
+#include <KPropertyEditorDataModel.h>
diff --git a/autotests/headers/KPropertyEditorView.h_HeaderTest.cpp \
b/autotests/headers/KPropertyEditorView.h_HeaderTest.cpp index c7a865a..db79968 \
100644
--- a/autotests/headers/KPropertyEditorView.h_HeaderTest.cpp
+++ b/autotests/headers/KPropertyEditorView.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/KPropertyEditorView.h>
+#include <KPropertyEditorView.h>
diff --git a/autotests/headers/KPropertyFactory.h_HeaderTest.cpp \
b/autotests/headers/KPropertyFactory.h_HeaderTest.cpp index 4fc3a50..615f810 100644
--- a/autotests/headers/KPropertyFactory.h_HeaderTest.cpp
+++ b/autotests/headers/KPropertyFactory.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/KPropertyFactory.h>
+#include <KPropertyFactory.h>
diff --git a/autotests/headers/KPropertySet.h_HeaderTest.cpp \
b/autotests/headers/KPropertySet.h_HeaderTest.cpp index 6ebf0fc..cba6083 100644
--- a/autotests/headers/KPropertySet.h_HeaderTest.cpp
+++ b/autotests/headers/KPropertySet.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/KPropertySet.h>
+#include <KPropertySet.h>
diff --git a/autotests/headers/KPropertyStringEditor.h_HeaderTest.cpp \
b/autotests/headers/KPropertyStringEditor.h_HeaderTest.cpp index 01a2cae..6ac64dc \
100644
--- a/autotests/headers/KPropertyStringEditor.h_HeaderTest.cpp
+++ b/autotests/headers/KPropertyStringEditor.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/KPropertyStringEditor.h>
+#include <KPropertyStringEditor.h>
diff --git a/autotests/headers/KPropertyUtils.h_HeaderTest.cpp \
b/autotests/headers/KPropertyUtils.h_HeaderTest.cpp index 492f0f3..ffdc8f2 100644
--- a/autotests/headers/KPropertyUtils.h_HeaderTest.cpp
+++ b/autotests/headers/KPropertyUtils.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/KPropertyUtils.h>
+#include <KPropertyUtils.h>
diff --git a/autotests/headers/booledit.h_HeaderTest.cpp \
b/autotests/headers/booledit.h_HeaderTest.cpp index a05e46f..a90d9b5 100644
--- a/autotests/headers/booledit.h_HeaderTest.cpp
+++ b/autotests/headers/booledit.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/booledit.h>
+#include <booledit.h>
diff --git a/autotests/headers/coloredit.h_HeaderTest.cpp \
b/autotests/headers/coloredit.h_HeaderTest.cpp index 68039d2..a5f3c01 100644
--- a/autotests/headers/coloredit.h_HeaderTest.cpp
+++ b/autotests/headers/coloredit.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/coloredit.h>
+#include <coloredit.h>
diff --git a/autotests/headers/combobox.h_HeaderTest.cpp \
b/autotests/headers/combobox.h_HeaderTest.cpp index e54b1d2..b98d494 100644
--- a/autotests/headers/combobox.h_HeaderTest.cpp
+++ b/autotests/headers/combobox.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/combobox.h>
+#include <combobox.h>
diff --git a/autotests/headers/cursoredit.h_HeaderTest.cpp \
b/autotests/headers/cursoredit.h_HeaderTest.cpp index 0deba98..b2479a8 100644
--- a/autotests/headers/cursoredit.h_HeaderTest.cpp
+++ b/autotests/headers/cursoredit.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/cursoredit.h>
+#include <cursoredit.h>
diff --git a/autotests/headers/dateedit.h_HeaderTest.cpp \
b/autotests/headers/dateedit.h_HeaderTest.cpp index c99f925..b5a66dd 100644
--- a/autotests/headers/dateedit.h_HeaderTest.cpp
+++ b/autotests/headers/dateedit.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/dateedit.h>
+#include <dateedit.h>
diff --git a/autotests/headers/datetimeedit.h_HeaderTest.cpp \
b/autotests/headers/datetimeedit.h_HeaderTest.cpp index 8629091..915692a 100644
--- a/autotests/headers/datetimeedit.h_HeaderTest.cpp
+++ b/autotests/headers/datetimeedit.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/datetimeedit.h>
+#include <datetimeedit.h>
diff --git a/autotests/headers/fontedit.h_HeaderTest.cpp \
b/autotests/headers/fontedit.h_HeaderTest.cpp index 3c0f8bc..de572c9 100644
--- a/autotests/headers/fontedit.h_HeaderTest.cpp
+++ b/autotests/headers/fontedit.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/fontedit.h>
+#include <fontedit.h>
diff --git a/autotests/headers/generate_HeadersTest.sh \
b/autotests/headers/generate_HeadersTest.sh index e128254..2807dbe 100755
--- a/autotests/headers/generate_HeadersTest.sh
+++ b/autotests/headers/generate_HeadersTest.sh
@@ -78,10 +78,10 @@ for f in `find_files $@ | grep -v \.h\$ | grep -v "\\." | sort` \
$extra_files; do echo " $fname" >> CMakeLists.txt
done
-# files to include using <prefix/name>, these are .h files
+# files to include using <name>, these are .h files
for f in `find_files $@ | grep \.h\$ | sort`; do
fname=${f}_HeaderTest.cpp
- echo "#include <$prefix/$f>" > $fname
+ echo "#include <$f>" > $fname
echo " $fname" >> CMakeLists.txt
done
diff --git a/autotests/headers/linestyleedit.h_HeaderTest.cpp \
b/autotests/headers/linestyleedit.h_HeaderTest.cpp index 756bb4d..8ff13dc 100644
--- a/autotests/headers/linestyleedit.h_HeaderTest.cpp
+++ b/autotests/headers/linestyleedit.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/linestyleedit.h>
+#include <linestyleedit.h>
diff --git a/autotests/headers/pixmapedit.h_HeaderTest.cpp \
b/autotests/headers/pixmapedit.h_HeaderTest.cpp index 5cac4cb..6e55d8f 100644
--- a/autotests/headers/pixmapedit.h_HeaderTest.cpp
+++ b/autotests/headers/pixmapedit.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/pixmapedit.h>
+#include <pixmapedit.h>
diff --git a/autotests/headers/pointedit.h_HeaderTest.cpp \
b/autotests/headers/pointedit.h_HeaderTest.cpp index f153c38..2126b17 100644
--- a/autotests/headers/pointedit.h_HeaderTest.cpp
+++ b/autotests/headers/pointedit.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/pointedit.h>
+#include <pointedit.h>
diff --git a/autotests/headers/rectedit.h_HeaderTest.cpp \
b/autotests/headers/rectedit.h_HeaderTest.cpp index d2900b0..8134a83 100644
--- a/autotests/headers/rectedit.h_HeaderTest.cpp
+++ b/autotests/headers/rectedit.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/rectedit.h>
+#include <rectedit.h>
diff --git a/autotests/headers/sizeedit.h_HeaderTest.cpp \
b/autotests/headers/sizeedit.h_HeaderTest.cpp index 9ab08ff..522826b 100644
--- a/autotests/headers/sizeedit.h_HeaderTest.cpp
+++ b/autotests/headers/sizeedit.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/sizeedit.h>
+#include <sizeedit.h>
diff --git a/autotests/headers/sizepolicyedit.h_HeaderTest.cpp \
b/autotests/headers/sizepolicyedit.h_HeaderTest.cpp index a2af9f4..0014fe6 100644
--- a/autotests/headers/sizepolicyedit.h_HeaderTest.cpp
+++ b/autotests/headers/sizepolicyedit.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/sizepolicyedit.h>
+#include <sizepolicyedit.h>
diff --git a/autotests/headers/spinbox.h_HeaderTest.cpp \
b/autotests/headers/spinbox.h_HeaderTest.cpp index 6bd18a0..64f79ec 100644
--- a/autotests/headers/spinbox.h_HeaderTest.cpp
+++ b/autotests/headers/spinbox.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/spinbox.h>
+#include <spinbox.h>
diff --git a/autotests/headers/timeedit.h_HeaderTest.cpp \
b/autotests/headers/timeedit.h_HeaderTest.cpp index 0f35d82..ae612dd 100644
--- a/autotests/headers/timeedit.h_HeaderTest.cpp
+++ b/autotests/headers/timeedit.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/timeedit.h>
+#include <timeedit.h>
diff --git a/autotests/headers/utils.h_HeaderTest.cpp \
b/autotests/headers/utils.h_HeaderTest.cpp index 4959919..4360d4c 100644
--- a/autotests/headers/utils.h_HeaderTest.cpp
+++ b/autotests/headers/utils.h_HeaderTest.cpp
@@ -1 +1 @@
-#include <kproperty/utils.h>
+#include <utils.h>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 788b4c9..2893ae8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -130,7 +130,6 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kproperty_version.h"
ecm_generate_headers(kproperty_FORWARDING_HEADERS
REQUIRED_HEADERS kproperty_HEADERS
ORIGINAL CAMELCASE
- PREFIX kproperty
HEADER_NAMES
KPropertyFactory
KProperty
@@ -144,7 +143,7 @@ ecm_generate_headers(kproperty_FORWARDING_HEADERS
install(
FILES
${kproperty_HEADERS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/KProperty/kproperty
+ DESTINATION ${INCLUDE_INSTALL_DIR}/KProperty
COMPONENT Devel
)
diff --git a/src/editors/CMakeLists.txt b/src/editors/CMakeLists.txt
index b00119b..147ffc4 100644
--- a/src/editors/CMakeLists.txt
+++ b/src/editors/CMakeLists.txt
@@ -1,7 +1,6 @@
ecm_generate_headers(kproperty_editors_FORWARDING_HEADERS
REQUIRED_HEADERS kproperty_editors_HEADERS
# TODO: rename to camelcase, then uncomment "ORIGINAL CAMELCASE"
- PREFIX kproperty
HEADER_NAMES
Utils
BoolEdit
@@ -28,7 +27,6 @@ ecm_generate_headers(kproperty_editors_FORWARDING_HEADERS
ecm_generate_headers(kproperty_editors_FORWARDING_HEADERS
REQUIRED_HEADERS kproperty_editors_HEADERS
ORIGINAL CAMELCASE
- PREFIX kproperty
HEADER_NAMES
KPropertyStringEditor
)
@@ -36,7 +34,7 @@ ecm_generate_headers(kproperty_editors_FORWARDING_HEADERS
install(
FILES
${kproperty_editors_HEADERS}
- DESTINATION ${INCLUDE_INSTALL_DIR}/KProperty/kproperty
+ DESTINATION ${INCLUDE_INSTALL_DIR}/KProperty
COMPONENT Devel
)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic