Rename a number of libraries and executables to avoid conflicts with KDE4

11 files changed, 15 insertions, 15 deletions

diff --git a/smb4k/core/Makefile.am b/smb4k/core/Makefile.am
index 12b7449..3d426b5 100644
--- a/smb4k/core/Makefile.am
+++ b/smb4k/core/Makefile.am
@@ -5,14 +5,14 @@ lib_LTLIBRARIES = libsmb4kcore.la
 libsmb4kcore_la_LDFLAGS = -no-undefined $(all_libraries) -ltdewalletclient \
 	-version-info 2:0:0
 include_HEADERS = smb4kauthinfo.h smb4kbookmark.h smb4kbookmarkhandler.h \
-	smb4kcore.h smb4kdefs.h smb4kerror.h smb4kfileio.h smb4kglobal.h \
+	smb4kcore.h smb4kdefs.h smb4kerror.h smb4tdefileio.h smb4kglobal.h \
 	smb4khomesshareshandler.h smb4kmounter.h smb4knetworkitems.h \
 	smb4kpasswordhandler.h smb4kpreviewer.h smb4kpreviewitem.h \
 	smb4kprint.h smb4kprintinfo.h smb4ksambaoptionshandler.h \
 	smb4ksambaoptionsinfo.h smb4kscanner.h smb4kshare.h \
 	smb4ksynchronizationinfo.h smb4ksynchronizer.h
 libsmb4kcore_la_SOURCES = smb4kauthinfo.cpp smb4kbookmark.cpp \
-	smb4kbookmarkhandler.cpp smb4kcore.cpp smb4kerror.cpp smb4kfileio.cpp smb4kglobal.cpp \
+	smb4kbookmarkhandler.cpp smb4kcore.cpp smb4kerror.cpp smb4tdefileio.cpp smb4kglobal.cpp \
 	smb4kglobal_p.cpp smb4khomesshareshandler.cpp smb4kmounter.cpp smb4kmounter_p.cpp \
 	smb4knetworkitems.cpp smb4kpasswordhandler.cpp smb4kpreviewer.cpp smb4kpreviewitem.cpp \
 	smb4kprint.cpp smb4kprintinfo.cpp smb4ksambaoptionshandler.cpp \
@@ -24,7 +24,7 @@ kde_kcfg_DATA = smb4k.kcfg
 
 # Build rules
 smb4kcore.lo: smb4ksettings.h
-smb4kfileio.lo: smb4ksettings.h
+smb4tdefileio.lo: smb4ksettings.h
 smb4kmounter.lo: smb4ksettings.h
 smb4kpasswordhandler.lo: smb4ksettings.h
 smb4kprint.lo: smb4ksettings.h
diff --git a/smb4k/core/smb4kcore.h b/smb4k/core/smb4kcore.h
index e49b4db..fd3a488 100644
--- a/smb4k/core/smb4kcore.h
+++ b/smb4k/core/smb4kcore.h
@@ -39,7 +39,7 @@
 // application specific includes
 #include "smb4kscanner.h"
 #include "smb4kmounter.h"
-#include "smb4kfileio.h"
+#include "smb4tdefileio.h"
 #include "smb4kbookmarkhandler.h"
 #include "smb4kprint.h"
 #include "smb4ksynchronizer.h"
diff --git a/smb4k/core/smb4kglobal.cpp b/smb4k/core/smb4kglobal.cpp
index e2e98ce..a1d09c8 100644
--- a/smb4k/core/smb4kglobal.cpp
+++ b/smb4k/core/smb4kglobal.cpp
@@ -24,7 +24,7 @@
  ***************************************************************************/
 
 // KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 // application specific includes
diff --git a/smb4k/core/smb4kglobal.h b/smb4k/core/smb4kglobal.h
index 1c7db8a..c6da2a4 100644
--- a/smb4k/core/smb4kglobal.h
+++ b/smb4k/core/smb4kglobal.h
@@ -29,7 +29,7 @@
 #include <tqstring.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // forward declarations:
 class Smb4KPasswordHandler;
diff --git a/smb4k/core/smb4kglobal_p.h b/smb4k/core/smb4kglobal_p.h
index 898d66e..8148f3a 100644
--- a/smb4k/core/smb4kglobal_p.h
+++ b/smb4k/core/smb4kglobal_p.h
@@ -35,7 +35,7 @@
 #include <tqtimer.h>
 
 // KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // application specific includes
 #include "smb4kpasswordhandler.h"
diff --git a/smb4k/core/smb4khomesshareshandler.h b/smb4k/core/smb4khomesshareshandler.h
index 44c3710..b343698 100644
--- a/smb4k/core/smb4khomesshareshandler.h
+++ b/smb4k/core/smb4khomesshareshandler.h
@@ -35,7 +35,7 @@
 
 // KDE includes
 #include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 /**
diff --git a/smb4k/core/smb4kprint.cpp b/smb4k/core/smb4kprint.cpp
index 3661db0..ae7655c 100644
--- a/smb4k/core/smb4kprint.cpp
+++ b/smb4k/core/smb4kprint.cpp
@@ -29,7 +29,7 @@
 
 // KDE includes
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdebug.h>
 
 // system includes
diff --git a/smb4k/core/smb4ksambaoptionshandler.h b/smb4k/core/smb4ksambaoptionshandler.h
index 7e20c83..eca3f9e 100644
--- a/smb4k/core/smb4ksambaoptionshandler.h
+++ b/smb4k/core/smb4ksambaoptionshandler.h
@@ -35,7 +35,7 @@
 #include <tqmap.h>
 
 // KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // forward declarations
 class Smb4KSambaOptionsInfo;
diff --git a/smb4k/core/smb4ksettings.cpp b/smb4k/core/smb4ksettings.cpp
index 8fc39bb..3aa8240 100644
--- a/smb4k/core/smb4ksettings.cpp
+++ b/smb4k/core/smb4ksettings.cpp
@@ -1,4 +1,4 @@
-// This file is generated by kconfig_compiler from smb4k.kcfg.
+// This file is generated by tdeconfig_compiler from smb4k.kcfg.
 // All changes you do to this file will be lost.
 
 #include "smb4ksettings.h"
diff --git a/smb4k/core/smb4kfileio.cpp b/smb4k/core/smb4tdefileio.cpp
index 05d59a9..617763c 100644
--- a/smb4k/core/smb4kfileio.cpp
+++ b/smb4k/core/smb4tdefileio.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-    smb4kfileio  -  Does file IO operations for Smb4K
+    smb4tdefileio  -  Does file IO operations for Smb4K
                              -------------------
     begin                : Do Jan 1 2004
     copyright            : (C) 2004-2007 by Alexander Reinholdt
@@ -44,7 +44,7 @@
 #include <pwd.h>
 
 // application specific includes
-#include "smb4kfileio.h"
+#include "smb4tdefileio.h"
 #include "smb4kdefs.h"
 #include "smb4kerror.h"
 #include "smb4kglobal.h"
@@ -1792,4 +1792,4 @@ void Smb4KFileIO::slotProcessExited( TDEProcess * )
   m_error_occurred = false;
 }
 
-#include "smb4kfileio.moc"
+#include "smb4tdefileio.moc"
diff --git a/smb4k/core/smb4kfileio.h b/smb4k/core/smb4tdefileio.h
index b014fcf..9da6aae 100644
--- a/smb4k/core/smb4kfileio.h
+++ b/smb4k/core/smb4tdefileio.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-    smb4kfileio  -  Does file IO operations for Smb4K
+    smb4tdefileio  -  Does file IO operations for Smb4K
                              -------------------
     begin                : Do Jan 1 2004
     copyright            : (C) 2004-2007 by Alexander Reinholdt