Rename kderc -> tderc in support of bug report 1447.

pull/16/head
Darrell Anderson 12 years ago
parent d6ee27dacd
commit 1c68d332fd

@ -80,7 +80,7 @@ filesystem, or when DNOTIFY is used. Specifying larger intervals may reduce
the CPU load and/or network traffic. Shorter intervals are not recommended. the CPU load and/or network traffic. Shorter intervals are not recommended.
Please note that in previous versions of KDE these options where listed in Please note that in previous versions of KDE these options where listed in
the kderc file. the tderc file.
Example kdeglobals fragment: Example kdeglobals fragment:

@ -74,7 +74,7 @@ public:
* *
* @param configDir The directory which has the TDEConfig file. * @param configDir The directory which has the TDEConfig file.
* @param configFile A TDEConfig file to use as the theme configuration. * @param configFile A TDEConfig file to use as the theme configuration.
* Defaults to ~/.kderc. * Defaults to ~/.tderc.
*/ */
KThemeStyle( const TQString& configDir, const TQString &configFile = TQString::null ); KThemeStyle( const TQString& configDir, const TQString &configFile = TQString::null );
~KThemeStyle(); ~KThemeStyle();

@ -31,7 +31,7 @@ In KDE2 resource management has been largely abstracted by the introduction
of the TDEStandardDirs class and has become much more flexible. The user / of the TDEStandardDirs class and has become much more flexible. The user /
administrator can now specify a variable number of locations where resources administrator can now specify a variable number of locations where resources
can be found. A list of locations can either be specified via $TDEDIRS 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 (notice the extra 'S'), via /etc/tderc 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 $TDEHOME (The default is $HOME/.trinity). Changes made by the user set with $TDEHOME (The default is $HOME/.trinity). Changes made by the user
are always written back to $TDEHOME. are always written back to $TDEHOME.

@ -12,7 +12,7 @@ Mapping profiles to users
========================= =========================
A mapping file determines which profile(s) should be used for which user. A mapping file determines which profile(s) should be used for which user.
The mapping file can be configured in /etc/kderc in the [Directories] group: The mapping file can be configured in /etc/tderc in the [Directories] group:
[Directories] [Directories]
userProfileMapFile=/etc/kde-user-profile userProfileMapFile=/etc/kde-user-profile
@ -99,7 +99,7 @@ user will be assigned the "default" profile.
The Profile determines the directory prefixes The Profile determines the directory prefixes
============================================= =============================================
The global KDE configuration file (e.g. kdeglobals or /etc/kderc) can The global KDE configuration file (e.g. kdeglobals or /etc/tderc) can
contain config-groups that are associated with a certain user profile. contain config-groups that are associated with a certain user profile.
Such a config-group is treated similar as the [Directories] config-group. Such a config-group is treated similar as the [Directories] config-group.
@ -109,7 +109,7 @@ The name of a such config-group is [Directories-<ProfileName>]
Integration with KIOSK Admin Tool Integration with KIOSK Admin Tool
================================= =================================
The KIOSK Admin Tool uses /etc/kderc as source for all its profile The KIOSK Admin Tool uses /etc/tderc as source for all its profile
information. For this it uses the following keys in the information. For this it uses the following keys in the
[Directories-<ProfileName>] config-group: [Directories-<ProfileName>] config-group:
@ -126,7 +126,7 @@ as default installation directory for this profile.
Default setting as example Default setting as example
========================== ==========================
The following snipped could be added to /etc/kderc to define a "default" profile: The following snipped could be added to /etc/tderc to define a "default" profile:
[Directories-default] [Directories-default]
ProfileDescription=Default profile ProfileDescription=Default profile

@ -350,24 +350,24 @@ bool TDEConfigINIBackEnd::parseConfigFiles()
// Parse the general config files // Parse the general config files
if (useKDEGlobals) { if (useKDEGlobals) {
TQStringList kdercs = TDEGlobal::dirs()-> TQStringList tdercs = TDEGlobal::dirs()->
findAllResources("config", TQString::fromLatin1("kdeglobals")); findAllResources("config", TQString::fromLatin1("kdeglobals"));
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
TQString etc_kderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\kderc" ); TQString etc_tderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\tderc" );
#else #else
TQString etc_kderc = TQString::fromLatin1("/etc/kderc"); TQString etc_tderc = TQString::fromLatin1("/etc/tderc");
#endif #endif
if (checkAccess(etc_kderc, R_OK)) if (checkAccess(etc_tderc, R_OK))
kdercs += etc_kderc; tdercs += etc_tderc;
kdercs += TDEGlobal::dirs()-> tdercs += TDEGlobal::dirs()->
findAllResources("config", TQString::fromLatin1("system.kdeglobals")); findAllResources("config", TQString::fromLatin1("system.kdeglobals"));
TQStringList::ConstIterator it; TQStringList::ConstIterator it;
for (it = kdercs.fromLast(); it != kdercs.end(); --it) { for (it = tdercs.fromLast(); it != tdercs.end(); --it) {
TQFile aConfigFile( *it ); TQFile aConfigFile( *it );
if (!aConfigFile.open( IO_ReadOnly )) if (!aConfigFile.open( IO_ReadOnly ))

Loading…
Cancel
Save