diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-04 01:46:07 -0500 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-11-09 01:57:38 +0100 |
commit | 205b3397710e08554fe2be67dee5fa4876e8d234 (patch) | |
tree | 28a5fc9e5fb7519f0063310cf0f70f521244fdec /kdecore | |
parent | 03929452275f29cf2c2cb7b331be898838506e14 (diff) | |
download | tdelibs-205b3397710e08554fe2be67dee5fa4876e8d234.tar.gz tdelibs-205b3397710e08554fe2be67dee5fa4876e8d234.zip |
Fix references to user profile directory.
(cherry picked from commit e256298e9d1d5f3f7fb5660f0ca33ea8489acd08)
Diffstat (limited to 'kdecore')
-rw-r--r-- | kdecore/README.kiosk | 8 | ||||
-rw-r--r-- | kdecore/kconfig_compiler/tests/test9main.cpp | 2 | ||||
-rw-r--r-- | kdecore/kstandarddirs.h | 12 | ||||
-rw-r--r-- | kdecore/tests/kurltest.cpp | 2 |
4 files changed, 12 insertions, 12 deletions
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"; |