Rename KDEHOME and KDEDIR

22 files changed, 38 insertions, 38 deletions

diff --git a/doc/knewsticker/index.docbook b/doc/knewsticker/index.docbook
index 140652cd..2afc70f6 100644
--- a/doc/knewsticker/index.docbook
+++ b/doc/knewsticker/index.docbook
@@ -1102,7 +1102,7 @@ this at the console:</para>
 <note><para>If an error appears that tells you that <filename>dcop</filename>
 couldn't be found or executed, please check whether the file
 <filename>dcop</filename> exists in
-<filename class="directory">$<envar>KDEDIR</envar>/bin</filename> and make sure its
+<filename class="directory">$<envar>TDEDIR</envar>/bin</filename> and make sure its
 permissions are set appropriately.</para></note>
 
 <para>In that command line, just replace <quote>[function]</quote> with the
diff --git a/doc/kopete/index.docbook b/doc/kopete/index.docbook
index f78c9ab8..5d3fc810 100644
--- a/doc/kopete/index.docbook
+++ b/doc/kopete/index.docbook
@@ -912,18 +912,18 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
 
 <para>The emoticons are easy to install - you just place a directory containing
 the icon files along with an XML file describing the mapping from text to picture in
-$KDEDIR/share/apps/kopete/pics/emoticons (or $KDEHOME, for example, in /home/joeuser/.kde/).</para>
+$TDEDIR/share/apps/kopete/pics/emoticons (or $TDEHOME, for example, in /home/joeuser/.kde/).</para>
 
 <orderedlist>
-<listitem><para>Copy the extracted directory to $KDEDIR/share/apps/kopete/pics/emoticons or
- $HOME/.kde/share/apps/kopete/pics/emoticons (or wherever $KDEHOME is)</para></listitem>
+<listitem><para>Copy the extracted directory to $TDEDIR/share/apps/kopete/pics/emoticons or
+ $HOME/.kde/share/apps/kopete/pics/emoticons (or wherever $TDEHOME is)</para></listitem>
 <listitem><para>Select Configure &kopete; from the Settings menu and click on Appearance in the left panel of the Preferences window and click on the Emoticons tab</para></listitem>
 <listitem><para>Select the emoticons set you just installed from the list</para></listitem>
 <listitem><para>Now you can use the newly installed emoticons in &kopete;</para></listitem>
 </orderedlist>
 <para>To replace the protocol icons, you'll have to replace the icons in
-$KDEDIR/share/apps/kopete/icons, or provide replacements to override them in
-the same dir under $KDEHOME.  At present there aren't any complete replacement
+$TDEDIR/share/apps/kopete/icons, or provide replacements to override them in
+the same dir under $TDEHOME.  At present there aren't any complete replacement
 sets that you can simply extract there.</para>
 </answer>
 </qandaentry>
diff --git a/doc/kppp/accounting.docbook b/doc/kppp/accounting.docbook
index ec6db43c..69401512 100644
--- a/doc/kppp/accounting.docbook
+++ b/doc/kppp/accounting.docbook
@@ -10,7 +10,7 @@ maintainer. The newly created rules file can be checked for valid syntax with
 the <userinput><option>-r</option>
 <replaceable>rule_file</replaceable></userinput> command line option to &kppp;
 and must be installed in <filename
-class="directory">${KDEDIR}/share/apps/kppp/Rules</filename> or in <filename
+class="directory">${TDEDIR}/share/apps/kppp/Rules</filename> or in <filename
 class="directory">${HOME}/.kde/share/apps/kppp/Rules</filename> before you will
 be able to select it in this dialog.</para>
 
diff --git a/doc/kppp/kppp-faq.docbook b/doc/kppp/kppp-faq.docbook
index 57ef26ff..bef790a7 100644
--- a/doc/kppp/kppp-faq.docbook
+++ b/doc/kppp/kppp-faq.docbook
@@ -135,8 +135,8 @@ your purposes. In order to give &kppp; setuid <systemitem>root</systemitem>
 permissions do the following:</para>
 
 <screen><prompt>%</prompt> <userinput><command>su</command> <option>root</option></userinput>
-<prompt>#</prompt> <userinput><command>chown</command> <option>root:root &dollar;KDEDIR/bin/kppp</option></userinput>
-<prompt>#</prompt> <userinput><command>chmod</command> <option>+s &dollar;KDEDIR/bin/kppp</option></userinput>
+<prompt>#</prompt> <userinput><command>chown</command> <option>root:root &dollar;TDEDIR/bin/kppp</option></userinput>
+<prompt>#</prompt> <userinput><command>chmod</command> <option>+s &dollar;TDEDIR/bin/kppp</option></userinput>
 <prompt>#</prompt> <userinput><command>exit</command></userinput>
 </screen>
 </answer>
@@ -369,7 +369,7 @@ the following AT commands:</para>
 <question><para>How do I write a telephones cost rules file?</para></question>
 <answer><para>Just follow the <filename>TEMPLATE</filename> rules file supplied
 with &kppp;.  You should be able to find a copy in <filename
-class="directory">$KDEDIR/doc/HTML/<replaceable>yourlang</replaceable>/kppp/</filename>.
+class="directory">$TDEDIR/doc/HTML/<replaceable>yourlang</replaceable>/kppp/</filename>.
 Use the <option>-r</option> &kppp; command line option to check the syntax of
 your proposed rules file.</para></answer>
 </qandaentry>
diff --git a/doc/ksirc/index.docbook b/doc/ksirc/index.docbook
index 78b08656..b45fbd5a 100644
--- a/doc/ksirc/index.docbook
+++ b/doc/ksirc/index.docbook
@@ -536,7 +536,7 @@ on.</para></listitem>
 
 <varlistentry>
 <term><guilabel>Enable logging</guilabel></term>
-<listitem><para>Creates log files for each channel per day. These log files are stored in $KDEHOME/share/apps/ksirc/logs/ and the files look like: /$KDEHOME/share/apps/ksirc/logs/#channelname_year_month_day_servername.log</para></listitem>
+<listitem><para>Creates log files for each channel per day. These log files are stored in $TDEHOME/share/apps/ksirc/logs/ and the files look like: /$TDEHOME/share/apps/ksirc/logs/#channelname_year_month_day_servername.log</para></listitem>
 </varlistentry>
 
 <varlistentry>
diff --git a/doc/ktalkd/index.docbook b/doc/ktalkd/index.docbook
index cfb6f8e2..b35fa3d4 100644
--- a/doc/ktalkd/index.docbook
+++ b/doc/ktalkd/index.docbook
@@ -143,7 +143,7 @@ if you're away. There are 3 different forwarding methods. See section
 <para>
 If &ktalkd; is compiled for &kde;, it reads config from &kde; config
 files, the sitewide
-(<filename>$<envar>KDEDIR</envar>/share/config/ktalkdrc</filename>) and
+(<filename>$<envar>TDEDIR</envar>/share/config/ktalkdrc</filename>) and
 the user one, in its home folder. The sitewide one has to be manually
 edited by the administrator, but there is now a configuration dialog for
 the user one. It's called <command>kcmktalkd</command> and can be found
diff --git a/doc/kwifimanager/index.docbook b/doc/kwifimanager/index.docbook
index e48d0a4a..d6756df3 100644
--- a/doc/kwifimanager/index.docbook
+++ b/doc/kwifimanager/index.docbook
@@ -178,11 +178,11 @@
           <para> The last line of the main window shows information about your AccessPoint. This
             requires that your system administrator provided a list of MAC addresses with a
             corresponding information. An example for such a list can be found
-                in<filename>$<envar>KDEDIR</envar>/share/apps/kwifimanager/locations/DE_BW_Karlsruhe_University.loc</filename>
+                in<filename>$<envar>TDEDIR</envar>/share/apps/kwifimanager/locations/DE_BW_Karlsruhe_University.loc</filename>
           </para>
           <para>If you want to set up a new list, simply create a file in the same format and copy
             it into the folder <filename class="directory"
-              >$<envar>KDEDIR</envar>/share/apps/kwifimanager/locations/</filename>
+              >$<envar>TDEDIR</envar>/share/apps/kwifimanager/locations/</filename>
           </para>
           <para>It will be automatically parsed at the next start of &kwifimanager;. If you have
             a list and want to have it included in future releases of &kwifimanager;, simply
diff --git a/doc/lisa/index.docbook b/doc/lisa/index.docbook
index 758b51d2..f135a737 100644
--- a/doc/lisa/index.docbook
+++ b/doc/lisa/index.docbook
@@ -586,7 +586,7 @@ MaxPingsAtOnce = 256                    #send up to 256 ICMP echo requests at on
 <para>Search first for
 <filename>$<envar>HOME</envar>/.kde/share/config/lisarc</filename>, then
 for
-<filename>$<envar>KDEDIR</envar>/share/config/lisarc</filename>.</para>
+<filename>$<envar>TDEDIR</envar>/share/config/lisarc</filename>.</para>
 </listitem>
 </varlistentry>
 
diff --git a/kopete/INSTALL b/kopete/INSTALL
index 1fc6e9d4..a8f262e7 100644
--- a/kopete/INSTALL
+++ b/kopete/INSTALL
@@ -200,7 +200,7 @@ console and restart Kopete when it finishes. If that doesn't help,
 please read on.
 
 KDE applications by default look in all directories listed in the
-/etc/kderc file, the $KDEDIRS environment variable, in $KDEDIR if
+/etc/kderc file, the $TDEDIRS environment variable, in $TDEDIR if
 this variable doesn't exist, and ultimately in the directory where
 tdelibs is installed. Unless you take special precautions applications
 will _NOT_ look in other directories, even if you install additional
@@ -216,8 +216,8 @@ If you don't have write access to /etc/kderc, or if you want to use more
 parallel builds of KDE and/or Kopete you need to rely on the environment
 variables instead.
 
-If $KDEDIRS currently points to /opt/trinity and you installed Kopete
-to /usr/local then you need to set $KDEDIRS to '/opt/trinity:/usr/local'.
+If $TDEDIRS currently points to /opt/trinity and you installed Kopete
+to /usr/local then you need to set $TDEDIRS to '/opt/trinity:/usr/local'.
 You need to store this change in a file that is picked up by all shells
 and for all users, like /etc/profile. The name of the preferred version
 varies from system to system.
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp
index 2f6ea711..91626e66 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp
+++ b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp
@@ -33,7 +33,7 @@ void ChatWindowStyle_Test::allTests()
 	testStyle = new ChatWindowStyle(TQString(SRCDIR)+TQString("/TestStyle"));
 
 	// change user data dir to avoid messing with user's .kde dir
-	setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
+	setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
 
 	testPaths();
 	testHtml();
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
index 4a2b648f..c3dd3edc 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
+++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
@@ -181,7 +181,7 @@ ChatWindowStyleRendering_Test::~ChatWindowStyleRendering_Test()
 void ChatWindowStyleRendering_Test::allTests()
 {
 	// change user data dir to avoid messing with user's .kde dir
-	setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
+	setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
 
 	KApplication::disableAutoDcopRegistration();
 	//KCmdLineArgs::init(argc,argv,"testkopetemessage", 0, 0, 0, 0);
diff --git a/kopete/libkopete/tests/kopetecontactlist_test.cpp b/kopete/libkopete/tests/kopetecontactlist_test.cpp
index 933a67bb..3ac1b34a 100644
--- a/kopete/libkopete/tests/kopetecontactlist_test.cpp
+++ b/kopete/libkopete/tests/kopetecontactlist_test.cpp
@@ -34,7 +34,7 @@ void KopeteContactList_Test::allTests()
 void KopeteContactList_Test::testSomething()
 {
 	// change user data dir to avoid messing with user's .kde dir
-	setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
+	setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
 
 	TQString filename = locateLocal( "appdata", TQString::tqfromLatin1( "contactlist.xml" ) );
 	if( ! filename.isEmpty() )
diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp
index e8ada405..1f3fd436 100644
--- a/kopete/libkopete/tests/kopeteemoticontest.cpp
+++ b/kopete/libkopete/tests/kopeteemoticontest.cpp
@@ -51,7 +51,7 @@ KUNITTEST_MODULE_REGISTER_TESTER( KopeteEmoticonTest );
 void KopeteEmoticonTest::allTests()
 {
 	// change user data dir to avoid messing with user's .kde dir
-	setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
+	setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
 
 	//KApplication::disableAutoDcopRegistration();
 	//KApplication app;
diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp
index 5603b911..293da6b9 100644
--- a/kopete/libkopete/tests/kopetemessage_test.cpp
+++ b/kopete/libkopete/tests/kopetemessage_test.cpp
@@ -50,7 +50,7 @@ KUNITTEST_MODULE_REGISTER_TESTER( KopeteMessage_Test );
 KopeteMessage_Test::KopeteMessage_Test()
 {
 	// change user data dir to avoid messing with user's .kde dir
-	setenv( "KDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
+	setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
 
 	// create fake objects needed to build a reasonable testeable message
 	m_protocol = new Kopete::Test::Mock::Protocol( new KInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message");
diff --git a/kppp/INSTALL b/kppp/INSTALL
index a207c1e1..56fecbc7 100644
--- a/kppp/INSTALL
+++ b/kppp/INSTALL
@@ -15,7 +15,7 @@ make install
 
 o If you run "make install" as root the kppp binary will be installed
   setuid root. Otherwise you can do this on your own:
-  cd $(KDEDIR)/bin ; chown root kppp; chmod +s kppp. This might not 
+  cd $(TDEDIR)/bin ; chown root kppp; chmod +s kppp. This might not 
   be absolutely necessary ( depending on the permissions 
   set on the modem device, /etc/resolv.conf etc. but if you can 
   afford to, this will make your life much easier.
diff --git a/kppp/Rules/Austria/Standard/UTA_easyinternet.rst b/kppp/Rules/Austria/Standard/UTA_easyinternet.rst
index 956933b9..ad5e6425 100644
--- a/kppp/Rules/Austria/Standard/UTA_easyinternet.rst
+++ b/kppp/Rules/Austria/Standard/UTA_easyinternet.rst
@@ -42,7 +42,7 @@ on (monday..friday) between (18:00..8:00) use (0.002667, 1)
 on (saturday..sunday) between (0:00..23:59) use (0.002667, 1)
 
 # Feiertage, übernommen aus 
-# $KDEDIR/share/apps/kppp/Rules/Austria/Standard/Online.rst
+# $TDEDIR/share/apps/kppp/Rules/Austria/Standard/Online.rst
 # (von Mario Weilguni <mweilguni@sime.com>)
 on (5/1,12/25,12/26,11/1,easter+1,easter+39,easter+50,1/1,10/26,1/6,12/8) between (00:00..23:59) use (0.002667, 1)
 
diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp
index 2a1ec1f8..121713c5 100644
--- a/kppp/acctselect.cpp
+++ b/kppp/acctselect.cpp
@@ -255,7 +255,7 @@ void AccountingSelector::setupTreeWidget() {
   tl->setColumnWidth(0, 205);
   tl->setRootIsDecorated(true);
 
-  // look in ~/.kde/share/apps/kppp/Rules and $KDEDIR/share/apps/kppp/Rules
+  // look in ~/.kde/share/apps/kppp/Rules and $TDEDIR/share/apps/kppp/Rules
   TQStringList dirs = KGlobal::dirs()->resourceDirs("appdata");
   for (TQStringList::ConstIterator it = dirs.begin();
        it != dirs.end(); it++) {
diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp
index 3b96df99..423e90c0 100644
--- a/ksirc/KSOpenkSirc/open_ksirc.cpp
+++ b/ksirc/KSOpenkSirc/open_ksirc.cpp
@@ -44,7 +44,7 @@ open_ksirc::open_ksirc
   setCaption( i18n("Connect to Server") );
 
   // check for existance of ~/.kde/share/apps/ksirc/servers.txt
-  // if it don't exist use $KDEDIR/share/apps/ksirc/servers.txt
+  // if it don't exist use $TDEDIR/share/apps/ksirc/servers.txt
   // changes are written to ~/.kde/share/apps/ksirc/servers.txt
 
   TQString filename = locate("appdata", "servers.txt");
diff --git a/ktalkd/ChangeLog b/ktalkd/ChangeLog
index de5efc5d..30fca6cd 100644
--- a/ktalkd/ChangeLog
+++ b/ktalkd/ChangeLog
@@ -368,12 +368,12 @@
 	ktalkd now opens ktalkdrc from KApplication::kde_configdir().
 
 1998-03-26  David Faure  <faure@kde.org> (0.5.0)
-	ktalkdrc: Extprg is now $KDEDIR/bin/ktalkdlg.
-	KDEDIR is now set when reading global configuration file.
-	Default value for Extprg includes $KDEDIR.
+	ktalkdrc: Extprg is now $TDEDIR/bin/ktalkdlg.
+	TDEDIR is now set when reading global configuration file.
+	Default value for Extprg includes $TDEDIR.
 
 1998-03-25  David Faure  <faure@kde.org> (0.4.8)
-	KDEDIR is now set by ktalkd, not by ktalkdlg.
+	TDEDIR is now set by ktalkd, not by ktalkdlg.
 	ktalkdrc*:removed path in front of sound files. ktalkdlg now finds them
 	 in kde_sounddir().
 	Added option ExtPrg. Set to ktalkdlg (default) or ktalk.
@@ -408,7 +408,7 @@
 
 1998-02-04  David Faure  <faure@kde.org> (0.4.2)
 	Added user option Answmach.
-	Moved the daemon to $KDEDIR/bin. One must now change inetd.conf 
+	Moved the daemon to $TDEDIR/bin. One must now change inetd.conf 
 	(this way, rpms won't conflict with standard ones, and the old
 	in.ntalkd will remain available). Should I deviate 'talk' protocol
 	too (in addition to 'ntalk') ?
@@ -416,7 +416,7 @@
 	Merged and updated READMEs.
 
 1998-02-03  David Faure  <faure@kde.org> (0.4.1)
-	Added -rpath option, as it's necessary for ktalkd if $KDEDIR/lib is
+	Added -rpath option, as it's necessary for ktalkd if $TDEDIR/lib is
 	not set in ld.so.conf (LD_LIBRARY_PATH not read by a daemon)
 
 1998-02-03 David Faure  <faure@kde.org> (0.4.0)
@@ -439,7 +439,7 @@
 
 1998-01-25  David Faure  <faure@kde.org> (0.3.2)
 	Changed default configuration : ktalkd.wav will be installed
-	in $KDEDIR/share/apps/ktalkd.  ktalkdrc points to it.
+	in $TDEDIR/share/apps/ktalkd.  ktalkdrc points to it.
 	Made package install_root capable (e.g. for building rpms).
 
 1998-01-25  David Faure  <faure@kde.org> (0.3.1)
@@ -496,7 +496,7 @@
 	Back to c compiling, except for .cpp files, of course.
 
 1997-12-02  David Faure <faure@kde.org> (0.1.5)
-	Read KDE configuration file, $KDEDIR/share/config/ktalkdrc, both by
+	Read KDE configuration file, $TDEDIR/share/config/ktalkdrc, both by
 	atdlg and ktalkd, in readcfg++.cpp. Made all daemon compile with g++.
 	(Is this right ?)
 
diff --git a/ktalkd/ktalkd/readcfg++.cpp b/ktalkd/ktalkd/readcfg++.cpp
index 974d7ea8..c59cf0ca 100644
--- a/ktalkd/ktalkd/readcfg++.cpp
+++ b/ktalkd/ktalkd/readcfg++.cpp
@@ -93,7 +93,7 @@ int init_user_config(const char * l_name)
 
       /* Set $HOME, because KInstance uses it */
       setenv("HOME",pw->pw_dir,1 /* overwrite */); 
-      unsetenv("KDEHOME");
+      unsetenv("TDEHOME");
       unsetenv("XAUTHORITY");
 ktalk_debug("%s",pw->pw_dir);
       KInstance tmpInstance("tmpInstance");
diff --git a/lanbrowsing/lisa/README b/lanbrowsing/lisa/README
index c6d5d1bd..d6d33156 100644
--- a/lanbrowsing/lisa/README
+++ b/lanbrowsing/lisa/README
@@ -383,7 +383,7 @@ For reslisa the file is named reslisarc instead lisarc.
                    for /etc/lisarc, this is the default behaviour
                    
 -k, --kde1         search at first for $HOME/.kde/share/config/lisarc,
-                   then for $KDEDIR/share/config/lisarc
+                   then for $TDEDIR/share/config/lisarc
 
 -K, --kde2         looks for the file lisarc in every directory
                    returned by running "kde-config --path config"
diff --git a/lanbrowsing/lisa/netmanager.cpp b/lanbrowsing/lisa/netmanager.cpp
index e652ce97..092d5180 100644
--- a/lanbrowsing/lisa/netmanager.cpp
+++ b/lanbrowsing/lisa/netmanager.cpp
@@ -341,7 +341,7 @@ MyString NetManager::getConfigFileName()
       tmpFilename+=MyString("/.kde/share/config/")+tmpBase;
       if (fileReadable(tmpFilename))
          return tmpFilename;
-      tmpFilename=getenv("KDEDIR");
+      tmpFilename=getenv("TDEDIR");
       tmpFilename+=MyString("/share/config/")+tmpBase;
       if (fileReadable(tmpFilename))
          return tmpFilename;