summaryrefslogtreecommitdiffstats
path: root/libtdepim
diff options
context:
space:
mode:
Diffstat (limited to 'libtdepim')
-rw-r--r--libtdepim/CMakeLists.txt4
-rw-r--r--libtdepim/Makefile.am4
-rw-r--r--libtdepim/addresseeview.cpp4
-rw-r--r--libtdepim/cfgc/README2
-rw-r--r--libtdepim/cfgc/autoexample.cpp2
-rw-r--r--libtdepim/cfgc/example.cpp2
-rw-r--r--libtdepim/cfgc/exampleprefs_base.kcfgc2
-rw-r--r--libtdepim/completionordereditor.h2
-rw-r--r--libtdepim/csshelper.cpp2
-rw-r--r--libtdepim/groupwarejob.cpp2
-rw-r--r--libtdepim/groupwarejob.h2
-rw-r--r--libtdepim/kaccount.cpp2
-rw-r--r--libtdepim/kcmdesignerfields.cpp4
-rw-r--r--libtdepim/kfoldertree.cpp2
-rw-r--r--libtdepim/kimportdialog.cpp2
-rw-r--r--libtdepim/komposer/core/core.cpp2
-rw-r--r--libtdepim/komposer/core/komposerconfig.desktop2
-rw-r--r--libtdepim/komposer/core/settings.kcfgc2
-rw-r--r--libtdepim/komposer/plugins/default/defaulteditor.cpp2
-rw-r--r--libtdepim/kpimprefs.cpp2
-rw-r--r--libtdepim/kpimprefs.h2
-rw-r--r--libtdepim/kprefsdialog.cpp2
-rw-r--r--libtdepim/kprefsdialog.h4
-rw-r--r--libtdepim/kresourceprefs.h2
-rw-r--r--libtdepim/ldapclient.cpp2
-rw-r--r--libtdepim/ldapclient.h4
-rw-r--r--libtdepim/ldapsearchdialog.cpp2
-rw-r--r--libtdepim/recentaddresses.cpp2
-rw-r--r--libtdepim/tdeconfigpropagator.cpp (renamed from libtdepim/kconfigpropagator.cpp)6
-rw-r--r--libtdepim/tdeconfigpropagator.h (renamed from libtdepim/kconfigpropagator.h)0
-rw-r--r--libtdepim/tdeconfigwizard.cpp (renamed from libtdepim/kconfigwizard.cpp)6
-rw-r--r--libtdepim/tdeconfigwizard.h (renamed from libtdepim/kconfigwizard.h)2
-rw-r--r--libtdepim/tdefileio.cpp (renamed from libtdepim/kfileio.cpp)2
-rw-r--r--libtdepim/tdefileio.h (renamed from libtdepim/kfileio.h)6
-rw-r--r--libtdepim/tdepartsdesignerplugin/CMakeLists.txt2
-rw-r--r--libtdepim/tests/myconfig.kcfgc2
-rw-r--r--libtdepim/tests/testdistrlist.cpp4
-rw-r--r--libtdepim/tests/testwizard.cpp2
38 files changed, 50 insertions, 50 deletions
diff --git a/libtdepim/CMakeLists.txt b/libtdepim/CMakeLists.txt
index 84f57a93f..2c79e018b 100644
--- a/libtdepim/CMakeLists.txt
+++ b/libtdepim/CMakeLists.txt
@@ -79,10 +79,10 @@ tde_add_library( tdepim SHARED AUTOMOC
kimportdialog.cpp kvcarddrag.cpp sidebarextension.cpp
infoextension.cpp addressesdialog.cpp addresspicker.ui
addresseeview.cpp maillistdrag.cpp interfaces/MailTransportServiceIface.skel
- interfaces/AddressBookServiceIface.skel kconfigpropagator.cpp kconfigwizard.cpp
+ interfaces/AddressBookServiceIface.skel tdeconfigpropagator.cpp tdeconfigwizard.cpp
weaver.cpp weaverextensions.cpp weaverlogger.cpp pluginloaderbase.cpp
addresseelineedit.cpp addresseelineedit.skel kdatepickerpopup.cpp
- kfileio.cpp clicklineedit.cpp configmanager.cpp collectingprocess.cpp
+ tdefileio.cpp clicklineedit.cpp configmanager.cpp collectingprocess.cpp
ldapclient.cpp overlaywidget.cpp progressmanager.cpp progressdialog.cpp
statusbarprogresswidget.cpp ssllabel.cpp completionordereditor.cpp
resourceabc.cpp diffalgo.cpp addresseediffalgo.cpp calendardiffalgo.cpp
diff --git a/libtdepim/Makefile.am b/libtdepim/Makefile.am
index 24942c728..7b690c8b2 100644
--- a/libtdepim/Makefile.am
+++ b/libtdepim/Makefile.am
@@ -14,10 +14,10 @@ libtdepim_la_SOURCES = \
addressesdialog.cpp addresspicker.ui addresseeview.cpp \
maillistdrag.cpp MailTransportServiceIface.skel \
AddressBookServiceIface.skel \
- kconfigpropagator.cpp kconfigwizard.cpp \
+ tdeconfigpropagator.cpp tdeconfigwizard.cpp \
weaver.cpp weaverextensions.cpp weaverlogger.cpp \
pluginloaderbase.cpp addresseelineedit.cpp addresseelineedit.skel \
- kdatepickerpopup.cpp kfileio.cpp \
+ kdatepickerpopup.cpp tdefileio.cpp \
clicklineedit.cpp configmanager.cpp \
collectingprocess.cpp ldapclient.cpp \
overlaywidget.cpp progressmanager.cpp progressdialog.cpp \
diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index 559f01713..ef754e819 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -30,11 +30,11 @@
#include <kabc/resource.h>
#include <kactionclasses.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <klocale.h>
#include <kmdcodec.h>
#include <kmessagebox.h>
diff --git a/libtdepim/cfgc/README b/libtdepim/cfgc/README
index 720ea2126..05dcdf354 100644
--- a/libtdepim/cfgc/README
+++ b/libtdepim/cfgc/README
@@ -1,5 +1,5 @@
This directory contains text and example code for automatic creation of
-configuration dialogs based on TDEConfigSkeleton, kconfig_compiler and
+configuration dialogs based on TDEConfigSkeleton, tdeconfig_compiler and
KPrefsDialog.
If you have questions or comments please contact Cornelius Schumacher
diff --git a/libtdepim/cfgc/autoexample.cpp b/libtdepim/cfgc/autoexample.cpp
index 595d195b8..8f5d08e8d 100644
--- a/libtdepim/cfgc/autoexample.cpp
+++ b/libtdepim/cfgc/autoexample.cpp
@@ -30,7 +30,7 @@
#include <klocale.h>
#include <kcmdlineargs.h>
#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kautoconfigdialog.h>
diff --git a/libtdepim/cfgc/example.cpp b/libtdepim/cfgc/example.cpp
index 28c093784..d3f068799 100644
--- a/libtdepim/cfgc/example.cpp
+++ b/libtdepim/cfgc/example.cpp
@@ -27,7 +27,7 @@
#include <klocale.h>
#include <kcmdlineargs.h>
#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <libtdepim/kprefsdialog.h>
diff --git a/libtdepim/cfgc/exampleprefs_base.kcfgc b/libtdepim/cfgc/exampleprefs_base.kcfgc
index 36e5ed4e6..6cc9a9231 100644
--- a/libtdepim/cfgc/exampleprefs_base.kcfgc
+++ b/libtdepim/cfgc/exampleprefs_base.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=exampleprefs_base.kcfg
ClassName=ExamplePrefsBase
Singleton=true
diff --git a/libtdepim/completionordereditor.h b/libtdepim/completionordereditor.h
index a755d1734..e13ce3130 100644
--- a/libtdepim/completionordereditor.h
+++ b/libtdepim/completionordereditor.h
@@ -32,7 +32,7 @@
#define COMPLETIONORDEREDITOR_H
#include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
class KPushButton;
class KListView;
diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp
index 3c0ba38d0..d2180e1a2 100644
--- a/libtdepim/csshelper.cpp
+++ b/libtdepim/csshelper.cpp
@@ -31,7 +31,7 @@
#include "csshelper.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobalsettings.h>
#include <kdebug.h>
#include <kglobal.h>
diff --git a/libtdepim/groupwarejob.cpp b/libtdepim/groupwarejob.cpp
index 22c9b7aa4..bbe443fc0 100644
--- a/libtdepim/groupwarejob.cpp
+++ b/libtdepim/groupwarejob.cpp
@@ -21,7 +21,7 @@
#include "groupwarejob.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <kdebug.h>
using namespace TDEIO;
diff --git a/libtdepim/groupwarejob.h b/libtdepim/groupwarejob.h
index 2fc2069b0..17561b36f 100644
--- a/libtdepim/groupwarejob.h
+++ b/libtdepim/groupwarejob.h
@@ -21,7 +21,7 @@
#ifndef KIO_GROUPWAREJOB_H
#define KIO_GROUPWAREJOB_H
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
namespace TDEIO {
diff --git a/libtdepim/kaccount.cpp b/libtdepim/kaccount.cpp
index f8fd61cf4..86cf4cfca 100644
--- a/libtdepim/kaccount.cpp
+++ b/libtdepim/kaccount.cpp
@@ -32,7 +32,7 @@
#include "kaccount.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
KAccount::KAccount( const uint id, const TQString &name, const Type type )
: mId( id ), mName( name ), mType( type )
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index bb870b11f..72613f158 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -44,10 +44,10 @@
#include <kstandarddirs.h>
#include <kactivelabel.h>
#include <kdirwatch.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <kprocess.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include "kcmdesignerfields.h"
diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp
index 5cad23656..58961ddc6 100644
--- a/libtdepim/kfoldertree.cpp
+++ b/libtdepim/kfoldertree.cpp
@@ -2,7 +2,7 @@
#include "kfoldertree.h"
#include <klocale.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <kstringhandler.h>
diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp
index e07ef00ac..df1181ed1 100644
--- a/libtdepim/kimportdialog.cpp
+++ b/libtdepim/kimportdialog.cpp
@@ -46,7 +46,7 @@
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include "kimportdialog.h"
#include "kimportdialog.moc"
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index 945c22311..a2f5fd003 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -29,7 +29,7 @@
#include <ksettings/dialog.h>
#include <kplugininfo.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <ktrader.h>
#include <klibloader.h>
#include <kstdaction.h>
diff --git a/libtdepim/komposer/core/komposerconfig.desktop b/libtdepim/komposer/core/komposerconfig.desktop
index 5ceb12582..ab5239b08 100644
--- a/libtdepim/komposer/core/komposerconfig.desktop
+++ b/libtdepim/komposer/core/komposerconfig.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell komposerconfig
+Exec=tdecmshell komposerconfig
Icon=komposer
Type=Application
Terminal=false
diff --git a/libtdepim/komposer/core/settings.kcfgc b/libtdepim/komposer/core/settings.kcfgc
index fc98478a9..a4c881006 100644
--- a/libtdepim/komposer/core/settings.kcfgc
+++ b/libtdepim/komposer/core/settings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=komposer.kcfg
NameSpace=Komposer
ClassName=Config
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp
index 105650eb0..426e4c01b 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp
@@ -29,7 +29,7 @@
#include <kaction.h>
#include <kcolordialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kinstance.h>
#include <klocale.h>
#include <kstdaction.h>
diff --git a/libtdepim/kpimprefs.cpp b/libtdepim/kpimprefs.cpp
index 9ae04cfaf..02e397361 100644
--- a/libtdepim/kpimprefs.cpp
+++ b/libtdepim/kpimprefs.cpp
@@ -29,7 +29,7 @@
#include <kstandarddirs.h>
#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/libtdepim/kpimprefs.h b/libtdepim/kpimprefs.h
index 051b0f2fb..dd180c970 100644
--- a/libtdepim/kpimprefs.h
+++ b/libtdepim/kpimprefs.h
@@ -23,7 +23,7 @@
#include <tqstringlist.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
#include <tdepimmacros.h>
class TQString;
diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp
index 577692506..230962cb2 100644
--- a/libtdepim/kprefsdialog.cpp
+++ b/libtdepim/kprefsdialog.cpp
@@ -40,7 +40,7 @@
#include <klocale.h>
#include <kfontdialog.h>
#include <kmessagebox.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
#include <kurlrequester.h>
#include "ktimeedit.h"
#include "kdateedit.h"
diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h
index 6774d96d7..3e331b180 100644
--- a/libtdepim/kprefsdialog.h
+++ b/libtdepim/kprefsdialog.h
@@ -30,8 +30,8 @@
#include <kdialogbase.h>
#include <tdecmodule.h>
-#include <kconfigskeleton.h>
-#include <kfile.h>
+#include <tdeconfigskeleton.h>
+#include <tdefile.h>
#include <tdepimmacros.h>
diff --git a/libtdepim/kresourceprefs.h b/libtdepim/kresourceprefs.h
index 968d86a9e..1954f19c1 100644
--- a/libtdepim/kresourceprefs.h
+++ b/libtdepim/kresourceprefs.h
@@ -22,7 +22,7 @@
#ifndef KRESOURCEPREFS_H
#define KRESOURCEPREFS_H
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
#include <tdepimmacros.h>
class TQString;
diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp
index 9f1a6fd8e..32202b3da 100644
--- a/libtdepim/ldapclient.cpp
+++ b/libtdepim/ldapclient.cpp
@@ -32,7 +32,7 @@
#include <kabc/ldapurl.h>
#include <kabc/ldif.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kdirwatch.h>
#include <kmdcodec.h>
diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h
index 502937299..789b46054 100644
--- a/libtdepim/ldapclient.h
+++ b/libtdepim/ldapclient.h
@@ -31,9 +31,9 @@
#include <tqguardedptr.h>
#include <tqtimer.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <kabc/ldif.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tdepimmacros.h>
diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp
index fe67137b1..586e9011d 100644
--- a/libtdepim/ldapsearchdialog.cpp
+++ b/libtdepim/ldapsearchdialog.cpp
@@ -34,7 +34,7 @@
#include <kabc/addresslineedit.h>
#include <kapplication.h>
#include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klineedit.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp
index bbd7d29a9..eb4660a3b 100644
--- a/libtdepim/recentaddresses.cpp
+++ b/libtdepim/recentaddresses.cpp
@@ -31,7 +31,7 @@
#include "libemailfunctions/email.h"
#include <kstaticdeleter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include <kdebug.h>
diff --git a/libtdepim/kconfigpropagator.cpp b/libtdepim/tdeconfigpropagator.cpp
index a231f9638..f6f482402 100644
--- a/libtdepim/kconfigpropagator.cpp
+++ b/libtdepim/tdeconfigpropagator.cpp
@@ -19,11 +19,11 @@
Boston, MA 02110-1301, USA.
*/
-#include "kconfigpropagator.h"
+#include "tdeconfigpropagator.h"
#include <kdebug.h>
-#include <kconfig.h>
-#include <kconfigskeleton.h>
+#include <tdeconfig.h>
+#include <tdeconfigskeleton.h>
#include <kstandarddirs.h>
#include <kstringhandler.h>
#include <klocale.h>
diff --git a/libtdepim/kconfigpropagator.h b/libtdepim/tdeconfigpropagator.h
index 92f9565f2..92f9565f2 100644
--- a/libtdepim/kconfigpropagator.h
+++ b/libtdepim/tdeconfigpropagator.h
diff --git a/libtdepim/kconfigwizard.cpp b/libtdepim/tdeconfigwizard.cpp
index c2baafcc7..026c85991 100644
--- a/libtdepim/kconfigwizard.cpp
+++ b/libtdepim/tdeconfigwizard.cpp
@@ -19,11 +19,11 @@
Boston, MA 02110-1301, USA.
*/
-#include "kconfigwizard.h"
+#include "tdeconfigwizard.h"
#include <klocale.h>
#include <kdebug.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
#include <kmessagebox.h>
#include <kapplication.h>
@@ -194,4 +194,4 @@ void TDEConfigWizard::slotOk()
}
}
-#include "kconfigwizard.moc"
+#include "tdeconfigwizard.moc"
diff --git a/libtdepim/kconfigwizard.h b/libtdepim/tdeconfigwizard.h
index a06849ecc..7eaaeda95 100644
--- a/libtdepim/kconfigwizard.h
+++ b/libtdepim/tdeconfigwizard.h
@@ -21,7 +21,7 @@
#ifndef KCONFIGWIZARD_H
#define KCONFIGWIZARD_H
-#include <kconfigpropagator.h>
+#include <tdeconfigpropagator.h>
#include <tdepimmacros.h>
#include <kdialogbase.h>
diff --git a/libtdepim/kfileio.cpp b/libtdepim/tdefileio.cpp
index fa963e167..ad899351f 100644
--- a/libtdepim/kfileio.cpp
+++ b/libtdepim/tdefileio.cpp
@@ -1,4 +1,4 @@
-// kfileio.cpp
+// tdefileio.cpp
// Author: Stefan Taferner <taferner@kde.org>
// License: GPL
diff --git a/libtdepim/kfileio.h b/libtdepim/tdefileio.h
index 15db09338..e90451315 100644
--- a/libtdepim/kfileio.h
+++ b/libtdepim/tdefileio.h
@@ -5,8 +5,8 @@
* Author: Stefan Taferner <taferner@kde.org>
* This code is under GPL.
*/
-#ifndef kpim_kfileio_h
-#define kpim_kfileio_h
+#ifndef kpim_tdefileio_h
+#define kpim_tdefileio_h
#include <tqcstring.h>
#include <tqwidget.h>
@@ -102,4 +102,4 @@ bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent,
const bool wantItWritable );
}
-#endif /*kpim_kfileio_h*/
+#endif /*kpim_tdefileio_h*/
diff --git a/libtdepim/tdepartsdesignerplugin/CMakeLists.txt b/libtdepim/tdepartsdesignerplugin/CMakeLists.txt
index 01bba1d8c..043d4526a 100644
--- a/libtdepim/tdepartsdesignerplugin/CMakeLists.txt
+++ b/libtdepim/tdepartsdesignerplugin/CMakeLists.txt
@@ -27,6 +27,6 @@ link_directories(
tde_add_kpart( tdepartsdesignerplugin AUTOMOC
SOURCES tdepartsdesignerplugin.cpp
- LINK tdeparts-shared kio-shared
+ LINK tdeparts-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer
)
diff --git a/libtdepim/tests/myconfig.kcfgc b/libtdepim/tests/myconfig.kcfgc
index 35e26c996..451a9ec13 100644
--- a/libtdepim/tests/myconfig.kcfgc
+++ b/libtdepim/tests/myconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=propagator_test.kcfg
ClassName=MyConfig
Singleton=true
diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp
index 895dc5371..75c4d5574 100644
--- a/libtdepim/tests/testdistrlist.cpp
+++ b/libtdepim/tests/testdistrlist.cpp
@@ -26,8 +26,8 @@ using KPIM::DistributionList;
#include <kabc/stdaddressbook.h>
#include <kurl.h>
#include <kapplication.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
#include <kdebug.h>
#include <kcmdlineargs.h>
diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp
index 1e404165e..9858a0920 100644
--- a/libtdepim/tests/testwizard.cpp
+++ b/libtdepim/tests/testwizard.cpp
@@ -21,7 +21,7 @@
#include "myconfig.h"
-#include <kconfigwizard.h>
+#include <tdeconfigwizard.h>
#include <kaboutdata.h>
#include <kapplication.h>