11 files changed, 16 insertions, 16 deletions
diff --git a/parts/appwizard/common/admin b/parts/appwizard/common/admin
-Subproject 4185112a621d8c5bc88984b117f434c9560e2cc
+Subproject 585c17a2dda766ac4d442c4b9f998e18cb1b2d9
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 297d802c..38b1965e 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <tdefiledialog.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <tdestandarddirs.h>
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index 18a5d686..9d1951be 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -23,7 +23,7 @@
 #include "classviewwidget.h"
 
 #include <kiconloader.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kurl.h>
 #include <tdeaction.h>
 #include <tdeactionclasses.h>
diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp
index 787a8f32..840982ba 100644
--- a/parts/documentation/protocols/chm/chm.cpp
+++ b/parts/documentation/protocols/chm/chm.cpp
@@ -26,7 +26,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeglobal.h>
 #include <kurl.h>
 #include <kmimemagic.h>
diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp
index b21b6c55..d182315b 100644
--- a/parts/documentation/protocols/chm/kchmpart.cpp
+++ b/parts/documentation/protocols/chm/kchmpart.cpp
@@ -17,7 +17,7 @@
 #include "kchmpart.h"
 #include <tqstring.h>
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdelocale.h>
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 6dff8e9f..f4287262 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -28,7 +28,7 @@
 #include <tdeprocess.h>
 #include <tdeglobal.h>
 #include <tdestandarddirs.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kstatusbar.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp
index 9741c6aa..86ed8306 100644
--- a/parts/partexplorer/partexplorer_plugin.cpp
+++ b/parts/partexplorer/partexplorer_plugin.cpp
@@ -11,7 +11,7 @@
 
 #include "partexplorer_plugin.h"
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index 784c4ce9..cd587e96 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -36,7 +36,7 @@
 #include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kdialog.h>
 #include <tdeglobal.h>
 #include <klineedit.h>
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index 8dabccbd..66fd442b 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -11,7 +11,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
@@ -98,7 +98,7 @@ void ToolsPart::updateMenu()
 	{
 	  TQString name = *it;
 
-	  KDesktopFile df(name, true);
+	  TDEDesktopFile df(name, true);
 	  if (df.readName().isNull())
 		continue;
 
@@ -183,7 +183,7 @@ void ToolsPart::updateToolsMenu()
                                       this, TQ_SLOT(toolsMenuActivated()),
                                       (TQObject*) 0, menutext.utf8());
         if (isdesktopfile) {
-            KDesktopFile df(config->readPathEntry("CommandLine"));
+            TDEDesktopFile df(config->readPathEntry("CommandLine"));
             action->setIcon(df.readIcon());
         }
         actions.append(action);
diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp
index adb2ab2f..bedbd59f 100644
--- a/parts/tools/toolsconfig.cpp
+++ b/parts/tools/toolsconfig.cpp
@@ -8,7 +8,7 @@
 #include <tqheader.h>
 
 #include <tdeapplication.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
@@ -100,7 +100,7 @@ void ToolsConfig::fill()
 
 void ToolsConfig::add(const TQString &desktopFile)
 {
-  KDesktopFile df(desktopFile, true);
+  TDEDesktopFile df(desktopFile, true);
   if (df.readName().isEmpty())
     return;
 
diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp
index 22d705c2..bfc9efbe 100644
--- a/parts/tools/toolsconfigwidget.cpp
+++ b/parts/tools/toolsconfigwidget.cpp
@@ -19,7 +19,7 @@
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
 #include <kiconloader.h>
 #include <tdemessagebox.h>
 #include <kurl.h>
@@ -113,7 +113,7 @@ void ToolsConfigWidget::fillListBox(TQListBox *lb, const TQDict<ToolsConfigEntry
     for (; it.current(); ++it) {
         ToolsConfigEntry *entry = it.current();
         if (entry->isdesktopfile) {
-            KDesktopFile df(entry->cmdline);
+            TDEDesktopFile df(entry->cmdline);
             lb->insertItem(SmallIcon(df.readIcon()), entry->menutext);
         } else {
             lb->insertItem(entry->menutext);
@@ -259,8 +259,8 @@ bool ToolsConfigWidget::eventFilter(TQObject *o, TQEvent *e)
         if (KURLDrag::decode(de, fileList)) {
             KURL::List::ConstIterator it;
             for (it = fileList.begin(); it != fileList.end(); ++it) {
-                if ((*it).isLocalFile() && KDesktopFile::isDesktopFile((*it).path())) {
-                    KDesktopFile df((*it).path());
+                if ((*it).isLocalFile() && TDEDesktopFile::isDesktopFile((*it).path())) {
+                    TDEDesktopFile df((*it).path());
                     ToolsConfigEntry *entry = new ToolsConfigEntry;
                     entry->menutext = df.readName();
                     entry->cmdline = (*it).path();