소스 검색

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

tags/r14.0.0
Darrell Anderson 6 년 전
부모
커밋
1c68d332fd
5개의 변경된 파일14개의 추가작업 그리고 14개의 파일을 삭제
  1. 1
    1
      kded/README.kded
  2. 1
    1
      kstyles/kthemestyle/kthemestyle.h
  3. 1
    1
      tdecore/README.kiosk
  4. 4
    4
      tdecore/README.user_profiles
  5. 7
    7
      tdecore/tdeconfigbackend.cpp

+ 1
- 1
kded/README.kded 파일 보기

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

+ 1
- 1
kstyles/kthemestyle/kthemestyle.h 파일 보기

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

+ 1
- 1
tdecore/README.kiosk 파일 보기

@@ -31,7 +31,7 @@ In KDE2 resource management has been largely abstracted by the introduction
31 31
 of the TDEStandardDirs class and has become much more flexible. The user /
32 32
 administrator can now specify a variable number of locations where resources
33 33
 can be found. A list of locations can either be specified via $TDEDIRS
34
-(notice the extra 'S'), via /etc/kderc and even via the kdeglobals config 
34
+(notice the extra 'S'), via /etc/tderc and even via the kdeglobals config 
35 35
 file. The location where user-specific resources can be found can be
36 36
 set with $TDEHOME (The default is $HOME/.trinity). Changes made by the user
37 37
 are always written back to $TDEHOME.

+ 4
- 4
tdecore/README.user_profiles 파일 보기

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

+ 7
- 7
tdecore/tdeconfigbackend.cpp 파일 보기

@@ -350,24 +350,24 @@ bool TDEConfigINIBackEnd::parseConfigFiles()
350 350
 
351 351
   // Parse the general config files
352 352
   if (useKDEGlobals) {
353
-    TQStringList kdercs = TDEGlobal::dirs()->
353
+    TQStringList tdercs = TDEGlobal::dirs()->
354 354
       findAllResources("config", TQString::fromLatin1("kdeglobals"));
355 355
 
356 356
 #ifdef Q_WS_WIN
357
-    TQString etc_kderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\kderc" );
357
+    TQString etc_tderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\tderc" );
358 358
 #else
359
-    TQString etc_kderc = TQString::fromLatin1("/etc/kderc");
359
+    TQString etc_tderc = TQString::fromLatin1("/etc/tderc");
360 360
 #endif
361 361
 
362
-    if (checkAccess(etc_kderc, R_OK))
363
-      kdercs += etc_kderc;
362
+    if (checkAccess(etc_tderc, R_OK))
363
+      tdercs += etc_tderc;
364 364
 
365
-    kdercs += TDEGlobal::dirs()->
365
+    tdercs += TDEGlobal::dirs()->
366 366
       findAllResources("config", TQString::fromLatin1("system.kdeglobals"));
367 367
 
368 368
     TQStringList::ConstIterator it;
369 369
 
370
-    for (it = kdercs.fromLast(); it != kdercs.end(); --it) {
370
+    for (it = tdercs.fromLast(); it != tdercs.end(); --it) {
371 371
 
372 372
       TQFile aConfigFile( *it );
373 373
       if (!aConfigFile.open( IO_ReadOnly ))

Loading…
취소
저장