Browse Source

Rename KDEHOME and KDEDIR

Timothy Pearson 7 years ago
parent
commit
99cc033990
59 changed files with 145 additions and 145 deletions
  1. 6
    6
      COMPILING
  2. 6
    6
      COMPILING.html
  3. 2
    2
      KDE2PORTING.html
  4. 1
    1
      config.h.cmake
  5. 1
    1
      configure.in.in
  6. 1
    1
      doc/common/README.Doxygen
  7. 1
    1
      doc/tdelibs/man-kbuildsycoca.8.docbook
  8. 1
    1
      kab/addressbook.h
  9. 1
    1
      kabc/scripts/createisomap.pl
  10. 1
    1
      kate/data/maxima.xml
  11. 1
    1
      kate/part/test_regression.cpp
  12. 3
    3
      kconf_update/README.kconf_update
  13. 1
    1
      kded/HOWTO
  14. 2
    2
      kded/kbuildsycoca.cpp
  15. 1
    1
      kdewidgets/README
  16. 1
    1
      kdoctools/kio_help.upd
  17. 1
    1
      khtml/java/kjavaprocess.h
  18. 1
    1
      khtml/test_regression.cpp
  19. 4
    4
      kinit/README.DCOP
  20. 1
    1
      kinit/README.autostart
  21. 2
    2
      kinit/README.wrapper
  22. 1
    1
      kinit/kdostartupconfig.cpp
  23. 4
    4
      kinit/kstartupconfig.cpp
  24. 2
    2
      kinit/lnusertemp.c
  25. 1
    1
      kinit/wrapper.c
  26. 1
    1
      kio/kio/kmimemagic.h
  27. 1
    1
      kio/kio/kservice.cpp
  28. 1
    1
      kio/kio/kservice.h
  29. 1
    1
      kio/kio/kservicetype.h
  30. 1
    1
      kio/tests/ksycocatest.cpp
  31. 16
    16
      kio/tests/kurifiltertest.cpp
  32. 1
    1
      kmdi/test/README
  33. 1
    1
      kparts/browserview.desktop
  34. 1
    1
      kparts/plugin.h
  35. 2
    2
      kparts/tests/README
  36. 1
    1
      kutils/kdeglobals.kcfg
  37. 2
    2
      tdecore/DESIGN.kconfig
  38. 25
    25
      tdecore/README.kiosk
  39. 1
    1
      tdecore/kaudioplayer.h
  40. 1
    1
      tdecore/kcrash.cpp
  41. 1
    1
      tdecore/kdebugrc
  42. 1
    1
      tdecore/knotifyclient.h
  43. 11
    11
      tdecore/kstandarddirs.cpp
  44. 10
    10
      tdecore/kstandarddirs.h
  45. 1
    1
      tdecore/ksycoca.h
  46. 1
    1
      tdecore/ktempdir.h
  47. 1
    1
      tdecore/ktempfile.h
  48. 1
    1
      tdesu/client.cpp
  49. 1
    1
      tdeui/kpanelextension.h
  50. 1
    1
      tdeui/kpanelmenu.h
  51. 1
    1
      win/common.pro
  52. 1
    1
      win/config.h
  53. 2
    2
      win/pro_files/kmdi/test/test.pro
  54. 1
    1
      win/pro_files/tdefx/tdefx_rel.pro
  55. 2
    2
      win/tdelibs_global_win.h
  56. 2
    2
      win/tools/.check_kde_env
  57. 2
    2
      win/tools/build_tdelibs_dbg
  58. 1
    1
      win/tools/build_tdelibs_rel
  59. 1
    1
      win/tools/kde_env_custom.template

+ 6
- 6
COMPILING View File

@@ -41,24 +41,24 @@ source. Qt libs then end up in /usr/local/lib/qt3/lib.
41 41
 2) Where do you want to have KDE installed. A good candidate is /usr/local/kde
42 42
 
43 43
 Make sure you do (if using sh, ksh, or bash):
44
-export KDEDIR=/usr/local/kde
44
+export TDEDIR=/usr/local/kde
45 45
 
46 46
 With csh or tcsh the following is more appropriate:
47 47
 
48
-setenv KDEDIR /usr/local/kde
48
+setenv TDEDIR /usr/local/kde
49 49
 
50 50
 Now you want to make sure that Qt and KDE libraries are picked up correctly.
51 51
 
52 52
 On systems that respond to environment variables something similar to the 
53 53
 following is appropriate:
54 54
 
55
-export LD_LIBRARY_PATH=$KDEDIR/lib:$QTDIR/lib
55
+export LD_LIBRARY_PATH=$TDEDIR/lib:$QTDIR/lib
56 56
 
57 57
 On systems whose diety of choice is ldconfig, try:
58
-ldconfig -m $KDEDIR/lib
58
+ldconfig -m $TDEDIR/lib
59 59
 ldconfig -m $QTDIR/lib
60 60
 
61
-You probably also want to add $KDEDIR/bin and $QTDIR/bin to your path.
61
+You probably also want to add $TDEDIR/bin and $QTDIR/bin to your path.
62 62
 
63 63
 See http://www.kde.org/kde2-and-trinity.html for tips about setting up
64 64
 KDE 3.0 next to KDE 2.x.
@@ -88,7 +88,7 @@ One of the biggest problems is picking up the correct version of Qt,
88 88
 especially if your system has more version of Qt installed. Be aware 
89 89
 that information about library paths gets saved in the "config.cache" 
90 90
 file, "Makefile.in" as well as "Makefile" files. So it can be that after 
91
-some struggle to get QTDIR/KDEDIR setup correctly your setup is actually 
91
+some struggle to get QTDIR/TDEDIR setup correctly your setup is actually 
92 92
 correct, but old -incorrect- settings are still lying around.
93 93
 
94 94
 The best thing to do in such a case is to do a "svn-clean" (from tdesdk/scripts).

+ 6
- 6
COMPILING.html View File

@@ -36,24 +36,24 @@ source. Qt libs then end up in /usr/local/lib/qt3/lib.
36 36
 <p>2) Where do you want to have KDE installed. A good candidate is /usr/local/kde
37 37
 
38 38
 <p>Make sure you do (if using sh, ksh, or bash):
39
-<pre>export KDEDIR=/usr/local/kde</pre>
39
+<pre>export TDEDIR=/usr/local/kde</pre>
40 40
 
41 41
 <p>With csh or tcsh the following is more appropriate:
42 42
 
43
-<pre>setenv KDEDIR /usr/local/kde</pre>
43
+<pre>setenv TDEDIR /usr/local/kde</pre>
44 44
 
45 45
 <p>Now you want to make sure that Qt and KDE libraries are picked up correctly.
46 46
 
47 47
 <p>On systems that respond to environment variables something similar to the 
48 48
 following is appropriate:
49 49
 
50
-<p>export LD_LIBRARY_PATH=$KDEDIR/lib:$QTDIR/lib
50
+<p>export LD_LIBRARY_PATH=$TDEDIR/lib:$QTDIR/lib
51 51
 
52 52
 <p>On systems whose diety of choice is ldconfig, try:
53
-<pre>ldconfig -m $KDEDIR/lib
53
+<pre>ldconfig -m $TDEDIR/lib
54 54
 ldconfig -m $QTDIR/lib</pre>
55 55
 
56
-<p>You probably also want to add $KDEDIR/bin and $QTDIR/bin to your path.
56
+<p>You probably also want to add $TDEDIR/bin and $QTDIR/bin to your path.
57 57
 
58 58
 <p>See http://www.kde.org/kde2-and-trinity.html for tips about setting up
59 59
 KDE 3.0 next to KDE 2.x.
@@ -92,7 +92,7 @@ make</pre>
92 92
 especially if your system has more version of Qt installed. Be aware 
93 93
 that information about library paths gets saved in the "config.cache" 
94 94
 file, "Makefile.in" as well as "Makefile" files. So it can be that after 
95
-some struggle to get QTDIR/KDEDIR setup correctly your setup is actually 
95
+some struggle to get QTDIR/TDEDIR setup correctly your setup is actually 
96 96
 correct, but old -incorrect- settings are still lying around.
97 97
 
98 98
 <p>The best thing to do in such a case is to do a "make cvs-clean". This 

+ 2
- 2
KDE2PORTING.html View File

@@ -117,9 +117,9 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
117 117
   BarIcon() or use KGlobal::iconLoader() instead of getIconLoader()<P>
118 118
 
119 119
   kde_*dir() have been removed as they require a unique top level directory
120
-  for all applications (KDEDIR). This concept doesn't exist in KDE 2.0
120
+  for all applications (TDEDIR). This concept doesn't exist in KDE 2.0
121 121
   any more, it has been replaced with "multiple levels of directories",
122
-  set in KDEDIRS, so that it's possible to have global settings and
122
+  set in TDEDIRS, so that it's possible to have global settings and
123 123
   group settings, applied before user settings.<P>
124 124
 
125 125
   Replace code that uses kde_*dir() + filename with calls to

+ 1
- 1
config.h.cmake View File

@@ -687,7 +687,7 @@
687 687
 #cmakedefine HAVE___ARGZ_STRINGIFY 1
688 688
 
689 689
 /* The prefix to use as fallback */
690
-#define KDEDIR "@KDEDIR@"
690
+#define TDEDIR "@TDEDIR@"
691 691
 
692 692
 /* Enable prevention against poor Linux OOM-killer */
693 693
 #cmakedefine TDEINIT_OOM_PROTECT 1

+ 1
- 1
configure.in.in View File

@@ -124,7 +124,7 @@ KDE_DO_UIC_AGAIN
124 124
 # configure would do this very late. Too late for us!
125 125
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
126 126
 
127
-AC_DEFINE_UNQUOTED(KDEDIR, "$prefix", [The prefix to use as fallback])
127
+AC_DEFINE_UNQUOTED(TDEDIR, "$prefix", [The prefix to use as fallback])
128 128
 KDE_EXPAND_MAKEVAR(ac_kde_sysconfdir, sysconfdir)
129 129
 AC_DEFINE_UNQUOTED(KDESYSCONFDIR, "$ac_kde_sysconfdir", [The compiled in system configuration prefix])
130 130
 

+ 1
- 1
doc/common/README.Doxygen View File

@@ -57,7 +57,7 @@ doxygen.sh [--recurse] [--modulename] [--doxdatadir=<dir>] [--installdir=<dir>]
57 57
 --doxdatadir=<dir> Locate the HTML header files and support graphics.
58 58
               In tdelibs, the subdirectory doc/common/ contains these
59 59
               files (and this README). In an installed KDE system, 
60
-              $KDEDIR/share/doc/HTML/en/common/ contains a copy.
60
+              $TDEDIR/share/doc/HTML/en/common/ contains a copy.
61 61
               This argument is mandatory if doxygen.sh can't guess where
62 62
               the doxdata lives.
63 63
 --installdir=<dir> Locate the directory where apidox from other modules

+ 1
- 1
doc/tdelibs/man-kbuildsycoca.8.docbook View File

@@ -191,7 +191,7 @@ command at the prompt
191 191
 <title>Environment Variables</title>
192 192
 <variablelist>
193 193
 <varlistentry>
194
-<term>$<envar>KDEDIRS</envar></term>
194
+<term>$<envar>TDEDIRS</envar></term>
195 195
 <listitem>
196 196
 <para>Specifies which directories are part of the KDE
197 197
 installations</para>

+ 1
- 1
kab/addressbook.h View File

@@ -565,7 +565,7 @@ public:
565 565
    * Creates the local configuration file. The filename is fixed to
566 566
    * \c kab.config, it will be created in the local kab directory
567 567
    * (\c $HOME/.kde/share/apps/kab). Adapt the global configuration template
568
-   * file (\c $KDEDIR/share/apps/kab/template.config) for unusual site-specific
568
+   * file (\c $TDEDIR/share/apps/kab/template.config) for unusual site-specific
569 569
    * settings.
570 570
    * The method does not load the new config file.
571 571
    */

+ 1
- 1
kabc/scripts/createisomap.pl View File

@@ -4,7 +4,7 @@
4 4
 # files in tdebase/l10n/*/
5 5
 #
6 6
 # USAGE EXAMPLE:
7
-#     ./createisomap.pl $KDEDIR/share/locale/l10n > countrytransl.map
7
+#     ./createisomap.pl $TDEDIR/share/locale/l10n > countrytransl.map
8 8
 #
9 9
 # Don't laugh at me. I put this together with an old perl book, perl
10 10
 # being a language I've never used before.

+ 1
- 1
kate/data/maxima.xml View File

@@ -16,7 +16,7 @@
16 16
     You should have received a copy of the GNU General Public License
17 17
     along with the maxima.xml. If not, see <http://www.gnu.org/licenses/>.
18 18
 
19
-    Usage: place maxima.xml in $KDEDIR/share/apps/katepart/syntax.
19
+    Usage: place maxima.xml in $TDEDIR/share/apps/katepart/syntax.
20 20
 -->
21 21
 
22 22
 <!DOCTYPE language SYSTEM "language.dtd">

+ 1
- 1
kate/part/test_regression.cpp View File

@@ -404,7 +404,7 @@ int main(int argc, char *argv[])
404 404
 
405 405
     TQString kh("/var/tmp/%1_kate_non_existent");
406 406
     kh = kh.arg( pw->pw_name );
407
-    setenv( "KDEHOME", kh.latin1(), 1 );
407
+    setenv( "TDEHOME", kh.latin1(), 1 );
408 408
     setenv( "LC_ALL", "C", 1 );
409 409
     setenv( "LANG", "C", 1 );
410 410
 

+ 3
- 3
kconf_update/README.kconf_update View File

@@ -27,7 +27,7 @@ How it works
27 27
 ============
28 28
 
29 29
 Applications can install so called "update files" under 
30
-$KDEDIR/share/apps/kconf_update. An update file has ".upd" as extension and
30
+$TDEDIR/share/apps/kconf_update. An update file has ".upd" as extension and
31 31
 contains instructions for transferring/converting configuration information 
32 32
 from one place to another.
33 33
 
@@ -214,7 +214,7 @@ your application KHello's config file khellorc, you can test by using
214 214
     cat ~/.kde/share/config/khellorc | khello_conf_update.sh
215 215
 
216 216
 (assuming khello_conf_update.sh is the kconf_update script and ~/.kde is your
217
-$KDEHOME). This is easier than making install every time, but has the obvious
217
+$TDEHOME). This is easier than making install every time, but has the obvious
218 218
 downside that you need to 'parse' your script's output yourself instead of
219 219
 letting kconf_update do it and check the resulting output file.
220 220
 
@@ -235,7 +235,7 @@ file's entry, 'make install', and kconf_update will happily run your script
235 235
 again, without you having to increase the version number.
236 236
 
237 237
 If you want to know what kconf_update has been up to lately, have a look
238
-at $KDEHOME/share/apps/kconf_update/update.log
238
+at $TDEHOME/share/apps/kconf_update/update.log
239 239
 
240 240
 
241 241
 Common Problems

+ 1
- 1
kded/HOWTO View File

@@ -9,7 +9,7 @@ is derived from KDEDModule. The name of a factory method always starts with
9 9
 
10 10
 It also needs to provide a desktop file that defines the service provided by
11 11
 the module. The desktop file needs to be installed under 
12
-$KDEDIR/share/services/kded/. The name of the desktop file must match with 
12
+$TDEDIR/share/services/kded/. The name of the desktop file must match with 
13 13
 the name of the DCOP object that is implemented by the module.
14 14
 
15 15
 The desktop file needs to define the library in which the module is 

+ 2
- 2
kded/kbuildsycoca.cpp View File

@@ -562,7 +562,7 @@ void KBuildSycoca::save()
562 562
       (*m_str) << aOffset;
563 563
    }
564 564
    (*m_str) << (TQ_INT32) 0; // No more factories.
565
-   // Write KDEDIRS
565
+   // Write TDEDIRS
566 566
    (*m_str) << KGlobal::dirs()->kfsstnd_prefixes();
567 567
    (*m_str) << newTimestamp;
568 568
    (*m_str) << KGlobal::locale()->language();
@@ -732,7 +732,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
732 732
 
733 733
    if (bGlobalDatabase)
734 734
    {
735
-     setenv("KDEHOME", "-", 1);
735
+     setenv("TDEHOME", "-", 1);
736 736
      setenv("KDEROOTHOME", "-", 1);
737 737
    }
738 738
 

+ 1
- 1
kdewidgets/README View File

@@ -7,7 +7,7 @@ Summary:
7 7
 
8 8
 This directory contains KDE custom widgets for designer 2 which comes with
9 9
 Qt 3. Just make sure your plugin path in qtconfig includes
10
-$KDEDIR/lib/trinity/plugins . With the KDE build system nothing special 
10
+$TDEDIR/lib/trinity/plugins . With the KDE build system nothing special 
11 11
 (i.e. editing the plugin path) is needed, as uic will automatically be
12 12
 called with -L <path to the kdewidgets plugin> .
13 13
 

+ 1
- 1
kdoctools/kio_help.upd View File

@@ -1,3 +1,3 @@
1
-# Move kio_help cache from $KDEHOME/share/apps/kio_help/cache to $KDEHOME/cache-$HOST/kio_help
1
+# Move kio_help cache from $TDEHOME/share/apps/kio_help/cache to $TDEHOME/cache-$HOST/kio_help
2 2
 Id=trinity_2
3 3
 Script=move_kio_help_cache.sh,sh

+ 1
- 1
khtml/java/kjavaprocess.h View File

@@ -75,7 +75,7 @@ public:
75 75
 
76 76
     /**
77 77
      * This will set the classpath the Java process will use.  It's used as a the
78
-     * -cp command line option.  It adds every jar file stored in $KDEDIRS/share/apps/kjava/
78
+     * -cp command line option.  It adds every jar file stored in $TDEDIRS/share/apps/kjava/
79 79
      * to the classpath, and then adds the $CLASSPATH environmental variable.  This allows
80 80
      * users to simply drop the JSSE (Java Secure Sockets Extension classes into that directory
81 81
      * without having to modify the jvm configuration files.

+ 1
- 1
khtml/test_regression.cpp View File

@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
440 440
 
441 441
     TQString kh("/var/tmp/%1_non_existant");
442 442
     kh = kh.arg( pw->pw_name );
443
-    setenv( "KDEHOME", kh.latin1(), 1 );
443
+    setenv( "TDEHOME", kh.latin1(), 1 );
444 444
     setenv( "LC_ALL", "C", 1 );
445 445
     setenv( "LANG", "C", 1 );
446 446
 

+ 4
- 4
kinit/README.DCOP View File

@@ -34,8 +34,8 @@ serviceResult start_service_by_name(QString serviceName, QStringList url)
34 34
  * Start a service by desktop path.
35 35
  *
36 36
  * 'serviceName' refers to a desktop file describing the service.
37
- * This may be an absolute path or a path relative to $KDEDIRS/applnk
38
- * and/or $KDEDIRS/services
37
+ * This may be an absolute path or a path relative to $TDEDIRS/applnk
38
+ * and/or $TDEDIRS/services
39 39
  * E.g. it should have the form "Applications/korganizer.desktop" or
40 40
  * "/opt/kde/share/applnk/Applications/korganizer.desktop".
41 41
  *
@@ -57,8 +57,8 @@ serviceResult start_service_by_desktop_path(QString serviceName, QStringList url
57 57
  * Start a service by desktop name.
58 58
  *
59 59
  * 'serviceName' refers to a desktop file describing the service.
60
- * The service is looked up anywhere in $KDEDIR/applnk and/or
61
- * $KDEDIR/services.
60
+ * The service is looked up anywhere in $TDEDIR/applnk and/or
61
+ * $TDEDIR/services.
62 62
  * E.g. it should have the form "korganizer".
63 63
  *
64 64
  * 'url', if not empty, will be passed to the service as

+ 1
- 1
kinit/README.autostart View File

@@ -12,7 +12,7 @@ Applications may be scheduled to be automatically run at KDE session startup
12 12
 in either autostart phase 1 or phase 2. Autostart phase 1 is the original
13 13
 autostart phase; phase 2 was introduced in KDE 3. To run in either phase, an
14 14
 application's .desktop file must be located in a KDE autostart directory such
15
-as $KDEDIR/share/autostart or $KDEHOME/share/autostart. The .desktop file can
15
+as $TDEDIR/share/autostart or $TDEHOME/share/autostart. The .desktop file can
16 16
 contain the following optional entries to control its autostart:
17 17
 
18 18
    X-KDE-autostart-condition = rcfile:group:entry:default

+ 2
- 2
kinit/README.wrapper View File

@@ -3,8 +3,8 @@ README
3 3
 tdeinit_wrapper, kshell and kwrapper are a programs that
4 4
 start programs via tdeinit.
5 5
 
6
-E.g. You can make a symbolic link from $KDEDIR/bin/konsole to 
7
-$KDEDIR/bin/tdeinit_wrapper. Typing 'konsole' on the command line 
6
+E.g. You can make a symbolic link from $TDEDIR/bin/konsole to 
7
+$TDEDIR/bin/tdeinit_wrapper. Typing 'konsole' on the command line 
8 8
 will then start 'konsole.la' through tdeinit instead.
9 9
 
10 10
 tdeinit_wrapper is the simplest for, it only passes the program

+ 1
- 1
kinit/kdostartupconfig.cpp View File

@@ -125,7 +125,7 @@ int main()
125 125
                 << "=\"" << value.replace( "\"", "\\\"" ) << "\"\n";
126 126
             }
127 127
         startupconfigfiles << line << endl;
128
-        // use even currently non-existing paths in $KDEDIRS
128
+        // use even currently non-existing paths in $TDEDIRS
129 129
         TQStringList dirs = TQStringList::split( KPATH_SEPARATOR, KGlobal::dirs()->kfsstnd_prefixes());
130 130
         for( TQStringList::ConstIterator it = dirs.begin();
131 131
              it != dirs.end();

+ 4
- 4
kinit/kstartupconfig.cpp View File

@@ -28,10 +28,10 @@ This utility helps to have some configuration options available in starttde
28 28
 without the need to launch anything linked to KDE libraries (which may need
29 29
 some time to load).
30 30
 
31
-The configuration options are written to $KDEHOME/share/config/startupconfigkeys,
31
+The configuration options are written to $TDEHOME/share/config/startupconfigkeys,
32 32
 one option per line, as <file> <group> <key> <default>. It is possible to
33 33
 use ' for quoting multiword entries. Values of these options will be written
34
-to $KDEHOME/share/config/startupconfig as a shell script that will set
34
+to $TDEHOME/share/config/startupconfig as a shell script that will set
35 35
 the values to shell variables, named <file>_<group>_<key> (all spaces replaced
36 36
 by underscores, everything lowercase). So e.g. line
37 37
 "ksplashrc KSplash Theme Default" may result in "ksplashrc_ksplash_theme=Default".
@@ -76,8 +76,8 @@ Otherwise kdostartupconfig is launched to create or update all the necessary fil
76 76
 int main()
77 77
     {
78 78
     char kdehome[ 1024 ];
79
-    if( getenv( "KDEHOME" ))
80
-        strlcpy( kdehome, getenv( "KDEHOME" ), 1024 );
79
+    if( getenv( "TDEHOME" ))
80
+        strlcpy( kdehome, getenv( "TDEHOME" ), 1024 );
81 81
     else if( getenv( "HOME" ))
82 82
         {
83 83
         strlcpy( kdehome, getenv( "HOME" ), 1024 );

+ 2
- 2
kinit/lnusertemp.c View File

@@ -100,7 +100,7 @@ int build_link(const char *tmp_prefix, const char *kde_prefix, int kdehostname)
100 100
   char tmp_buf[PATH_MAX+1];
101 101
   int uid = getuid();
102 102
   const char *home_dir = getenv("HOME");
103
-  const char *kde_home = uid ? getenv("KDEHOME") : getenv("KDEROOTHOME");
103
+  const char *kde_home = uid ? getenv("TDEHOME") : getenv("KDEROOTHOME");
104 104
   int result;
105 105
   struct stat stat_buf;
106 106
 
@@ -181,7 +181,7 @@ int build_link(const char *tmp_prefix, const char *kde_prefix, int kdehostname)
181 181
   result = lstat(kde_tmp_dir, &stat_buf);
182 182
   if ((result == 0) && (S_ISDIR(stat_buf.st_mode)))
183 183
   {
184
-     /* $KDEHOME/tmp is a normal directory. Do nothing. */
184
+     /* $TDEHOME/tmp is a normal directory. Do nothing. */
185 185
      /*printf("Directory \"%s\" already exists.\n", kde_tmp_dir);*/
186 186
      return 0;
187 187
   }

+ 1
- 1
kinit/wrapper.c View File

@@ -132,7 +132,7 @@ static int openSocket()
132 132
 #define MAX_SOCK_FILE 255
133 133
   char sock_file[MAX_SOCK_FILE + 1];
134 134
   const char *home_dir = getenv("HOME");
135
-  const char *kde_home = getenv("KDEHOME");
135
+  const char *kde_home = getenv("TDEHOME");
136 136
   char *display;
137 137
 
138 138
   sock_file[0] = sock_file[MAX_SOCK_FILE] = 0;

+ 1
- 1
kio/kio/kmimemagic.h View File

@@ -82,7 +82,7 @@ protected:
82 82
  *
83 83
  *
84 84
  * Unless specified otherwise, KMimeMagic uses
85
- * $KDEDIR/share/mimelnk/magic for this purpose.
85
+ * $TDEDIR/share/mimelnk/magic for this purpose.
86 86
  *
87 87
  * To make KMimeMagic restore the 'atime' of a file after it opened it,
88 88
  * add its directory in kmimemagicrc like:

+ 1
- 1
kio/kio/kservice.cpp View File

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

+ 1
- 1
kio/kio/kservice.h View File

@@ -165,7 +165,7 @@ public:
165 165
    * is stored.
166 166
    *
167 167
    * This is a relative path if the desktop entry was found in any
168
-   * of the locations pointed to by $KDEDIRS (e.g. "Internet/kppp.desktop")
168
+   * of the locations pointed to by $TDEDIRS (e.g. "Internet/kppp.desktop")
169 169
    * It is a full path if the desktop entry originates from another
170 170
    * location.
171 171
    * @return the path of the service's desktop file,

+ 1
- 1
kio/kio/kservicetype.h View File

@@ -39,7 +39,7 @@
39 39
  * instead of a type of file.
40 40
  * For instance, KOfficeFilter is a service type.
41 41
  * It is associated to services according to the user profile (kuserprofile.h).
42
- * Service types are stored as desktop files in $KDEHOME/share/servicetypes.
42
+ * Service types are stored as desktop files in $TDEHOME/share/servicetypes.
43 43
  * @see KService
44 44
  */
45 45
 class KIO_EXPORT KServiceType : public KSycocaEntry

+ 1
- 1
kio/tests/ksycocatest.cpp View File

@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
193 193
 
194 194
 
195 195
    //
196
-   debug("\nTrying findByURL for $KDEDIR/bin/kdesktop");
196
+   debug("\nTrying findByURL for $TDEDIR/bin/kdesktop");
197 197
    KMimeType::Ptr mf  = KMimeType::findByURL( KStandardDirs::findExe( "kdesktop" ), 0,
198 198
 				 true, false );
199 199
    assert( mf );

+ 16
- 16
kio/tests/kurifiltertest.cpp View File

@@ -154,8 +154,8 @@ static const KCmdLineOptions options[] =
154 154
 int main(int argc, char **argv)
155 155
 {
156 156
     // Ensure that user configuration doesn't change the results of those tests
157
-    // KDEHOME needs to be writable though, for a ksycoca database
158
-    setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-kurifiltertest" ), true );
157
+    // TDEHOME needs to be writable though, for a ksycoca database
158
+    setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kde-kurifiltertest" ), true );
159 159
     setenv( "KDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup
160 160
 
161 161
     KAboutData aboutData(appName, programName, version, description);
@@ -214,7 +214,7 @@ int main(int argc, char **argv)
214 214
 
215 215
     // ShortURI/LocalDomain filter tests. NOTE: any of these tests can fail
216 216
     // if you have specified your own patterns in kshorturifilterrc. For
217
-    // examples, see $KDEDIR/share/config/kshorturifilterrc .
217
+    // examples, see $TDEDIR/share/config/kshorturifilterrc .
218 218
     filter( "linuxtoday.com", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL );
219 219
     filter( "LINUXTODAY.COM", "http://linuxtoday.com", KURIFilterData::NET_PROTOCOL );
220 220
     filter( "kde.org", "http://kde.org", KURIFilterData::NET_PROTOCOL );
@@ -290,7 +290,7 @@ int main(int argc, char **argv)
290 290
 
291 291
     TQCString qtdir=getenv("QTDIR");
292 292
     TQCString home = getenv("HOME");
293
-    TQCString kdehome = getenv("KDEHOME");
293
+    TQCString kdehome = getenv("TDEHOME");
294 294
 
295 295
     filter( "$SOMEVAR/tdelibs/kio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
296 296
     filter( "$ETC/passwd", "/etc/passwd", KURIFilterData::LOCAL_FILE );
@@ -301,31 +301,31 @@ int main(int argc, char **argv)
301 301
     if (kdehome.isEmpty())
302 302
     {
303 303
       kdehome += "$HOME/.kde";
304
-      setenv("KDEHOME", kdehome.data(), 0);
304
+      setenv("TDEHOME", kdehome.data(), 0);
305 305
     }
306 306
 
307
-    filter( "$KDEHOME/share", kdehome+"/share", KURIFilterData::LOCAL_DIR );
307
+    filter( "$TDEHOME/share", kdehome+"/share", KURIFilterData::LOCAL_DIR );
308 308
     KStandardDirs::makeDir( kdehome+"/a+plus" );
309
-    filter( "$KDEHOME/a+plus", kdehome+"/a+plus", KURIFilterData::LOCAL_DIR );
309
+    filter( "$TDEHOME/a+plus", kdehome+"/a+plus", KURIFilterData::LOCAL_DIR );
310 310
 
311 311
     // BR 27788
312 312
     KStandardDirs::makeDir( kdehome+"/share/Dir With Space" );
313
-    filter( "$KDEHOME/share/Dir With Space", kdehome+"/share/Dir With Space", KURIFilterData::LOCAL_DIR );
313
+    filter( "$TDEHOME/share/Dir With Space", kdehome+"/share/Dir With Space", KURIFilterData::LOCAL_DIR );
314 314
 
315 315
     // support for name filters (BR 93825)
316
-    filter( "$KDEHOME/*.txt", kdehome+"/*.txt", KURIFilterData::LOCAL_DIR );
317
-    filter( "$KDEHOME/[a-b]*.txt", kdehome+"/[a-b]*.txt", KURIFilterData::LOCAL_DIR );
318
-    filter( "$KDEHOME/a?c.txt", kdehome+"/a?c.txt", KURIFilterData::LOCAL_DIR );
319
-    filter( "$KDEHOME/?c.txt", kdehome+"/?c.txt", KURIFilterData::LOCAL_DIR );
316
+    filter( "$TDEHOME/*.txt", kdehome+"/*.txt", KURIFilterData::LOCAL_DIR );
317
+    filter( "$TDEHOME/[a-b]*.txt", kdehome+"/[a-b]*.txt", KURIFilterData::LOCAL_DIR );
318
+    filter( "$TDEHOME/a?c.txt", kdehome+"/a?c.txt", KURIFilterData::LOCAL_DIR );
319
+    filter( "$TDEHOME/?c.txt", kdehome+"/?c.txt", KURIFilterData::LOCAL_DIR );
320 320
     // but let's check that a directory with * in the name still works
321 321
     KStandardDirs::makeDir( kdehome+"/share/Dir*With*Stars" );
322
-    filter( "$KDEHOME/share/Dir*With*Stars", kdehome+"/share/Dir*With*Stars", KURIFilterData::LOCAL_DIR );
322
+    filter( "$TDEHOME/share/Dir*With*Stars", kdehome+"/share/Dir*With*Stars", KURIFilterData::LOCAL_DIR );
323 323
     KStandardDirs::makeDir( kdehome+"/share/Dir?QuestionMark" );
324
-    filter( "$KDEHOME/share/Dir?QuestionMark", kdehome+"/share/Dir?QuestionMark", KURIFilterData::LOCAL_DIR );
324
+    filter( "$TDEHOME/share/Dir?QuestionMark", kdehome+"/share/Dir?QuestionMark", KURIFilterData::LOCAL_DIR );
325 325
     KStandardDirs::makeDir( kdehome+"/share/Dir[Bracket" );
326
-    filter( "$KDEHOME/share/Dir[Bracket", kdehome+"/share/Dir[Bracket", KURIFilterData::LOCAL_DIR );
326
+    filter( "$TDEHOME/share/Dir[Bracket", kdehome+"/share/Dir[Bracket", KURIFilterData::LOCAL_DIR );
327 327
 
328
-    filter( "$HOME/$KDEDIR/tdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR );
328
+    filter( "$HOME/$TDEDIR/tdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR );
329 329
     filter( "$1/$2/$3", "http://www.google.com/search?q=$1/$2/$3&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL );  // can be used as bogus or valid test. Currently triggers default search, i.e. google
330 330
     filter( "$$$$", "http://www.google.com/search?q=$$$$&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); // worst case scenarios.
331 331
 

+ 1
- 1
kmdi/test/README View File

@@ -8,7 +8,7 @@ Call
8 8
   qmake kFourChildren -o Makefile
9 9
   make
10 10
 to build the example app.
11
-Likely you must set the environment variable KDEDIR (to e.g. /opt/trinity).
11
+Likely you must set the environment variable TDEDIR (to e.g. /opt/trinity).
12 12
 
13 13
 
14 14
 

+ 1
- 1
kparts/browserview.desktop View File

@@ -152,6 +152,6 @@ Type=QString
152 152
 # If the part has a plugin for KHTML Javascript's window.navigator.plugins
153 153
 # array, it should create a plugin info file and set this propery to the
154 154
 # file path here. The path should be relative to KDE's data dir
155
-# ($KDEDIR/share/apps)
155
+# ($TDEDIR/share/apps)
156 156
 [PropertyDef::X-KDE-BrowserView-PluginsInfo]
157 157
 Type=QString

+ 1
- 1
kparts/plugin.h View File

@@ -40,7 +40,7 @@ namespace KParts
40 40
  *
41 41
  * If you want this plugin to be used by a part, you need to
42 42
  * install the rc file under the directory
43
- * "data" (KDEDIR/share/apps usually)+"/instancename/kpartplugins/"
43
+ * "data" (TDEDIR/share/apps usually)+"/instancename/kpartplugins/"
44 44
  * where instancename is the name of the part's instance.
45 45
  *
46 46
  * You should also install a "plugin info" .desktop file with the same name.

+ 2
- 2
kparts/tests/README View File

@@ -1,5 +1,5 @@
1 1
 In order to test embedding the notepad part in konqueror, you need
2 2
 to "make install", to install the libs, and to copy notepad.desktop
3
-into $KDEDIR/share/services/, and remove kwrite.desktop from
4
-$KDEDIR/share/applnk/... (at least the ServiceTypes line of it)
3
+into $TDEDIR/share/services/, and remove kwrite.desktop from
4
+$TDEDIR/share/applnk/... (at least the ServiceTypes line of it)
5 5
 

+ 1
- 1
kutils/kdeglobals.kcfg View File

@@ -450,7 +450,7 @@
450 450
   <entry key="Autostart" type="Path" >
451 451
     <label>Path to the autostart directory</label>
452 452
     <whatsthis>Path to the directory containing executables to be run on session login</whatsthis>
453
-    <default>$KDEHOME/Autostart</default>
453
+    <default>$TDEHOME/Autostart</default>
454 454
   </entry>
455 455
   <entry key="Desktop" type="Path" >
456 456
     <label>Path to the desktop directory</label>

+ 2
- 2
tdecore/DESIGN.kconfig View File

@@ -52,7 +52,7 @@ void deleteEntry(key); // Remove entry
52 52
 
53 53
 Note that there is a subtle difference between revertToDefault() and deleteEntry().
54 54
 revertToDefault() will change the entry to the default value set by the system 
55
-administrator (Via e.g. $KDEDIR/share/config) or, if no such default was set,
55
+administrator (Via e.g. $TDEDIR/share/config) or, if no such default was set,
56 56
 non-existant.
57 57
 deleteEntry() will make the entry non-existant.
58 58
 
@@ -123,7 +123,7 @@ mandatory if enums become an explicit type.
123 123
 
124 124
 
125 125
 Instead of relying on the defaults that are hard-coded in the application, 
126
-rely on default configuration files being installed in $KDEDIR. The technical
126
+rely on default configuration files being installed in $TDEDIR. The technical
127 127
 changes required for this are very minimal, it is mostly a change in policy.
128 128
 
129 129
 Type information can be provide by preceding every entry with a formalized 

+ 25
- 25
tdecore/README.kiosk View File

@@ -24,17 +24,17 @@ for its applications. Resources range from icons, wallpapers, fonts to
24 24
 sounds, menu-descriptions and configuration files. 
25 25
 
26 26
 In KDE1 there were two locations were resources could be located: The 
27
-resources provided by the system were located under $KDEDIR and user-
27
+resources provided by the system were located under $TDEDIR and user-
28 28
 specific resources were located under $HOME/.kde.
29 29
 
30 30
 In KDE2 resource management has been largely abstracted by the introduction
31 31
 of the KStandardDirs class and has become much more flexible. The user /
32 32
 administrator can now specify a variable number of locations where resources
33
-can be found. A list of locations can either be specified via $KDEDIRS
33
+can be found. A list of locations can either be specified via $TDEDIRS
34 34
 (notice the extra 'S'), via /etc/kderc and even via the kdeglobals config 
35 35
 file. The location where user-specific resources can be found can be
36
-set with $KDEHOME (The default is $HOME/.kde). Changes made by the user
37
-are always written back to $KDEHOME.
36
+set with $TDEHOME (The default is $HOME/.kde). Changes made by the user
37
+are always written back to $TDEHOME.
38 38
 
39 39
 Both KDE1 and KDE2 feature so called "cascading configuration files": There
40 40
 can be multiple configuration files with the same name in the various 
@@ -42,29 +42,29 @@ locations for (config) resources, when that is the case, the information of
42 42
 all these configuration files is combined on a key by key basis. If the same
43 43
 key (within a certain group) is defined in more than one place, the value
44 44
 of the key for the config file that was read last will override any previously
45
-read values. Configuration files under $KDEHOME are always read last. This
45
+read values. Configuration files under $TDEHOME are always read last. This
46 46
 ensures that after a configuration entry is written, the same value wil be
47 47
 read back.
48 48
 
49 49
 In KDE3 two important changes have been made:
50 50
 
51 51
 * Default values are no longer written.
52
-When a configuration file in a location other than $KDEHOME defines a value 
52
+When a configuration file in a location other than $TDEHOME defines a value 
53 53
 for a key and the application subsequently writes out a new configuration file
54
-to $KDEHOME, that configuration file will only contain an entry for the key
54
+to $TDEHOME, that configuration file will only contain an entry for the key
55 55
 if its value differs from the value read from the other file.
56 56
 
57 57
 This counters the problem that changing default configuration files under 
58
-$KDEDIR would not take effect for users, since these users would most likely
59
-have their own copy of these settings under $KDEHOME. KDE3 will make sure 
60
-not to copy these settings so changes made under $KDEDIR will affect all users
58
+$TDEDIR would not take effect for users, since these users would most likely
59
+have their own copy of these settings under $TDEHOME. KDE3 will make sure 
60
+not to copy these settings so changes made under $TDEDIR will affect all users
61 61
 that haven't explicitly changed the affected settings to something else.
62 62
 
63 63
 * Configuration entries can be marked "immutable".
64 64
 Starting with KDE3, configuration entries can be marked "immutable". When a
65 65
 configuration entry is immutable it means that configuration files that are
66 66
 read later will not be able to override its value. Immutable entries cannot
67
-be changed via KConfig and if the entry is present under $KDEHOME it will 
67
+be changed via KConfig and if the entry is present under $TDEHOME it will 
68 68
 be ignored.
69 69
 
70 70
 Entries can be marked immutable on 4 different levels:
@@ -383,8 +383,8 @@ shell_access
383 383
           option (Alt-F2) can be used to run shell-commands and arbitrary  
384 384
           executables. Likewise, executables placed in the user's
385 385
           Autostart folder will no longer be executed. Applications can
386
-          still be autostarted by placing .desktop files in the $KDEHOME/Autostart
387
-          or $KDEDIR/share/autostart directory.
386
+          still be autostarted by placing .desktop files in the $TDEHOME/Autostart
387
+          or $TDEDIR/share/autostart directory.
388 388
           See also run_desktop_files.
389 389
 
390 390
 custom_config 
@@ -416,13 +416,13 @@ run_desktop_files
416 416
           part of the default desktop, KDE menu, registered services and
417 417
           autostarting services.
418 418
           * The default desktop includes the files under 
419
-            $KDEDIR/share/kdesktop/Desktop but _NOT_ the files under
419
+            $TDEDIR/share/kdesktop/Desktop but _NOT_ the files under
420 420
             $HOME/Desktop. 
421
-          * The KDE menu includes all files under $KDEDIR/share/applnk and
421
+          * The KDE menu includes all files under $TDEDIR/share/applnk and
422 422
             $XDGDIR/applications
423
-          * Registered services includes all files under $KDEDIR/share/services. 
424
-          * Autostarting services include all files under $KDEDIR/share/autostart 
425
-            but _NOT_ the files under $KDEHOME/Autostart
423
+          * Registered services includes all files under $TDEDIR/share/services. 
424
+          * Autostarting services include all files under $TDEDIR/share/autostart 
425
+            but _NOT_ the files under $TDEHOME/Autostart
426 426
 
427 427
           You probably also want to activate the following resource
428 428
           restictions:
@@ -432,7 +432,7 @@ run_desktop_files
432 432
           "services" - To restrict registered services.
433 433
           "autostart" - To restrict autostarting services.
434 434
           Otherwise users can still execute .desktop files by placing them
435
-          in e.g. $KDEHOME/share/kdesktop/Desktop
435
+          in e.g. $TDEHOME/share/kdesktop/Desktop
436 436
 
437 437
 lineedit_text_completion
438 438
         - defines whether input lines should have the potential to remember 
@@ -553,14 +553,14 @@ Some remarks:
553 553
 KDE3 Resource Restrictions
554 554
 ==========================
555 555
 Most KDE applications make use of additional resource files that are typically
556
-located in directories under $KDEDIR/share. By default KDE allows users to
556
+located in directories under $TDEDIR/share. By default KDE allows users to
557 557
 override any of these resources by placing files in the same location 
558
-under $KDEHOME/share. For example, Konsole stores profiles under 
559
-$KDEDIR/share/apps/konsole and users can add additional profiles by 
560
-installing files in $KDEHOME/share/apps/konsole.
558
+under $TDEHOME/share. For example, Konsole stores profiles under 
559
+$TDEDIR/share/apps/konsole and users can add additional profiles by 
560
+installing files in $TDEHOME/share/apps/konsole.
561 561
 
562 562
 KDE3 Resource Restrictions make it possible to restrict the lookup of files
563
-to directories outside of $KDEHOME only.
563
+to directories outside of $TDEHOME only.
564 564
 
565 565
 The following resources are defined:
566 566
 
@@ -589,7 +589,7 @@ data_<appname> - covers the sub section for <appname> in the data resource.
589 589
 To restrict resources the kdeglobals file should contain the
590 590
 group "[KDE Resource Restrictions]", each resource can then be restricted by
591 591
 adding "<resource>=false". E.g. to restrict the "wallpaper" resource to 
592
-$KDEDIR/share/wallpapers one would add:
592
+$TDEDIR/share/wallpapers one would add:
593 593
 [KDE Resource Restrictions][$i]
594 594
 wallpaper=false
595 595
 

+ 1
- 1
tdecore/kaudioplayer.h View File

@@ -75,7 +75,7 @@ public:
75 75
 	 * Static play function.
76 76
 	 *
77 77
 	 * @param filename Absolute path to the filename of the sound file to play.
78
-	 *                if not absolute, goes off KDEDIR/share/sounds/ (preferred)
78
+	 *                if not absolute, goes off TDEDIR/share/sounds/ (preferred)
79 79
 	 */
80 80
 	static void play(const TQString &filename);
81 81
 

+ 1
- 1
tdecore/kcrash.cpp View File

@@ -434,7 +434,7 @@ static int openSocket()
434 434
 #define MAX_SOCK_FILE 255
435 435
   char sock_file[MAX_SOCK_FILE + 1];
436 436
   const char *home_dir = getenv("HOME");
437
-  const char *kde_home = getenv("KDEHOME");
437
+  const char *kde_home = getenv("TDEHOME");
438 438
   char *display;
439 439
 
440 440
   sock_file[0] = sock_file[MAX_SOCK_FILE] = 0;

+ 1
- 1
tdecore/kdebugrc View File

@@ -2,7 +2,7 @@
2 2
 # This allows to leave the kdDebug* calls in the code, but still have them
3 3
 # disabled for most users.
4 4
 #
5
-# This file will be installed as $KDEDIR/share/config/kdebugrc
5
+# This file will be installed as $TDEDIR/share/config/kdebugrc
6 6
 #
7 7
 # There are four levels of output: Info, Warn, Error and Fatal
8 8
 # corresponding to kdDebug(), kdWarn(), kdError(), kdFatal()

+ 1
- 1
tdecore/knotifyclient.h View File

@@ -27,7 +27,7 @@ class KInstance;
27 27
  * This namespace provides a method for issuing events to a KNotifyServer
28 28
  * call KNotifyClient::event("eventname"); to issue it.
29 29
  * On installation, there should be a file called
30
- * $KDEDIR/share/apps/appname/eventsrc which contains the events.
30
+ * $TDEDIR/share/apps/appname/eventsrc which contains the events.
31 31
  *
32 32
  * The file looks like this:
33 33
  * \code

+ 11
- 11
tdecore/kstandarddirs.cpp View File

@@ -167,7 +167,7 @@ static void priorityAdd(TQStringList &prefixes, const TQString& dir, bool priori
167 167
 {
168 168
     if (priority && !prefixes.isEmpty())
169 169
     {
170
-        // Add in front but behind $KDEHOME
170
+        // Add in front but behind $TDEHOME
171 171
         TQStringList::iterator it = prefixes.begin();
172 172
         it++;
173 173
         prefixes.insert(it, 1, dir);
@@ -1253,13 +1253,13 @@ TQString KStandardDirs::kfsstnd_defaultprefix()
1253 1253
    if (!s->defaultprefix.isEmpty())
1254 1254
       return s->defaultprefix;
1255 1255
 #ifdef Q_WS_WIN
1256
-   s->defaultprefix = readEnvPath("KDEDIR");
1256
+   s->defaultprefix = readEnvPath("TDEDIR");
1257 1257
    if (s->defaultprefix.isEmpty()) {
1258 1258
       s->defaultprefix = TQFile::decodeName("c:\\kde");
1259 1259
       //TODO: find other location (the Registry?)
1260 1260
    }
1261 1261
 #else //UNIX
1262
-   s->defaultprefix = KDEDIR;
1262
+   s->defaultprefix = TDEDIR;
1263 1263
 #endif
1264 1264
    if (s->defaultprefix.isEmpty())
1265 1265
       kdWarning() << "KStandardDirs::kfsstnd_defaultprefix(): default KDE prefix not found!" << endl;
@@ -1287,15 +1287,15 @@ void KStandardDirs::addKDEDefaults()
1287 1287
 {
1288 1288
     TQStringList kdedirList;
1289 1289
 
1290
-    // begin KDEDIRS
1291
-    TQString kdedirs = readEnvPath("KDEDIRS");
1290
+    // begin TDEDIRS
1291
+    TQString kdedirs = readEnvPath("TDEDIRS");
1292 1292
     if (!kdedirs.isEmpty())
1293 1293
     {
1294 1294
         tokenize(kdedirList, kdedirs, TQChar(KPATH_SEPARATOR));
1295 1295
     }
1296 1296
     else
1297 1297
     {
1298
-        TQString kdedir = readEnvPath("KDEDIR");
1298
+        TQString kdedir = readEnvPath("TDEDIR");
1299 1299
         if (!kdedir.isEmpty())
1300 1300
         {
1301 1301
            kdedir = KShell::tildeExpand(kdedir);
@@ -1303,8 +1303,8 @@ void KStandardDirs::addKDEDefaults()
1303 1303
         }
1304 1304
     }
1305 1305
 
1306
-#ifndef Q_OS_WIN //no default KDEDIR on win32 defined
1307
-    kdedirList.append(KDEDIR);
1306
+#ifndef Q_OS_WIN //no default TDEDIR on win32 defined
1307
+    kdedirList.append(TDEDIR);
1308 1308
 #endif
1309 1309
 
1310 1310
 #ifdef __KDE_EXECPREFIX
@@ -1324,10 +1324,10 @@ void KStandardDirs::addKDEDefaults()
1324 1324
     if (getuid() == 0) {
1325 1325
       localKdeDir = readEnvPath("KDEROOTHOME");
1326 1326
       if (localKdeDir.isEmpty() == true)
1327
-        localKdeDir = readEnvPath("KDEHOME");
1327
+        localKdeDir = readEnvPath("TDEHOME");
1328 1328
     }
1329 1329
     else {
1330
-      localKdeDir = readEnvPath("KDEHOME");
1330
+      localKdeDir = readEnvPath("TDEHOME");
1331 1331
     }
1332 1332
     if (!localKdeDir.isEmpty())
1333 1333
     {
@@ -1352,7 +1352,7 @@ void KStandardDirs::addKDEDefaults()
1352 1352
         TQString dir = KShell::tildeExpand(*it);
1353 1353
 	addPrefix(dir);
1354 1354
     }
1355
-    // end KDEDIRS
1355
+    // end TDEDIRS
1356 1356
 
1357 1357
     // begin XDG_CONFIG_XXX
1358 1358
     TQStringList xdgdirList;

+ 10
- 10
tdecore/kstandarddirs.h View File

@@ -105,17 +105,17 @@ class KStandardDirsPrivate;
105 105
  *
106 106
  * <b>KStandardDirs supports the following environment variables:</b>
107 107
  *
108
- * @li KDEDIRS: This may set an additional number of directory prefixes to
108
+ * @li TDEDIRS: This may set an additional number of directory prefixes to
109 109
  *          search for resources. The directories should be separated
110 110
  *          by ':'. The directories are searched in the order they are
111 111
  *          specified.
112
- * @li KDEDIR:  Used for backwards compatibility. As KDEDIRS but only a single
113
- *          directory may be specified. If KDEDIRS is set KDEDIR is
112
+ * @li TDEDIR:  Used for backwards compatibility. As TDEDIRS but only a single
113
+ *          directory may be specified. If TDEDIRS is set TDEDIR is
114 114
  *          ignored.
115
- * @li KDEHOME: The directory where changes are saved to. This directory is
116
- *          used to search for resources first. If KDEHOME is not
115
+ * @li TDEHOME: The directory where changes are saved to. This directory is
116
+ *          used to search for resources first. If TDEHOME is not
117 117
  *          specified it defaults to "$HOME/.kde"
118
- * @li KDEROOTHOME: Like KDEHOME, but used for the root user.
118
+ * @li KDEROOTHOME: Like TDEHOME, but used for the root user.
119 119
  *          If KDEROOTHOME is not set it defaults to the .kde directory in the
120 120
  *          home directory of root, usually "/root/.kde".
121 121
  *          Note that the setting of $HOME is ignored in this case.
@@ -139,7 +139,7 @@ public:
139 139
 	 * Adds another search dir to front of the @p fsstnd list.
140 140
 	 *
141 141
 	 * @li When compiling tdelibs, the prefix is added to this.
142
-	 * @li KDEDIRS or KDEDIR is taking into account
142
+	 * @li TDEDIRS or TDEDIR is taking into account
143 143
 	 * @li Additional dirs may be loaded from kdeglobals.
144 144
 	 *
145 145
 	 * @param dir The directory to append relative paths to.
@@ -213,7 +213,7 @@ public:
213 213
 	 * for resources. So is a way to get the path to libtdecore.la
214 214
 	 * to findResource("lib", "libtdecore.la"). KStandardDirs will
215 215
 	 * then look into the subdir lib of all elements of all prefixes
216
-	 * ($KDEDIRS) for a file libtdecore.la and return the path to
216
+	 * ($TDEDIRS) for a file libtdecore.la and return the path to
217 217
 	 * the first one it finds (e.g. /opt/kde/lib/libtdecore.la)
218 218
 	 *
219 219
 	 * @param type The type of the wanted resource
@@ -232,7 +232,7 @@ public:
232 232
 	 *
233 233
 	 * E.g. by restricting the "wallpaper" resource, only system-wide
234 234
 	 * installed wallpapers will be found by this class. Wallpapers
235
-	 * installed under the $KDEHOME directory will be ignored.
235
+	 * installed under the $TDEHOME directory will be ignored.
236 236
 	 *
237 237
 	 * @param type The type of the resource to check
238 238
 	 * @param relPath A relative path in the resource.
@@ -631,7 +631,7 @@ public:
631 631
 
632 632
         // Like their public counter parts but with an extra priority argument
633 633
         // If priority is true, the directory is added directly after
634
-        // $KDEHOME/$XDG_DATA_HOME/$XDG_CONFIG_HOME
634
+        // $TDEHOME/$XDG_DATA_HOME/$XDG_CONFIG_HOME
635 635
 	void addPrefix( const TQString& dir, bool priority );
636 636
 	void addXdgConfigPrefix( const TQString& dir, bool priority );
637 637
 	void addXdgDataPrefix( const TQString& dir, bool priority );

+ 1
- 1
tdecore/ksycoca.h View File

@@ -99,7 +99,7 @@ public:
99 99
     * @internal - returns update signature of database
100 100
     *
101 101
     * Signature that keeps track of changes to
102
-    * $KDEDIR/share/services/update_ksycoca
102
+    * $TDEDIR/share/services/update_ksycoca
103 103
     *
104 104
     * Touching this file causes the database to be recreated
105 105
     * from scratch.

+ 1
- 1
tdecore/ktempdir.h View File

@@ -57,7 +57,7 @@ public:
57 57
     * Creates a temporary directory with the name:
58 58
     *  \p \<directoryPrefix\>\<six letters\>
59 59
     *
60
-    * The default \p directoryPrefix is "$KDEHOME/tmp-$HOST/appname"
60
+    * The default \p directoryPrefix is "$TDEHOME/tmp-$HOST/appname"
61 61
     * @param directoryPrefix the prefix of the file name, or
62 62
     *        TQString::null for the default value
63 63
     * @param mode the file permissions,

+ 1
- 1
tdecore/ktempfile.h View File

@@ -60,7 +60,7 @@ public:
60 60
     * Creates a temporary file with the name:
61 61
     *  \<filePrefix>\<six letters>\<fileExtension>
62 62
     *
63
-    * The default @p filePrefix is "$KDEHOME/tmp-$HOST/appname/"
63
+    * The default @p filePrefix is "$TDEHOME/tmp-$HOST/appname/"
64 64
     * The default @p fileExtension is ".tmp"
65 65
     * @param filePrefix the prefix of the file name, or TQString::null
66 66
     *        for the default value

+ 1
- 1
tdesu/client.cpp View File

@@ -388,7 +388,7 @@ int KDEsuClient::stopServer()
388 388
 static TQString findDaemon()
389 389
 {
390 390
     TQString daemon = locate("bin", "tdesud");
391
-    if (daemon.isEmpty()) // if not in KDEDIRS, rely on PATH
391
+    if (daemon.isEmpty()) // if not in TDEDIRS, rely on PATH
392 392
 	daemon = KStandardDirs::findExe("tdesud");
393 393
 
394 394
     if (daemon.isEmpty())

+ 1
- 1
tdeui/kpanelextension.h View File

@@ -43,7 +43,7 @@ class KPanelExtensionPrivate;
43 43
  * external wrapper process.
44 44
  *
45 45
  * The panel locates available extensions by searching for extension desktop
46
- * files in (ALL_KDEDIRS)/share/apps/kicker/extensions. Every panel extension should
46
+ * files in (ALL_TDEDIRS)/share/apps/kicker/extensions. Every panel extension should
47 47
  * install a desktop file there to be recognized by the panel.
48 48
  *
49 49
  * Besides standard keys like "Name", "Comment" and "Icon" there are

+ 1
- 1
tdeui/kpanelmenu.h View File

@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
46 46
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
47 47
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
48 48
  * library name without any extension). This desktop file has to be installed in
49
- * $KDEDIR/share/apps/kicker/menuext/.
49
+ * $TDEDIR/share/apps/kicker/menuext/.
50 50
  *
51 51
  * @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
52 52
  */

+ 1
- 1
win/common.pro View File

@@ -46,7 +46,7 @@ contains(KW_CONFIG,console) {
46 46
 
47 47
 # global binary destination directory
48 48
 isEmpty( KDEBINDESTDIR ) {
49
-	KDEBINDESTDIR = $(KDEDIR)
49
+	KDEBINDESTDIR = $(TDEDIR)
50 50
 }
51 51
 
52 52
 # global library destination directory 

+ 1
- 1
win/config.h View File

@@ -36,7 +36,7 @@
36 36
 #define HAVE_SYS_TIME_H 1
37 37
 #endif
38 38
 
39
-/*#define KDEDIR "F:\\KDE"  TODO */
39
+/*#define TDEDIR "F:\\KDE"  TODO */
40 40
 
41 41
 #define KDELIBSUFF ""
42 42
 

+ 2
- 2
win/pro_files/kmdi/test/test.pro View File

@@ -10,8 +10,8 @@ CONFIG += debug
10 10
 CONFIG += console
11 11
 
12 12
 unix:DEFINES   = NO_INCLUDE_MOCFILES QT_NO_COMPAT
13
-unix:LIBS       += -lkmdi -L$(KDEDIR)/lib -ltdecore -ltdeui -lDCOP -lkparts
14
-unix:INCLUDEPATH     += . .. $(KDEDIR)/include
13
+unix:LIBS       += -lkmdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -lkparts
14
+unix:INCLUDEPATH     += . .. $(TDEDIR)/include
15 15
 
16 16
 LIBS += $$KDELIBDESTDIR\kmdi$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX
17 17
 

+ 1
- 1
win/pro_files/tdefx/tdefx_rel.pro View File

@@ -12,7 +12,7 @@ DEFINES += MAKE_TDEFX_LIB
12 12
 
13 13
 system( moc kstyle.h -o moc/kstyle.moc )
14 14
 
15
-LIBS -= "$(KDEDIR)\lib\kdewin32_$(KDE_VER).lib" "$(KDEDIR)\lib\ltdl_$(KDE_VER).lib"
15
+LIBS -= "$(TDEDIR)\lib\kdewin32_$(KDE_VER).lib" "$(TDEDIR)\lib\ltdl_$(KDE_VER).lib"
16 16
 
17 17
 SOURCES = \
18 18
 kimageeffect.cpp \

+ 2
- 2
win/tdelibs_global_win.h View File

@@ -79,8 +79,8 @@ int kde_start
79 79
 #ifdef __cplusplus
80 80
 #include <tqstring.h>
81 81
 
82
-# ifndef KDEDIR
83
-#  define KDEDIR TQString(KDEWIN32_DIR)
82
+# ifndef TDEDIR
83
+#  define TDEDIR TQString(KDEWIN32_DIR)
84 84
 # endif
85 85
 # ifndef __KDE_BINDIR 
86 86
 #  define __KDE_BINDIR TQString(KDEWIN32_DIR "/bin")

+ 2
- 2
win/tools/.check_kde_env View File

@@ -7,8 +7,8 @@ if [ -z "$KDEWIN" ] ; then
7 7
 	exit 1
8 8
 fi
9 9
 
10
-if [ -z "$KDEDIR" ] ; then 
11
-	echo `basename $0`": \$KDEDIR environment variable is not set. Set it to absolute path of tdelibs/win32 binaries, e.g. C:\\kde"
10
+if [ -z "$TDEDIR" ] ; then 
11
+	echo `basename $0`": \$TDEDIR environment variable is not set. Set it to absolute path of tdelibs/win32 binaries, e.g. C:\\kde"
12 12
 	exit 1
13 13
 fi
14 14
 

+ 2
- 2
win/tools/build_tdelibs_dbg View File

@@ -16,7 +16,7 @@ echo "-------------------------------------------------"
16 16
 echo "Building Debug Version of KDElibs/win32"
17 17
 echo "Source directory: \$KDELIBS = $KDELIBS"
18 18
 echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT"
19
-echo "Destination directory: \$KDEDIR = $KDEDIR"
19
+echo "Destination directory: \$TDEDIR = $TDEDIR"
20 20
 if [ -n $noclean ] ; then
21 21
 	echo "Options: noclean"
22 22
 fi
@@ -73,7 +73,7 @@ qmake makekdewidgets.pro && $make clean && $make || exit 1
73 73
 qmake && $make clean && $make || exit 1
74 74
 
75 75
 # copy kdewidgets plugin for Qt Designer
76
-cp $KDEDIR/lib/trinity/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/
76
+cp $TDEDIR/lib/trinity/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/
77 77
 
78 78
 cd $pwd
79 79
 

+ 1
- 1
win/tools/build_tdelibs_rel View File

@@ -16,7 +16,7 @@ echo "-------------------------------------------------"
16 16
 echo "Building Release Version of KDElibs/win32"
17 17
 echo "Source directory: \$KDELIBS = $KDELIBS"
18 18
 echo "Version: $KDE_VER_MAJ.$KDE_VER_MIN.$KDE_VER_PAT"
19
-echo "Destination directory: \$KDEDIR = $KDEDIR"
19
+echo "Destination directory: \$TDEDIR = $TDEDIR"
20 20
 if [ -n $noclean ] ; then
21 21
 	echo "Options: noclean"
22 22
 fi

+ 1
- 1
win/tools/kde_env_custom.template View File

@@ -7,7 +7,7 @@
7 7
 	MSVC="c:\\vs7"
8 8
 
9 9
 # Top KDE Directory - target of your compilation, please change
10
-export KDEDIR="c:\\kde"
10
+export TDEDIR="c:\\kde"
11 11
 
12 12
 # KDElibs/win32 top source directory, please change
13 13
 KDEWIN="c:\\kdewin32"

Loading…
Cancel
Save