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

5 files changed, 6 insertions, 6 deletions

diff --git a/kcontrol/filetypes/Makefile.am b/kcontrol/filetypes/Makefile.am
index 21752d05c..31a1d60a2 100644
--- a/kcontrol/filetypes/Makefile.am
+++ b/kcontrol/filetypes/Makefile.am
@@ -21,7 +21,7 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails
 
 keditfiletype_SOURCES = keditfiletype.cpp
 keditfiletype_LDADD = libfiletypes.la $(LIB_KIO)
-keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 messages:
 	$(XGETTEXT) *.cpp -o $(podir)/filetypes.pot
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index a678e0eb2..abb973580 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -235,7 +235,7 @@ void FileTypeDetails::updateAskSave()
     // - images (reasoning: no need to save, most of the time, because fast to see)
     // e.g. postscript is different, because takes longer to read, so
     // it's more likely that the user might want to save it.
-    // - multipart/* ("server push", see kmultipart)
+    // - multipart/* ("server push", see tdemultipart)
     // - other strange 'internal' mimetypes like print/manager...
     if ( mime->is( "text/html" ) ||
          mime->is( "text/xml" ) ||
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index 07b023532..d641a18b0 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -22,7 +22,7 @@
 #include "filetypedetails.h"
 #include "filegroupdetails.h"
 #include "filetypesview.h"
-#include <ksycoca.h>
+#include <tdesycoca.h>
 
 FileTypesView::FileTypesView(TQWidget *p, const char *name)
   : TDECModule(p, name)
@@ -418,7 +418,7 @@ void FileTypesView::slotDatabaseChanged()
 {
   if ( KSycoca::self()->isChanged( "mime" ) )
   {
-    // ksycoca has new KMimeTypes objects for us, make sure to update
+    // tdesycoca has new KMimeTypes objects for us, make sure to update
     // our 'copies' to be in sync with it. Not important for OK, but
     // important for Apply (how to differentiate those 2?).
     // See BR 35071.
diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp
index 2750e8aab..d568a43fd 100644
--- a/kcontrol/filetypes/keditfiletype.cpp
+++ b/kcontrol/filetypes/keditfiletype.cpp
@@ -26,7 +26,7 @@
 #include <kaboutdata.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <kstandarddirs.h>
 
 #ifdef Q_WS_X11
diff --git a/kcontrol/filetypes/typeslistitem.h b/kcontrol/filetypes/typeslistitem.h
index 671604961..baaff242e 100644
--- a/kcontrol/filetypes/typeslistitem.h
+++ b/kcontrol/filetypes/typeslistitem.h
@@ -89,7 +89,7 @@ public:
   bool isDirty() const;
   void sync();
   void setup();
-  void refresh(); // update m_mimetype from ksycoca when Apply is pressed
+  void refresh(); // update m_mimetype from tdesycoca when Apply is pressed
 
   static bool defaultEmbeddingSetting(  const TQString& major );
   static void reset();