summaryrefslogtreecommitdiffstats
path: root/kresources
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:31:44 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-06 02:31:44 -0600
commitd70ce47c224b328c429a5f2406e5e793b009541d (patch)
treecef1f2b51b5429229c2c5fad2436b60dddbcf6cc /kresources
parent480ccc4ed6441c8e663dc62be689c19499d806ea (diff)
downloadtdepim-d70ce47c224b328c429a5f2406e5e793b009541d.tar.gz
tdepim-d70ce47c224b328c429a5f2406e5e793b009541d.zip
Additional kde to tde renaming
Diffstat (limited to 'kresources')
-rw-r--r--kresources/birthdays/CMakeLists.txt2
-rw-r--r--kresources/birthdays/resourcekabc.h2
-rw-r--r--kresources/blogging/API_Blogger.cpp2
-rw-r--r--kresources/blogging/API_Blogger.h2
-rw-r--r--kresources/blogging/bloggingcalendaradaptor.cpp2
-rw-r--r--kresources/blogging/bloggingcalendaradaptor.h2
-rw-r--r--kresources/blogging/bloggingglobals.cpp2
-rw-r--r--kresources/blogging/bloggingglobals.h2
-rw-r--r--kresources/blogging/kcal_resourceblogging.cpp2
-rw-r--r--kresources/blogging/kcal_resourceblogging.h4
-rw-r--r--kresources/blogging/kcal_resourceblogging_plugin.cpp4
-rw-r--r--kresources/blogging/kcal_resourcebloggingconfig.cpp2
-rw-r--r--kresources/blogging/kcal_resourcebloggingconfig.h4
-rw-r--r--kresources/caldav/CMakeLists.txt2
-rw-r--r--kresources/caldav/resource.h2
-rw-r--r--kresources/carddav/CMakeLists.txt2
-rw-r--r--kresources/carddav/plugin.cpp2
-rw-r--r--kresources/carddav/resource.h2
-rw-r--r--kresources/egroupware/CMakeLists.txt4
-rw-r--r--kresources/egroupware/Makefile.am2
-rw-r--r--kresources/egroupware/access.h2
-rw-r--r--kresources/egroupware/debugdialog.cpp2
-rw-r--r--kresources/egroupware/debugdialog.h2
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpc.cpp2
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpc.h4
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpcconfig.cpp2
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpcconfig.h4
-rw-r--r--kresources/egroupware/kabc_resourcexmlrpcplugin.cpp2
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpc.cpp2
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpc.h4
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpcconfig.cpp2
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpcconfig.h4
-rw-r--r--kresources/egroupware/kcal_resourcexmlrpcplugin.cpp2
-rw-r--r--kresources/egroupware/knotes_resourcexmlrpc.cpp2
-rw-r--r--kresources/egroupware/knotes_resourcexmlrpc.h4
-rw-r--r--kresources/egroupware/knotes_resourcexmlrpcconfig.cpp2
-rw-r--r--kresources/egroupware/knotes_resourcexmlrpcconfig.h4
-rw-r--r--kresources/egroupware/knotes_resourcexmlrpcplugin.cpp2
-rw-r--r--kresources/egroupware/synchronizer.cpp2
-rw-r--r--kresources/egroupware/synchronizer.h2
-rw-r--r--kresources/egroupware/todostatemapper.cpp2
-rw-r--r--kresources/egroupware/todostatemapper.h2
-rw-r--r--kresources/featureplan/CMakeLists.txt2
-rw-r--r--kresources/featureplan/Makefile.am4
-rw-r--r--kresources/featureplan/benchmarkfeaturelist.cpp2
-rw-r--r--kresources/featureplan/dumpfeaturelist.cpp2
-rw-r--r--kresources/featureplan/kcal_resourcefeatureplan.cpp2
-rw-r--r--kresources/featureplan/kcal_resourcefeatureplan.h4
-rw-r--r--kresources/featureplan/kcal_resourcefeatureplanconfig.cpp2
-rw-r--r--kresources/featureplan/kcal_resourcefeatureplanconfig.h4
-rw-r--r--kresources/featureplan/kcal_resourcefeatureplanplugin.cpp2
-rw-r--r--kresources/groupdav/groupdavaddressbookadaptor.cpp2
-rw-r--r--kresources/groupdav/groupdavaddressbookadaptor.h2
-rw-r--r--kresources/groupdav/groupdavcalendaradaptor.cpp2
-rw-r--r--kresources/groupdav/groupdavcalendaradaptor.h2
-rw-r--r--kresources/groupdav/groupdavglobals.cpp2
-rw-r--r--kresources/groupdav/groupdavglobals.h2
-rw-r--r--kresources/groupdav/kabc_resourcegroupdav.cpp2
-rw-r--r--kresources/groupdav/kabc_resourcegroupdav.h4
-rw-r--r--kresources/groupdav/kabc_resourcegroupdav_plugin.cpp4
-rw-r--r--kresources/groupdav/kcal_resourcegroupdav.cpp2
-rw-r--r--kresources/groupdav/kcal_resourcegroupdav.h2
-rw-r--r--kresources/groupdav/kcal_resourcegroupdav_plugin.cpp4
-rw-r--r--kresources/groupware/kabc_resourcegroupware.cpp2
-rw-r--r--kresources/groupware/kabc_resourcegroupware.h2
-rw-r--r--kresources/groupware/kabc_resourcegroupware_plugin.cpp2
-rw-r--r--kresources/groupware/kabc_resourcegroupwareconfig.cpp2
-rw-r--r--kresources/groupware/kabc_resourcegroupwareconfig.h2
-rw-r--r--kresources/groupware/kcal_resourcegroupware.cpp2
-rw-r--r--kresources/groupware/kcal_resourcegroupware.h2
-rw-r--r--kresources/groupware/kcal_resourcegroupware_plugin.cpp2
-rw-r--r--kresources/groupware/kcal_resourcegroupwareconfig.cpp2
-rw-r--r--kresources/groupware/kcal_resourcegroupwareconfig.h2
-rw-r--r--kresources/groupwise/groupwisesettingswidget.cpp2
-rw-r--r--kresources/groupwise/groupwisesettingswidget.h2
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise.cpp2
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise.h4
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise_plugin.cpp2
-rw-r--r--kresources/groupwise/kabc_resourcegroupwiseconfig.cpp2
-rw-r--r--kresources/groupwise/kabc_resourcegroupwiseconfig.h4
-rw-r--r--kresources/groupwise/kcal_resourcegroupwise.cpp2
-rw-r--r--kresources/groupwise/kcal_resourcegroupwise.h4
-rw-r--r--kresources/groupwise/kcal_resourcegroupwise_plugin.cpp2
-rw-r--r--kresources/groupwise/kcal_resourcegroupwiseconfig.cpp2
-rw-r--r--kresources/groupwise/kcal_resourcegroupwiseconfig.h4
-rw-r--r--kresources/groupwise/kioslave/groupwise.cpp2
-rw-r--r--kresources/groupwise/soap/CMakeLists.txt2
-rw-r--r--kresources/groupwise/soap/Makefile.am4
-rw-r--r--kresources/groupwise/soap/contactconverter.cpp2
-rw-r--r--kresources/groupwise/soap/contactconverter.h2
-rw-r--r--kresources/groupwise/soap/gwconverter.cpp2
-rw-r--r--kresources/groupwise/soap/gwconverter.h2
-rw-r--r--kresources/groupwise/soap/incidenceconverter.cpp2
-rw-r--r--kresources/groupwise/soap/incidenceconverter.h2
-rw-r--r--kresources/groupwise/soap/patches/socklen.diff2
-rw-r--r--kresources/groupwise/soap/patches/type_typo.diff2
-rw-r--r--kresources/kolab/kabc/resourcekolab.h2
-rw-r--r--kresources/kolab/kcal/resourcekolab.h2
-rw-r--r--kresources/kolab/knotes/Makefile.am2
-rw-r--r--kresources/kolab/knotes/resourcekolab.h2
-rw-r--r--kresources/lib/CMakeLists.txt2
-rw-r--r--kresources/lib/Makefile.am2
-rw-r--r--kresources/lib/addressbookadaptor.cpp2
-rw-r--r--kresources/lib/addressbookadaptor.h4
-rw-r--r--kresources/lib/calendaradaptor.cpp2
-rw-r--r--kresources/lib/calendaradaptor.h4
-rw-r--r--kresources/lib/davaddressbookadaptor.cpp2
-rw-r--r--kresources/lib/davaddressbookadaptor.h4
-rw-r--r--kresources/lib/davcalendaradaptor.cpp2
-rw-r--r--kresources/lib/davcalendaradaptor.h4
-rw-r--r--kresources/lib/davgroupwareglobals.cpp2
-rw-r--r--kresources/lib/davgroupwareglobals.h2
-rw-r--r--kresources/lib/folderconfig.h2
-rw-r--r--kresources/lib/folderlister.h2
-rw-r--r--kresources/lib/folderselectdialog.cpp2
-rw-r--r--kresources/lib/folderselectdialog.h2
-rw-r--r--kresources/lib/groupwaredataadaptor.cpp2
-rw-r--r--kresources/lib/groupwaredataadaptor.h4
-rw-r--r--kresources/lib/groupwaredownloadjob.cpp2
-rw-r--r--kresources/lib/groupwaredownloadjob.h2
-rw-r--r--kresources/lib/groupwareresourcejob.cpp2
-rw-r--r--kresources/lib/groupwareresourcejob.h2
-rw-r--r--kresources/lib/groupwareuploadjob.cpp2
-rw-r--r--kresources/lib/groupwareuploadjob.h2
-rw-r--r--kresources/lib/kabc_resourcegroupwarebase.cpp2
-rw-r--r--kresources/lib/kabc_resourcegroupwarebase.h4
-rw-r--r--kresources/lib/kabc_resourcegroupwarebaseconfig.cpp2
-rw-r--r--kresources/lib/kabc_resourcegroupwarebaseconfig.h4
-rw-r--r--kresources/lib/kcal_cachesettingsdlg.cpp2
-rw-r--r--kresources/lib/kcal_cachesettingsdlg.h4
-rw-r--r--kresources/lib/kcal_resourcegroupwarebase.cpp2
-rw-r--r--kresources/lib/kcal_resourcegroupwarebase.h4
-rw-r--r--kresources/lib/kcal_resourcegroupwarebaseconfig.cpp2
-rw-r--r--kresources/lib/kcal_resourcegroupwarebaseconfig.h4
-rw-r--r--kresources/lib/webdavhandler.cpp2
-rw-r--r--kresources/lib/webdavhandler.h4
-rw-r--r--kresources/newexchange/exchangeaddressbookadaptor.cpp2
-rw-r--r--kresources/newexchange/exchangeaddressbookadaptor.h2
-rw-r--r--kresources/newexchange/exchangecalendaradaptor.cpp2
-rw-r--r--kresources/newexchange/exchangecalendaradaptor.h2
-rw-r--r--kresources/newexchange/exchangeglobals.cpp2
-rw-r--r--kresources/newexchange/exchangeglobals.h2
-rw-r--r--kresources/newexchange/kabc_resourceexchange.cpp2
-rw-r--r--kresources/newexchange/kabc_resourceexchange.h2
-rw-r--r--kresources/newexchange/kabc_resourceexchange_plugin.cpp2
-rw-r--r--kresources/newexchange/kcal_resourceexchange.cpp2
-rw-r--r--kresources/newexchange/kcal_resourceexchange.h2
-rw-r--r--kresources/newexchange/kcal_resourceexchange_plugin.cpp2
-rw-r--r--kresources/remote/CMakeLists.txt2
-rw-r--r--kresources/remote/resourceremote.h2
-rw-r--r--kresources/remote/resourceremoteconfig.h2
-rw-r--r--kresources/scalix/kabc/resourcescalix.h2
-rw-r--r--kresources/scalix/kcal/resourcescalix.h2
-rw-r--r--kresources/scalix/kioslave/CMakeLists.txt2
-rw-r--r--kresources/scalix/kioslave/scalix.cpp2
-rw-r--r--kresources/scalix/knotes/Makefile.am2
-rw-r--r--kresources/scalix/knotes/resourcescalix.h2
-rw-r--r--kresources/scalix/scalixadmin/Makefile.am2
-rw-r--r--kresources/slox/CMakeLists.txt2
-rw-r--r--kresources/slox/Makefile.am2
-rw-r--r--kresources/slox/kabcresourceslox.cpp2
-rw-r--r--kresources/slox/kabcresourceslox.h4
-rw-r--r--kresources/slox/kabcresourceslox_plugin.cpp2
-rw-r--r--kresources/slox/kabcresourcesloxconfig.cpp2
-rw-r--r--kresources/slox/kabcresourcesloxconfig.h4
-rw-r--r--kresources/slox/kcalresourceslox.cpp2
-rw-r--r--kresources/slox/kcalresourceslox.h4
-rw-r--r--kresources/slox/kcalresourceslox_plugin.cpp2
-rw-r--r--kresources/slox/kcalresourcesloxconfig.cpp2
-rw-r--r--kresources/slox/kcalresourcesloxconfig.h4
-rw-r--r--kresources/slox/sloxaccounts.cpp2
-rw-r--r--kresources/slox/sloxaccounts.h4
-rw-r--r--kresources/slox/sloxbase.h2
-rw-r--r--kresources/slox/sloxfolder.h2
-rw-r--r--kresources/slox/sloxfoldermanager.h2
-rw-r--r--kresources/slox/testsloxaccounts.cpp2
-rw-r--r--kresources/slox/webdavhandler.cpp2
-rw-r--r--kresources/slox/webdavhandler.h4
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytime.cpp2
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytime.h4
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp2
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp2
-rw-r--r--kresources/tvanytime/kcal_resourcetvanytimeconfig.h4
-rw-r--r--kresources/tvanytime/tvanytime.kdevelop6
184 files changed, 226 insertions, 226 deletions
diff --git a/kresources/birthdays/CMakeLists.txt b/kresources/birthdays/CMakeLists.txt
index 4836da70d..99fd0ecd1 100644
--- a/kresources/birthdays/CMakeLists.txt
+++ b/kresources/birthdays/CMakeLists.txt
@@ -41,6 +41,6 @@ install( FILES kabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kcal
tde_add_kpart( kcal_kabc AUTOMOC
SOURCES
resourcekabc.cpp resourcekabcconfig.cpp
- LINK kabcommon-static kdepim-shared
+ LINK kabcommon-static tdepim-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kresources/birthdays/resourcekabc.h b/kresources/birthdays/resourcekabc.h
index 6c69a01a6..30c0814d2 100644
--- a/kresources/birthdays/resourcekabc.h
+++ b/kresources/birthdays/resourcekabc.h
@@ -33,7 +33,7 @@
#include "libkcal/resourcecalendar.h"
-#include "libtdepim/kdepimmacros.h"
+#include "libtdepim/tdepimmacros.h"
namespace KIO {
class FileCopyJob;
diff --git a/kresources/blogging/API_Blogger.cpp b/kresources/blogging/API_Blogger.cpp
index 5cdeec257..0745467b8 100644
--- a/kresources/blogging/API_Blogger.cpp
+++ b/kresources/blogging/API_Blogger.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/blogging/API_Blogger.h b/kresources/blogging/API_Blogger.h
index 32610bf60..04950338d 100644
--- a/kresources/blogging/API_Blogger.h
+++ b/kresources/blogging/API_Blogger.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/blogging/bloggingcalendaradaptor.cpp b/kresources/blogging/bloggingcalendaradaptor.cpp
index 1255cab38..bb91edb07 100644
--- a/kresources/blogging/bloggingcalendaradaptor.cpp
+++ b/kresources/blogging/bloggingcalendaradaptor.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/blogging/bloggingcalendaradaptor.h b/kresources/blogging/bloggingcalendaradaptor.h
index 9baedfdae..f193f8794 100644
--- a/kresources/blogging/bloggingcalendaradaptor.h
+++ b/kresources/blogging/bloggingcalendaradaptor.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (C) 2004-05 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/blogging/bloggingglobals.cpp b/kresources/blogging/bloggingglobals.cpp
index b6b4c4228..53743e9a6 100644
--- a/kresources/blogging/bloggingglobals.cpp
+++ b/kresources/blogging/bloggingglobals.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/blogging/bloggingglobals.h b/kresources/blogging/bloggingglobals.h
index 004ed4d9a..74eafdf75 100644
--- a/kresources/blogging/bloggingglobals.h
+++ b/kresources/blogging/bloggingglobals.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/blogging/kcal_resourceblogging.cpp b/kresources/blogging/kcal_resourceblogging.cpp
index 07d097db9..c8b016620 100644
--- a/kresources/blogging/kcal_resourceblogging.cpp
+++ b/kresources/blogging/kcal_resourceblogging.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>>
diff --git a/kresources/blogging/kcal_resourceblogging.h b/kresources/blogging/kcal_resourceblogging.h
index ac3820abb..36942d521 100644
--- a/kresources/blogging/kcal_resourceblogging.h
+++ b/kresources/blogging/kcal_resourceblogging.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
@@ -22,7 +22,7 @@
#define KCAL_RESOURCEBLOGGING_H
#include <kcal_resourcegroupwarebase.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KBlog {
class APIBlog;
diff --git a/kresources/blogging/kcal_resourceblogging_plugin.cpp b/kresources/blogging/kcal_resourceblogging_plugin.cpp
index 108d5e896..b3eaf9378 100644
--- a/kresources/blogging/kcal_resourceblogging_plugin.cpp
+++ b/kresources/blogging/kcal_resourceblogging_plugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
@@ -34,7 +34,7 @@ extern "C"
{
void *init_kcal_blogging()
{
- KGlobal::locale()->insertCatalogue( "kdepimresources" );
+ KGlobal::locale()->insertCatalogue( "tdepimresources" );
KGlobal::locale()->insertCatalogue( "kres_blogging" );
return new BloggingFactory;
}
diff --git a/kresources/blogging/kcal_resourcebloggingconfig.cpp b/kresources/blogging/kcal_resourcebloggingconfig.cpp
index d68584a2b..bd999ffe3 100644
--- a/kresources/blogging/kcal_resourcebloggingconfig.cpp
+++ b/kresources/blogging/kcal_resourcebloggingconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/blogging/kcal_resourcebloggingconfig.h b/kresources/blogging/kcal_resourcebloggingconfig.h
index c8ff2aa67..b9509e9bd 100644
--- a/kresources/blogging/kcal_resourcebloggingconfig.h
+++ b/kresources/blogging/kcal_resourcebloggingconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com>
@@ -20,7 +20,7 @@
#ifndef KCAL_RESOURCEBLOGGINGCONFIG_H
#define KCAL_RESOURCEBLOGGINGCONFIG_H
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <kcal_resourcegroupwarebaseconfig.h>
namespace KCal {
diff --git a/kresources/caldav/CMakeLists.txt b/kresources/caldav/CMakeLists.txt
index da220c139..960f086f9 100644
--- a/kresources/caldav/CMakeLists.txt
+++ b/kresources/caldav/CMakeLists.txt
@@ -49,6 +49,6 @@ tde_add_library( kcal_caldav SHARED AUTOMOC
resource.cpp config.cpp configwidgets.cpp preferences.cpp job.cpp
reader.cpp writer.cpp prefsskel.kcfgc
VERSION 1.0.0
- LINK kdepim-shared ${CALDAV_LIBRARIES}
+ LINK tdepim-shared ${CALDAV_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kresources/caldav/resource.h b/kresources/caldav/resource.h
index 417767663..fd028f7a3 100644
--- a/kresources/caldav/resource.h
+++ b/kresources/caldav/resource.h
@@ -26,7 +26,7 @@
#include <kabc/locknull.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <kconfig.h>
namespace KCal {
diff --git a/kresources/carddav/CMakeLists.txt b/kresources/carddav/CMakeLists.txt
index e1c637945..c5d3e3cee 100644
--- a/kresources/carddav/CMakeLists.txt
+++ b/kresources/carddav/CMakeLists.txt
@@ -49,6 +49,6 @@ tde_add_library( kabc_carddav SHARED AUTOMOC
resource.cpp config.cpp configwidgets.cpp preferences.cpp job.cpp
reader.cpp writer.cpp prefsskel.kcfgc
VERSION 1.0.0
- LINK kdepim-shared ${CARDDAV_LIBRARIES}
+ LINK tdepim-shared ${CARDDAV_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kresources/carddav/plugin.cpp b/kresources/carddav/plugin.cpp
index f167e7f5c..8d51e53b9 100644
--- a/kresources/carddav/plugin.cpp
+++ b/kresources/carddav/plugin.cpp
@@ -38,7 +38,7 @@ extern "C"
{
void *init_kabc_carddav()
{
- KGlobal::locale()->insertCatalogue( "kdepimresources" );
+ KGlobal::locale()->insertCatalogue( "tdepimresources" );
KGlobal::locale()->insertCatalogue( "kres_caldav" );
return new CardDavFactory;
}
diff --git a/kresources/carddav/resource.h b/kresources/carddav/resource.h
index 608d09cb1..cfe0f4da8 100644
--- a/kresources/carddav/resource.h
+++ b/kresources/carddav/resource.h
@@ -25,7 +25,7 @@
#include <kabc/locknull.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <kconfig.h>
namespace KABC {
diff --git a/kresources/egroupware/CMakeLists.txt b/kresources/egroupware/CMakeLists.txt
index 065e9a9c0..bdc95298f 100644
--- a/kresources/egroupware/CMakeLists.txt
+++ b/kresources/egroupware/CMakeLists.txt
@@ -53,7 +53,7 @@ tde_add_library( kabc_xmlrpc SHARED AUTOMOC
kabc_resourcexmlrpc.cpp kabc_resourcexmlrpcconfig.cpp
kabc_egroupwareprefs.kcfgc
VERSION 1.0.0
- LINK egwcommon-static kabcommon-static kdepim-shared
+ LINK egwcommon-static kabcommon-static tdepim-shared
DESTINATION ${LIB_INSTALL_DIR}
)
@@ -65,7 +65,7 @@ tde_add_library( kcal_xmlrpc SHARED AUTOMOC
kcal_resourcexmlrpc.cpp kcal_resourcexmlrpcconfig.cpp todostatemapper.cpp
kcal_egroupwareprefs.kcfgc
VERSION 1.0.0
- LINK egwcommon-static kdepim-shared
+ LINK egwcommon-static tdepim-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kresources/egroupware/Makefile.am b/kresources/egroupware/Makefile.am
index 23e5232e7..a3effa7fb 100644
--- a/kresources/egroupware/Makefile.am
+++ b/kresources/egroupware/Makefile.am
@@ -34,7 +34,7 @@ libkcal_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
libknotes_xmlrpc_la_SOURCES = knotes_resourcexmlrpc.cpp knotes_resourcexmlrpcconfig.cpp \
knotes_egroupwareprefs.kcfgc
libknotes_xmlrpc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libknotes_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la -lkdeprint \
+libknotes_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la -ltdeprint \
$(top_builddir)/knotes/libknotesresources.la \
$(top_builddir)/libtdepim/libtdepim.la \
libegwcommon.la
diff --git a/kresources/egroupware/access.h b/kresources/egroupware/access.h
index 8ed6a6afe..aab787796 100644
--- a/kresources/egroupware/access.h
+++ b/kresources/egroupware/access.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/egroupware/debugdialog.cpp b/kresources/egroupware/debugdialog.cpp
index 57a6479f4..0b2764c64 100644
--- a/kresources/egroupware/debugdialog.cpp
+++ b/kresources/egroupware/debugdialog.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/egroupware/debugdialog.h b/kresources/egroupware/debugdialog.h
index 52ddb2273..dc3124a7b 100644
--- a/kresources/egroupware/debugdialog.h
+++ b/kresources/egroupware/debugdialog.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp
index 35d38ea70..1247975f7 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.h b/kresources/egroupware/kabc_resourcexmlrpc.h
index 749296163..73b083d1b 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.h
+++ b/kresources/egroupware/kabc_resourcexmlrpc.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#define KABC_RESOURCEXMLRPC_H
#include <tqmap.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include "libtdepim/kabcresourcecached.h"
diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
index 02a2f1ad3..ddafbd1f2 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2002 - 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.h b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
index 084f92109..7ed608aa8 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2002 - 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#define RESOURCEXMLRPCCONFIG_H
#include <kresources/configwidget.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
class KLineEdit;
class KURLRequester;
diff --git a/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp b/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp
index 9fd5611e6..68918f8c0 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpcplugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index 8b68b4cbe..f47df2718 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org>
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.h b/kresources/egroupware/kcal_resourcexmlrpc.h
index 6d538d73c..b95f13446 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.h
+++ b/kresources/egroupware/kcal_resourcexmlrpc.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org>
@@ -29,7 +29,7 @@
#include <kconfig.h>
#include <kurl.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include "libkcal/calendarlocal.h"
#include "libkcal/incidence.h"
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
index 36e3b9486..213da26e3 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.h b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
index 13e359b00..7b38bbad9 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#define RESOURCEXMLRPCCONFIG_H
#include <kresources/configwidget.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
class KIntSpinBox;
class KLineEdit;
diff --git a/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp b/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp
index 1cc867b62..a22e55a0e 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpcplugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2003 - 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp
index 6446a833d..8b50c3b8e 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.h b/kresources/egroupware/knotes_resourcexmlrpc.h
index eeb47e139..c44700c34 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.h
+++ b/kresources/egroupware/knotes_resourcexmlrpc.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
@@ -27,7 +27,7 @@
#include <kconfig.h>
#include <kurl.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include "libkcal/calendarlocal.h"
#include "libkcal/journal.h"
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
index 224cb9914..8cf2a35c8 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.h b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
index dac45f818..f55a66021 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.h
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
#define RESOURCEXMLRPCCONFIG_H
#include <kresources/configwidget.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
class KIntSpinBox;
class KLineEdit;
diff --git a/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp b/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp
index b3b6aabe3..db8cfdc4c 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpcplugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/egroupware/synchronizer.cpp b/kresources/egroupware/synchronizer.cpp
index f48542467..8152828cb 100644
--- a/kresources/egroupware/synchronizer.cpp
+++ b/kresources/egroupware/synchronizer.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
diff --git a/kresources/egroupware/synchronizer.h b/kresources/egroupware/synchronizer.h
index ccb34d7cb..97270e318 100644
--- a/kresources/egroupware/synchronizer.h
+++ b/kresources/egroupware/synchronizer.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp
index ed87e9db6..81c517d0c 100644
--- a/kresources/egroupware/todostatemapper.cpp
+++ b/kresources/egroupware/todostatemapper.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
diff --git a/kresources/egroupware/todostatemapper.h b/kresources/egroupware/todostatemapper.h
index 46c531cfc..fb82b4786 100644
--- a/kresources/egroupware/todostatemapper.h
+++ b/kresources/egroupware/todostatemapper.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
diff --git a/kresources/featureplan/CMakeLists.txt b/kresources/featureplan/CMakeLists.txt
index c365c8cbb..7d07c761e 100644
--- a/kresources/featureplan/CMakeLists.txt
+++ b/kresources/featureplan/CMakeLists.txt
@@ -69,6 +69,6 @@ tde_add_library( kcal_resourcefeatureplan SHARED AUTOMOC
SOURCES
kcal_resourcefeatureplan.cpp kcal_resourcefeatureplanconfig.cpp
VERSION 1.0.0
- LINK featureplancommon-static kdepim-shared
+ LINK featureplancommon-static tdepim-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kresources/featureplan/Makefile.am b/kresources/featureplan/Makefile.am
index 70bddac30..8c5a1999c 100644
--- a/kresources/featureplan/Makefile.am
+++ b/kresources/featureplan/Makefile.am
@@ -28,12 +28,12 @@ kcal_service_DATA = kcal_resourcefeatureplan.desktop
check_PROGRAMS = dumpfeaturelist benchmarkfeaturelist
-dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
dumpfeaturelist_LDADD = libfeatureplancommon.la $(LIB_KDECORE)
dumpfeaturelist_SOURCES = dumpfeaturelist.cpp
dumpfeaturelist_COMPILE_FIRST = kde-features.h
-benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
benchmarkfeaturelist_LDADD = libfeatureplancommon.la $(LIB_KDECORE)
benchmarkfeaturelist_SOURCES = benchmarkfeaturelist.cpp
benchmarkfeaturelist_COMPILE_FIRST = kde-features.h
diff --git a/kresources/featureplan/benchmarkfeaturelist.cpp b/kresources/featureplan/benchmarkfeaturelist.cpp
index 2ae4432a0..f30ec2700 100644
--- a/kresources/featureplan/benchmarkfeaturelist.cpp
+++ b/kresources/featureplan/benchmarkfeaturelist.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/featureplan/dumpfeaturelist.cpp b/kresources/featureplan/dumpfeaturelist.cpp
index fd5a5a01a..08f6fdf0a 100644
--- a/kresources/featureplan/dumpfeaturelist.cpp
+++ b/kresources/featureplan/dumpfeaturelist.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/featureplan/kcal_resourcefeatureplan.cpp b/kresources/featureplan/kcal_resourcefeatureplan.cpp
index 2b54b0267..349e4ad56 100644
--- a/kresources/featureplan/kcal_resourcefeatureplan.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplan.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/featureplan/kcal_resourcefeatureplan.h b/kresources/featureplan/kcal_resourcefeatureplan.h
index 67799044e..41eb54af9 100644
--- a/kresources/featureplan/kcal_resourcefeatureplan.h
+++ b/kresources/featureplan/kcal_resourcefeatureplan.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
@@ -29,7 +29,7 @@
#include <kabc/locknull.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <kconfig.h>
namespace KCal {
diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
index 42043a5dd..55d12cbd9 100644
--- a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.h b/kresources/featureplan/kcal_resourcefeatureplanconfig.h
index e27ea94c2..94e31313f 100644
--- a/kresources/featureplan/kcal_resourcefeatureplanconfig.h
+++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
@@ -23,7 +23,7 @@
#define RESOURCEFEATUREPLANCONFIG_H
#include <kresources/configwidget.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
class KLineEdit;
class KURLRequester;
diff --git a/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp b/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp
index cee41809f..8f384ac97 100644
--- a/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplanplugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupdav/groupdavaddressbookadaptor.cpp b/kresources/groupdav/groupdavaddressbookadaptor.cpp
index 538d07159..f8f30f659 100644
--- a/kresources/groupdav/groupdavaddressbookadaptor.cpp
+++ b/kresources/groupdav/groupdavaddressbookadaptor.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/groupdav/groupdavaddressbookadaptor.h b/kresources/groupdav/groupdavaddressbookadaptor.h
index f66d7b863..7a716800b 100644
--- a/kresources/groupdav/groupdavaddressbookadaptor.h
+++ b/kresources/groupdav/groupdavaddressbookadaptor.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/groupdav/groupdavcalendaradaptor.cpp b/kresources/groupdav/groupdavcalendaradaptor.cpp
index b83a9d4e5..2556e3d02 100644
--- a/kresources/groupdav/groupdavcalendaradaptor.cpp
+++ b/kresources/groupdav/groupdavcalendaradaptor.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/groupdav/groupdavcalendaradaptor.h b/kresources/groupdav/groupdavcalendaradaptor.h
index 64e8e86ed..15b41de80 100644
--- a/kresources/groupdav/groupdavcalendaradaptor.h
+++ b/kresources/groupdav/groupdavcalendaradaptor.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/groupdav/groupdavglobals.cpp b/kresources/groupdav/groupdavglobals.cpp
index 10716000d..5fb9d6d3a 100644
--- a/kresources/groupdav/groupdavglobals.cpp
+++ b/kresources/groupdav/groupdavglobals.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/groupdav/groupdavglobals.h b/kresources/groupdav/groupdavglobals.h
index 7a89f1def..14ae7a3c8 100644
--- a/kresources/groupdav/groupdavglobals.h
+++ b/kresources/groupdav/groupdavglobals.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/groupdav/kabc_resourcegroupdav.cpp b/kresources/groupdav/kabc_resourcegroupdav.cpp
index b1fb46aa2..568f6fc5a 100644
--- a/kresources/groupdav/kabc_resourcegroupdav.cpp
+++ b/kresources/groupdav/kabc_resourcegroupdav.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/groupdav/kabc_resourcegroupdav.h b/kresources/groupdav/kabc_resourcegroupdav.h
index c3724424b..082eb2a5f 100644
--- a/kresources/groupdav/kabc_resourcegroupdav.h
+++ b/kresources/groupdav/kabc_resourcegroupdav.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
@@ -23,7 +23,7 @@
#define KABC_RESOURCEGROUPDAV_H
#include "kabc_resourcegroupwarebase.h"
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KABC {
diff --git a/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp b/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp
index 15e12e63b..63614979d 100644
--- a/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp
+++ b/kresources/groupdav/kabc_resourcegroupdav_plugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
@@ -35,7 +35,7 @@ extern "C"
{
void *init_kabc_groupdav()
{
- KGlobal::locale()->insertCatalogue( "kdepimresources" );
+ KGlobal::locale()->insertCatalogue( "tdepimresources" );
KGlobal::locale()->insertCatalogue( "kres_groupdav" );
return new GroupDavFactory;
}
diff --git a/kresources/groupdav/kcal_resourcegroupdav.cpp b/kresources/groupdav/kcal_resourcegroupdav.cpp
index 293cb66fa..eef95c6e0 100644
--- a/kresources/groupdav/kcal_resourcegroupdav.cpp
+++ b/kresources/groupdav/kcal_resourcegroupdav.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/groupdav/kcal_resourcegroupdav.h b/kresources/groupdav/kcal_resourcegroupdav.h
index 2ff54695e..35d76c605 100644
--- a/kresources/groupdav/kcal_resourcegroupdav.h
+++ b/kresources/groupdav/kcal_resourcegroupdav.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp b/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp
index 6ab8eaee2..10b751a3d 100644
--- a/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp
+++ b/kresources/groupdav/kcal_resourcegroupdav_plugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
@@ -36,7 +36,7 @@ extern "C"
{
void *init_kcal_groupdav()
{
- KGlobal::locale()->insertCatalogue( "kdepimresources" );
+ KGlobal::locale()->insertCatalogue( "tdepimresources" );
KGlobal::locale()->insertCatalogue( "kres_groupdav" );
return new GroupDavFactory;
}
diff --git a/kresources/groupware/kabc_resourcegroupware.cpp b/kresources/groupware/kabc_resourcegroupware.cpp
index 251b9a530..c7950bcb0 100644
--- a/kresources/groupware/kabc_resourcegroupware.cpp
+++ b/kresources/groupware/kabc_resourcegroupware.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupware/kabc_resourcegroupware.h b/kresources/groupware/kabc_resourcegroupware.h
index db87254ac..70875f1da 100644
--- a/kresources/groupware/kabc_resourcegroupware.h
+++ b/kresources/groupware/kabc_resourcegroupware.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupware/kabc_resourcegroupware_plugin.cpp b/kresources/groupware/kabc_resourcegroupware_plugin.cpp
index b486f7839..38b156fd9 100644
--- a/kresources/groupware/kabc_resourcegroupware_plugin.cpp
+++ b/kresources/groupware/kabc_resourcegroupware_plugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.cpp b/kresources/groupware/kabc_resourcegroupwareconfig.cpp
index a930219cb..956ee4321 100644
--- a/kresources/groupware/kabc_resourcegroupwareconfig.cpp
+++ b/kresources/groupware/kabc_resourcegroupwareconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.h b/kresources/groupware/kabc_resourcegroupwareconfig.h
index 06ef4186c..04900ca7b 100644
--- a/kresources/groupware/kabc_resourcegroupwareconfig.h
+++ b/kresources/groupware/kabc_resourcegroupwareconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupware/kcal_resourcegroupware.cpp b/kresources/groupware/kcal_resourcegroupware.cpp
index 9bf03b191..6af5dce26 100644
--- a/kresources/groupware/kcal_resourcegroupware.cpp
+++ b/kresources/groupware/kcal_resourcegroupware.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupware/kcal_resourcegroupware.h b/kresources/groupware/kcal_resourcegroupware.h
index 81cd71180..072487a34 100644
--- a/kresources/groupware/kcal_resourcegroupware.h
+++ b/kresources/groupware/kcal_resourcegroupware.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupware/kcal_resourcegroupware_plugin.cpp b/kresources/groupware/kcal_resourcegroupware_plugin.cpp
index a30f47a94..bfa4f9f6d 100644
--- a/kresources/groupware/kcal_resourcegroupware_plugin.cpp
+++ b/kresources/groupware/kcal_resourcegroupware_plugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.cpp b/kresources/groupware/kcal_resourcegroupwareconfig.cpp
index 2d5cffe00..9a191bc30 100644
--- a/kresources/groupware/kcal_resourcegroupwareconfig.cpp
+++ b/kresources/groupware/kcal_resourcegroupwareconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.h b/kresources/groupware/kcal_resourcegroupwareconfig.h
index b55febc8b..b43d1bc1a 100644
--- a/kresources/groupware/kcal_resourcegroupwareconfig.h
+++ b/kresources/groupware/kcal_resourcegroupwareconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupwise/groupwisesettingswidget.cpp b/kresources/groupwise/groupwisesettingswidget.cpp
index 60d047123..ec1bc178d 100644
--- a/kresources/groupwise/groupwisesettingswidget.cpp
+++ b/kresources/groupwise/groupwisesettingswidget.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Will Stephenson <wstephenson@suse.de>
diff --git a/kresources/groupwise/groupwisesettingswidget.h b/kresources/groupwise/groupwisesettingswidget.h
index 46c6ca6d9..03b688730 100644
--- a/kresources/groupwise/groupwisesettingswidget.h
+++ b/kresources/groupwise/groupwisesettingswidget.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Will Stephenson <wstephenson@suse.de>
diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp
index e6570b46e..8291b2bfc 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupwise/kabc_resourcegroupwise.h b/kresources/groupwise/kabc_resourcegroupwise.h
index b300336c1..d5c6734ba 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.h
+++ b/kresources/groupwise/kabc_resourcegroupwise.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
@@ -23,7 +23,7 @@
#include "soap/groupwiseserver.h"
#include <kabcresourcecached.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <libtdepim/progressmanager.h>
diff --git a/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp b/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp
index 8fb53d09a..bacd1a7b5 100644
--- a/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise_plugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
index 42896bb01..483268cc2 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.h b/kresources/groupwise/kabc_resourcegroupwiseconfig.h
index 06278834e..4db0a705d 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.h
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
@@ -23,7 +23,7 @@
#include "soap/groupwiseserver.h"
#include <kresources/configwidget.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <tqmap.h>
diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/kresources/groupwise/kcal_resourcegroupwise.cpp
index ae56576ea..026cf9b6c 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwise.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupwise/kcal_resourcegroupwise.h b/kresources/groupwise/kcal_resourcegroupwise.h
index e99a04029..7baf07295 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.h
+++ b/kresources/groupwise/kcal_resourcegroupwise.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
@@ -30,7 +30,7 @@
#include <kabc/locknull.h>
#include <kio/job.h>
#include <kconfig.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
class ngwt__Settings;
diff --git a/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp b/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp
index 930e907fc..8cce68e7e 100644
--- a/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwise_plugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
index 78f049e85..26689315e 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.h b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
index c27ac5dbb..2bf07c83b 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.h
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
@@ -21,7 +21,7 @@
#define KCALRESOURCEGROUPWISECONFIG_H
#include <kurlrequester.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <kresources/resource.h>
#include <kresources/configwidget.h>
diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp
index 5e182283e..a2f305a21 100644
--- a/kresources/groupwise/kioslave/groupwise.cpp
+++ b/kresources/groupwise/kioslave/groupwise.cpp
@@ -44,7 +44,7 @@
#include <unistd.h>
#include <stdlib.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include "groupwise.h"
diff --git a/kresources/groupwise/soap/CMakeLists.txt b/kresources/groupwise/soap/CMakeLists.txt
index 64509638e..be5c8205f 100644
--- a/kresources/groupwise/soap/CMakeLists.txt
+++ b/kresources/groupwise/soap/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_library( gwsoap SHARED AUTOMOC
contactconverter.cpp gwconverter.cpp incidenceconverter.cpp groupwiseserver.cpp
gwjobs.cpp ksslsocket.cpp soapC.cpp soapClient.cpp stdsoap2.cpp
VERSION 0.0.0
- LINK kdepim-shared
+ LINK tdepim-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kresources/groupwise/soap/Makefile.am b/kresources/groupwise/soap/Makefile.am
index 8ea5074e8..219737768 100644
--- a/kresources/groupwise/soap/Makefile.am
+++ b/kresources/groupwise/soap/Makefile.am
@@ -5,8 +5,8 @@ KDE_CXXFLAGS = -Wno-non-virtual-dtor
check_PROGRAMS = soapdebug
-soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
-soapdebug_LDADD = libgwsoap.la -lkdecore \
+soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+soapdebug_LDADD = libgwsoap.la -ltdecore \
$(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libtdepim/libtdepim.la
soapdebug_SOURCES = soapdebug.cpp
diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp
index d4ab5f6a4..4f4454399 100644
--- a/kresources/groupwise/soap/contactconverter.cpp
+++ b/kresources/groupwise/soap/contactconverter.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/groupwise/soap/contactconverter.h b/kresources/groupwise/soap/contactconverter.h
index 6594c6d0e..7dbc8c79c 100644
--- a/kresources/groupwise/soap/contactconverter.h
+++ b/kresources/groupwise/soap/contactconverter.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/groupwise/soap/gwconverter.cpp b/kresources/groupwise/soap/gwconverter.cpp
index 4e848b7e3..2f7d5e03b 100644
--- a/kresources/groupwise/soap/gwconverter.cpp
+++ b/kresources/groupwise/soap/gwconverter.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/groupwise/soap/gwconverter.h b/kresources/groupwise/soap/gwconverter.h
index f57171dcc..d240ffec9 100644
--- a/kresources/groupwise/soap/gwconverter.h
+++ b/kresources/groupwise/soap/gwconverter.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp
index 85143da3b..7360d8a42 100644
--- a/kresources/groupwise/soap/incidenceconverter.cpp
+++ b/kresources/groupwise/soap/incidenceconverter.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/groupwise/soap/incidenceconverter.h b/kresources/groupwise/soap/incidenceconverter.h
index 305f19258..317562fa3 100644
--- a/kresources/groupwise/soap/incidenceconverter.h
+++ b/kresources/groupwise/soap/incidenceconverter.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
diff --git a/kresources/groupwise/soap/patches/socklen.diff b/kresources/groupwise/soap/patches/socklen.diff
index 87b283804..74c2bbce0 100644
--- a/kresources/groupwise/soap/patches/socklen.diff
+++ b/kresources/groupwise/soap/patches/socklen.diff
@@ -1,6 +1,6 @@
Index: soap/stdsoap2.cpp
===================================================================
-RCS file: /home/kde/kdepim/kresources/groupwise/soap/stdsoap2.cpp,v
+RCS file: /home/kde/tdepim/kresources/groupwise/soap/stdsoap2.cpp,v
retrieving revision 1.3
diff -u -3 -p -r1.3 stdsoap2.cpp
--- soap/stdsoap2.cpp 3 Dec 2004 17:15:43 -0000 1.3
diff --git a/kresources/groupwise/soap/patches/type_typo.diff b/kresources/groupwise/soap/patches/type_typo.diff
index c663dad14..6e0f47929 100644
--- a/kresources/groupwise/soap/patches/type_typo.diff
+++ b/kresources/groupwise/soap/patches/type_typo.diff
@@ -1,6 +1,6 @@
Index: soap/soapC.cpp
===================================================================
-RCS file: /home/kde/kdepim/kresources/groupwise/soap/soapC.cpp,v
+RCS file: /home/kde/tdepim/kresources/groupwise/soap/soapC.cpp,v
retrieving revision 1.4.2.3
diff -u -3 -p -r1.4.2.3 soapC.cpp
--- soap/soapC.cpp 25 Oct 2004 13:58:20 -0000 1.4.2.3
diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h
index c6a27b6bf..95fdf3abe 100644
--- a/kresources/kolab/kabc/resourcekolab.h
+++ b/kresources/kolab/kabc/resourcekolab.h
@@ -38,7 +38,7 @@
#include "../shared/resourcekolabbase.h"
#include "../shared/subresource.h"
#include <kmail/kmailicalIface.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KABC {
diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h
index 872fbda4c..8d5672f96 100644
--- a/kresources/kolab/kcal/resourcekolab.h
+++ b/kresources/kolab/kcal/resourcekolab.h
@@ -37,7 +37,7 @@
#include <tqtimer.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <libkcal/calendarlocal.h>
#include <libkcal/icalformat.h>
#include <libkcal/resourcecalendar.h>
diff --git a/kresources/kolab/knotes/Makefile.am b/kresources/kolab/knotes/Makefile.am
index 0315f3365..b95c261d3 100644
--- a/kresources/kolab/knotes/Makefile.am
+++ b/kresources/kolab/knotes/Makefile.am
@@ -12,7 +12,7 @@ libknoteskolab_la_LIBADD = \
$(top_builddir)/kresources/kolab/shared/libresourcekolabshared.la \
$(top_builddir)/knotes/libknotesresources.la \
$(top_builddir)/libkcal/libkcal.la \
- -lkresources -lkdeprint
+ -lkresources -ltdeprint
kde_module_LTLIBRARIES = knotes_kolab.la
diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h
index 3b61d6ec9..cc77d25d2 100644
--- a/kresources/kolab/knotes/resourcekolab.h
+++ b/kresources/kolab/knotes/resourcekolab.h
@@ -39,7 +39,7 @@
#include <libkcal/calendarlocal.h>
#include "../shared/resourcekolabbase.h"
#include "../shared/subresource.h"
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace Kolab {
diff --git a/kresources/lib/CMakeLists.txt b/kresources/lib/CMakeLists.txt
index 3d1753b20..a604c51b6 100644
--- a/kresources/lib/CMakeLists.txt
+++ b/kresources/lib/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_add_library( kgroupwarebase SHARED AUTOMOC
kresources_groupwareprefs.kcfgc kcal_resourcegroupwarebaseconfig.cpp
kabc_resourcegroupwarebaseconfig.cpp kcal_cachesettingsdlg.cpp
VERSION 0.0.0
- LINK kdepim-shared
+ LINK tdepim-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kresources/lib/Makefile.am b/kresources/lib/Makefile.am
index 0fb1dd857..10719ed53 100644
--- a/kresources/lib/Makefile.am
+++ b/kresources/lib/Makefile.am
@@ -31,5 +31,5 @@ METASOURCES = AUTO
KDE_OPTIONS = nofinal
messages: rc.cpp
- $(XGETTEXT) *.cpp -o $(podir)/kdepimresources.pot
+ $(XGETTEXT) *.cpp -o $(podir)/tdepimresources.pot
diff --git a/kresources/lib/addressbookadaptor.cpp b/kresources/lib/addressbookadaptor.cpp
index 626867c74..8cc28f67a 100644
--- a/kresources/lib/addressbookadaptor.cpp
+++ b/kresources/lib/addressbookadaptor.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/addressbookadaptor.h b/kresources/lib/addressbookadaptor.h
index fb4408eca..b029ff60d 100644
--- a/kresources/lib/addressbookadaptor.h
+++ b/kresources/lib/addressbookadaptor.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
@@ -26,7 +26,7 @@
#include "groupwaredataadaptor.h"
#include <kabc/addressee.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <kurl.h>
namespace KABC {
diff --git a/kresources/lib/calendaradaptor.cpp b/kresources/lib/calendaradaptor.cpp
index 88685bdfe..f2e255f0d 100644
--- a/kresources/lib/calendaradaptor.cpp
+++ b/kresources/lib/calendaradaptor.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/calendaradaptor.h b/kresources/lib/calendaradaptor.h
index b8df62f9d..12e7d3ae7 100644
--- a/kresources/lib/calendaradaptor.h
+++ b/kresources/lib/calendaradaptor.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
@@ -27,7 +27,7 @@
#include <libkcal/incidence.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <kurl.h>
namespace KPIM {
diff --git a/kresources/lib/davaddressbookadaptor.cpp b/kresources/lib/davaddressbookadaptor.cpp
index b6f54c1e1..f96e353dd 100644
--- a/kresources/lib/davaddressbookadaptor.cpp
+++ b/kresources/lib/davaddressbookadaptor.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/davaddressbookadaptor.h b/kresources/lib/davaddressbookadaptor.h
index bdf9e35b8..55bb18193 100644
--- a/kresources/lib/davaddressbookadaptor.h
+++ b/kresources/lib/davaddressbookadaptor.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
@@ -24,7 +24,7 @@
#include "addressbookadaptor.h"
#include "folderlister.h"
#include <tqdom.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KABC {
diff --git a/kresources/lib/davcalendaradaptor.cpp b/kresources/lib/davcalendaradaptor.cpp
index 0bd64a838..206bb7e96 100644
--- a/kresources/lib/davcalendaradaptor.cpp
+++ b/kresources/lib/davcalendaradaptor.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/lib/davcalendaradaptor.h b/kresources/lib/davcalendaradaptor.h
index b7aba04ea..00134eda9 100644
--- a/kresources/lib/davcalendaradaptor.h
+++ b/kresources/lib/davcalendaradaptor.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
@@ -24,7 +24,7 @@
#include "calendaradaptor.h"
#include "folderlister.h"
#include <tqdom.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KCal {
diff --git a/kresources/lib/davgroupwareglobals.cpp b/kresources/lib/davgroupwareglobals.cpp
index 5795c97ba..5d9a37206 100644
--- a/kresources/lib/davgroupwareglobals.cpp
+++ b/kresources/lib/davgroupwareglobals.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004-2005 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/lib/davgroupwareglobals.h b/kresources/lib/davgroupwareglobals.h
index a899370fc..67eb22801 100644
--- a/kresources/lib/davgroupwareglobals.h
+++ b/kresources/lib/davgroupwareglobals.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004-2005 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/lib/folderconfig.h b/kresources/lib/folderconfig.h
index 6ed2ae591..0c6fb7951 100644
--- a/kresources/lib/folderconfig.h
+++ b/kresources/lib/folderconfig.h
@@ -24,7 +24,7 @@
#define KPIM_FOLDERCONFIG_H
#include <kurl.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <tqwidget.h>
// class KListView;
diff --git a/kresources/lib/folderlister.h b/kresources/lib/folderlister.h
index e2f55953c..81121ff61 100644
--- a/kresources/lib/folderlister.h
+++ b/kresources/lib/folderlister.h
@@ -26,7 +26,7 @@
// #include "kresources_groupwareprefs.h"
/*#include "groupwareresourcejob.h"*/
#include <kurl.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <tqvaluelist.h>
#include <tqstring.h>
diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp
index 189506182..f05dccf0a 100644
--- a/kresources/lib/folderselectdialog.cpp
+++ b/kresources/lib/folderselectdialog.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2008 Kevin Ottens <ervin@kde.org>
diff --git a/kresources/lib/folderselectdialog.h b/kresources/lib/folderselectdialog.h
index 884b91328..e33ac80a4 100644
--- a/kresources/lib/folderselectdialog.h
+++ b/kresources/lib/folderselectdialog.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2008 Kevin Ottens <ervin@kde.org>
diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp
index d77c0e550..da012b158 100644
--- a/kresources/lib/groupwaredataadaptor.cpp
+++ b/kresources/lib/groupwaredataadaptor.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h
index 203c62782..09fef6597 100644
--- a/kresources/lib/groupwaredataadaptor.h
+++ b/kresources/lib/groupwaredataadaptor.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
@@ -29,7 +29,7 @@
#include <tqstring.h>
#include <libkcal/listbase.h>
#include <tqobject.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KIO {
diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp
index e3756ebba..3bdead675 100644
--- a/kresources/lib/groupwaredownloadjob.cpp
+++ b/kresources/lib/groupwaredownloadjob.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/groupwaredownloadjob.h b/kresources/lib/groupwaredownloadjob.h
index 58f473ef9..e611d286c 100644
--- a/kresources/lib/groupwaredownloadjob.h
+++ b/kresources/lib/groupwaredownloadjob.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/groupwareresourcejob.cpp b/kresources/lib/groupwareresourcejob.cpp
index c1b23d16d..b7e4b57b0 100644
--- a/kresources/lib/groupwareresourcejob.cpp
+++ b/kresources/lib/groupwareresourcejob.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/groupwareresourcejob.h b/kresources/lib/groupwareresourcejob.h
index 5260b485a..6b9cd9700 100644
--- a/kresources/lib/groupwareresourcejob.h
+++ b/kresources/lib/groupwareresourcejob.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/groupwareuploadjob.cpp b/kresources/lib/groupwareuploadjob.cpp
index 4714a7f99..60e4a53e6 100644
--- a/kresources/lib/groupwareuploadjob.cpp
+++ b/kresources/lib/groupwareuploadjob.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/groupwareuploadjob.h b/kresources/lib/groupwareuploadjob.h
index 80816d153..273ab77cd 100644
--- a/kresources/lib/groupwareuploadjob.h
+++ b/kresources/lib/groupwareuploadjob.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/kabc_resourcegroupwarebase.cpp b/kresources/lib/kabc_resourcegroupwarebase.cpp
index 8af4cf837..0d8f197c4 100644
--- a/kresources/lib/kabc_resourcegroupwarebase.cpp
+++ b/kresources/lib/kabc_resourcegroupwarebase.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/kabc_resourcegroupwarebase.h b/kresources/lib/kabc_resourcegroupwarebase.h
index b8d7fe71a..872a52e83 100644
--- a/kresources/lib/kabc_resourcegroupwarebase.h
+++ b/kresources/lib/kabc_resourcegroupwarebase.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
@@ -24,7 +24,7 @@
#include <kurl.h>
#include <kabcresourcecached.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
class KConfig;
diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
index 803037342..6609a3b28 100644
--- a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.h b/kresources/lib/kabc_resourcegroupwarebaseconfig.h
index dbb57ed65..88b9f6db7 100644
--- a/kresources/lib/kabc_resourcegroupwarebaseconfig.h
+++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
@@ -23,7 +23,7 @@
#define KABC_RESOURCEGROUPWAREBASECONFIG_H
#include <kresources/configwidget.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
class KLineEdit;
class KURLRequester;
diff --git a/kresources/lib/kcal_cachesettingsdlg.cpp b/kresources/lib/kcal_cachesettingsdlg.cpp
index 808a16734..20b48ad9e 100644
--- a/kresources/lib/kcal_cachesettingsdlg.cpp
+++ b/kresources/lib/kcal_cachesettingsdlg.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/kcal_cachesettingsdlg.h b/kresources/lib/kcal_cachesettingsdlg.h
index 3de47e9a8..920bde0cb 100644
--- a/kresources/lib/kcal_cachesettingsdlg.h
+++ b/kresources/lib/kcal_cachesettingsdlg.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
@@ -23,7 +23,7 @@
#define KCAL_CACHESETTINGSDLG_H
#include <kdialogbase.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KRES {
diff --git a/kresources/lib/kcal_resourcegroupwarebase.cpp b/kresources/lib/kcal_resourcegroupwarebase.cpp
index cf149b66b..bae91bf61 100644
--- a/kresources/lib/kcal_resourcegroupwarebase.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebase.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/kcal_resourcegroupwarebase.h b/kresources/lib/kcal_resourcegroupwarebase.h
index ac2bc3303..800469c14 100644
--- a/kresources/lib/kcal_resourcegroupwarebase.h
+++ b/kresources/lib/kcal_resourcegroupwarebase.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
@@ -25,7 +25,7 @@
#include <kurl.h>
#include <libkcal/resourcecached.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <kabc/locknull.h>
namespace KIO {
diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
index 9ae91a0d8..ed8a63f92 100644
--- a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.h b/kresources/lib/kcal_resourcegroupwarebaseconfig.h
index eb2522ecc..d51092812 100644
--- a/kresources/lib/kcal_resourcegroupwarebaseconfig.h
+++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
@@ -23,7 +23,7 @@
#define KCAL_RESOURCEGROUPWAREBASECONFIG_H
#include <kresources/configwidget.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
class KPushButton;
class KLineEdit;
diff --git a/kresources/lib/webdavhandler.cpp b/kresources/lib/webdavhandler.cpp
index 180740662..fea7a0b16 100644
--- a/kresources/lib/webdavhandler.cpp
+++ b/kresources/lib/webdavhandler.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
diff --git a/kresources/lib/webdavhandler.h b/kresources/lib/webdavhandler.h
index f978759f8..0bfb33e90 100644
--- a/kresources/lib/webdavhandler.h
+++ b/kresources/lib/webdavhandler.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2004 Till Adam <adam@kde.org>
@@ -27,7 +27,7 @@
#include <tqdom.h>
#include <tqdatetime.h>
#include <kurl.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
class KDE_EXPORT WebdavHandler
{
diff --git a/kresources/newexchange/exchangeaddressbookadaptor.cpp b/kresources/newexchange/exchangeaddressbookadaptor.cpp
index 13ad362df..bd22858a5 100644
--- a/kresources/newexchange/exchangeaddressbookadaptor.cpp
+++ b/kresources/newexchange/exchangeaddressbookadaptor.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/newexchange/exchangeaddressbookadaptor.h b/kresources/newexchange/exchangeaddressbookadaptor.h
index 2d3df7420..576427645 100644
--- a/kresources/newexchange/exchangeaddressbookadaptor.h
+++ b/kresources/newexchange/exchangeaddressbookadaptor.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/newexchange/exchangecalendaradaptor.cpp b/kresources/newexchange/exchangecalendaradaptor.cpp
index 43e1dfdb3..c0882ab1a 100644
--- a/kresources/newexchange/exchangecalendaradaptor.cpp
+++ b/kresources/newexchange/exchangecalendaradaptor.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/newexchange/exchangecalendaradaptor.h b/kresources/newexchange/exchangecalendaradaptor.h
index 08bad45f0..3a4acab99 100644
--- a/kresources/newexchange/exchangecalendaradaptor.h
+++ b/kresources/newexchange/exchangecalendaradaptor.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/newexchange/exchangeglobals.cpp b/kresources/newexchange/exchangeglobals.cpp
index ef27580f0..aaef31bcd 100644
--- a/kresources/newexchange/exchangeglobals.cpp
+++ b/kresources/newexchange/exchangeglobals.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/newexchange/exchangeglobals.h b/kresources/newexchange/exchangeglobals.h
index f8ad33178..a1e12f4c1 100644
--- a/kresources/newexchange/exchangeglobals.h
+++ b/kresources/newexchange/exchangeglobals.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/newexchange/kabc_resourceexchange.cpp b/kresources/newexchange/kabc_resourceexchange.cpp
index 7b08423a5..db773f2f4 100644
--- a/kresources/newexchange/kabc_resourceexchange.cpp
+++ b/kresources/newexchange/kabc_resourceexchange.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/newexchange/kabc_resourceexchange.h b/kresources/newexchange/kabc_resourceexchange.h
index 0ef4677af..9f967c55d 100644
--- a/kresources/newexchange/kabc_resourceexchange.h
+++ b/kresources/newexchange/kabc_resourceexchange.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/newexchange/kabc_resourceexchange_plugin.cpp b/kresources/newexchange/kabc_resourceexchange_plugin.cpp
index d324be10d..adc0b6859 100644
--- a/kresources/newexchange/kabc_resourceexchange_plugin.cpp
+++ b/kresources/newexchange/kabc_resourceexchange_plugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/newexchange/kcal_resourceexchange.cpp b/kresources/newexchange/kcal_resourceexchange.cpp
index 37d99d376..953e30c31 100644
--- a/kresources/newexchange/kcal_resourceexchange.cpp
+++ b/kresources/newexchange/kcal_resourceexchange.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/newexchange/kcal_resourceexchange.h b/kresources/newexchange/kcal_resourceexchange.h
index 94ef8901e..7c7c3a705 100644
--- a/kresources/newexchange/kcal_resourceexchange.h
+++ b/kresources/newexchange/kcal_resourceexchange.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/newexchange/kcal_resourceexchange_plugin.cpp b/kresources/newexchange/kcal_resourceexchange_plugin.cpp
index e2b1d5396..6130e0dc0 100644
--- a/kresources/newexchange/kcal_resourceexchange_plugin.cpp
+++ b/kresources/newexchange/kcal_resourceexchange_plugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/kresources/remote/CMakeLists.txt b/kresources/remote/CMakeLists.txt
index 19dfcb7b1..d1a4b57b1 100644
--- a/kresources/remote/CMakeLists.txt
+++ b/kresources/remote/CMakeLists.txt
@@ -51,6 +51,6 @@ tde_add_library( kcal_resourceremote SHARED AUTOMOC
SOURCES
resourceremote.cpp resourceremoteconfig.cpp
VERSION 1.0.0
- LINK kdepim-shared
+ LINK tdepim-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kresources/remote/resourceremote.h b/kresources/remote/resourceremote.h
index 255fa687c..0a7ccef6d 100644
--- a/kresources/remote/resourceremote.h
+++ b/kresources/remote/resourceremote.h
@@ -28,7 +28,7 @@
#include <kurl.h>
#include <kconfig.h>
#include <kdirwatch.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <libtdepim/progressmanager.h>
diff --git a/kresources/remote/resourceremoteconfig.h b/kresources/remote/resourceremoteconfig.h
index 7c7d5124a..e741510d2 100644
--- a/kresources/remote/resourceremoteconfig.h
+++ b/kresources/remote/resourceremoteconfig.h
@@ -30,7 +30,7 @@
#include <kresources/resource.h>
#include <kresources/configwidget.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KCal {
diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h
index 9693b5259..613c186af 100644
--- a/kresources/scalix/kabc/resourcescalix.h
+++ b/kresources/scalix/kabc/resourcescalix.h
@@ -39,7 +39,7 @@
#include "../shared/resourcescalixbase.h"
#include "../shared/subresource.h"
#include <kmail/kmailicalIface.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KABC {
diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h
index 67ecac365..1f409069a 100644
--- a/kresources/scalix/kcal/resourcescalix.h
+++ b/kresources/scalix/kcal/resourcescalix.h
@@ -36,7 +36,7 @@
#include <tqtimer.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <libkcal/calendarlocal.h>
#include <libkcal/icalformat.h>
#include <libkcal/resourcecalendar.h>
diff --git a/kresources/scalix/kioslave/CMakeLists.txt b/kresources/scalix/kioslave/CMakeLists.txt
index f210891ff..7ba76f672 100644
--- a/kresources/scalix/kioslave/CMakeLists.txt
+++ b/kresources/scalix/kioslave/CMakeLists.txt
@@ -32,6 +32,6 @@ install(
tde_add_kpart( kio_scalix AUTOMOC
SOURCES scalix.cpp
- LINK kdepim-shared
+ LINK tdepim-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index 36b2aa776..8b8c15c5c 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -28,7 +28,7 @@
#include <kio/global.h>
#include <klocale.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <stdlib.h>
diff --git a/kresources/scalix/knotes/Makefile.am b/kresources/scalix/knotes/Makefile.am
index f04c03940..56d7efe3e 100644
--- a/kresources/scalix/knotes/Makefile.am
+++ b/kresources/scalix/knotes/Makefile.am
@@ -12,7 +12,7 @@ libknotesscalix_la_LIBADD = \
$(top_builddir)/kresources/scalix/shared/libresourcescalixshared.la \
$(top_builddir)/knotes/libknotesresources.la \
$(top_builddir)/libkcal/libkcal.la \
- -lkresources -lkdeprint
+ -lkresources -ltdeprint
kde_module_LTLIBRARIES = knotes_scalix.la
diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h
index fc1309b98..96b11b399 100644
--- a/kresources/scalix/knotes/resourcescalix.h
+++ b/kresources/scalix/knotes/resourcescalix.h
@@ -38,7 +38,7 @@
#include <libkcal/calendarlocal.h>
#include "../shared/resourcescalixbase.h"
#include "../shared/subresource.h"
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace Scalix {
diff --git a/kresources/scalix/scalixadmin/Makefile.am b/kresources/scalix/scalixadmin/Makefile.am
index fb748a0fb..ebde37e2e 100644
--- a/kresources/scalix/scalixadmin/Makefile.am
+++ b/kresources/scalix/scalixadmin/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = scalixadmin
INCLUDES = $(all_includes)
-scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
scalixadmin_LDADD = $(LIB_KABC)
scalixadmin_SOURCES = main.cpp mainwindow.cpp passwordpage.cpp settings.cpp jobs.cpp \
otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp \
diff --git a/kresources/slox/CMakeLists.txt b/kresources/slox/CMakeLists.txt
index 045e5fa95..423569785 100644
--- a/kresources/slox/CMakeLists.txt
+++ b/kresources/slox/CMakeLists.txt
@@ -54,7 +54,7 @@ tde_add_library( kslox SHARED AUTOMOC
sloxaccounts.cpp webdavhandler.cpp sloxfolder.cpp sloxfoldermanager.cpp
sloxfolderdialog.cpp sloxbase.cpp
VERSION 0.0.0
- LINK kdepim-shared
+ LINK tdepim-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kresources/slox/Makefile.am b/kresources/slox/Makefile.am
index 97da13403..ef0f84ab1 100644
--- a/kresources/slox/Makefile.am
+++ b/kresources/slox/Makefile.am
@@ -34,7 +34,7 @@ kabc_slox_la_LIBADD = libkabc_slox.la
EXTRA_PROGRAMS = testsloxaccounts
-testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testsloxaccounts_LDADD = libkslox.la
testsloxaccounts_SOURCES = testsloxaccounts.cpp
diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp
index d45ead3e5..f45108b42 100644
--- a/kresources/slox/kabcresourceslox.cpp
+++ b/kresources/slox/kabcresourceslox.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2005 Volker Krause <volker.krause@rwth-aachen.de>
diff --git a/kresources/slox/kabcresourceslox.h b/kresources/slox/kabcresourceslox.h
index 605c8dea5..cede17177 100644
--- a/kresources/slox/kabcresourceslox.h
+++ b/kresources/slox/kabcresourceslox.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
@@ -24,7 +24,7 @@
#include "webdavhandler.h"
#include <libtdepim/kabcresourcecached.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <kabc/addressee.h>
#include <tqmap.h>
diff --git a/kresources/slox/kabcresourceslox_plugin.cpp b/kresources/slox/kabcresourceslox_plugin.cpp
index 73152673a..f570cff9f 100644
--- a/kresources/slox/kabcresourceslox_plugin.cpp
+++ b/kresources/slox/kabcresourceslox_plugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/slox/kabcresourcesloxconfig.cpp b/kresources/slox/kabcresourcesloxconfig.cpp
index abacaf718..d9e32a556 100644
--- a/kresources/slox/kabcresourcesloxconfig.cpp
+++ b/kresources/slox/kabcresourcesloxconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/slox/kabcresourcesloxconfig.h b/kresources/slox/kabcresourcesloxconfig.h
index 79b255a1c..203985622 100644
--- a/kresources/slox/kabcresourcesloxconfig.h
+++ b/kresources/slox/kabcresourcesloxconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
@@ -21,7 +21,7 @@
#define RESOURCESLOXCONFIG_H
#include <kresources/configwidget.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
class TQCheckBox;
class KLineEdit;
diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp
index d3a87c169..a47c64b6f 100644
--- a/kresources/slox/kcalresourceslox.cpp
+++ b/kresources/slox/kcalresourceslox.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2005 Volker Krause <volker.krause@rwth-aachen.de>
diff --git a/kresources/slox/kcalresourceslox.h b/kresources/slox/kcalresourceslox.h
index 17eb8789a..93d05370b 100644
--- a/kresources/slox/kcalresourceslox.h
+++ b/kresources/slox/kcalresourceslox.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
@@ -31,7 +31,7 @@
#include <kurl.h>
#include <kconfig.h>
#include <kdirwatch.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <libkcal/incidence.h>
#include <libkcal/todo.h>
diff --git a/kresources/slox/kcalresourceslox_plugin.cpp b/kresources/slox/kcalresourceslox_plugin.cpp
index 57aa9dc58..e141892d5 100644
--- a/kresources/slox/kcalresourceslox_plugin.cpp
+++ b/kresources/slox/kcalresourceslox_plugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/slox/kcalresourcesloxconfig.cpp b/kresources/slox/kcalresourcesloxconfig.cpp
index 441ea5336..e09cf85c1 100644
--- a/kresources/slox/kcalresourcesloxconfig.cpp
+++ b/kresources/slox/kcalresourcesloxconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/slox/kcalresourcesloxconfig.h b/kresources/slox/kcalresourcesloxconfig.h
index 63526070c..cbba2a458 100644
--- a/kresources/slox/kcalresourcesloxconfig.h
+++ b/kresources/slox/kcalresourcesloxconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
@@ -21,7 +21,7 @@
#define KCALRESOURCESLOXCONFIG_H
#include <kurlrequester.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <kresources/resource.h>
#include <kresources/configwidget.h>
diff --git a/kresources/slox/sloxaccounts.cpp b/kresources/slox/sloxaccounts.cpp
index a32df5fa2..616197936 100644
--- a/kresources/slox/sloxaccounts.cpp
+++ b/kresources/slox/sloxaccounts.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
Copyright (c) 2005 Volker Krause <volker.krause@rwth-aachen.de>
diff --git a/kresources/slox/sloxaccounts.h b/kresources/slox/sloxaccounts.h
index f971360cb..4860bfd6b 100644
--- a/kresources/slox/sloxaccounts.h
+++ b/kresources/slox/sloxaccounts.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
@@ -21,7 +21,7 @@
#define SLOXACCOUNTS_H
#include <kabc/addressee.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <tqobject.h>
namespace KIO {
diff --git a/kresources/slox/sloxbase.h b/kresources/slox/sloxbase.h
index 3a6e70555..6f291c8f6 100644
--- a/kresources/slox/sloxbase.h
+++ b/kresources/slox/sloxbase.h
@@ -21,7 +21,7 @@
#define SLOXUTILS_H
#include <tqstring.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KRES {
class Resource;
diff --git a/kresources/slox/sloxfolder.h b/kresources/slox/sloxfolder.h
index e27399a66..e722dfd4c 100644
--- a/kresources/slox/sloxfolder.h
+++ b/kresources/slox/sloxfolder.h
@@ -21,7 +21,7 @@
#define SLOXFOLDER_H
#include <tqstring.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
class KListViewItem;
diff --git a/kresources/slox/sloxfoldermanager.h b/kresources/slox/sloxfoldermanager.h
index ee21c150d..1ccecc386 100644
--- a/kresources/slox/sloxfoldermanager.h
+++ b/kresources/slox/sloxfoldermanager.h
@@ -25,7 +25,7 @@
#include <kurl.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KIO {
class Job;
diff --git a/kresources/slox/testsloxaccounts.cpp b/kresources/slox/testsloxaccounts.cpp
index 6ad10c1b1..2884703d8 100644
--- a/kresources/slox/testsloxaccounts.cpp
+++ b/kresources/slox/testsloxaccounts.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp
index 1758c09e5..cb8acde02 100644
--- a/kresources/slox/webdavhandler.cpp
+++ b/kresources/slox/webdavhandler.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/slox/webdavhandler.h b/kresources/slox/webdavhandler.h
index bbaf897f7..8dedf0a72 100644
--- a/kresources/slox/webdavhandler.h
+++ b/kresources/slox/webdavhandler.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
@@ -25,7 +25,7 @@
#include <tqdatetime.h>
#include <tqdom.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <kabc/addressee.h>
namespace KCal {
diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp
index 81461d644..f819bba5a 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Will Stephenson <wstephenson@kde.org>
diff --git a/kresources/tvanytime/kcal_resourcetvanytime.h b/kresources/tvanytime/kcal_resourcetvanytime.h
index ea1650827..23922e703 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.h
+++ b/kresources/tvanytime/kcal_resourcetvanytime.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Will Stephenson <wstephenson@kde.org>
@@ -30,7 +30,7 @@
#include <kabc/locknull.h>
#include <kio/job.h>
#include <kconfig.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include "service.h"
diff --git a/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp b/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp
index a9d7bcc14..481a62b51 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytime_plugin.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
index 47d62d376..110a62f9e 100644
--- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Will Stephenson <wstephenson@kde.org>
diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
index e88ce6f0b..6e23ee851 100644
--- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
+++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.h
@@ -1,5 +1,5 @@
/*
- This file is part of kdepim.
+ This file is part of tdepim.
Copyright (c) 2005 Will Stephenson <wstephenson@kde.org>
@@ -21,7 +21,7 @@
#define KCALRESOURCETVANYTIMECONFIG_H
#include <kurlrequester.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <kresources/resource.h>
#include <kresources/configwidget.h>
diff --git a/kresources/tvanytime/tvanytime.kdevelop b/kresources/tvanytime/tvanytime.kdevelop
index 9af3eb4cf..c938252bc 100644
--- a/kresources/tvanytime/tvanytime.kdevelop
+++ b/kresources/tvanytime/tvanytime.kdevelop
@@ -37,13 +37,13 @@
</optimized>
<debug>
<configargs>--enable-debug=full</configargs>
- <builddir>/space/kde/svn/head/build/kdepim/kresources/tvanytime</builddir>
+ <builddir>/space/kde/svn/head/build/tdepim/kresources/tvanytime</builddir>
<ccompiler>kdevgccoptions</ccompiler>
<cxxcompiler>kdevgppoptions</cxxcompiler>
<f77compiler>kdevg77options</f77compiler>
<cxxflags>-O0 -g3</cxxflags>
<envvars/>
- <topsourcedir>/space/kde/svn/head/src/kdepim/kresources/tvanytime</topsourcedir>
+ <topsourcedir>/space/kde/svn/head/src/tdepim/kresources/tvanytime</topsourcedir>
<cppflags/>
<ldflags/>
<ccompilerbinary/>
@@ -159,7 +159,7 @@
<LICENSEFILE>COPYING</LICENSEFILE>
<VERSION>0.1</VERSION>
<YEAR>2005</YEAR>
- <dest>/space/kde/head/src/kdepim/kresources/tvanytime</dest>
+ <dest>/space/kde/head/src/tdepim/kresources/tvanytime</dest>
</substmap>
<kdevcppsupport>
<references>