summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-11-04 01:46:07 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-11-04 01:46:07 -0500
commite256298e9d1d5f3f7fb5660f0ca33ea8489acd08 (patch)
treec1cb331fe9ebe18846c72c565342b82ce824877d
parent55c0d54a9863b438be2949a4629ec3fb0a307fe4 (diff)
downloadtdelibs-e256298e9d1d5f3f7fb5660f0ca33ea8489acd08.tar.gz
tdelibs-e256298e9d1d5f3f7fb5660f0ca33ea8489acd08.zip
Fix references to user profile directory.
-rw-r--r--README2
-rw-r--r--kab/addressbook.h6
-rw-r--r--kab/kabapi.h2
-rw-r--r--kabc/HOWTO2
-rw-r--r--kconf_update/README.kconf_update4
-rw-r--r--kinit/kinit.cpp2
-rw-r--r--kio/bookmarks/kbookmarkmanager.h4
-rw-r--r--kio/kfile/kpropertiesdialog.cpp2
-rw-r--r--kio/kio/kservice.cpp2
-rw-r--r--kio/kioexec/main.cpp2
-rw-r--r--kio/tests/jobtest.cpp6
-rw-r--r--kio/tests/kurifiltertest.cpp6
-rw-r--r--kresources/README.design2
-rw-r--r--tdecore/README.kiosk8
-rw-r--r--tdecore/kconfig_compiler/tests/test9main.cpp2
-rw-r--r--tdecore/kstandarddirs.h12
-rw-r--r--tdecore/tests/kurltest.cpp2
-rw-r--r--tdeui/kedittoolbar.h2
18 files changed, 34 insertions, 34 deletions
diff --git a/README b/README
index 2d720bb4..9a829717 100644
--- a/README
+++ b/README
@@ -166,7 +166,7 @@ See also the file DEBUG.
Upgrading
---------
If you have an tdebase 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 e4ac7382..bd71b23b 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 $TDEDIR/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 cc73f674..6cf46c37 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 37f7ccef..7b41371b 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 32c087c0..c8229c73 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
$TDEHOME). 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/kinit/kinit.cpp b/kinit/kinit.cpp
index 191757d0..11fed9c3 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>/tdeinit-<display> socket for incoming wrapper
+ * Create ~/.trinity/tmp-<hostname>/tdeinit-<display> socket for incoming wrapper
* requests.
*/
init_tdeinit_socket();
diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h
index f2d4021f..d076eefc 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 30d6e063..8d76b99d 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 28ee1b91..6dfd5a85 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 = "TDEHOME=$HOME/.kde XDG_DATA_DIRS=/usr/share TDEDIRS=/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 = "TDEHOME=$HOME/.trinity XDG_DATA_DIRS=/usr/share TDEDIRS=/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-TDE-SubstituteUID")) {
int space = m_strExec.find(" ");
if (space==-1)
diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp
index 88f7d305..63f1164d 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 3ed748d9..463c464d 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 a1ebf2e4..7f448c54 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -155,7 +155,7 @@ int main(int argc, char **argv)
{
// Ensure that user configuration doesn't change the results of those tests
// TDEHOME needs to be writable though, for a ksycoca database
- setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-kurifiltertest" ), true );
+ setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.tde-kurifiltertest" ), true );
setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
KAboutData aboutData(appName, programName, version, description);
@@ -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 (tdehome.isEmpty())
{
- tdehome += "$HOME/.kde";
+ tdehome += "$HOME/.trinity";
setenv("TDEHOME", tdehome.data(), 0);
}
diff --git a/kresources/README.design b/kresources/README.design
index beafa0bf..b2163c8b 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
diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk
index 1e723824..896981d3 100644
--- a/tdecore/README.kiosk
+++ b/tdecore/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 $TDEDIR 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 $TDEDIRS
(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 $TDEHOME (The default is $HOME/.kde). Changes made by the user
+set with $TDEHOME (The default is $HOME/.trinity). Changes made by the user
are always written back to $TDEHOME.
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/tdecore/kconfig_compiler/tests/test9main.cpp b/tdecore/kconfig_compiler/tests/test9main.cpp
index 12e16e0d..39b904af 100644
--- a/tdecore/kconfig_compiler/tests/test9main.cpp
+++ b/tdecore/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/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index 4dbd8656..77fec4ef 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/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 tdelibs, 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 tdelibs allocates are:</b>\n
@@ -114,10 +114,10 @@ class KStandardDirsPrivate;
* ignored.
* @li TDEHOME: The directory where changes are saved to. This directory is
* used to search for resources first. If TDEHOME is not
- * specified it defaults to "$HOME/.kde"
+ * specified it defaults to "$HOME/.trinity"
* @li TDEROOTHOME: Like TDEHOME, but used for the root user.
* If TDEROOTHOME 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/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp
index 57ef996e..563eb893 100644
--- a/tdecore/tests/kurltest.cpp
+++ b/tdecore/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/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h
index 4fcd5ac3..60a15d5d 100644
--- a/tdeui/kedittoolbar.h
+++ b/tdeui/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.
*