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

5 files changed, 14 insertions, 14 deletions

diff --git a/interfaces/terminal/Makefile.am b/interfaces/terminal/Makefile.am
index 70bb091ef..3e2f8e4df 100644
--- a/interfaces/terminal/Makefile.am
+++ b/interfaces/terminal/Makefile.am
@@ -1,2 +1,2 @@
-ktexteditorinclude_HEADERS = kde_terminal_interface.h
-ktexteditorincludedir = $(includedir)
+tdetexteditorinclude_HEADERS = kde_terminal_interface.h
+tdetexteditorincludedir = $(includedir)
diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h
index 6a65477c2..0624c0e8d 100644
--- a/interfaces/terminal/kde_terminal_interface.h
+++ b/interfaces/terminal/kde_terminal_interface.h
@@ -35,7 +35,7 @@ class TQStrList;
  * we can't have signals without having a TQObject, which
  * TerminalInterface is not.
  * These are the signals you can connect to:
- *  void processExited( KProcess *process );
+ *  void processExited( TDEProcess *process );
  *  void receivedData( const TQString& s );
  * See the example code below for how to connect to these..
  * 
diff --git a/interfaces/terminal/test/Makefile.am b/interfaces/terminal/test/Makefile.am
index 1c62aaced..7570f6d2b 100644
--- a/interfaces/terminal/test/Makefile.am
+++ b/interfaces/terminal/test/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES=$(all_includes)
 check_PROGRAMS=test
 test_SOURCES=main.cc
-test_LDADD=$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lkio
+test_LDADD=$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio
 test_LDFLAGS=$(all_libraries)
 METASOURCES=AUTO
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index dbf60616b..8130f85d6 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -1,14 +1,14 @@
 #include <kde_terminal_interface.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <ktrader.h>
 #include <klibloader.h>
-#include <kmainwindow.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdemainwindow.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <tqdir.h>
 #include <assert.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <cassert>
 #include "main.h"
 #include "main.moc"
@@ -33,9 +33,9 @@ Win::Win()
 
 int main( int argc, char** argv )
 {
-    KAboutData* about = new KAboutData( "tetest", "TETest", "0.1" );
-    KCmdLineArgs::init( argc, argv, about );
-    KApplication a;
+    TDEAboutData* about = new TDEAboutData( "tetest", "TETest", "0.1" );
+    TDECmdLineArgs::init( argc, argv, about );
+    TDEApplication a;
     Win* win = new Win();
     win->show();
     return a.exec();
diff --git a/interfaces/terminal/test/main.h b/interfaces/terminal/test/main.h
index 098c10d54..256b0840a 100644
--- a/interfaces/terminal/test/main.h
+++ b/interfaces/terminal/test/main.h
@@ -3,7 +3,7 @@
 
 
 class Win
-    : public KMainWindow
+    : public TDEMainWindow
 {
     Q_OBJECT
     KParts::Part* p;