12 files changed, 34 insertions, 34 deletions
diff --git a/kplato/Makefile.am b/kplato/Makefile.am
index 865920a4..d421804f 100644
--- a/kplato/Makefile.am
+++ b/kplato/Makefile.am
@@ -34,7 +34,7 @@ libkplatopart_la_SOURCES = \
     kptcanvasitem.cc kptprojectdialogbase.ui \
     resourcespanelbase.ui \
     kptresourceview.cc \
-    kpttaskresourcespanelbase.ui kptrequestresourcespanel.cc \
+    kpttastderesourcespanelbase.ui kptrequestresourcespanel.cc \
     resourcedialogbase.ui kptresourcedialog.cc \
     kpttaskgeneralpanelbase.ui \
     kpttasknotespanelbase.ui \
@@ -102,7 +102,7 @@ noinst_HEADERS = \
 ## The part
 lib_LTLIBRARIES = 
 kde_module_LTLIBRARIES = libkplatopart.la
-libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -ltdeprint
+libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -ltdeprint
 libkplatopart_la_LIBADD = $(LIB_KABC) $(KOFFICE_LIBS) -lDCOP \
                           $(top_builddir)/kdgantt/libkdgantt.la
 ##                          $(top_builddir)/kugar/lib/libkugarlib.la
@@ -113,7 +113,7 @@ libkplatopart_la_METASOURCES = AUTO
 tdeinit_LTLIBRARIES = kplato.la
 bin_PROGRAMS =
 kplato_la_SOURCES = main.cc
-kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -ltdeprint
+kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -ltdeprint
 kplato_la_LIBADD = $(KOFFICE_LIBS)
 
 xdg_apps_DATA = kplato.desktop
diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc
index efa57f2e..04274dce 100644
--- a/kplato/kptpertcanvas.cc
+++ b/kplato/kptpertcanvas.cc
@@ -42,7 +42,7 @@
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <assert.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #include <klistview.h>
 
 namespace KPlato
diff --git a/kplato/kptrequestresourcespanel.h b/kplato/kptrequestresourcespanel.h
index 86e7dc65..973c8242 100644
--- a/kplato/kptrequestresourcespanel.h
+++ b/kplato/kptrequestresourcespanel.h
@@ -20,7 +20,7 @@
 #ifndef KPTREQUESTRESOURCESPANEL_H
 #define KPTREQUESTRESOURCESPANEL_H
 
-#include "kpttaskresourcespanelbase.h"
+#include "kpttastderesourcespanelbase.h"
 #include "kptduration.h"
 
 #include <tqlistview.h>
diff --git a/kplato/kpttaskresourcespanelbase.ui b/kplato/kpttastderesourcespanelbase.ui
index 93444894..5d2b82b0 100644
--- a/kplato/kpttaskresourcespanelbase.ui
+++ b/kplato/kpttastderesourcespanelbase.ui
@@ -105,7 +105,7 @@
     </hbox>
 </widget>
 <includes>
-    <include location="local" impldecl="in implementation">kpttaskresourcespanelbase.ui.h</include>
+    <include location="local" impldecl="in implementation">kpttastderesourcespanelbase.ui.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kplato/kpttaskresourcespanelbase.ui.h b/kplato/kpttastderesourcespanelbase.ui.h
index ae9e8a50..ae9e8a50 100644
--- a/kplato/kpttaskresourcespanelbase.ui.h
+++ b/kplato/kpttastderesourcespanelbase.ui.h
diff --git a/kplato/tests/CalendarTester.cpp b/kplato/tests/CalendarTester.cpp
index bf0f299f..d5a3956b 100644
--- a/kplato/tests/CalendarTester.cpp
+++ b/kplato/tests/CalendarTester.cpp
@@ -21,13 +21,13 @@
 #include <kptdatetime.h>
 #include <kptduration.h>
 #include <kptmap.h>
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 #include <tqstring.h>
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE(kunittest_CalendarTester, "Calendar Tester");
+KUNITTEST_MODULE(tdeunittest_CalendarTester, "Calendar Tester");
 KUNITTEST_MODULE_REGISTER_TESTER(CalendarTester);
 
 void CalendarTester::allTests() {
diff --git a/kplato/tests/CalendarTester.h b/kplato/tests/CalendarTester.h
index d9f422e3..970dbd13 100644
--- a/kplato/tests/CalendarTester.h
+++ b/kplato/tests/CalendarTester.h
@@ -16,7 +16,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class KoXmlWriter;
 
diff --git a/kplato/tests/DateTimeTester.cpp b/kplato/tests/DateTimeTester.cpp
index c1c18de9..e3558a32 100644
--- a/kplato/tests/DateTimeTester.cpp
+++ b/kplato/tests/DateTimeTester.cpp
@@ -19,14 +19,14 @@
 #include "DateTimeTester.h"
 #include <kptdatetime.h>
 #include <kptduration.h>
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 
 #include <tqdatetime.h>
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE(kunittest_DateTimeTester, "DateTime Tester");
+KUNITTEST_MODULE(tdeunittest_DateTimeTester, "DateTime Tester");
 KUNITTEST_MODULE_REGISTER_TESTER(DateTimeTester);
 
 void DateTimeTester::allTests() {
diff --git a/kplato/tests/DateTimeTester.h b/kplato/tests/DateTimeTester.h
index aac3e13d..3653cecc 100644
--- a/kplato/tests/DateTimeTester.h
+++ b/kplato/tests/DateTimeTester.h
@@ -20,7 +20,7 @@
 #ifndef DATETIMETESTER_H
 #define DATETIMETESTER_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 #include <kptduration.h>
 
 class KoXmlWriter;
diff --git a/kplato/tests/DurationTester.cpp b/kplato/tests/DurationTester.cpp
index 2d84986d..b6ac6d72 100644
--- a/kplato/tests/DurationTester.cpp
+++ b/kplato/tests/DurationTester.cpp
@@ -18,12 +18,12 @@
 */
 #include "DurationTester.h"
 #include <kptduration.h>
-#include <kunittest/runner.h>
-#include <kunittest/module.h>
+#include <tdeunittest/runner.h>
+#include <tdeunittest/module.h>
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE(kunittest_DurationTester, "Duration Tester");
+KUNITTEST_MODULE(tdeunittest_DurationTester, "Duration Tester");
 KUNITTEST_MODULE_REGISTER_TESTER(DurationTester);
 
 void DurationTester::allTests() {
diff --git a/kplato/tests/DurationTester.h b/kplato/tests/DurationTester.h
index bdcc4866..13781bed 100644
--- a/kplato/tests/DurationTester.h
+++ b/kplato/tests/DurationTester.h
@@ -16,7 +16,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class KoXmlWriter;
 
diff --git a/kplato/tests/Makefile.am b/kplato/tests/Makefile.am
index e9b7ec22..6bb02e10 100644
--- a/kplato/tests/Makefile.am
+++ b/kplato/tests/Makefile.am
@@ -4,26 +4,26 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes)
 
 # The check_ target makes sure we don't install the modules,
 # $(KDE_CHECK_PLUGIN) assures a shared library is created.
-check_LTLIBRARIES = kunittest_DateTimeTester.la \
-                    kunittest_DurationTester.la \
-                    kunittest_CalendarTester.la
+check_LTLIBRARIES = tdeunittest_DateTimeTester.la \
+                    tdeunittest_DurationTester.la \
+                    tdeunittest_CalendarTester.la
 
-kunittest_DateTimeTester_la_SOURCES = DateTimeTester.cpp
-kunittest_DateTimeTester_la_LIBADD = -lkunittest ../libkplatopart.la
-kunittest_DateTimeTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_DateTimeTester_la_SOURCES = DateTimeTester.cpp
+tdeunittest_DateTimeTester_la_LIBADD = -ltdeunittest ../libkplatopart.la
+tdeunittest_DateTimeTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
-kunittest_DurationTester_la_SOURCES = DurationTester.cpp
-kunittest_DurationTester_la_LIBADD = -lkunittest ../libkplatopart.la
-kunittest_DurationTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_DurationTester_la_SOURCES = DurationTester.cpp
+tdeunittest_DurationTester_la_LIBADD = -ltdeunittest ../libkplatopart.la
+tdeunittest_DurationTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
-kunittest_CalendarTester_la_SOURCES = CalendarTester.cpp
-kunittest_CalendarTester_la_LIBADD = -lkunittest ../libkplatopart.la
-kunittest_CalendarTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_CalendarTester_la_SOURCES = CalendarTester.cpp
+tdeunittest_CalendarTester_la_LIBADD = -ltdeunittest ../libkplatopart.la
+tdeunittest_CalendarTester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
-check-local: kunittest_DateTimeTester.la \
-             kunittest_DurationTester.la \
-             kunittest_CalendarTester.la
+check-local: tdeunittest_DateTimeTester.la \
+             tdeunittest_DurationTester.la \
+             tdeunittest_CalendarTester.la
 
 check: 
-	kunittestmodrunner
+	tdeunittestmodrunner