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

27 files changed, 101 insertions, 58 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d3cbe58f..1d5beba31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,7 @@ option( WITH_XRANDR "Enable xrandr support" ${WITH_ALL_OPTIONS} )
 option( WITH_XRENDER "Enable xrender support" ${WITH_ALL_OPTIONS} )
 option( WITH_XDAMAGE "Enable xdamage support" ${WITH_ALL_OPTIONS} )
 option( WITH_XEXT "Enable xext support" ${WITH_ALL_OPTIONS} )
-option( WITH_XTEST "Enable xext support" ${WITH_ALL_OPTIONS} )
+option( WITH_XTEST "Enable xtest support" ${WITH_ALL_OPTIONS} )
 option( WITH_XSCREENSAVER "Enable xscreensaver support" ${WITH_ALL_OPTIONS} )
 option( WITH_LIBART "Enable libart support (for SVG icons and wallpapers)" ${WITH_ALL_OPTIONS} )
 option( WITH_LIBUSB "Enable control of some mouse models through libusb" ${WITH_ALL_OPTIONS} )
@@ -85,6 +85,49 @@ option( WITH_TDEHWLIB "Enable TDE hardware library support" OFF )
 option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
 option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
 
+##### options comments ##########################
+
+# WITH_SASL         affects kioslaves(kio_ldap kio_smtp kio_pop3)
+# WITH_LDAP         affects kioslaves(kio_ldap)
+# WITH_SAMBA        affects kioslaves(kio_samba) kcontrol
+# WITH_OPENEXR      affects kioslaves(thumbnail)
+# WITH_XCOMPOSITE   affects twin kicker(taskmanager) tdm
+# WITH_XCURSOR      affects kioslaves(thumbnail), kcontrol(input), kdesktop
+# WITH_XFIXES       affects twin klipper kicker(taskmanager)
+# WITH_XDAMAGE      affects <nothing>
+# WITH_XEXT         affects <nothing>
+# WITH_XRANDR       affects tdm, kcontrol(displayconfig randr iccconfig)
+# WITH_XRENDER      affects twin konsole kicker(taskmanager) kdesktop
+#                           kcontrol(style)
+# WITH_XTEST        desription adds some hotkey functonality. Its functionality
+#                              replaced by xkb nearly everywhere except the
+#                              mouse gestures. Also it used as a fallback if
+#                              xkb initialization fails.
+# WITH_XTEST        affects tdm kxkb khotkeys
+# WITH_XSCREENSAVER affects kdesktop
+# WITH_LIBART       affects tdm kcontrol(icons background)
+# WITH_LIBUSB       affects kcontrol(input)
+# WITH_XDMCP        affects tdm
+# WITH_XINERAMA     affects ksplashml
+# WITH_ARTS         affects libkonq khotkeys
+# WITH_I8K          affects ksysguard
+# WITH_HAL          affects kioslaves(media) ksmserver
+# WITH_TDEHWLIB     affects kioslaves(media), replaces WITH_HAL on systems without HAL
+# WITH_LIBRAW1394   affects kcontrol(view1394)
+# WITH_PAM          affects tdm kdesktop kcheckpass
+# WITH_SHADOW       affects tdm kcheckpass
+# WITH_UPOWER       affects ksmserver
+# WITH_SUDO_TDESU_BACKEND affects tdesu
+
+# NOTE: WITH_SHADOW and WITH_PAM shouldn't be set concurrently
+#       WITH_PAM will override WITH_SHADOW
+# NOTE: if WITH_XCOMPOSITE=ON then the following options are also required:
+#       WITH_XRENDER=ON
+#       WITH_XFIXES=ON
+#       WITH_XDAMAGE=ON
+#       WITH_XEXT=ON
+# NOTE: seems WITH_XDAMAGE and WITH_XET doesn't change anything
+#       they are just required by WITH_XCOMPOSITE
 
 ##### user requested modules ####################
 
@@ -97,7 +140,7 @@ option( BUILD_DOC "Build doc" ${BUILD_ALL} )
 option( BUILD_LIBKONQ "Build libkonq" ${BUILD_ALL} )
 option( BUILD_KCMINIT "Build kcminit" ${BUILD_ALL} )
 option( BUILD_KCONTROL "Build kcontrol" ${BUILD_ALL} )
-option( BUILD_KWIN "Build twin" ${BUILD_ALL} )
+option( BUILD_TWIN "Build twin" ${BUILD_ALL} )
 option( BUILD_KATE "Build kate" ${BUILD_ALL} )
 option( BUILD_KONQUEROR "Build konqueror" ${BUILD_ALL} )
 option( BUILD_KIOSLAVES "Build kioslaves" ${BUILD_ALL} )
@@ -175,7 +218,7 @@ tde_conditional_add_subdirectory( BUILD_DOC doc )
 tde_conditional_add_subdirectory( BUILD_LIBKONQ libkonq )
 tde_conditional_add_subdirectory( BUILD_KCMINIT kcminit )
 add_subdirectory( kcontrol )
-tde_conditional_add_subdirectory( BUILD_KWIN twin )
+tde_conditional_add_subdirectory( BUILD_TWIN twin )
 tde_conditional_add_subdirectory( BUILD_KATE kate )
 tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror )
 tde_conditional_add_subdirectory( BUILD_KIOSLAVES kioslave )
diff --git a/doc/faq/tdeapps.docbook b/doc/faq/tdeapps.docbook
index 6f20acc69..441759054 100644
--- a/doc/faq/tdeapps.docbook
+++ b/doc/faq/tdeapps.docbook
@@ -69,7 +69,7 @@ for a dialup connection. Try changing it to a smaller value like
 <userinput>296</userinput>
 or <userinput>576</userinput>.</para></listitem>
 <listitem><para>Check in your <filename
-class="directory">$<envar>HOME</envar>/.kde/share/config</filename> for the
+class="directory">$<envar>HOME</envar>/.trinity/share/config</filename> for the
 <filename>kppprc</filename>. Ensure the correct modem speed is
 actually defined there.</para></listitem>
 </itemizedlist></listitem>
diff --git a/doc/kcontrol/screensaver/index.docbook b/doc/kcontrol/screensaver/index.docbook
index e52173649..3d7d43cb5 100644
--- a/doc/kcontrol/screensaver/index.docbook
+++ b/doc/kcontrol/screensaver/index.docbook
@@ -169,7 +169,7 @@ no grace period.</para>
 <para>To alter the grace period setting, you need to manually edit the 
 configuration file.  To do so:</para>
 <para>
-<prompt>$</prompt> <command>cd <filename>~/.kde/share/config</filename>
+<prompt>$</prompt> <command>cd <filename>~/.trinity/share/config</filename>
 </command>
 </para>
 <para>Now, using a text editor (the example uses &kate;, the &tde; text editor), 
diff --git a/doc/kicker/index.docbook b/doc/kicker/index.docbook
index a4fe79ace..3645669d2 100644
--- a/doc/kicker/index.docbook
+++ b/doc/kicker/index.docbook
@@ -2328,8 +2328,8 @@ another picture?
 </question>
 <answer>
 <para>
-Look for <filename>$HOME/.kde/share/apps/kicker/pics/go.png</filename>
-and <filename>$HOME/.kde/share/apps/kicker/pics/mini/go.png</filename>
+Look for <filename>$HOME/.trinity/share/apps/kicker/pics/go.png</filename>
+and <filename>$HOME/.trinity/share/apps/kicker/pics/mini/go.png</filename>
 and replace them. Do not forget to flatten the replacements to one
 layer, or else you will not see anything.  Create the folders if
 they do not already exist. Then restart &kicker;.
diff --git a/doc/konqueror/browser.docbook b/doc/konqueror/browser.docbook
index 02bb39a04..2c1e0fa17 100644
--- a/doc/konqueror/browser.docbook
+++ b/doc/konqueror/browser.docbook
@@ -448,7 +448,7 @@ OverridenPorts=CommaSeparatedListOfAllowedPorts
 </userinput></screen>
 to <filename>$TDEDIR/share/config/kio_httprc
 </filename> or 
-<filename>~/.kde/share/config/kio_httprc</filename>.</para>
+<filename>~/.trinity/share/config/kio_httprc</filename>.</para>
 <para>For example
 <screen><userinput>OverridenPorts=23,15
 </userinput></screen> 
diff --git a/doc/konqueror/faq.docbook b/doc/konqueror/faq.docbook
index 7d964b93a..0d7ce4ec2 100644
--- a/doc/konqueror/faq.docbook
+++ b/doc/konqueror/faq.docbook
@@ -37,7 +37,7 @@ helps.</para></answer>
 <qandaentry>
 <question><para>Where does &konqueror; keep all its configuration
 data?</para></question>
-<answer><para>Generally in the <filename>~/.kde</filename> folder (this may 
+<answer><para>Generally in the <filename>~/.trinity</filename> folder (this may 
 be <filename>~/.trinity</filename> on your system, depending on how &tde; 3 
 was installed). Don't alter these files unless you really know what you are 
 doing.</para>
@@ -45,30 +45,30 @@ doing.</para>
 <itemizedlist>
 
 <listitem><para>The <filename
-class="directory">~/.kde/share/apps/konqueror/profiles</filename> folder
+class="directory">~/.trinity/share/apps/konqueror/profiles</filename> folder
 holds individual files containing settings for each of your <link
 linkend="save-settings">profiles.  </link></para></listitem>
 
 <listitem><para>Your bookmarks are held in <filename
-class="directory">~/.kde/share/apps/konqueror/bookmarks.xml</filename></para></listitem>
+class="directory">~/.trinity/share/apps/konqueror/bookmarks.xml</filename></para></listitem>
 <listitem><para>Cookies are held in <filename
-class="directory">~/.kde/share/apps/kcookiejar/cookies</filename></para></listitem>
+class="directory">~/.trinity/share/apps/kcookiejar/cookies</filename></para></listitem>
 <listitem><para>Your history, as used for the auto-completion feature,  is in
-<filename>~/.kde/share/config/konq_history</filename></para></listitem>
+<filename>~/.trinity/share/config/konq_history</filename></para></listitem>
 
 <listitem><para>In the folder <filename
-class="directory">~/.kde/share/config/</filename> the files
+class="directory">~/.trinity/share/config/</filename> the files
 <filename>konqiconviewrc</filename>, <filename>konqlistviewrc</filename> and
 <filename>konquerorrc</filename> hold a whole lot of general configuration
 settings.</para></listitem>
 
 <listitem><para>The folder
-<filename class="directory">~/.kde/share/cache/http/</filename> 
+<filename class="directory">~/.trinity/share/cache/http/</filename> 
 contains the browser cache.</para></listitem>
 
 <listitem><para>The Navigation Panel uses the files and subfolders in
 <filename
-class="directory">~/.kde/share/apps/konqsidebartng</filename></para></listitem>
+class="directory">~/.trinity/share/apps/konqsidebartng</filename></para></listitem>
 </itemizedlist>
 
 <para>Any folder specific view settings are put into <literal
diff --git a/doc/konqueror/filemanager.docbook b/doc/konqueror/filemanager.docbook
index 705dea28c..a1ef9eb4f 100644
--- a/doc/konqueror/filemanager.docbook
+++ b/doc/konqueror/filemanager.docbook
@@ -654,7 +654,7 @@ folder. You can get there in &konqueror; by choosing
 <menuchoice><guimenu>Go</guimenu>
 <guimenuitem>Applications</guimenuitem></menuchoice>. Then create a single icon
 on your desktop to open your Applications folder, which is usually in
-<filename class="directory">~/.kde/share/applnk</filename>.</para>
+<filename class="directory">~/.trinity/share/applnk</filename>.</para>
 
 <para>To put an application link icon into the panel, first create it in the
 Applications folder then drag the icon onto a clear area of the
diff --git a/doc/konqueror/plugins.docbook b/doc/konqueror/plugins.docbook
index fa933d36c..4cb56795d 100644
--- a/doc/konqueror/plugins.docbook
+++ b/doc/konqueror/plugins.docbook
@@ -32,7 +32,7 @@ Plugins</guibutton> button or automatically each time &tde; starts up.</para>
 role="extension">.so</literal> files containing plugin code. It examines every
 such file to find out which <acronym>MIME</acronym> types the plugin
 supports. It then creates <acronym>MIME</acronym> type definitions for &tde; in
-the user's <filename class="directory"> ~/.kde/share/mimelnk</filename>
+the user's <filename class="directory"> ~/.trinity/share/mimelnk</filename>
 folder to make other applications aware of them.</para>
 
 <para>The <guilabel>Plugins</guilabel> page shows you the &Netscape; plugins
diff --git a/doc/konqueror/sidebar.docbook b/doc/konqueror/sidebar.docbook
index e428c1f32..14e82bcd9 100644
--- a/doc/konqueror/sidebar.docbook
+++ b/doc/konqueror/sidebar.docbook
@@ -82,7 +82,7 @@ main view or <mousebutton>right</mousebutton> click to bring up a menu with
 a wider range of possibilities.</para>
 <para>The folders shown in the <guilabel>Network</guilabel> page are held in 
 the folder <filename class="directory">
-~/.kde/share/apps/konqsidebartng/virtual_folders/remote/</filename>, and you can make 
+~/.trinity/share/apps/konqsidebartng/virtual_folders/remote/</filename>, and you can make 
 new ones just as you would make any other subfolder. The items within 
 these folders are held as <literal role="extension">.desktop</literal> files 
 and can be created with &konqueror;'s <menuchoice><guisubmenu>Create New</guisubmenu>
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index ebef5fea5..b461e26c7 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -86,7 +86,7 @@ your tastes, you can learn how to customize the appearance of
 
 <para>To use themes from <ulink
 url="http://www.kde-look.org">KDE-Look</ulink>, extract them to
-<filename>~/.kde/share/apps/ksplash/Themes/</filename> for a single user, or
+<filename>~/.trinity/share/apps/ksplash/Themes/</filename> for a single user, or
 to
 <filename>$<envar>TDEDIR</envar>/share/apps/ksplash/Themes/</filename>
 to make them available to all users of your system.</para>
@@ -146,7 +146,7 @@ it.</para>
 the theme to be recognized by &ksplash;, it should be stored in a
 folder called <filename class="directory">MyCoolTheme</filename>
 under <filename
-class="directory">~/.kde/apps/ksplash/Themes/</filename>. It should
+class="directory">~/.trinity/apps/ksplash/Themes/</filename>. It should
 have a file called <filename>Theme.rc</filename>, containing the
 settings of the theme. You can specify large numbers of special things
 to theme, change the plugin engine to use, and so on. You do not have
@@ -178,7 +178,7 @@ by assigning key-value pairs as in the example file above.</para>
 
 <important>
 <para>Ensure that the name of the directory that contains the theme files
-(<filename class="directory">~/.kde/apps/ksplash/Themes/MyCoolTheme</filename>
+(<filename class="directory">~/.trinity/apps/ksplash/Themes/MyCoolTheme</filename>
 in this example) and the identifier (<literal>[KSplash Theme:
 MyCoolTheme]</literal> in this example) of the theme in the
 <filename>Theme.rc</filename> file are identical. Otherwise, &ksplash; will not
diff --git a/doc/tdeprint/getting-started.docbook b/doc/tdeprint/getting-started.docbook
index 9ac3dec25..2e306c0d7 100644
--- a/doc/tdeprint/getting-started.docbook
+++ b/doc/tdeprint/getting-started.docbook
@@ -80,7 +80,7 @@ users may have different print subsystems in use, if those do exist on
 the computer and are compliant with each other.  Their settings are
 stored in the <filename>tdeprintrc</filename>.  This file is unique to
 every user, and is normally installed in
-<filename>$<envar>HOME</envar>/.kde/share/config/tdeprintrc</filename>.</para>
+<filename>$<envar>HOME</envar>/.trinity/share/config/tdeprintrc</filename>.</para>
 
 <warning>
 <para>This file is not intended to be directly editable, and all
diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook
index 691ae691d..6a49a129a 100644
--- a/doc/userguide/tde-for-admins.docbook
+++ b/doc/userguide/tde-for-admins.docbook
@@ -25,7 +25,7 @@ stores all its files in a directory tree with a fixed structure.
 class="directory">/opt/trinity</filename>).</para></listitem>
 <listitem><para>One at the user level in the user's home directory
 (usually <filename class="directory">
-~/.kde</filename>)</para></listitem>
+~/.trinity</filename>)</para></listitem>
 </itemizedlist>
 
 <para>As a system administrator you can create additional trees. Such
@@ -36,7 +36,7 @@ linkend="user-profiles">profiles</link></para>
 
 <itemizedlist>
 <listitem><para><filename
-class="directory">$<envar>HOME</envar>/.kde</filename></para></listitem>
+class="directory">$<envar>HOME</envar>/.trinity</filename></para></listitem>
 <listitem><para><filename
 class="directory">/opt/trinity</filename>. (This is
 &SuSE;-specific; other distributions may use
@@ -66,7 +66,7 @@ the following files are searched:</para>
 
 <itemizedlist>
 <listitem><para><filename
-class="directory">$<envar>HOME</envar>/.kde/share/mimelnk/text/plain.desktop</filename></para></listitem>
+class="directory">$<envar>HOME</envar>/.trinity/share/mimelnk/text/plain.desktop</filename></para></listitem>
 <listitem><para><filename
 class="directory">/opt/trinity/share/mimelnk/text/plain.desktop</filename></para></listitem>
 <listitem><para><filename
@@ -74,7 +74,7 @@ class="directory">/etc/opt/trinity/share/mimelnk/text/plain.desktop</filename></
 </itemizedlist>
 
 <para>If a user makes a change, the change is written to <filename
-class="directory">$<envar>HOME</envar>/.kde/share/mimelnk/text/plain.desktop</filename></para>
+class="directory">$<envar>HOME</envar>/.trinity/share/mimelnk/text/plain.desktop</filename></para>
 </informalexample>
 
 <para>For configuration files the story is slightly different. If
@@ -87,7 +87,7 @@ which value is used for the key.</para>
 <informalexample><para>
 For example, if the following two files exist, with these contents:</para>
 <variablelist>
-<varlistentry><term><filename>$<envar>HOME</envar>/.kde/share/config/foobar</filename></term>
+<varlistentry><term><filename>$<envar>HOME</envar>/.trinity/share/config/foobar</filename></term>
 <listitem><programlisting>
 Color=red
 Shape=circle
@@ -128,13 +128,13 @@ Position=10,10
 
 <seglistitem>
 <seg><envar>TDEHOME</envar></seg>
-<seg><filename class="directory">~/.kde</filename></seg>
+<seg><filename class="directory">~/.trinity</filename></seg>
 <seg></seg>
 </seglistitem>
 
 <seglistitem>
 <seg><envar>TDEROOTHOME</envar></seg>
-<seg><filename class="directory">/root/.kde</filename></seg>
+<seg><filename class="directory">/root/.trinity</filename></seg>
 <seg>Different variable to prevent
 root writing to $TDEHOME of the user after running
 <command>su</command>.</seg>
@@ -194,7 +194,7 @@ prefixes=/opt/kde_staff
 <para>This creates a profile named <quote>staff</quote> that adds the
 <filename class="directory">/opt/kde_staff</filename> directory
 tree. (Note that &SuSE; &Linux; uses
-<filename>/etc/trinityrc</filename> instead of
+<filename>/etc/kde3rc</filename> instead of
 <filename>/etc/kderc</filename>. Now that we have a named profile it
 can be assigned to users.</para>
 
@@ -528,7 +528,7 @@ precedence.  If a key in a certain group is defined multiple times in a
 single file, the value of the last entry is used.</para>
 
 <informalexample>
-<para>If <filename>$<envar>HOME</envar>/.kde/share/config/foobar</filename>
+<para>If <filename>$<envar>HOME</envar>/.trinity/share/config/foobar</filename>
 contains:
 <programlisting>
 [MyGroup]
@@ -553,7 +553,7 @@ Position=10,10
 
 <informalexample>
 <para>If
-	<filename>$<envar>HOME</envar>/.kde/share/config/foobar</filename>
+	<filename>$<envar>HOME</envar>/.trinity/share/config/foobar</filename>
 	contains
 <programlisting>
 [MyGroup]
@@ -607,7 +607,7 @@ Color[$i]=blue
 
 <informalexample>
 <para>If
-	<filename>$<envar>HOME</envar>/.kde/share/config/foobar</filename>
+	<filename>$<envar>HOME</envar>/.trinity/share/config/foobar</filename>
 	contains:
 <programlisting>
 [MyGroup]
@@ -630,7 +630,7 @@ Position=10,10
 </informalexample>
 
 <informalexample><para>If
-	<filename>$<envar>HOME</envar>/.kde/share/config/foobar</filename>
+	<filename>$<envar>HOME</envar>/.trinity/share/config/foobar</filename>
 	contains:
 <programlisting>
 [MyGroup]
@@ -1151,13 +1151,13 @@ or have to install some programs to a different prefix than the rest of
 </varlistentry>
 
 <varlistentry><term><envar>$TDEHOME</envar></term><listitem><para>If
-not set, &tde; uses <filename class="directory">~/.kde</filename> as
+not set, &tde; uses <filename class="directory">~/.trinity</filename> as
 the directory where personal data is stored.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry><term>$<envar>TDEROOTHOME</envar></term><listitem><para>If
-not set, &tde; uses <filename class="directory">~root/.kde</filename>
+not set, &tde; uses <filename class="directory">~root/.trinity</filename>
 as the directory for <systemitem class="username">root</systemitem>'s
 personal data. Was introduced to prevent &tde; from accidently
 overwriting user data with root permissions when the user runs a &tde;
@@ -1815,7 +1815,7 @@ NoDisplay=true
 the directory structures in <filename
 class="directory">$<envar>TDEDIR</envar>/share/applnk</filename>
 (system wide) and <filename
-class="directory">$<envar>HOME</envar>/.kde/share/applnk</filename>
+class="directory">$<envar>HOME</envar>/.trinity/share/applnk</filename>
 (user specific). This is observed unless the <literal role="extension">.desktop</literal> file has a  <varname>Categories</varname>= line. In that case the categories determine the location in the menu.</para>
 </sect2>
 
@@ -1945,7 +1945,7 @@ role="extension">.gif</literal> files.
 
 <para>A user can change file association in the
 &kcontrolcenter;. These changes are stored in
-<filename>$<envar>HOME</envar>/.kde/share/config/profilerc</filename>.
+<filename>$<envar>HOME</envar>/.trinity/share/config/profilerc</filename>.
 To use the same settings for multiple users, store these settings in
 user profile directory or the global &tde; config directory to use as
 default for multiple users.</para>
diff --git a/kcontrol/keys/README b/kcontrol/keys/README
index 14e09f73e..63964a1fe 100644
--- a/kcontrol/keys/README
+++ b/kcontrol/keys/README
@@ -1,5 +1,5 @@
 CHANGES V0.2
-- Global keys stored by default in ~/.kde/share/config/kdeglobals 
+- Global keys stored by default in ~/.trinity/share/config/kdeglobals 
   [Global Keys] group
 - KKeyDialog checks new key choices against exising bindings for the widget
 and against entries in .kderc [Global Keys]
diff --git a/kcontrol/krdb/ad/README b/kcontrol/krdb/ad/README
index 830ba77b4..9a5d836cb 100644
--- a/kcontrol/krdb/ad/README
+++ b/kcontrol/krdb/ad/README
@@ -39,7 +39,7 @@ $(TDEDIR)/share/apps/kdisplay/app-defaults
 
 or
 
-$(HOME)/.kde/share/apps/kdisplay/app-defaults
+$(HOME)/.trinity/share/apps/kdisplay/app-defaults
 
 so that it is available to krdb for reading. If you want to
 override a system file simply copy it to your user
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 88d24f801..3b88ec5b2 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -330,7 +330,7 @@ static TQString color( const TQColor& col )
 
 static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version )
 {
-    // lukas: why does it create in ~/.kde/share/config ???
+    // lukas: why does it create in ~/.trinity/share/config ???
     // pfeiffer: so that we don't overwrite the user's gtkrc.
     // it is found via the GTK_RC_FILES environment variable.
     KSaveFile saveFile( locateLocal( "config", 2==version?"gtkrc-2.0":"gtkrc" ) ); 
diff --git a/kdebugdialog/README b/kdebugdialog/README
index e1d239223..59c9fcd9f 100644
--- a/kdebugdialog/README
+++ b/kdebugdialog/README
@@ -8,5 +8,5 @@ to it and never clearing it. So don't forget to empty it once in a
 while!
 
 Your configuration will of course be stored in
-  $HOME/.kde/share/config/kdebugrc
+  $HOME/.trinity/share/config/kdebugrc
 
diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp
index a12e48bce..c953d075d 100644
--- a/kicker/kicker/buttons/nonkdeappbutton.cpp
+++ b/kicker/kicker/buttons/nonkdeappbutton.cpp
@@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // our own definition
 #include "nonkdeappbutton.h"
 
-// we include the "tqmoc" file so that the KDE build system knows to create it
+// we include the "moc" file so that the TDE build system knows to create it
 #include "nonkdeappbutton.moc"
 
 // this is one of the two constructors. gets called when creating a new button
diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp
index 94d33771a..c5c25d872 100644
--- a/kioslave/trash/testtrash.cpp
+++ b/kioslave/trash/testtrash.cpp
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 
 TQString TestTrash::homeTmpDir() const
 {
-    return TQDir::homeDirPath() + "/.kde/testtrash/";
+    return TQDir::homeDirPath() + "/.trinity/testtrash/";
 }
 
 TQString TestTrash::readOnlyDirPath() const
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc
index dcb508dc8..f8533ef17 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cc
@@ -96,7 +96,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
 
     puts(i18n("  kfmclient openProfile 'profile' ['url']\n"
                 "            # Opens a window using the given profile.\n"
-                "            #   'profile' is a file under ~/.kde/share/apps/konqueror/profiles.\n"
+                "            #   'profile' is a file under ~/.trinity/share/apps/konqueror/profiles.\n"
                 "            #   'url' is an optional URL to open.\n\n").local8Bit());
 
     puts(i18n("  kfmclient openProperties 'url'\n"
diff --git a/konqueror/convert_kdelnk.sh b/konqueror/convert_kdelnk.sh
index 02ed247e6..0acc799ad 100755
--- a/konqueror/convert_kdelnk.sh
+++ b/konqueror/convert_kdelnk.sh
@@ -3,7 +3,7 @@
 # Converts all user's .kdelnk files to .desktop
 # Necessary to avoid duplication when saving a mimetype or an applnk
 
-find ~/.kde/share/mimelnk ~/.kde/share/applnk -name "*.kdelnk" -print |
+find ~/.trinity/share/mimelnk ~/.trinity/share/applnk -name "*.kdelnk" -print |
  while read k; do
   d=`echo $k|sed -e 's/\.kdelnk/\.desktop/'`
   echo "Renaming $k to $d"
@@ -11,7 +11,7 @@ find ~/.kde/share/mimelnk ~/.kde/share/applnk -name "*.kdelnk" -print |
  done
 
 # Convert user's bookmarks to .desktop and to remove .xpm from icons
-find ~/.kde/share/apps/kfm/bookmarks -type f -print |
+find ~/.trinity/share/apps/kfm/bookmarks -type f -print |
  while read k; do
   if echo $k | grep -q kdelnk; then  # kdelnk file
     d=`echo $k|sed -e 's/\.kdelnk/\.desktop/'`
diff --git a/konqueror/profile_kde_devel.desktop b/konqueror/profile_kde_devel.desktop
index 2f87dcb4b..afb7d36e8 100644
--- a/konqueror/profile_kde_devel.desktop
+++ b/konqueror/profile_kde_devel.desktop
@@ -79,21 +79,21 @@ ViewT0_PassiveMode=false
 ViewT0_ServiceName=khtml
 ViewT0_ServiceType=text/html
 ViewT0_ToggleView=false
-ViewT0_URL=http://api.kde.org/
+ViewT0_URL=http://www.trinitydesktop.org/docs/trinity/current/kdelibs/html/main.html
 ViewT1_LinkedView=false
 ViewT1_LockedLocation=false
 ViewT1_PassiveMode=false
 ViewT1_ServiceName=khtml
 ViewT1_ServiceType=text/html
 ViewT1_ToggleView=false
-ViewT1_URL=http://doc.trolltech.com/
+ViewT1_URL=http://www.trinitydesktop.org/docs/qt3/index-2.html
 ViewT2_LinkedView=false
 ViewT2_LockedLocation=false
 ViewT2_PassiveMode=false
 ViewT2_ServiceName=khtml
 ViewT2_ServiceType=text/html
 ViewT2_ToggleView=false
-ViewT2_URL=http://bugs.kde.org/
+ViewT2_URL=http://bugs.trinitydesktop.org/
 ViewT3_LinkedView=false
 ViewT3_LockedLocation=false
 ViewT3_PassiveMode=false
diff --git a/konsole/other/README.Desktop b/konsole/other/README.Desktop
index e87c88dc9..23bc81df8 100644
--- a/konsole/other/README.Desktop
+++ b/konsole/other/README.Desktop
@@ -3,4 +3,4 @@
 The session offered to be created in the File menu are
 taken from from configurations files with a *.desktop
 pattern either located in $TDEDIR/share/apps/konsole
-or ~/.kde/share/apps/konsole.
+or ~/.trinity/share/apps/konsole.
diff --git a/konsole/other/README.KeyTab b/konsole/other/README.KeyTab
index 8eeb15423..75d6cfd79 100644
--- a/konsole/other/README.KeyTab
+++ b/konsole/other/README.KeyTab
@@ -3,7 +3,7 @@
 The keytabs offered in the Options/Keyboard menu are
 taken from from configurations files with a *.keytab
 pattern either located in $TDEDIR/share/apps/konsole
-or ~/.kde/share/apps/konsole.
+or ~/.trinity/share/apps/konsole.
 
 Keytabs allow to configure the behavior of konsole
 on keyboard events, especially for functions keys.
diff --git a/konsole/other/README.Schema b/konsole/other/README.Schema
index a87f46f4d..bdc0599b5 100644
--- a/konsole/other/README.Schema
+++ b/konsole/other/README.Schema
@@ -3,7 +3,7 @@
 The schemata offered in the Options/Schema menu are
 taken from from configurations files with a *.schema
 pattern either located in $TDEDIR/share/apps/konsole
-or ~/.kde/share/apps/konsole.
+or ~/.trinity/share/apps/konsole.
 
 Schemata allow to configure the color set that konsole
 uses, together with some more information on rendition
diff --git a/ksmserver/README b/ksmserver/README
index 710fede2a..452bf75f4 100644
--- a/ksmserver/README
+++ b/ksmserver/README
@@ -122,7 +122,7 @@ desparately trying to connect to something, try setting it to some
 bogus value.
 
 In addition, ksmserver propagates both its network address and its
-process id in ~/.kde/socket-$HOSTNAME/KSMserver-$DISPLAY. A
+process id in ~/.trinity/socket-$HOSTNAME/KSMserver-$DISPLAY. A
 utility function KApplication::propagateSessionManager() reads this
 setting and sets SESSION_MANAGER accordingly, so that child processes
 can pick it up.  The function is called by clients that are started
@@ -172,6 +172,6 @@ Troubleshooting
 If you experience trouble like 'logout does not work anymore' or 'I
 cannot start new applications', as a result of a previous crash,
 ensure that ksmserver is indeed not running anymore and remove the
-file ~/.kde/socket-$HOSTNAME/KSMserver-$DISPLAY. Shouldn't be necessry, 
+file ~/.trinity/socket-$HOSTNAME/KSMserver-$DISPLAY. Shouldn't be necessry, 
 but one never knows.
 
diff --git a/libkonq/SERVICEMENUS b/libkonq/SERVICEMENUS
index 127acd6de..12035388c 100644
--- a/libkonq/SERVICEMENUS
+++ b/libkonq/SERVICEMENUS
@@ -12,7 +12,7 @@ associate it with the relevant file types.
 
 How
 ===
-Create a file ~/.kde/share/apps/konqueror/servicemenus/something.desktop
+Create a file ~/.trinity/share/apps/konqueror/servicemenus/something.desktop
 and write into it something like (without the comments) :
 
 [Desktop Entry]
diff --git a/twin/CONFIGURING b/twin/CONFIGURING
index ee5e21668..01b6696a5 100644
--- a/twin/CONFIGURING
+++ b/twin/CONFIGURING
@@ -36,7 +36,7 @@ To create such window-specific setting automatically without a need of doing
 it manually for every user (for example when doing a large deployment), follow
 these steps:
 
-- Back up your $TDEHOME/share/config/twinrulesrc ($TDEHOME usually being $HOME/.kde)
+- Back up your $TDEHOME/share/config/twinrulesrc ($TDEHOME usually being $HOME/.trinity)
  and remove it
 - Run 'dcop twin default reconfigure'
 - Create manually all window-specific settings that should be included (see above)