Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

author: Timothy Pearson <[email protected]> 2013-04-18 19:01:11 -0500
committer: Timothy Pearson <[email protected]> 2013-04-18 19:01:11 -0500
commit: 2b31f11f979f3ffc3dd060072b85559a832bfab5 (patch)
tree: 081358a0df37f88e89a3e2fa4e137810681ab480
parent: 30b0af1f01cdbfcc51a56943e8c091bc8991f83a (diff)
parent: 1c68d332fd7e08a190daedbaa6ace857b575b7c4 (diff)
download: tdelibs-2b31f11f979f3ffc3dd060072b85559a832bfab5.tar.gz
tdelibs-2b31f11f979f3ffc3dd060072b85559a832bfab5.zip
38 files changed, 58 insertions, 58 deletions
diff --git a/doc/common/CMakeLists.txt b/doc/common/CMakeLists.txt
index a54894234..80a459fc2 100644
--- a/doc/common/CMakeLists.txt
+++ b/doc/common/CMakeLists.txt
@@ -15,7 +15,7 @@ install( FILES
     artistic-license.html bottom1.png bottom2.png
     bsd-license.html doctop1.png doctop2.png fdl-license
     fdl-license.html gpl-license gpl-license.html
-    kde-common.css kde-default.css kde-web.css kde-localised.css.template
+    tde-common.css tde-default.css tde-web.css tde-localised.css.template
     lgpl-license lgpl-license.html qpl-license.html shadow.png
     web-docbottom.png x11-license.html xml.dcl web-doctop.png
     doctop1a.png doctop1b.png 1.png 2.png 3.png 4.png
diff --git a/doc/common/Makefile.am b/doc/common/Makefile.am
index dade6749e..d1c9e7e35 100644
--- a/doc/common/Makefile.am
+++ b/doc/common/Makefile.am
@@ -1,4 +1,4 @@
-# logotp3.png, logotp3-small.png and kde-localised.css.template
+# logotp3.png, logotp3-small.png and tde-localised.css.template
 # are not included in the language-specific common directory
 # They serve only as `reference' versions.
 
@@ -6,8 +6,8 @@ commondir = $(kde_htmldir)/en/common
 
 common_DATA = artistic-license.html bottom1.png bottom2.png bsd-license.html \
 	doctop1.png doctop2.png fdl-license fdl-license.html gpl-license \
-	gpl-license.html kde-common.css kde-default.css kde-web.css \
-	kde-localised.css.template lgpl-license lgpl-license.html \
+	gpl-license.html tde-common.css tde-default.css tde-web.css \
+	tde-localised.css.template lgpl-license lgpl-license.html \
 	qpl-license.html shadow.png web-docbottom.png \
 	x11-license.html xml.dcl web-doctop.png \
 	doctop1a.png doctop1b.png 1.png 2.png 3.png 4.png 5.png 6.png \
diff --git a/doc/common/artistic-license.html b/doc/common/artistic-license.html
index 2069b4ed0..65aaedf0c 100644
--- a/doc/common/artistic-license.html
+++ b/doc/common/artistic-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="Artistic, artistic, Artistic License, Artistic license, Artisticlicense, artistic license, artisticlicense, Artistic Licence, Artistic licence, Artisticlicence, artistic licence, artisticlicence, license, licence, software, softwarelicense">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
     <H1>The "Artistic License"</H1>
diff --git a/doc/common/bsd-license.html b/doc/common/bsd-license.html
index 422bb339f..216c91f21 100644
--- a/doc/common/bsd-license.html
+++ b/doc/common/bsd-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="BSD, bsd, Bsd, license, licence, software, free software, softwarelicense, BSD Software license">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
     <H1>BSD License</H1>
diff --git a/doc/common/fdl-license.html b/doc/common/fdl-license.html
index 9ce378a30..2a94311f4 100644
--- a/doc/common/fdl-license.html
+++ b/doc/common/fdl-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="gnu, Gnu, GNU, license, licence, software, free software, software license, software licence, GNU general public license, GNU General Public License, documentation licence, documentation license, documentation, GNU free documentation license, GNU Free Documentation License">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
 <h3>GNU Free Documentation License</h3>
diff --git a/doc/common/gpl-license.html b/doc/common/gpl-license.html
index 26ae3af1f..68a63d56d 100644
--- a/doc/common/gpl-license.html
+++ b/doc/common/gpl-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="gnu, Gnu, GNU, license, licence, software, free software, software license, software licence, GNU general public license, GNU General Public License">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
 <H1>GNU General Public License</H1>
diff --git a/doc/common/header.html b/doc/common/header.html
index b57fb0a04..8b133a3b2 100644
--- a/doc/common/header.html
+++ b/doc/common/header.html
@@ -20,7 +20,7 @@
   <link rel="shortcut icon" href="@topdir@/favicon.ico" /><link rel="icon" href="@topdir@/favicon.ico" />
   <link rel="stylesheet" type="text/css" href="@topdir@/doxygen.css" />
   <link rel="stylesheet" type="text/css" href="@topdir@/tabs.css" />
-  <link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/kde.css" />
+  <link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/tde.css" />
   <link rel="stylesheet" media="print, embossed" type="text/css" href="@topdir@/print.css" />
   <link rel="stylesheet" media="screen, aural, handheld, tty, braille" type="text/css" title="Flat" href="@topdir@/flat.css" />
 </head>
diff --git a/doc/common/lgpl-license.html b/doc/common/lgpl-license.html
index 343576dfb..d99591beb 100644
--- a/doc/common/lgpl-license.html
+++ b/doc/common/lgpl-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="gnu, Gnu, GNU, license, licence, software, free software, software license, software licence, GNU general public license, GNU General Public License, library licence, library license, software library, software libraries, GNU lesser general public license, GNU Lesser General Public License">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
 <H1>GNU LESSER GENERAL PUBLIC LICENSE</H1>
diff --git a/doc/common/mainheader.html b/doc/common/mainheader.html
index a7e2adca6..a730e325d 100644
--- a/doc/common/mainheader.html
+++ b/doc/common/mainheader.html
@@ -20,7 +20,7 @@
   <link rel="shortcut icon" href="@topdir@/favicon.ico" /><link rel="icon" href="@topdir@/favicon.ico" />
   <link rel="stylesheet" type="text/css" href="@topdir@/doxygen.css" />
   <link rel="stylesheet" type="text/css" href="@topdir@/tabs.css" />
-  <link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/kde.css" />
+  <link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/tde.css" />
   <link rel="stylesheet" media="print, embossed" type="text/css" href="@topdir@/print.css" />
   <link rel="stylesheet" media="screen, aural, handheld, tty, braille" type="text/css" title="Flat" href="@topdir@/flat.css" />
 </head>
diff --git a/doc/common/qpl-license.html b/doc/common/qpl-license.html
index 19a863bc5..dddb43623 100644
--- a/doc/common/qpl-license.html
+++ b/doc/common/qpl-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="Q, q, Q Public License, Q public license, q public license, public license, Q Public Licence, Q public licence, q public licence, public licence, license, licence, software, softwarelicense, Troll, troll, Troll License, troll license, Troll Licence, troll licence">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
     <H1>The Q Public License</H1>
diff --git a/doc/common/kde-common.css b/doc/common/tde-common.css
index 5898199ba..5898199ba 100644
--- a/doc/common/kde-common.css
+++ b/doc/common/tde-common.css
diff --git a/doc/common/kde-default.css b/doc/common/tde-default.css
index 61043e9ef..61043e9ef 100644
--- a/doc/common/kde-default.css
+++ b/doc/common/tde-default.css
diff --git a/doc/common/kde-localised.css.template b/doc/common/tde-localised.css.template
index abcd1ec91..52b91d179 100644
--- a/doc/common/kde-localised.css.template
+++ b/doc/common/tde-localised.css.template
@@ -20,7 +20,7 @@
 */
 
 /*
-   These settings will override kde-default.css.
+   These settings will override tde-default.css.
 
    Any updates should be validated, e.g. http://jigsaw.w3.org/css-validator/
 
diff --git a/doc/common/kde-web.css b/doc/common/tde-web.css
index 1e3efe64a..1e3efe64a 100644
--- a/doc/common/kde-web.css
+++ b/doc/common/tde-web.css
diff --git a/doc/common/kde.css b/doc/common/tde.css
index 183b62fa1..183b62fa1 100644
--- a/doc/common/kde.css
+++ b/doc/common/tde.css
diff --git a/doc/common/x11-license.html b/doc/common/x11-license.html
index 444a27bec..6ade70f69 100644
--- a/doc/common/x11-license.html
+++ b/doc/common/x11-license.html
@@ -9,7 +9,7 @@
     <META NAME="keywords" CONTENT="X, x, X Window, x window, X Windows, x windows, X Window System License, x window system license, X Window System Licence, x window system licence, X11R6.4, x11r6.4, x11r64, license, licence, software, softwarelicense">
     <META NAME="robots" CONTENT="none">
     <META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-    <LINK REL="stylesheet" HREF="kde-default.css" TYPE="text/css">
+    <LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
   </HEAD>
   <BODY CLASS="license">
     <H1>X Window System License - X11R6.4</H1>
diff --git a/doc/tdelibs/Makefile.am b/doc/tdelibs/Makefile.am
index a95ec29b3..37d6f5ddc 100644
--- a/doc/tdelibs/Makefile.am
+++ b/doc/tdelibs/Makefile.am
@@ -1,5 +1,5 @@
 KDE_LANG = en
 KDE_MANS = AUTO
-KDE_XSL_MAN_STYLESHEET = $(top_srcdir)/kdoctools/customization/kde-man.xsl
+KDE_XSL_MAN_STYLESHEET = $(top_srcdir)/kdoctools/customization/tde-man.xsl
 
 KDE_DOCS_DEPS = $(MEINPROC_DEP)
diff --git a/kded/README.kded b/kded/README.kded
index 7265a1084..a59c22ee3 100644
--- a/kded/README.kded
+++ b/kded/README.kded
@@ -80,7 +80,7 @@ filesystem, or when DNOTIFY is used. Specifying larger intervals may reduce
 the CPU load and/or network traffic. Shorter intervals are not recommended.
 
 Please note that in previous versions of KDE these options where listed in 
-the kderc file.
+the tderc file.
 
 Example kdeglobals fragment:
 
diff --git a/kdoctools/configure.in.in b/kdoctools/configure.in.in
index 1905d9a21..738cf25d6 100644
--- a/kdoctools/configure.in.in
+++ b/kdoctools/configure.in.in
@@ -78,7 +78,7 @@ KDOCTOOLS_CHECK_BZIP2
 if test -n "$HELP_SUBDIR"; then  
   MEINPROC='$(top_builddir)/kdoctools/meinproc --srcdir=$(top_srcdir)/kdoctools'
   MEINPROC_DEP='$(top_builddir)/kdoctools/meinproc'
-  KDE_XSL_STYLESHEET='$(top_srcdir)/kdoctools/customization/kde-chunk.xsl'
+  KDE_XSL_STYLESHEET='$(top_srcdir)/kdoctools/customization/tde-chunk.xsl'
 else
   MEINPROC=""
   MEINPROC_DEP=""
diff --git a/kdoctools/customization/README b/kdoctools/customization/README
index 51ff10614..17cd8e26c 100644
--- a/kdoctools/customization/README
+++ b/kdoctools/customization/README
@@ -1,38 +1,38 @@
 2002-11-12
 Some short documentation on the different stylesheets, and how to use them.
 
-kde-chunk.xsl
+tde-chunk.xsl
 
 The standard TDE stylesheet, as used to generate the content for
 KHelpCenter.  If you do not specify a stylesheet, this is the default.
 
-This stylesheet includes kde-navig.xsl, which controls the
+This stylesheet includes tde-navig.xsl, which controls the
 presentation of the top and bottom of the page graphics, and is reused
-in other places.  You should probably not call kde-navig.xsl on it's own.
+in other places.  You should probably not call tde-navig.xsl on it's own.
 
-kde-nochunk.xsl
+tde-nochunk.xsl
 
 This is very similar to the standard TDE stylesheet, but it creates
 one single html file for the entire document.  This is one way to get
 print output, using html2pdf or html2ps.  It's also useable to create
 a "printable version" of a document to link to on a website.
 
-kde-style.xsl
+tde-style.xsl
 
 All TDE "look and feel" customizations (other than the navigation
-graphics in kde-navig.xsl) are here. This is where changes to how
+graphics in tde-navig.xsl) are here. This is where changes to how
 things render are placed.  In most cases, the actual rendering is
 controlled by the CSS files, and this file simply has the instructions
 to ensure class attributes are written into the HTML as necessary, for
 the CSS to display.
 
-kde-ttlpg.xsl
+tde-ttlpg.xsl
 
 The Title Page layout for the TDE documentation.  This one covers
 customizing the TOC, presentation of legal notices, and a slightly
 different navigation graphic.
 
-kde-web.xsl
+tde-web.xsl
 (This stylesheet includes kde-web-navig.xsl, which should not be used
 directly on it's own)
 
@@ -41,14 +41,14 @@ is constrained to a 680px wide table.  You could use this for example,
 to generate web pages that will print nicely and display on older
 browsers nicely.
 
-kde-chunk-online.xsl
+tde-chunk-online.xsl
 (This stylesheet includes kde-web-navig-online.xsl, which should not
 be used directly on it's own)
 
 Slightly altered version of the TDE stylesheet, used to generate the
 website versions, among others.
 
-kde-man.xsl
+tde-man.xsl
 
 A stylesheet for generating *roff output (for manpages) from DocBook
 files. It's virtually the same as the original manpages/docbook.xsl file
diff --git a/kdoctools/customization/kde-chunk-online.xsl b/kdoctools/customization/tde-chunk-online.xsl
index e683db8b9..69fb63b61 100644
--- a/kdoctools/customization/kde-chunk-online.xsl
+++ b/kdoctools/customization/tde-chunk-online.xsl
@@ -3,9 +3,9 @@
 
 <xsl:import href="../docbook/xsl/html/autoidx.xsl"/>
 <xsl:import href="../docbook/xsl/html/chunk.xsl"/>
-<xsl:include href="kde-navig-online.xsl"/>
-<xsl:include href="kde-ttlpg-online.xsl"/>
-<xsl:include href="kde-style.xsl"/>
+<xsl:include href="tde-navig-online.xsl"/>
+<xsl:include href="tde-ttlpg-online.xsl"/>
+<xsl:include href="tde-style.xsl"/>
 <xsl:output encoding="utf-8"/>
 
 <xsl:variable name="TDE_VERSION">1.13</xsl:variable>
@@ -42,7 +42,7 @@
 <xsl:param name="use.extensions">0</xsl:param>
 <xsl:param name="admon.graphics">0</xsl:param>
 <xsl:param name="kde.common">/HEAD/common/</xsl:param>
-<xsl:param name="html.stylesheet" select="concat($kde.common,'kde-default.css')"/>
+<xsl:param name="html.stylesheet" select="concat($kde.common,'tde-default.css')"/>
 <xsl:param name="admon.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>
 <xsl:param name="callout.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>
 
diff --git a/kdoctools/customization/kde-chunk.xsl b/kdoctools/customization/tde-chunk.xsl
index 4262710b0..cfe2dd7c1 100644
--- a/kdoctools/customization/kde-chunk.xsl
+++ b/kdoctools/customization/tde-chunk.xsl
@@ -3,9 +3,9 @@
 
 <xsl:import href="../docbook/xsl/html/autoidx.xsl"/>
 <xsl:import href="../docbook/xsl/html/chunk.xsl"/>
-<xsl:include href="kde-navig.xsl"/>
-<xsl:include href="kde-ttlpg.xsl"/>
-<xsl:include href="kde-style.xsl"/>
+<xsl:include href="tde-navig.xsl"/>
+<xsl:include href="tde-ttlpg.xsl"/>
+<xsl:include href="tde-style.xsl"/>
 
 <xsl:variable name="TDE_VERSION">1.13</xsl:variable> 
 
@@ -41,7 +41,7 @@
 <xsl:param name="use.extensions">0</xsl:param>
 <xsl:param name="admon.graphics">0</xsl:param>
 <xsl:param name="kde.common">help:/common/</xsl:param>
-<xsl:param name="html.stylesheet" select="concat($kde.common,'kde-default.css')"/>
+<xsl:param name="html.stylesheet" select="concat($kde.common,'tde-default.css')"/>
 <xsl:param name="admon.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>
 <xsl:param name="callout.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>
 
diff --git a/kdoctools/customization/kde-man.xsl b/kdoctools/customization/tde-man.xsl
index 8e8686811..8e8686811 100644
--- a/kdoctools/customization/kde-man.xsl
+++ b/kdoctools/customization/tde-man.xsl
diff --git a/kdoctools/customization/kde-navig-online.xsl b/kdoctools/customization/tde-navig-online.xsl
index ff919b68e..ff919b68e 100644
--- a/kdoctools/customization/kde-navig-online.xsl
+++ b/kdoctools/customization/tde-navig-online.xsl
diff --git a/kdoctools/customization/kde-navig.xsl b/kdoctools/customization/tde-navig.xsl
index 2e8a9e717..2e8a9e717 100644
--- a/kdoctools/customization/kde-navig.xsl
+++ b/kdoctools/customization/tde-navig.xsl
diff --git a/kdoctools/customization/kde-nochunk.xsl b/kdoctools/customization/tde-nochunk.xsl
index 9e05f8342..59f0e6e5c 100644
--- a/kdoctools/customization/kde-nochunk.xsl
+++ b/kdoctools/customization/tde-nochunk.xsl
@@ -4,8 +4,8 @@
 <xsl:import href="../docbook/xsl/html/autoidx.xsl"/>
 <xsl:import href="../docbook/xsl/html/docbook.xsl"/>
 <!-- <xsl:include href="kde-print-navig.xsl"/> -->
-<xsl:include href="kde-ttlpg.xsl"/>
-<xsl:include href="kde-style.xsl"/>
+<xsl:include href="tde-ttlpg.xsl"/>
+<xsl:include href="tde-style.xsl"/>
 
 <xsl:variable name="TDE_VERSION">1.13</xsl:variable> 
 
@@ -20,7 +20,7 @@
 <xsl:param name="use.extensions">0</xsl:param>
 <xsl:param name="admon.graphics">0</xsl:param>
 <xsl:param name="kde.common">../common/</xsl:param>
-<xsl:param name="html.stylesheet" select="concat($kde.common,'kde-web.css')"/>
+<xsl:param name="html.stylesheet" select="concat($kde.common,'tde-web.css')"/>
 <xsl:param name="admon.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>
 <xsl:param name="callout.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>
 
diff --git a/kdoctools/customization/kde-style.xsl b/kdoctools/customization/tde-style.xsl
index 03e8bc987..03e8bc987 100644
--- a/kdoctools/customization/kde-style.xsl
+++ b/kdoctools/customization/tde-style.xsl
diff --git a/kdoctools/customization/kde-ttlpg-online.xsl b/kdoctools/customization/tde-ttlpg-online.xsl
index 523648b7f..523648b7f 100644
--- a/kdoctools/customization/kde-ttlpg-online.xsl
+++ b/kdoctools/customization/tde-ttlpg-online.xsl
diff --git a/kdoctools/customization/kde-ttlpg.xsl b/kdoctools/customization/tde-ttlpg.xsl
index 78d4792cd..78d4792cd 100644
--- a/kdoctools/customization/kde-ttlpg.xsl
+++ b/kdoctools/customization/tde-ttlpg.xsl
diff --git a/kdoctools/customization/kde-web-navig.xsl b/kdoctools/customization/tde-web-navig.xsl
index e8d2c713d..e8d2c713d 100644
--- a/kdoctools/customization/kde-web-navig.xsl
+++ b/kdoctools/customization/tde-web-navig.xsl
diff --git a/kdoctools/customization/kde-web.xsl b/kdoctools/customization/tde-web.xsl
index 8a9dfcdb7..130c197b0 100644
--- a/kdoctools/customization/kde-web.xsl
+++ b/kdoctools/customization/tde-web.xsl
@@ -4,8 +4,8 @@
 <xsl:import href="../docbook/xsl/html/autoidx.xsl"/>
 <xsl:import href="../docbook/xsl/html/chunk.xsl"/>
 <xsl:include href="kde-web-navig.xsl"/>
-<xsl:include href="kde-ttlpg.xsl"/>
-<xsl:include href="kde-style.xsl"/>
+<xsl:include href="tde-ttlpg.xsl"/>
+<xsl:include href="tde-style.xsl"/>
 
 <xsl:variable name="TDE_VERSION">1.13</xsl:variable> 
 
@@ -41,7 +41,7 @@
 <xsl:param name="use.extensions">0</xsl:param>
 <xsl:param name="admon.graphics">0</xsl:param>
 <xsl:param name="kde.common">../common/</xsl:param>
-<xsl:param name="html.stylesheet" select="concat($kde.common,'kde-default.css')"/>
+<xsl:param name="html.stylesheet" select="concat($kde.common,'tde-default.css')"/>
 <xsl:param name="admon.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>
 <xsl:param name="callout.graphics.path"><xsl:value-of select="kde.common"/></xsl:param>
 
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 51f0b913a..601f53f25 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -226,7 +226,7 @@ int main(int argc, char **argv) {
     bool index = args->isSet( "htdig" );
     TQString tss = args->getOption( "stylesheet" );
     if ( tss.isEmpty() )
-        tss =  "customization/kde-chunk.xsl";
+        tss =  "customization/tde-chunk.xsl";
     if ( index )
         tss = "customization/htdig_index.xsl" ;
 
diff --git a/kdoctools/tdeio_help.cpp b/kdoctools/tdeio_help.cpp
index 7b9d2a36e..fc40dd3fa 100644
--- a/kdoctools/tdeio_help.cpp
+++ b/kdoctools/tdeio_help.cpp
@@ -209,7 +209,7 @@ void HelpProtocol::get( const KURL& url )
     infoMessage(i18n("Preparing document"));
 
     if ( mGhelp ) {
-        TQString xsl = "customization/kde-nochunk.xsl";
+        TQString xsl = "customization/tde-nochunk.xsl";
         mParsed = transform(file, locate("dtd", xsl));
 
         kdDebug( 7119 ) << "parsed " << mParsed.length() << endl;
@@ -235,7 +235,7 @@ void HelpProtocol::get( const KURL& url )
         kdDebug( 7119 ) << "cached parsed " << mParsed.length() << endl;
 
         if ( mParsed.isEmpty() ) {
-            mParsed = transform(file, locate("dtd", "customization/kde-chunk.xsl"));
+            mParsed = transform(file, locate("dtd", "customization/tde-chunk.xsl"));
             if ( !mParsed.isEmpty() ) {
                 infoMessage( i18n( "Saving to cache" ) );
                 TQString cache = file.left( file.length() - 7 );
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index 498e6b2c8..a6e144ce8 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -235,7 +235,7 @@ static bool readCache( const TQString &filename,
     kdDebug( 7119 ) << "verifyCache " << filename << " " << cache << endl;
     if ( !compareTimeStamps( filename, cache ) )
         return false;
-    if ( !compareTimeStamps( locate( "dtd", "customization/kde-chunk.xsl"), cache ) )
+    if ( !compareTimeStamps( locate( "dtd", "customization/tde-chunk.xsl"), cache ) )
         return false;
 
     kdDebug( 7119 ) << "create filter" << endl;
diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h
index 24f24e1a8..ca112ed14 100644
--- a/kstyles/kthemestyle/kthemestyle.h
+++ b/kstyles/kthemestyle/kthemestyle.h
@@ -74,7 +74,7 @@ public:
      *
      * @param configDir The directory which has the TDEConfig file.
      * @param configFile A TDEConfig file to use as the theme configuration.
-     * Defaults to ~/.kderc.
+     * Defaults to ~/.tderc.
      */
     KThemeStyle( const TQString& configDir, const TQString &configFile = TQString::null );
     ~KThemeStyle();
diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk
index 54ab60d2d..826fc6da6 100644
--- a/tdecore/README.kiosk
+++ b/tdecore/README.kiosk
@@ -31,7 +31,7 @@ In KDE2 resource management has been largely abstracted by the introduction
 of the TDEStandardDirs class and has become much more flexible. The user /
 administrator can now specify a variable number of locations where resources
 can be found. A list of locations can either be specified via $TDEDIRS
-(notice the extra 'S'), via /etc/kderc and even via the kdeglobals config 
+(notice the extra 'S'), via /etc/tderc and even via the kdeglobals config 
 file. The location where user-specific resources can be found can be
 set with $TDEHOME (The default is $HOME/.trinity). Changes made by the user
 are always written back to $TDEHOME.
diff --git a/tdecore/README.user_profiles b/tdecore/README.user_profiles
index 4fb43b757..4f9f8f592 100644
--- a/tdecore/README.user_profiles
+++ b/tdecore/README.user_profiles
@@ -12,7 +12,7 @@ Mapping profiles to users
 =========================
 
 A mapping file determines which profile(s) should be used for which user.
-The mapping file can be configured in /etc/kderc in the [Directories] group:
+The mapping file can be configured in /etc/tderc in the [Directories] group:
 
 	[Directories]
 	userProfileMapFile=/etc/kde-user-profile
@@ -99,7 +99,7 @@ user will be assigned the "default" profile.
 The Profile determines the directory prefixes
 =============================================
 
-The global KDE configuration file (e.g. kdeglobals or /etc/kderc) can
+The global KDE configuration file (e.g. kdeglobals or /etc/tderc) can
 contain config-groups that are associated with a certain user profile. 
 Such a config-group is treated similar as the [Directories] config-group.
 
@@ -109,7 +109,7 @@ The name of a such config-group is [Directories-<ProfileName>]
 Integration with KIOSK Admin Tool
 =================================
 
-The KIOSK Admin Tool uses /etc/kderc as source for all its profile
+The KIOSK Admin Tool uses /etc/tderc as source for all its profile
 information. For this it uses the following keys in the
 [Directories-<ProfileName>] config-group:
 
@@ -126,7 +126,7 @@ as default installation directory for this profile.
 Default setting as example
 ==========================
 
-The following snipped could be added to /etc/kderc to define a "default" profile:
+The following snipped could be added to /etc/tderc to define a "default" profile:
 
 	[Directories-default]
 	ProfileDescription=Default profile
diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp
index 6d5197ff7..06939551a 100644
--- a/tdecore/tdeconfigbackend.cpp
+++ b/tdecore/tdeconfigbackend.cpp
@@ -350,24 +350,24 @@ bool TDEConfigINIBackEnd::parseConfigFiles()
 
   // Parse the general config files
   if (useKDEGlobals) {
-    TQStringList kdercs = TDEGlobal::dirs()->
+    TQStringList tdercs = TDEGlobal::dirs()->
       findAllResources("config", TQString::fromLatin1("kdeglobals"));
 
 #ifdef Q_WS_WIN
-    TQString etc_kderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\kderc" );
+    TQString etc_tderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\tderc" );
 #else
-    TQString etc_kderc = TQString::fromLatin1("/etc/kderc");
+    TQString etc_tderc = TQString::fromLatin1("/etc/tderc");
 #endif
 
-    if (checkAccess(etc_kderc, R_OK))
-      kdercs += etc_kderc;
+    if (checkAccess(etc_tderc, R_OK))
+      tdercs += etc_tderc;
 
-    kdercs += TDEGlobal::dirs()->
+    tdercs += TDEGlobal::dirs()->
       findAllResources("config", TQString::fromLatin1("system.kdeglobals"));
 
     TQStringList::ConstIterator it;
 
-    for (it = kdercs.fromLast(); it != kdercs.end(); --it) {
+    for (it = tdercs.fromLast(); it != tdercs.end(); --it) {
 
       TQFile aConfigFile( *it );
       if (!aConfigFile.open( IO_ReadOnly ))
author	Timothy Pearson <[email protected]>	2013-04-18 19:01:11 -0500
committer	Timothy Pearson <[email protected]>	2013-04-18 19:01:11 -0500
commit	2b31f11f979f3ffc3dd060072b85559a832bfab5 (patch)
tree	081358a0df37f88e89a3e2fa4e137810681ab480
parent	30b0af1f01cdbfcc51a56943e8c091bc8991f83a (diff)
parent	1c68d332fd7e08a190daedbaa6ace857b575b7c4 (diff)
download	tdelibs-2b31f11f979f3ffc3dd060072b85559a832bfab5.tar.gz tdelibs-2b31f11f979f3ffc3dd060072b85559a832bfab5.zip