summaryrefslogtreecommitdiffstats
path: root/kdecore
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-04-10 23:20:57 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-09-08 15:30:23 +0200
commit6e184e4ea3f83c3d7830bd3bb41ac8c9fd986cda (patch)
tree9bb51ceca2a84c4988007fc37fffebf42bc463e1 /kdecore
parent29768dd7b2ee05ba0f6c1f1f2c0270cc0e237438 (diff)
downloadtdelibs-6e184e4ea3f83c3d7830bd3bb41ac8c9fd986cda.tar.gz
tdelibs-6e184e4ea3f83c3d7830bd3bb41ac8c9fd986cda.zip
Update final HTML install path so all modules are consistent.
(cherry picked from commit 979b0c9a1ca30628cb4cff90e231ce973aaf6117)
Diffstat (limited to 'kdecore')
-rw-r--r--kdecore/README.kiosk2
-rw-r--r--kdecore/kstandarddirs.cpp2
-rw-r--r--kdecore/kstandarddirs.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/kdecore/README.kiosk b/kdecore/README.kiosk
index cd59f8db3..78df1ced4 100644
--- a/kdecore/README.kiosk
+++ b/kdecore/README.kiosk
@@ -566,7 +566,7 @@ The following resources are defined:
autostart - share/autostart
data - share/apps
-html - share/doc/HTML
+html - share/doc/tde/HTML
icon - share/icon
config - share/config
pixmap - share/pixmaps
diff --git a/kdecore/kstandarddirs.cpp b/kdecore/kstandarddirs.cpp
index 99140c45c..d00369711 100644
--- a/kdecore/kstandarddirs.cpp
+++ b/kdecore/kstandarddirs.cpp
@@ -1039,7 +1039,7 @@ TQString KStandardDirs::kde_default(const char *type) {
if (!strcmp(type, "html-bundle"))
return "share/doc-bundle/HTML/";
if (!strcmp(type, "html"))
- return "share/doc/kde/HTML/";
+ return "share/doc/tde/HTML/";
if (!strcmp(type, "icon"))
return "share/icons/";
if (!strcmp(type, "config"))
diff --git a/kdecore/kstandarddirs.h b/kdecore/kstandarddirs.h
index 16bfd1847..72dd1c470 100644
--- a/kdecore/kstandarddirs.h
+++ b/kdecore/kstandarddirs.h
@@ -57,7 +57,7 @@ class KStandardDirsPrivate;
* may be even more. Under these prefixes there are several well
* defined suffixes where specific resource types are to be found.
* For example, for the resource type "html" the suffixes could be
- * share/doc/HTML and share/doc/kde/HTML.
+ * share/doc/HTML and share/doc/tde/HTML.
* So the search algorithm basically appends to each prefix each registered
* suffix and tries to locate the file there.
* To make the thing even more complex, it's also possible to register
@@ -506,7 +506,7 @@ public:
* of what this is all about.
*
* @li data - share/apps
- * @li html - share/doc/HTML
+ * @li html - share/doc/tde/HTML
* @li icon - share/icon
* @li config - share/config
* @li pixmap - share/pixmaps