TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix references to user profile directory.

Browse Source 
(cherry picked from commit e256298e9d)
v3.5.13-sru
Darrell Anderson 12 years ago committed by Slávek Banko
parent 0392945227
commit 205b339771
18 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

2
README
Unescape View File

@ -166,7 +166,7 @@ See also the file DEBUG.
Upgrading Upgrading
--------- ---------
If you have an kdebase older than 3.0 installed, just copy all your .k*rc 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. values are used for most apps.

6
kab/addressbook.h
Unescape View File

@ -113,9 +113,9 @@ class CategoriesMap : public TQMap<int, TQString>
* instances of the program may use different data files. Read-only addressbook * instances of the program may use different data files. Read-only addressbook
* files are possible. <BR> * files are possible. <BR>
* Only one configuration file per user is used, it is <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> * 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 * File changes are watched by the program, so every instance will automatically
* update its database on a change of the opened file. * 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 * Creates the local configuration file. The filename is fixed to
* \c kab.config, it will be created in the local kab directory * \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 * file (\c $KDEDIR/share/apps/kab/template.config) for unusual site-specific
* settings. * settings.
* The method does not load the new config file. * The method does not load the new config file.

2
kab/kabapi.h
Unescape View File

@ -82,7 +82,7 @@ public:
KabAPI(TQWidget* parent=0, const char* name=0); KabAPI(TQWidget* parent=0, const char* name=0);
/** /**
* You must call init before accessing the database. init opens the * 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. * and loads its contents.
* @return NoError if all succeeded or a valid ErrorCode. * @return NoError if all succeeded or a valid ErrorCode.
* @see AddressBook::ErrorCode * @see AddressBook::ErrorCode

2
kabc/HOWTO
Unescape View File

@ -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 a pointer to a KABC::AddressBook, because he has to resolve the stored uids to
currently available email addresses. currently available email addresses.
In line 4 the manager loads all distribution lists from the central config file 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 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. used in line 9 to retrieve a pointer to the specific list.
Now that you have a KABC::DistributionList object, you can performe the Now that you have a KABC::DistributionList object, you can performe the

4
kconf_update/README.kconf_update
Unescape View File

@ -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 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 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 $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 downside that you need to 'parse' your script's output yourself instead of
letting kconf_update do it and check the resulting output file. letting kconf_update do it and check the resulting output file.

8
kdecore/README.kiosk
Unescape View File

@ -25,7 +25,7 @@ sounds, menu-descriptions and configuration files.
In KDE1 there were two locations were resources could be located: The In KDE1 there were two locations were resources could be located: The
resources provided by the system were located under $KDEDIR and user- 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 In KDE2 resource management has been largely abstracted by the introduction
of the KStandardDirs class and has become much more flexible. The user / 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 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 (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 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. are always written back to $KDEHOME.
Both KDE1 and KDE2 feature so called "cascading configuration files": There 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 use the commands below.
Example: Example:
chown root.root /home/user/.kde/share/config/kickerrc chown root.root /home/user/.trinity/share/config/kickerrc
chmod 644 /home/user/.kde/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 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 writable. Since you will normally not want that, you can add the following

2
kdecore/kconfig_compiler/tests/test9main.cpp
Unescape View File

@ -32,7 +32,7 @@ int main( int, char*[] )
kdWarning() << myPathsList2 << endl; kdWarning() << myPathsList2 << endl;
// add another path // add another path
TQStringList newlist = TQDir::homeDirPath() + TQString::fromLatin1("/.kde"); TQStringList newlist = TQDir::homeDirPath() + TQString::fromLatin1("/.trinity");
myPathsList2 = myPathsList2 + newlist; myPathsList2 = myPathsList2 + newlist;
kdWarning() << myPathsList2 << endl; kdWarning() << myPathsList2 << endl;

12
kdecore/kstandarddirs.h
Unescape View File

@ -53,7 +53,7 @@ class KStandardDirsPrivate;
* The main idea behind KStandardDirs is that there are several * The main idea behind KStandardDirs is that there are several
* toplevel prefixes below which the files lie. One of these prefixes is * toplevel prefixes below which the files lie. One of these prefixes is
* the one where the user installed kdelibs, one is where the * 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 * may be even more. Under these prefixes there are several well
* defined suffixes where specific resource types are to be found. * defined suffixes where specific resource types are to be found.
* For example, for the resource type "html" the suffixes could be * 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 * To make the thing even more complex, it's also possible to register
* absolute paths that KStandardDirs looks up after not finding anything * absolute paths that KStandardDirs looks up after not finding anything
* in the former steps. They can be useful if the user wants to provide * 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. * for example, icons.
* *
* <b>Standard resources that kdelibs allocates are:</b>\n * <b>Standard resources that kdelibs allocates are:</b>\n
@ -114,10 +114,10 @@ class KStandardDirsPrivate;
* ignored. * ignored.
* @li KDEHOME: The directory where changes are saved to. This directory is * @li KDEHOME: The directory where changes are saved to. This directory is
* used to search for resources first. If KDEHOME is not * 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. * @li KDEROOTHOME: Like KDEHOME, but used for the root user.
* If KDEROOTHOME is not set it defaults to the .kde directory in the * 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. * Note that the setting of $HOME is ignored in this case.
* *
* @see KGlobalSettings * @see KGlobalSettings
@ -263,7 +263,7 @@ public:
* specified type and a relative path. So would * specified type and a relative path. So would
* findDirs("apps", "Settings") return * findDirs("apps", "Settings") return
* @li /opt/kde/share/applnk/Settings/ * @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, * Note that it appends / to the end of the directories,
* so you can use this right away as directory names. * so you can use this right away as directory names.
@ -546,7 +546,7 @@ public:
/** /**
* Returns the toplevel directory in which KStandardDirs * 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 * Don't use this function if you can use locateLocal
* @return the toplevel directory * @return the toplevel directory
*/ */

2
kdecore/tests/kurltest.cpp
Unescape View File

@ -189,7 +189,7 @@ int main(int argc, char *argv[])
url1= "KDE"; url1= "KDE";
check("KURL::isValid()", url1.isValid()?"TRUE":"FALSE", "FALSE" ); 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" ); check("KURL::isValid()", url1.isValid()?"TRUE":"FALSE", "FALSE" );
u1 = "file:/opt/kde2/qt2/doc/html/showimg-main-cpp.html#TQObject::connect"; u1 = "file:/opt/kde2/qt2/doc/html/showimg-main-cpp.html#TQObject::connect";

2
kdeui/kedittoolbar.h
Unescape View File

@ -370,7 +370,7 @@ public:
/** /**
* Save any changes the user made. The file will be in the user's * 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 * filename will be the one specified in the constructor.. or the
* made up one if the filename was NULL. * made up one if the filename was NULL.
* *

2
kinit/kinit.cpp
Unescape View File

@ -1782,7 +1782,7 @@ int main(int argc, char **argv, char **envp)
if (keep_running) if (keep_running)
{ {
/* /*
* Create ~/.kde/tmp-<hostname>/kdeinit-<display> socket for incoming wrapper * Create ~/.trinity/tmp-<hostname>/kdeinit-<display> socket for incoming wrapper
* requests. * requests.
*/ */
init_kdeinit_socket(); init_kdeinit_socket();

4
kio/bookmarks/kbookmarkmanager.h
Unescape View File

@ -64,7 +64,7 @@ protected:
* called. * called.
* *
* @param bookmarksFile full path to the bookmarks file, * @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 * @param bImportDesktopFiles if true, and if the bookmarksFile
* doesn't already exist, import bookmarks from desktop files * doesn't already exist, import bookmarks from desktop files
@ -200,7 +200,7 @@ public:
* instantiate it before this method is ever called. * instantiate it before this method is ever called.
* *
* @param bookmarksFile full path to the bookmarks file, * @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 * @param bImportDesktopFiles if true, and if the bookmarksFile
* doesn't already exist, import bookmarks from desktop files * doesn't already exist, import bookmarks from desktop files

2
kio/kfile/kpropertiesdialog.cpp
Unescape View File

@ -1398,7 +1398,7 @@ void KFilePropsPlugin::slotCopyFinished( KIO::Job * job )
assert( properties->item() ); assert( properties->item() );
assert( !properties->item()->url().isEmpty() ); 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()) if (KBindingPropsPlugin::supports(properties->items()) && !m_sRelativePath.isEmpty())
{ {
KURL newURL; KURL newURL;

2
kio/kio/kservice.cpp
Unescape View File

@ -198,7 +198,7 @@ KService::init( KDesktopFile *config )
m_strExec = config->readPathEntry( "Exec" ); m_strExec = config->readPathEntry( "Exec" );
if (kde4application && !m_strExec.startsWith("/")) { 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")) { } else if (config->readBoolEntry("X-KDE-SubstituteUID")) {
int space = m_strExec.find(" "); int space = m_strExec.find(" ");
if (space==-1) if (space==-1)

2
kio/kioexec/main.cpp
Unescape View File

@ -108,7 +108,7 @@ KIOExec::KIOExec()
TQString fileName = KIO::encodeFileName( url.fileName() ); TQString fileName = KIO::encodeFileName( url.fileName() );
if ( !suggestedFileName.isEmpty() ) if ( !suggestedFileName.isEmpty() )
fileName = suggestedFileName; 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 // Unlike KDE-1.1, we put the filename at the end so that the extension is kept
// (Some programs rely on it) // (Some programs rely on it)
TQString tmp = KGlobal::dirs()->saveLocation( "cache", "krun/" ) + TQString tmp = KGlobal::dirs()->saveLocation( "cache", "krun/" ) +

6
kio/tests/jobtest.cpp
Unescape View File

@ -78,7 +78,7 @@ int main(int argc, char *argv[])
TQString JobTest::homeTmpDir() const TQString JobTest::homeTmpDir() const
{ {
return TQDir::homeDirPath() + "/.kde/jobtest/"; return TQDir::homeDirPath() + "/.trinity/jobtest/";
} }
TQString JobTest::otherTmpDir() const TQString JobTest::otherTmpDir() const
@ -89,12 +89,12 @@ TQString JobTest::otherTmpDir() const
KURL JobTest::systemTmpDir() const KURL JobTest::systemTmpDir() const
{ {
return "system:/home/.kde/jobtest-system/"; return "system:/home/.trinity/jobtest-system/";
} }
TQString JobTest::realSystemPath() const TQString JobTest::realSystemPath() const
{ {
return TQDir::homeDirPath() + "/.kde/jobtest-system/"; return TQDir::homeDirPath() + "/.trinity/jobtest-system/";
} }
void JobTest::setup() void JobTest::setup()

4
kio/tests/kurifiltertest.cpp
Unescape View File

@ -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( "$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 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()) if (kdehome.isEmpty())
{ {
kdehome += "$HOME/.kde"; kdehome += "$HOME/.trinity";
setenv("KDEHOME", kdehome.data(), 0); setenv("KDEHOME", kdehome.data(), 0);
} }

2
kresources/README.design
Unescape View File

@ -42,7 +42,7 @@ type, but with different settings. These resources are persistent,
and they are managed by the ResourceManager for the calendar and they are managed by the ResourceManager for the calendar
resource family. The list of resources, and the settings for resource family. The list of resources, and the settings for
each resource, are stored by the resource manager using KConfig, 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. The resource manager is a singleton object for every resource family.
Use the resource manager to get the list of available resource types Use the resource manager to get the list of available resource types

Write Preview
Loading…
Cancel
Save