[frameworks/kio] /: Update install locations for KIO worker docs to KF6
Alexander Lohnau
null at kde.org
Sat May 6 16:03:53 BST 2023
Git commit ea08b0e9063ea2b2f392d8836dd3530d8fadba40 by Alexander Lohnau, on behalf of Friedrich W. H. Kossebau.
Committed on 05/05/2023 at 15:34.
Pushed by ltoscano into branch 'master'.
Update install locations for KIO worker docs to KF6
M +1 -1 docs/CMakeLists.txt
D +0 -2 docs/kioslave5/webdav/CMakeLists.txt
R +0 -0 docs/kioworker6/CMakeLists.txt [from: docs/kioslave5/CMakeLists.txt - 100% similarity]
R +1 -1 docs/kioworker6/data/CMakeLists.txt [from: docs/kioslave5/http/CMakeLists.txt - 067% similarity]
R +0 -0 docs/kioworker6/data/index.docbook [from: docs/kioslave5/data/index.docbook - 100% similarity]
R +1 -1 docs/kioworker6/file/CMakeLists.txt [from: docs/kioslave5/data/CMakeLists.txt - 067% similarity]
R +0 -0 docs/kioworker6/file/index.docbook [from: docs/kioslave5/file/index.docbook - 100% similarity]
C +1 -1 docs/kioworker6/ftp/CMakeLists.txt [from: docs/kioslave5/ftp/CMakeLists.txt - 067% similarity]
R +0 -0 docs/kioworker6/ftp/index.docbook [from: docs/kioslave5/ftp/index.docbook - 100% similarity]
R +1 -1 docs/kioworker6/help/CMakeLists.txt [from: docs/kioslave5/help/CMakeLists.txt - 074% similarity]
R +1 -1 docs/kioworker6/help/documentationnotfound/CMakeLists.txt [from: docs/kioslave5/help/documentationnotfound/CMakeLists.txt - 059% similarity]
R +0 -0 docs/kioworker6/help/documentationnotfound/index.docbook [from: docs/kioslave5/help/documentationnotfound/index.docbook - 100% similarity]
R +0 -0 docs/kioworker6/help/index.docbook [from: docs/kioslave5/help/index.docbook - 100% similarity]
R +1 -1 docs/kioworker6/http/CMakeLists.txt [from: docs/kioslave5/file/CMakeLists.txt - 067% similarity]
R +0 -0 docs/kioworker6/http/index.docbook [from: docs/kioslave5/http/index.docbook - 100% similarity]
R +1 -1 docs/kioworker6/webdav/CMakeLists.txt [from: docs/kioslave5/ftp/CMakeLists.txt - 066% similarity]
R +0 -0 docs/kioworker6/webdav/index.docbook [from: docs/kioslave5/webdav/index.docbook - 100% similarity]
M +1 -1 src/kioworkers/file/file.json
M +1 -1 src/kioworkers/ftp/ftp.json
M +1 -1 src/kioworkers/help/help.json
M +1 -1 src/kioworkers/help/kio_help.cpp
M +4 -4 src/kioworkers/http/http.json
https://invent.kde.org/frameworks/kio/commit/ea08b0e9063ea2b2f392d8836dd3530d8fadba40
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index b88f5d493f..9601c047bd 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -1,3 +1,3 @@
add_subdirectory(kcookiejar5)
-add_subdirectory(kioslave5)
+add_subdirectory(kioworker6)
add_subdirectory(kcontrol5)
diff --git a/docs/kioslave5/webdav/CMakeLists.txt b/docs/kioslave5/webdav/CMakeLists.txt
deleted file mode 100644
index a767168486..0000000000
--- a/docs/kioslave5/webdav/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioslave5/webdav)
diff --git a/docs/kioslave5/CMakeLists.txt b/docs/kioworker6/CMakeLists.txt
similarity index 100%
rename from docs/kioslave5/CMakeLists.txt
rename to docs/kioworker6/CMakeLists.txt
diff --git a/docs/kioslave5/http/CMakeLists.txt b/docs/kioworker6/data/CMakeLists.txt
similarity index 67%
rename from docs/kioslave5/http/CMakeLists.txt
rename to docs/kioworker6/data/CMakeLists.txt
index efeaa02dc3..871dbb7e28 100644
--- a/docs/kioslave5/http/CMakeLists.txt
+++ b/docs/kioworker6/data/CMakeLists.txt
@@ -1,2 +1,2 @@
########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioslave5/http)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioworker6/data)
diff --git a/docs/kioslave5/data/index.docbook b/docs/kioworker6/data/index.docbook
similarity index 100%
rename from docs/kioslave5/data/index.docbook
rename to docs/kioworker6/data/index.docbook
diff --git a/docs/kioslave5/data/CMakeLists.txt b/docs/kioworker6/file/CMakeLists.txt
similarity index 67%
rename from docs/kioslave5/data/CMakeLists.txt
rename to docs/kioworker6/file/CMakeLists.txt
index 3c5eddad53..d07f42ae19 100644
--- a/docs/kioslave5/data/CMakeLists.txt
+++ b/docs/kioworker6/file/CMakeLists.txt
@@ -1,2 +1,2 @@
########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioslave5/data)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioworker6/file)
diff --git a/docs/kioslave5/file/index.docbook b/docs/kioworker6/file/index.docbook
similarity index 100%
rename from docs/kioslave5/file/index.docbook
rename to docs/kioworker6/file/index.docbook
diff --git a/docs/kioslave5/ftp/CMakeLists.txt b/docs/kioworker6/ftp/CMakeLists.txt
similarity index 67%
copy from docs/kioslave5/ftp/CMakeLists.txt
copy to docs/kioworker6/ftp/CMakeLists.txt
index 2a6b6dd4ee..a396886341 100644
--- a/docs/kioslave5/ftp/CMakeLists.txt
+++ b/docs/kioworker6/ftp/CMakeLists.txt
@@ -1,2 +1,2 @@
########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioslave5/ftp)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioworker6/ftp)
diff --git a/docs/kioslave5/ftp/index.docbook b/docs/kioworker6/ftp/index.docbook
similarity index 100%
rename from docs/kioslave5/ftp/index.docbook
rename to docs/kioworker6/ftp/index.docbook
diff --git a/docs/kioslave5/help/CMakeLists.txt b/docs/kioworker6/help/CMakeLists.txt
similarity index 74%
rename from docs/kioslave5/help/CMakeLists.txt
rename to docs/kioworker6/help/CMakeLists.txt
index 98cb154ea9..a394c20c9e 100644
--- a/docs/kioslave5/help/CMakeLists.txt
+++ b/docs/kioworker6/help/CMakeLists.txt
@@ -1,4 +1,4 @@
########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioslave5/help)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioworker6/help)
add_subdirectory(documentationnotfound)
diff --git a/docs/kioslave5/help/documentationnotfound/CMakeLists.txt b/docs/kioworker6/help/documentationnotfound/CMakeLists.txt
similarity index 59%
rename from docs/kioslave5/help/documentationnotfound/CMakeLists.txt
rename to docs/kioworker6/help/documentationnotfound/CMakeLists.txt
index 22394d6824..08237e9742 100644
--- a/docs/kioslave5/help/documentationnotfound/CMakeLists.txt
+++ b/docs/kioworker6/help/documentationnotfound/CMakeLists.txt
@@ -1,2 +1,2 @@
########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioslave5/help/documentationnotfound)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioworker6/help/documentationnotfound)
diff --git a/docs/kioslave5/help/documentationnotfound/index.docbook b/docs/kioworker6/help/documentationnotfound/index.docbook
similarity index 100%
rename from docs/kioslave5/help/documentationnotfound/index.docbook
rename to docs/kioworker6/help/documentationnotfound/index.docbook
diff --git a/docs/kioslave5/help/index.docbook b/docs/kioworker6/help/index.docbook
similarity index 100%
rename from docs/kioslave5/help/index.docbook
rename to docs/kioworker6/help/index.docbook
diff --git a/docs/kioslave5/file/CMakeLists.txt b/docs/kioworker6/http/CMakeLists.txt
similarity index 67%
rename from docs/kioslave5/file/CMakeLists.txt
rename to docs/kioworker6/http/CMakeLists.txt
index bdcc8dd3aa..34bf963158 100644
--- a/docs/kioslave5/file/CMakeLists.txt
+++ b/docs/kioworker6/http/CMakeLists.txt
@@ -1,2 +1,2 @@
########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioslave5/file)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioworker6/http)
diff --git a/docs/kioslave5/http/index.docbook b/docs/kioworker6/http/index.docbook
similarity index 100%
rename from docs/kioslave5/http/index.docbook
rename to docs/kioworker6/http/index.docbook
diff --git a/docs/kioslave5/ftp/CMakeLists.txt b/docs/kioworker6/webdav/CMakeLists.txt
similarity index 66%
rename from docs/kioslave5/ftp/CMakeLists.txt
rename to docs/kioworker6/webdav/CMakeLists.txt
index 2a6b6dd4ee..3c8554eba4 100644
--- a/docs/kioslave5/ftp/CMakeLists.txt
+++ b/docs/kioworker6/webdav/CMakeLists.txt
@@ -1,2 +1,2 @@
########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioslave5/ftp)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioworker6/webdav)
diff --git a/docs/kioslave5/webdav/index.docbook b/docs/kioworker6/webdav/index.docbook
similarity index 100%
rename from docs/kioslave5/webdav/index.docbook
rename to docs/kioworker6/webdav/index.docbook
diff --git a/src/kioworkers/file/file.json b/src/kioworkers/file/file.json
index b158d1421e..d7f2632f2f 100644
--- a/src/kioworkers/file/file.json
+++ b/src/kioworkers/file/file.json
@@ -4,7 +4,7 @@
"Class": ":local",
"ExtraNames": [],
"Icon": "folder",
- "X-DocPath": "kioslave5/file/index.html",
+ "X-DocPath": "kioworker6/file/index.html",
"deleteRecursive": true,
"deleting": true,
"input": "none",
diff --git a/src/kioworkers/ftp/ftp.json b/src/kioworkers/ftp/ftp.json
index 10ee58a26f..c42641d613 100644
--- a/src/kioworkers/ftp/ftp.json
+++ b/src/kioworkers/ftp/ftp.json
@@ -4,7 +4,7 @@
"Class": ":internet",
"Icon": "folder-remote",
"ProxiedBy": "http",
- "X-DocPath": "kioslave5/ftp/index.html",
+ "X-DocPath": "kioworker6/ftp/index.html",
"copyFromFile": true,
"copyToFile": true,
"deleting": true,
diff --git a/src/kioworkers/help/help.json b/src/kioworkers/help/help.json
index 92b9e82e41..c260b24de6 100644
--- a/src/kioworkers/help/help.json
+++ b/src/kioworkers/help/help.json
@@ -3,7 +3,7 @@
"help": {
"Class": ":local",
"Icon": "help-browser",
- "X-DocPath": "kioslave5/help/index.html",
+ "X-DocPath": "kioworker6/help/index.html",
"defaultMimetype": "text/html",
"input": "none",
"output": "filesystem",
diff --git a/src/kioworkers/help/kio_help.cpp b/src/kioworkers/help/kio_help.cpp
index 74b172850e..b5dace3e11 100644
--- a/src/kioworkers/help/kio_help.cpp
+++ b/src/kioworkers/help/kio_help.cpp
@@ -100,7 +100,7 @@ QString HelpProtocol::lookupFile(const QString &fname, const QString &query, boo
// qDebug() << "redirect to " << red;
redirect = true;
} else {
- const QString documentationNotFound = QStringLiteral("kioslave5/help/documentationnotfound/index.html");
+ const QString documentationNotFound = QStringLiteral("kioworker6/help/documentationnotfound/index.html");
if (!langLookup(documentationNotFound).isEmpty()) {
QUrl red;
red.setScheme(QStringLiteral("help"));
diff --git a/src/kioworkers/http/http.json b/src/kioworkers/http/http.json
index f6c2d55a8c..b41be7ab9c 100644
--- a/src/kioworkers/http/http.json
+++ b/src/kioworkers/http/http.json
@@ -3,7 +3,7 @@
"http": {
"Class": ":internet",
"Icon": "text-html",
- "X-DocPath": "kioslave5/http/index.html",
+ "X-DocPath": "kioworker6/http/index.html",
"defaultMimetype": "application/octet-stream",
"deleting": true,
"determineMimetypeFromExtension": false,
@@ -18,7 +18,7 @@
"https": {
"Class": ":internet",
"Icon": "text-html",
- "X-DocPath": "kioslave5/http/index.html",
+ "X-DocPath": "kioworker6/http/index.html",
"config": "http",
"defaultMimetype": "application/octet-stream",
"deleting": true,
@@ -34,7 +34,7 @@
"webdav": {
"Class": ":internet",
"Icon": "folder-remote",
- "X-DocPath": "kioslave5/webdav/index.html",
+ "X-DocPath": "kioworker6/webdav/index.html",
"copyFromFile": true,
"defaultMimetype": "application/octet-stream",
"deleteRecursive": true,
@@ -61,7 +61,7 @@
"webdavs": {
"Class": ":internet",
"Icon": "folder-remote",
- "X-DocPath": "kioslave5/webdav/index.html",
+ "X-DocPath": "kioworker6/webdav/index.html",
"config": "webdav",
"copyFromFile": true,
"defaultMimetype": "application/octet-stream",
More information about the kde-doc-english
mailing list