Rename a few build variables for overall consistency

16 files changed, 31 insertions, 31 deletions

diff --git a/doc/tdm/tdmrc-ref.docbook b/doc/tdm/tdmrc-ref.docbook
index 488cbe689..c5bf14869 100644
--- a/doc/tdm/tdmrc-ref.docbook
+++ b/doc/tdm/tdmrc-ref.docbook
@@ -2265,7 +2265,7 @@ the following environment variables are passed:</para>
   <listitem><para>may be set to a non-standard authority file</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term>KRBTKFILE</term>
+  <term>KRBTTDEFILE</term>
   <listitem><para>may be set to a Kerberos4 credentials cache name</para>
   </listitem>
  </varlistentry>
diff --git a/kcontrol/background/Makefile.am b/kcontrol/background/Makefile.am
index e1d847ead..c64cdc5c1 100644
--- a/kcontrol/background/Makefile.am
+++ b/kcontrol/background/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_background.la
 
 kcm_background_la_SOURCES = main.cpp
 kcm_background_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined
-kcm_background_la_LIBADD = libkcmbgnd.la libbgnd.la $(LIB_KFILE) $(LIB_KNEWSTUFF)
+kcm_background_la_LIBADD = libkcmbgnd.la libbgnd.la $(LIB_TDEFILE) $(LIB_KNEWSTUFF)
 
 METASOURCES = AUTO
 
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
index 8a86b1ae2..474b0e7fb 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h
@@ -1,5 +1,5 @@
-#ifndef __KFILE_FONT_ICON_VIEW_H__
-#define __KFILE_FONT_ICON_VIEW_H__
+#ifndef __TDEFILE_FONT_ICON_VIEW_H__
+#define __TDEFILE_FONT_ICON_VIEW_H__
 
 ////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
index 6496c13fd..7a6adb448 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
@@ -1,5 +1,5 @@
-#ifndef __KFILE_FONT_VIEW_H__
-#define __KFILE_FONT_VIEW_H__
+#ifndef __TDEFILE_FONT_VIEW_H__
+#define __TDEFILE_FONT_VIEW_H__
 
 ////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/kcontrol/kfontinst/tdefile-plugin/KFileFont.h b/kcontrol/kfontinst/tdefile-plugin/KFileFont.h
index a383d9a8e..b479ba3b1 100644
--- a/kcontrol/kfontinst/tdefile-plugin/KFileFont.h
+++ b/kcontrol/kfontinst/tdefile-plugin/KFileFont.h
@@ -1,5 +1,5 @@
-#ifndef __KFILE_FONT_H__
-#define __KFILE_FONT_H__
+#ifndef __TDEFILE_FONT_H__
+#define __TDEFILE_FONT_H__
 
 ////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/kcontrol/randr/Makefile.am b/kcontrol/randr/Makefile.am
index d1f137140..7a5357c63 100644
--- a/kcontrol/randr/Makefile.am
+++ b/kcontrol/randr/Makefile.am
@@ -30,7 +30,7 @@ bin_PROGRAMS = tderandrtray
 
 tderandrtray_SOURCES = main.cpp tderandrtray.cpp tderandrapp.cpp tderandrpassivepopup.cpp configdialog.cpp
 tderandrtray_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltderandr
-tderandrtray_LDADD = $(LIB_KFILE) $(LIB_KUTILS) $(LIB_XRANDR)
+tderandrtray_LDADD = $(LIB_TDEFILE) $(LIB_KUTILS) $(LIB_XRANDR)
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/tderandr.pot
diff --git a/kcontrol/randr/tderandrapp.h b/kcontrol/randr/tderandrapp.h
index 766b0056c..004da6294 100644
--- a/kcontrol/randr/tderandrapp.h
+++ b/kcontrol/randr/tderandrapp.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef KRANDRAPP_H
-#define KRANDRAPP_H
+#ifndef TDERANDRAPP_H
+#define TDERANDRAPP_H
 
 #include <tqtimer.h>
 #include <kuniqueapplication.h>
diff --git a/kcontrol/randr/tderandrmodule.h b/kcontrol/randr/tderandrmodule.h
index 188b4ea1d..65131ee26 100644
--- a/kcontrol/randr/tderandrmodule.h
+++ b/kcontrol/randr/tderandrmodule.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef KRANDRMODULE_H
-#define KRANDRMODULE_H
+#ifndef TDERANDRMODULE_H
+#define TDERANDRMODULE_H
 
 #include <libtderandr/libtderandr.h>
 
diff --git a/kcontrol/randr/tderandrtray.h b/kcontrol/randr/tderandrtray.h
index 320f0cb1c..6c96203e4 100644
--- a/kcontrol/randr/tderandrtray.h
+++ b/kcontrol/randr/tderandrtray.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef KRANDRTRAY_H
-#define KRANDRTRAY_H
+#ifndef TDERANDRTRAY_H
+#define TDERANDRTRAY_H
 
 #include <tqptrlist.h>
 
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index 0189c9e56..14e3427f3 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -53,7 +53,7 @@
 
 extern KSimpleConfig *config;
 
-#define TSAK_LOCKFILE "/tmp/tdesocket-global/tsak.lock"
+#define TSAK_LOCTDEFILE "/tmp/tdesocket-global/tsak.lock"
 
 TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   : TQWidget(parent, name), sakwarning(0)
@@ -486,7 +486,7 @@ void TDMAppearanceWidget::save()
   }
   else {
     // Get PID
-    TQFile file(TSAK_LOCKFILE);
+    TQFile file(TSAK_LOCTDEFILE);
     if (file.open(IO_ReadOnly)) {
       TQTextStream stream(&file);
       unsigned long tsakpid = stream.readLine().toULong();
diff --git a/kdesktop/tdefileividesktop.h b/kdesktop/tdefileividesktop.h
index 8dd0f1fc4..a4a4f4e0c 100644
--- a/kdesktop/tdefileividesktop.h
+++ b/kdesktop/tdefileividesktop.h
@@ -21,8 +21,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef KFILE_IVI_DESKTOP
-#define KFILE_IVI_DESKTOP
+#ifndef TDEFILE_IVI_DESKTOP
+#define TDEFILE_IVI_DESKTOP
 
 #include <tqcolor.h>
 #include <tqpixmap.h>
diff --git a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h
index e8dc7d26a..dcc2591be 100644
--- a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h
+++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KFILE_MEDIA_H_
-#define _KFILE_MEDIA_H_
+#ifndef _TDEFILE_MEDIA_H_
+#define _TDEFILE_MEDIA_H_
 
 #include <tdefilemetainfo.h>
 #include <kurl.h>
diff --git a/tdeioslave/trash/tdefile-plugin/tdefile_trash.h b/tdeioslave/trash/tdefile-plugin/tdefile_trash.h
index ad3d276d6..71e4f2bff 100644
--- a/tdeioslave/trash/tdefile-plugin/tdefile_trash.h
+++ b/tdeioslave/trash/tdefile-plugin/tdefile_trash.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef __KFILE_TRASH_H_
-#define __KFILE_TRASH_H_
+#ifndef __TDEFILE_TRASH_H_
+#define __TDEFILE_TRASH_H_
 
 #include <tdefilemetainfo.h>
 #include "../trashimpl.h"
diff --git a/tdm/backend/client.c b/tdm/backend/client.c
index 313812f3f..344984edb 100644
--- a/tdm/backend/client.c
+++ b/tdm/backend/client.c
@@ -1308,7 +1308,7 @@ StartClient()
 		env = setEnv (env, "TDM_AUTOLOGIN", curuser);
 #if !defined(USE_PAM) && !defined(_AIX) && defined(KERBEROS)
 	if (krbttdefile[0] != '\0')
-		env = setEnv( env, "KRBTKFILE", krbttdefile );
+		env = setEnv( env, "KRBTTDEFILE", krbttdefile );
 #endif
 #ifdef WITH_CONSOLE_KIT
 	if (ck_session_cookie != NULL) {
diff --git a/tdm/config.def b/tdm/config.def
index b1045b6db..7ac2b3299 100644
--- a/tdm/config.def
+++ b/tdm/config.def
@@ -632,7 +632,7 @@ the following environment variables are passed:</para>
   <listitem><para>may be set to a non-standard authority file</para></listitem>
  </varlistentry>
  <varlistentry>
-  <term>KRBTKFILE</term>
+  <term>KRBTTDEFILE</term>
   <listitem><para>may be set to a Kerberos4 credentials cache name</para>
   </listitem>
  </varlistentry>
diff --git a/tsak/main.cpp b/tsak/main.cpp
index 652466852..7bc2b8d6a 100644
--- a/tsak/main.cpp
+++ b/tsak/main.cpp
@@ -45,7 +45,7 @@ using namespace std;
 
 #define FIFO_DIR "/tmp/tdesocket-global"
 #define FIFO_FILE_OUT "/tmp/tdesocket-global/tsak"
-#define FIFO_LOCKFILE_OUT "/tmp/tdesocket-global/tsak.lock"
+#define FIFO_LOCTDEFILE_OUT "/tmp/tdesocket-global/tsak.lock"
 
 // WARNING
 // MAX_KEYBOARDS must be greater than or equal to MAX_INPUT_NODE
@@ -266,7 +266,7 @@ void tearDownPipe()
 void tearDownLockingPipe()
 {
 	close(mPipe_lockfd_out);
-	unlink(FIFO_LOCKFILE_OUT);
+	unlink(FIFO_LOCTDEFILE_OUT);
 }
 
 bool setFileLock(int fd, bool close_on_failure)
@@ -296,7 +296,7 @@ bool checkFileLock()
 	fl.l_whence  = SEEK_SET;
 	fl.l_len     = 0;
 
-	int fd = open(FIFO_LOCKFILE_OUT, O_RDWR | O_NONBLOCK);
+	int fd = open(FIFO_LOCTDEFILE_OUT, O_RDWR | O_NONBLOCK);
 	fcntl(fd, F_GETLK, &fl);  /* Overwrites lock structure with preventors. */
 
 	if (fd > -1) {
@@ -333,10 +333,10 @@ bool setupLockingPipe(bool writepid)
 	umask(0);
 	mkdir(FIFO_DIR,0644);
 
-	mknod(FIFO_LOCKFILE_OUT, 0600, 0);
-	chmod(FIFO_LOCKFILE_OUT, 0600);
+	mknod(FIFO_LOCTDEFILE_OUT, 0600, 0);
+	chmod(FIFO_LOCTDEFILE_OUT, 0600);
 
-	mPipe_lockfd_out = open(FIFO_LOCKFILE_OUT, O_RDWR | O_NONBLOCK);
+	mPipe_lockfd_out = open(FIFO_LOCTDEFILE_OUT, O_RDWR | O_NONBLOCK);
 	if (mPipe_lockfd_out > -1) {
 		if (writepid) {
 			// Write my PID to the file