Fix references to user profile directory.

(cherry picked from commit e256298e9d1d5f3f7fb5660f0ca33ea8489acd08)

18 files changed, 33 insertions, 33 deletions

diff --git a/README b/README
index 941771750..81c0da090 100644
--- a/README
+++ b/README
@@ -166,7 +166,7 @@ See also the file DEBUG.
 Upgrading
 ---------
 If you have an kdebase older than 3.0 installed, just copy all your .k*rc
-files from $HOME to $HOME/.kde/share/config. In the other case, default
+files from $HOME to $HOME/.trinity/share/config. In the other case, default
 values are used for most apps.
 
 
diff --git a/kab/addressbook.h b/kab/addressbook.h
index 63f5882c2..c66414c45 100644
--- a/kab/addressbook.h
+++ b/kab/addressbook.h
@@ -113,9 +113,9 @@ class CategoriesMap : public TQMap<int, TQString>
  *  instances of the program may use different data files.  Read-only addressbook
  *  files are possible. <BR>
  *  Only one configuration file per user is used, it is <BR>
- *  <TT>   ~/.kde/share/apps/kab/kab.config </TT> <BR>
+ *  <TT>   ~/.trinity/share/apps/kab/kab.config </TT> <BR>
  *  A standard user file will automatically be created as <BR> 
- *  <TT>   ~/.kde/share/apps/kab/addressbook.kab </TT> <BR>
+ *  <TT>   ~/.trinity/share/apps/kab/addressbook.kab </TT> <BR>
  *  File changes are watched by the program, so every instance will automatically
  *  update its database on a change of the opened file. 
  *
@@ -564,7 +564,7 @@ public:
   /**
    * Creates the local configuration file. The filename is fixed to
    * \c kab.config, it will be created in the local kab directory
-   * (\c $HOME/.kde/share/apps/kab). Adapt the global configuration template
+   * (\c $HOME/.trinity/share/apps/kab). Adapt the global configuration template
    * file (\c $KDEDIR/share/apps/kab/template.config) for unusual site-specific
    * settings.
    * The method does not load the new config file.
diff --git a/kab/kabapi.h b/kab/kabapi.h
index 9289d3f98..17d95512d 100644
--- a/kab/kabapi.h
+++ b/kab/kabapi.h
@@ -82,7 +82,7 @@ public:
   KabAPI(TQWidget* parent=0, const char* name=0);
   /**
    * You must call init before accessing the database. init opens the
-   * database file (usually $HOME/.kde/share/apps/kab/addressbook.database)
+   * database file (usually $HOME/.trinity/share/apps/kab/addressbook.database)
    * and loads its contents.
    * @return NoError if all succeeded or a valid ErrorCode.
    * @see AddressBook::ErrorCode
diff --git a/kabc/HOWTO b/kabc/HOWTO
index 37f7ccefe..7b41371b0 100644
--- a/kabc/HOWTO
+++ b/kabc/HOWTO
@@ -344,7 +344,7 @@ In the first line a KABC::DistributionListManager is created. The manager takes
 a pointer to a KABC::AddressBook, because he has to resolve the stored uids to
 currently available email addresses.
 In line 4 the manager loads all distribution lists from the central config file
-$HOME/.kde/share/apps/kabc/distlists.
+$HOME/.trinity/share/apps/kabc/distlists.
 The next line queries the names of all available distribution lists, which are
 used in line 9 to retrieve a pointer to the specific list.
 Now that you have a KABC::DistributionList object, you can performe the
diff --git a/kconf_update/README.kconf_update b/kconf_update/README.kconf_update
index 14d50ad66..25a0d8f98 100644
--- a/kconf_update/README.kconf_update
+++ b/kconf_update/README.kconf_update
@@ -211,9 +211,9 @@ The easiest is to not install the kconf_update script in the first place, but
 manually call it through a pipe. If you want to test the update script for
 your application KHello's config file khellorc, you can test by using
 
-    cat ~/.kde/share/config/khellorc | khello_conf_update.sh
+    cat ~/.trinity/share/config/khellorc | khello_conf_update.sh
 
-(assuming khello_conf_update.sh is the kconf_update script and ~/.kde is your
+(assuming khello_conf_update.sh is the kconf_update script and ~/.trinity is your
 $KDEHOME). This is easier than making install every time, but has the obvious
 downside that you need to 'parse' your script's output yourself instead of
 letting kconf_update do it and check the resulting output file.
diff --git a/kdecore/README.kiosk b/kdecore/README.kiosk
index 78df1ced4..0cdadc9a9 100644
--- a/kdecore/README.kiosk
+++ b/kdecore/README.kiosk
@@ -25,7 +25,7 @@ sounds, menu-descriptions and configuration files.
 
 In KDE1 there were two locations were resources could be located: The 
 resources provided by the system were located under $KDEDIR and user-
-specific resources were located under $HOME/.kde.
+specific resources were located under $HOME/.trinity.
 
 In KDE2 resource management has been largely abstracted by the introduction
 of the KStandardDirs class and has become much more flexible. The user /
@@ -33,7 +33,7 @@ administrator can now specify a variable number of locations where resources
 can be found. A list of locations can either be specified via $KDEDIRS
 (notice the extra 'S'), via /etc/kderc and even via the kdeglobals config 
 file. The location where user-specific resources can be found can be
-set with $KDEHOME (The default is $HOME/.kde). Changes made by the user
+set with $KDEHOME (The default is $HOME/.trinity). Changes made by the user
 are always written back to $KDEHOME.
 
 Both KDE1 and KDE2 feature so called "cascading configuration files": There
@@ -102,8 +102,8 @@ To make the configration file of kicker (the panel) immutable one could for
 example use the commands below.
 
 Example:
-chown root.root /home/user/.kde/share/config/kickerrc
-chmod 644 /home/user/.kde/share/config/kickerrc
+chown root.root /home/user/.trinity/share/config/kickerrc
+chmod 644 /home/user/.trinity/share/config/kickerrc
 
 If you do this, the user will be warned that the configuration file is not
 writable. Since you will normally not want that, you can add the following
diff --git a/kdecore/kconfig_compiler/tests/test9main.cpp b/kdecore/kconfig_compiler/tests/test9main.cpp
index 12e16e0d4..39b904af9 100644
--- a/kdecore/kconfig_compiler/tests/test9main.cpp
+++ b/kdecore/kconfig_compiler/tests/test9main.cpp
@@ -32,7 +32,7 @@ int main( int, char*[] )
   kdWarning() << myPathsList2 << endl;
 
   // add another path
-  TQStringList newlist = TQDir::homeDirPath() + TQString::fromLatin1("/.kde");
+  TQStringList newlist = TQDir::homeDirPath() + TQString::fromLatin1("/.trinity");
   myPathsList2 = myPathsList2 + newlist;
   kdWarning() << myPathsList2 << endl;
 
diff --git a/kdecore/kstandarddirs.h b/kdecore/kstandarddirs.h
index 72dd1c470..53219b575 100644
--- a/kdecore/kstandarddirs.h
+++ b/kdecore/kstandarddirs.h
@@ -53,7 +53,7 @@ class KStandardDirsPrivate;
  * The main idea behind KStandardDirs is that there are several
  * toplevel prefixes below which the files lie. One of these prefixes is
  * the one where the user installed kdelibs, one is where the
- * application was installed, and one is $HOME/.kde, but there
+ * application was installed, and one is $HOME/.trinity, but there
  * 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
@@ -63,7 +63,7 @@ class KStandardDirsPrivate;
  * To make the thing even more complex, it's also possible to register
  * absolute paths that KStandardDirs looks up after not finding anything
  * in the former steps. They can be useful if the user wants to provide
- * specific directories that aren't in his $HOME/.kde directory for,
+ * specific directories that aren't in his $HOME/.trinity directory for,
  * for example, icons.
  *
  * <b>Standard resources that kdelibs allocates are:</b>\n
@@ -114,10 +114,10 @@ class KStandardDirsPrivate;
  *          ignored.
  * @li KDEHOME: The directory where changes are saved to. This directory is
  *          used to search for resources first. If KDEHOME is not
- *          specified it defaults to "$HOME/.kde"
+ *          specified it defaults to "$HOME/.trinity"
  * @li KDEROOTHOME: Like KDEHOME, but used for the root user.
  *          If KDEROOTHOME is not set it defaults to the .kde directory in the
- *          home directory of root, usually "/root/.kde".
+ *          home directory of root, usually "/root/.trinity".
  *          Note that the setting of $HOME is ignored in this case.
  *
  * @see KGlobalSettings
@@ -263,7 +263,7 @@ public:
 	 * specified type and a relative path. So would
 	 * findDirs("apps", "Settings") return
 	 * @li /opt/kde/share/applnk/Settings/
-	 * @li /home/joe/.kde/share/applnk/Settings/
+	 * @li /home/joe/.trinity/share/applnk/Settings/
 	 *
 	 * Note that it appends / to the end of the directories,
 	 * so you can use this right away as directory names.
@@ -546,7 +546,7 @@ public:
 
 	/**
 	 * Returns the toplevel directory in which KStandardDirs
-	 * will store things. Most likely $HOME/.kde
+	 * will store things. Most likely $HOME/.trinity
 	 * Don't use this function if you can use locateLocal
 	 * @return the toplevel directory
 	 */
diff --git a/kdecore/tests/kurltest.cpp b/kdecore/tests/kurltest.cpp
index e80561d2c..640d38707 100644
--- a/kdecore/tests/kurltest.cpp
+++ b/kdecore/tests/kurltest.cpp
@@ -189,7 +189,7 @@ int main(int argc, char *argv[])
   url1= "KDE";
   check("KURL::isValid()", url1.isValid()?"TRUE":"FALSE", "FALSE" );
 
-  url1= "$HOME/.kde/share/config";
+  url1= "$HOME/.trinity/share/config";
   check("KURL::isValid()", url1.isValid()?"TRUE":"FALSE", "FALSE" );
 
   u1 = "file:/opt/kde2/qt2/doc/html/showimg-main-cpp.html#TQObject::connect";
diff --git a/kdeui/kedittoolbar.h b/kdeui/kedittoolbar.h
index 9033ff17f..55e8bde5f 100644
--- a/kdeui/kedittoolbar.h
+++ b/kdeui/kedittoolbar.h
@@ -370,7 +370,7 @@ public:
 
   /**
    * Save any changes the user made.  The file will be in the user's
-   * local directory (usually $HOME/.kde/share/apps/\<appname\>).  The
+   * local directory (usually $HOME/.trinity/share/apps/\<appname\>).  The
    * filename will be the one specified in the constructor.. or the
    * made up one if the filename was NULL.
    *
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 73f292877..e152252b3 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -1782,7 +1782,7 @@ int main(int argc, char **argv, char **envp)
    if (keep_running)
    {
       /*
-       * Create ~/.kde/tmp-<hostname>/kdeinit-<display> socket for incoming wrapper
+       * Create ~/.trinity/tmp-<hostname>/kdeinit-<display> socket for incoming wrapper
        * requests.
        */
       init_kdeinit_socket();
diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h
index 403a2e1b3..450ed22fe 100644
--- a/kio/bookmarks/kbookmarkmanager.h
+++ b/kio/bookmarks/kbookmarkmanager.h
@@ -64,7 +64,7 @@ protected:
      * called.
      *
      * @param bookmarksFile full path to the bookmarks file,
-     * Use ~/.kde/share/apps/konqueror/bookmarks.xml for the konqueror bookmarks
+     * Use ~/.trinity/share/apps/konqueror/bookmarks.xml for the konqueror bookmarks
      *
      * @param bImportDesktopFiles if true, and if the bookmarksFile
      * doesn't already exist, import bookmarks from desktop files
@@ -200,7 +200,7 @@ public:
      * instantiate it before this method is ever called.
      *
      * @param bookmarksFile full path to the bookmarks file,
-     * Use ~/.kde/share/apps/konqueror/bookmarks.xml for the konqueror bookmarks
+     * Use ~/.trinity/share/apps/konqueror/bookmarks.xml for the konqueror bookmarks
      *
      * @param bImportDesktopFiles if true, and if the bookmarksFile
      * doesn't already exist, import bookmarks from desktop files
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index ac485eb93..3ce3f27cd 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -1398,7 +1398,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job )
   assert( properties->item() );
   assert( !properties->item()->url().isEmpty() );
 
-  // Save the file where we can -> usually in ~/.kde/...
+  // Save the file where we can -> usually in ~/.trinity/...
   if (KBindingPropsPlugin::supports(properties->items()) && !m_sRelativePath.isEmpty())
   {
     KURL newURL;
diff --git a/kio/kio/kservice.cpp b/kio/kio/kservice.cpp
index fb6deb27c..49641032b 100644
--- a/kio/kio/kservice.cpp
+++ b/kio/kio/kservice.cpp
@@ -198,7 +198,7 @@ KService::init( KDesktopFile *config )
 
   m_strExec = config->readPathEntry( "Exec" );
   if (kde4application && !m_strExec.startsWith("/")) {
-    m_strExec = "KDEHOME=$HOME/.kde XDG_DATA_DIRS=/usr/share KDEDIRS=/usr/ XDG_CONFIG_DIRS=/etc/xdg/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$PATH "+m_strExec;
+    m_strExec = "KDEHOME=$HOME/.trinity XDG_DATA_DIRS=/usr/share KDEDIRS=/usr/ XDG_CONFIG_DIRS=/etc/xdg/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$PATH "+m_strExec;
   } else if (config->readBoolEntry("X-KDE-SubstituteUID")) {
     int space = m_strExec.find(" ");
     if (space==-1)
diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp
index 88f7d3059..63f1164dd 100644
--- a/kio/kioexec/main.cpp
+++ b/kio/kioexec/main.cpp
@@ -108,7 +108,7 @@ KIOExec::KIOExec()
                 TQString fileName = KIO::encodeFileName( url.fileName() );
                 if ( !suggestedFileName.isEmpty() )
                     fileName = suggestedFileName;
-                // Build the destination filename, in ~/.kde/cache-*/krun/
+                // Build the destination filename, in ~/.trinity/cache-*/krun/
                 // Unlike KDE-1.1, we put the filename at the end so that the extension is kept
                 // (Some programs rely on it)
                 TQString tmp = KGlobal::dirs()->saveLocation( "cache", "krun/" ) +
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index 04c33f7fd..fb2b001db 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/tests/jobtest.cpp
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
 
 TQString JobTest::homeTmpDir() const
 {
-    return TQDir::homeDirPath() + "/.kde/jobtest/";
+    return TQDir::homeDirPath() + "/.trinity/jobtest/";
 }
 
 TQString JobTest::otherTmpDir() const
@@ -89,12 +89,12 @@ TQString JobTest::otherTmpDir() const
 
 KURL JobTest::systemTmpDir() const
 {
-    return "system:/home/.kde/jobtest-system/";
+    return "system:/home/.trinity/jobtest-system/";
 }
 
 TQString JobTest::realSystemPath() const
 {
-    return TQDir::homeDirPath() + "/.kde/jobtest-system/";
+    return TQDir::homeDirPath() + "/.trinity/jobtest-system/";
 }
 
 void JobTest::setup()
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index 8e4b023cb..c6c2a3e8e 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -297,10 +297,10 @@ int main(int argc, char **argv)
     filter( "$QTDIR/doc/html/functions.html#s", TQCString("file://")+qtdir+"/doc/html/functions.html#s", KURIFilterData::LOCAL_FILE );
     filter( "http://www.kde.org/$USER", "http://www.kde.org/$USER", KURIFilterData::NET_PROTOCOL ); // no expansion
 
-    // Assume the default (~/.kde) if
+    // Assume the default (~/.trinity) if
     if (kdehome.isEmpty())
     {
-      kdehome += "$HOME/.kde";
+      kdehome += "$HOME/.trinity";
       setenv("KDEHOME", kdehome.data(), 0);
     }
 
diff --git a/kresources/README.design b/kresources/README.design
index 563d0aeed..842a750e0 100644
--- a/kresources/README.design
+++ b/kresources/README.design
@@ -42,7 +42,7 @@ type, but with different settings. These resources are persistent,
 and they are managed by the ResourceManager for the calendar
 resource family. The list of resources, and the settings for
 each resource, are stored by the resource manager using KConfig,
-in $HOME/.kde/share/config/<family>.
+in $HOME/.trinity/share/config/<family>.
 
 The resource manager is a singleton object for every resource family. 
 Use the resource manager to get the list of available resource types