11 files changed, 28 insertions, 28 deletions
diff --git a/tdefile-plugins/Makefile.am b/tdefile-plugins/Makefile.am
index fc127f02..6bdf4ccb 100644
--- a/tdefile-plugins/Makefile.am
+++ b/tdefile-plugins/Makefile.am
@@ -1,22 +1,22 @@
 if include_ogg_SUBDIR
-KFILE_OGG_SUBDIR=ogg
+TDEFILE_OGG_SUBDIR=ogg
 endif
 
 if include_flac_SUBDIR
-KFILE_FLAC_SUBDIR=flac
+TDEFILE_FLAC_SUBDIR=flac
 endif
 
 if include_mp3_SUBDIR
-KFILE_MP3_SUBDIR=mp3
+TDEFILE_MP3_SUBDIR=mp3
 endif
 
 if include_mpc_SUBDIR
-KFILE_MPC_SUBDIR=mpc
+TDEFILE_MPC_SUBDIR=mpc
 endif
 
 if include_theora_SUBDIR
-KFILE_THEORA_SUBDIR=theora
+TDEFILE_THEORA_SUBDIR=theora
 endif
 
-SUBDIRS=m3u $(KFILE_MP3_SUBDIR) $(KFILE_MPC_SUBDIR) au avi mpeg wav sid $(KFILE_OGG_SUBDIR) \
-        $(KFILE_FLAC_SUBDIR) $(KFILE_THEORA_SUBDIR)
+SUBDIRS=m3u $(TDEFILE_MP3_SUBDIR) $(TDEFILE_MPC_SUBDIR) au avi mpeg wav sid $(TDEFILE_OGG_SUBDIR) \
+        $(TDEFILE_FLAC_SUBDIR) $(TDEFILE_THEORA_SUBDIR)
diff --git a/tdefile-plugins/au/tdefile_au.h b/tdefile-plugins/au/tdefile_au.h
index 7ac18c9c..9d5104ef 100644
--- a/tdefile-plugins/au/tdefile_au.h
+++ b/tdefile-plugins/au/tdefile_au.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __KFILE_AU_H__
-#define __KFILE_AU_H__
+#ifndef __TDEFILE_AU_H__
+#define __TDEFILE_AU_H__
 
 #include <tdefilemetainfo.h>
 
diff --git a/tdefile-plugins/avi/tdefile_avi.h b/tdefile-plugins/avi/tdefile_avi.h
index b73f324b..a533723b 100644
--- a/tdefile-plugins/avi/tdefile_avi.h
+++ b/tdefile-plugins/avi/tdefile_avi.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __KFILE_AVI_H__
-#define __KFILE_AVI_H__
+#ifndef __TDEFILE_AVI_H__
+#define __TDEFILE_AVI_H__
 
 #include <tdefilemetainfo.h>
 #include <tqfile.h>
diff --git a/tdefile-plugins/flac/tdefile_flac.h b/tdefile-plugins/flac/tdefile_flac.h
index f4f3c96f..982a8a51 100644
--- a/tdefile-plugins/flac/tdefile_flac.h
+++ b/tdefile-plugins/flac/tdefile_flac.h
@@ -21,8 +21,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KFILE_FLAC_H__
-#define __KFILE_FLAC_H__
+#ifndef __TDEFILE_FLAC_H__
+#define __TDEFILE_FLAC_H__
 
 #include <tdefilemetainfo.h>
 
diff --git a/tdefile-plugins/mp3/tdefile_mp3.h b/tdefile-plugins/mp3/tdefile_mp3.h
index 209c81a6..cc01aa3e 100644
--- a/tdefile-plugins/mp3/tdefile_mp3.h
+++ b/tdefile-plugins/mp3/tdefile_mp3.h
@@ -16,8 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KFILE_MP3_H__
-#define __KFILE_MP3_H__
+#ifndef __TDEFILE_MP3_H__
+#define __TDEFILE_MP3_H__
 
 #include <tdefilemetainfo.h>
 
diff --git a/tdefile-plugins/mpc/tdefile_mpc.h b/tdefile-plugins/mpc/tdefile_mpc.h
index 8b3345ed..4bb3a387 100644
--- a/tdefile-plugins/mpc/tdefile_mpc.h
+++ b/tdefile-plugins/mpc/tdefile_mpc.h
@@ -21,8 +21,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __KFILE_MPC_H__
-#define __KFILE_MPC_H__
+#ifndef __TDEFILE_MPC_H__
+#define __TDEFILE_MPC_H__
 
 #include <tdefilemetainfo.h>
 
diff --git a/tdefile-plugins/mpeg/tdefile_mpeg.h b/tdefile-plugins/mpeg/tdefile_mpeg.h
index 13035837..113bd8ee 100644
--- a/tdefile-plugins/mpeg/tdefile_mpeg.h
+++ b/tdefile-plugins/mpeg/tdefile_mpeg.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __KFILE_MPEG_H__
-#define __KFILE_MPEG_H__
+#ifndef __TDEFILE_MPEG_H__
+#define __TDEFILE_MPEG_H__
 
 #include <tdefilemetainfo.h>
 #include <tqfile.h>
diff --git a/tdefile-plugins/ogg/tdefile_ogg.h b/tdefile-plugins/ogg/tdefile_ogg.h
index 0737dff7..f03e4283 100644
--- a/tdefile-plugins/ogg/tdefile_ogg.h
+++ b/tdefile-plugins/ogg/tdefile_ogg.h
@@ -18,8 +18,8 @@
  *  $Id$
  */
 
-#ifndef __KFILE_OGG_H__
-#define __KFILE_OGG_H__
+#ifndef __TDEFILE_OGG_H__
+#define __TDEFILE_OGG_H__
 
 #include <tdefilemetainfo.h>
 
diff --git a/tdefile-plugins/sid/tdefile_sid.h b/tdefile-plugins/sid/tdefile_sid.h
index ba9931f7..fadf13f5 100644
--- a/tdefile-plugins/sid/tdefile_sid.h
+++ b/tdefile-plugins/sid/tdefile_sid.h
@@ -18,8 +18,8 @@
  *  $Id$
  */
 
-#ifndef KFILE_SID_H
-#define KFILE_SID_H
+#ifndef TDEFILE_SID_H
+#define TDEFILE_SID_H
 
 #include <tdefilemetainfo.h>
 
diff --git a/tdefile-plugins/theora/tdefile_theora.h b/tdefile-plugins/theora/tdefile_theora.h
index 88e465c2..a1aa0c09 100644
--- a/tdefile-plugins/theora/tdefile_theora.h
+++ b/tdefile-plugins/theora/tdefile_theora.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
  
-#ifndef __KFILE_THEORA_H__
-#define __KFILE_THEORA_H__
+#ifndef __TDEFILE_THEORA_H__
+#define __TDEFILE_THEORA_H__
 
 /**
  * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>
@@ -39,5 +39,5 @@ public:
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
 
-#endif // __KFILE_THEORA_H__
+#endif // __TDEFILE_THEORA_H__
 
diff --git a/tdefile-plugins/wav/tdefile_wav.h b/tdefile-plugins/wav/tdefile_wav.h
index c3a5b2ba..53eb6ccd 100644
--- a/tdefile-plugins/wav/tdefile_wav.h
+++ b/tdefile-plugins/wav/tdefile_wav.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __KFILE_WAV_H__
-#define __KFILE_WAV_H__
+#ifndef __TDEFILE_WAV_H__
+#define __TDEFILE_WAV_H__
 
 #include <tdefilemetainfo.h>