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

7 files changed, 14 insertions, 14 deletions

diff --git a/knotes/CMakeLists.txt b/knotes/CMakeLists.txt
index 7ef23ca41..198d124e8 100644
--- a/knotes/CMakeLists.txt
+++ b/knotes/CMakeLists.txt
@@ -42,8 +42,8 @@ install( FILES KNotesIface.h KNotesAppIface.h DESTINATION ${INCLUDE_INSTALL_DIR}
 install( FILES knotes.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 install( FILES knoteconfig.kcfg knotesglobalconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES knotesappui.rc knotesui.rc DESTINATION ${DATA_INSTALL_DIR}/knotes )
-install( FILES local.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/knotes )
-install( FILES knotes_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources )
+install( FILES local.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/knotes )
+install( FILES knotes_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
 
 
 ##### knotes (executable) #######################
@@ -76,7 +76,7 @@ tde_add_library( knotes SHARED AUTOMOC
     knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.cpp knotealarmdlg.cpp
     knotesalarm.cpp
   VERSION 0.0.0
-  LINK tdepim-shared kutils-shared tdeprint-shared
+  LINK tdepim-shared tdeutils-shared tdeprint-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/knotes/ChangeLog b/knotes/ChangeLog
index ef73afecd..3c4161dcc 100644
--- a/knotes/ChangeLog
+++ b/knotes/ChangeLog
@@ -219,7 +219,7 @@ ChangeLog for KNotes
 2004/04/23  Michael Brade <brade@kde.org>
 
     * fixed adding a new resource every start of KNotes. Please delete
-      your .kde/share/config/kresources/notes/stdrc file to make KNotes start
+      your .kde/share/config/tderesources/notes/stdrc file to make KNotes start
       fast again. KNotes is ready for release now :)
 
 2004/04/21  Michael Brade <brade@kde.org>
diff --git a/knotes/Makefile.am b/knotes/Makefile.am
index a18d21989..2e600e666 100644
--- a/knotes/Makefile.am
+++ b/knotes/Makefile.am
@@ -27,15 +27,15 @@ libknote_la_SOURCES = knote.cpp knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.
 knotes_SOURCES  = main.cpp knotesapp.cpp KNotesAppIface.skel
 knotes_LDADD    = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \
                   libknoteslegacy.la libknotesconfig.la libknotesprinting.la $(top_builddir)/libkcal/libkcal.la \
-                  $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) -lkresources -ltdeprint -lkutils
-knotes_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+                  $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) -ltderesources -ltdeprint -ltdeutils
+knotes_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 knotes_COMPILE_FIRST = knoteconfig.h
 
 kde_module_LTLIBRARIES  = knotes_local.la
 knotes_local_la_SOURCES = resourcelocal_plugin.cpp
 knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN)
 knotes_local_la_LIBADD  = libknotesresources.la libknotesconfig.la libknotesprinting.la \
-                          $(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -lkresources
+                          $(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltderesources
 
 METASOURCES     = AUTO
 
@@ -46,10 +46,10 @@ ui_DATA         = knotesappui.rc knotesui.rc
 uidir           = $(kde_datadir)/knotes
 
 service_DATA    = local.desktop
-servicedir      = $(kde_servicesdir)/kresources/knotes
+servicedir      = $(kde_servicesdir)/tderesources/knotes
 
 manager_DATA    = knotes_manager.desktop
-managerdir      = $(kde_servicesdir)/kresources
+managerdir      = $(kde_servicesdir)/tderesources
 
 KDE_OPTIONS = nofinal
 
diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp
index 417f81a05..1214e0ad6 100644
--- a/knotes/resourcelocalconfig.cpp
+++ b/knotes/resourcelocalconfig.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kresources/configwidget.h>
+#include <tderesources/configwidget.h>
 #include <kurlrequester.h>
 
 #include "resourcelocal.h"
diff --git a/knotes/resourcelocalconfig.h b/knotes/resourcelocalconfig.h
index bdfeea303..ab78cd68c 100644
--- a/knotes/resourcelocalconfig.h
+++ b/knotes/resourcelocalconfig.h
@@ -21,7 +21,7 @@
 #ifndef RESOURCELOCALCONFIG_H
 #define RESOURCELOCALCONFIG_H
 
-#include <kresources/configwidget.h>
+#include <tderesources/configwidget.h>
 
 class KURLRequester;
 
diff --git a/knotes/resourcemanager.h b/knotes/resourcemanager.h
index 350d7c7d6..423ee7a9f 100644
--- a/knotes/resourcemanager.h
+++ b/knotes/resourcemanager.h
@@ -35,7 +35,7 @@
 #define KNOTES_RESOURCEMANAGER_H
 
 #include <knotes/resourcenotes.h>
-#include <kresources/manager.h>
+#include <tderesources/manager.h>
 
 #include <libkcal/alarm.h>
 
diff --git a/knotes/resourcenotes.h b/knotes/resourcenotes.h
index 1e0d07d1a..d33b34233 100644
--- a/knotes/resourcenotes.h
+++ b/knotes/resourcenotes.h
@@ -33,7 +33,7 @@
 #ifndef RESOURCENOTES_H
 #define RESOURCENOTES_H
 
-#include <kresources/resource.h>
+#include <tderesources/resource.h>
 #include <tdepimmacros.h>
 #include <libkcal/alarm.h>
 
@@ -47,7 +47,7 @@ namespace KCal {
 
 /**
  * This class provides the interfaces for a KNotes resource. It makes use of
- * the kresources framework.
+ * the tderesources framework.
  *
  * \warning This code is still under heavy development. Don't expect source or
  *          binary compatibility in future versions.