Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

1 files changed, 10 insertions, 10 deletions

diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h
index aa6f21f6d..0f865fcea 100644
--- a/kate/part/katedialogs.h
+++ b/kate/part/katedialogs.h
@@ -29,7 +29,7 @@
 
 #include "../interfaces/document.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 #include <kmimetype.h>
 
@@ -46,19 +46,19 @@ struct syntaxContextData;
 class KateDocument;
 class KateView;
 
-namespace KIO
+namespace TDEIO
 {
   class Job;
   class TransferJob;
 }
 
-class KAccel;
+class TDEAccel;
 class KColorButton;
 class KComboBox;
 class KIntNumInput;
 class KKeyButton;
 class KKeyChooser;
-class KMainWindow;
+class TDEMainWindow;
 class KPushButton;
 class KRegExpDialog;
 class KIntNumInput;
@@ -235,7 +235,7 @@ class KateEditKeyConfiguration: public KateConfigPage
     bool m_ready;
     class KateDocument *m_doc;
     KKeyChooser* m_keyChooser;
-    class KActionCollection *m_ac;
+    class TDEActionCollection *m_ac;
 };
 
 class KateSaveConfigTab : public KateConfigPage
@@ -263,7 +263,7 @@ class KateSaveConfigTab : public KateConfigPage
 
 class KatePartPluginListItem;
 
-class KatePartPluginListView : public KListView
+class KatePartPluginListView : public TDEListView
 {
   Q_OBJECT
 
@@ -350,17 +350,17 @@ class KateHlDownloadDialog: public KDialogBase
   private:
     class TQListView  *list;
     class TQString listData;
-    KIO::TransferJob *transferJob;
+    TDEIO::TransferJob *transferJob;
 
   private slots:
-    void listDataReceived(KIO::Job *, const TQByteArray &data);
+    void listDataReceived(TDEIO::Job *, const TQByteArray &data);
 
   public slots:
     void slotUser1();
 };
 
 class KProcIO;
-class KProcess;
+class TDEProcess;
 /**
  * This dialog will prompt the user for what do with a file that is
  * modified on disk.
@@ -394,7 +394,7 @@ class KateModOnHdPrompt : public KDialogBase
 
   private slots:
     void slotPRead(KProcIO*); ///< Read from the diff process
-    void slotPDone(KProcess*); ///< Runs the diff file when done
+    void slotPDone(TDEProcess*); ///< Runs the diff file when done
 
   private:
     KateDocument *m_doc;