diff options
Diffstat (limited to 'tdeioslave')
69 files changed, 107 insertions, 107 deletions
diff --git a/tdeioslave/cgi/cgi.cpp b/tdeioslave/cgi/cgi.cpp index b17ab6209..4f54d6668 100644 --- a/tdeioslave/cgi/cgi.cpp +++ b/tdeioslave/cgi/cgi.cpp @@ -26,7 +26,7 @@ #include <kprocess.h> #include <kstandarddirs.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include "cgi.h" diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp index f20c5d732..592371cb6 100644 --- a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp +++ b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp @@ -17,8 +17,8 @@ */ #include <tdeconfig.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeaboutdata.h> #include <tdefiledialog.h> diff --git a/tdeioslave/finger/tdeio_finger.cpp b/tdeioslave/finger/tdeio_finger.cpp index ba0294918..643a699f0 100644 --- a/tdeioslave/finger/tdeio_finger.cpp +++ b/tdeioslave/finger/tdeio_finger.cpp @@ -29,9 +29,9 @@ #include <kdebug.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include "tdeio_finger.h" diff --git a/tdeioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp index 6ef204510..98c11a712 100644 --- a/tdeioslave/fish/fish.cpp +++ b/tdeioslave/fish/fish.cpp @@ -62,11 +62,11 @@ #endif #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kremoteencoding.h> #include <kurl.h> #include <ksock.h> diff --git a/tdeioslave/floppy/tdeio_floppy.cpp b/tdeioslave/floppy/tdeio_floppy.cpp index 0e576e472..c67af0b39 100644 --- a/tdeioslave/floppy/tdeio_floppy.cpp +++ b/tdeioslave/floppy/tdeio_floppy.cpp @@ -45,7 +45,7 @@ #include <kinstance.h> #include <kdebug.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> using namespace TDEIO; diff --git a/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp b/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp index 19bcff988..ac4e79f66 100644 --- a/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp +++ b/tdeioslave/home/kdedmodule/homedirnotifymodule.cpp @@ -19,8 +19,8 @@ #include "homedirnotifymodule.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> HomeDirNotifyModule::HomeDirNotifyModule(const TQCString &obj) : KDEDModule(obj) diff --git a/tdeioslave/home/tdeio_home.cpp b/tdeioslave/home/tdeio_home.cpp index 8ab6bff91..109252f43 100644 --- a/tdeioslave/home/tdeio_home.cpp +++ b/tdeioslave/home/tdeio_home.cpp @@ -20,11 +20,11 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <dcopclient.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "tdeio_home.h" diff --git a/tdeioslave/info/info.cc b/tdeioslave/info/info.cc index 4d973bc5f..6ef78adc4 100644 --- a/tdeioslave/info/info.cc +++ b/tdeioslave/info/info.cc @@ -12,7 +12,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include "info.h" diff --git a/tdeioslave/ldap/CMakeLists.txt b/tdeioslave/ldap/CMakeLists.txt index d05048e0d..f32c3132a 100644 --- a/tdeioslave/ldap/CMakeLists.txt +++ b/tdeioslave/ldap/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES ldap.protocol ldaps.protocol DESTINATION ${SERVICES_INSTALL_DIR} tde_add_kpart( tdeio_ldap AUTOMOC SOURCES tdeio_ldap.cpp - LINK kabc-shared ${LDAP_LIBRARIES} + LINK tdeabc-shared ${LDAP_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeioslave/ldap/tdeio_ldap.cpp b/tdeioslave/ldap/tdeio_ldap.cpp index 2e22e6994..29fc24905 100644 --- a/tdeioslave/ldap/tdeio_ldap.cpp +++ b/tdeioslave/ldap/tdeio_ldap.cpp @@ -11,7 +11,7 @@ #include <kdebug.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #ifdef HAVE_SASL_SASL_H //prefer libsasl2 #include <sasl/sasl.h> @@ -20,7 +20,7 @@ #include <sasl.h> #endif #endif -#include <kabc/ldif.h> +#include <tdeabc/ldif.h> #include "tdeio_ldap.h" diff --git a/tdeioslave/ldap/tdeio_ldap.h b/tdeioslave/ldap/tdeio_ldap.h index f3bd61fe5..dfab32a71 100644 --- a/tdeioslave/ldap/tdeio_ldap.h +++ b/tdeioslave/ldap/tdeio_ldap.h @@ -10,7 +10,7 @@ #define LDAP_DEPRECATED 1 /* Needed for ldap_simple_bind_s with openldap >= 2.3.x */ #include <lber.h> #include <ldap.h> -#include <kabc/ldapurl.h> +#include <tdeabc/ldapurl.h> class LDAPProtocol : public TDEIO::SlaveBase { diff --git a/tdeioslave/mac/tdeio_mac.cpp b/tdeioslave/mac/tdeio_mac.cpp index 707d995ee..caef50784 100644 --- a/tdeioslave/mac/tdeio_mac.cpp +++ b/tdeioslave/mac/tdeio_mac.cpp @@ -20,7 +20,7 @@ #include <kinstance.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tqstring.h> #include <tqregexp.h> diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp index 09cc0251e..556b287e4 100644 --- a/tdeioslave/man/kmanpart.cpp +++ b/tdeioslave/man/kmanpart.cpp @@ -21,9 +21,9 @@ #include <tqstring.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeaboutdata.h> #include <tdeversion.h> diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp index 032de3ecf..7412077c5 100644 --- a/tdeioslave/man/tdeio_man.cpp +++ b/tdeioslave/man/tdeio_man.cpp @@ -33,10 +33,10 @@ #include <kdebug.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> #include "tdeio_man.h" diff --git a/tdeioslave/man/tdeio_man_test.cpp b/tdeioslave/man/tdeio_man_test.cpp index d409570b4..131e03541 100644 --- a/tdeioslave/man/tdeio_man_test.cpp +++ b/tdeioslave/man/tdeio_man_test.cpp @@ -6,7 +6,7 @@ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> class tdeio_man_test : public MANProtocol diff --git a/tdeioslave/media/libmediacommon/actionlistboxitem.cpp b/tdeioslave/media/libmediacommon/actionlistboxitem.cpp index 271d2e487..9fd3b2bfb 100644 --- a/tdeioslave/media/libmediacommon/actionlistboxitem.cpp +++ b/tdeioslave/media/libmediacommon/actionlistboxitem.cpp @@ -19,7 +19,7 @@ #include "actionlistboxitem.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqpixmap.h> diff --git a/tdeioslave/media/libmediacommon/medium.cpp b/tdeioslave/media/libmediacommon/medium.cpp index 7b97fb1a0..ca526ea49 100644 --- a/tdeioslave/media/libmediacommon/medium.cpp +++ b/tdeioslave/media/libmediacommon/medium.cpp @@ -19,7 +19,7 @@ #include "medium.h" #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> const TQString Medium::SEPARATOR = "---"; diff --git a/tdeioslave/media/libmediacommon/notifieraction.cpp b/tdeioslave/media/libmediacommon/notifieraction.cpp index 0dfc4110e..5222b9e65 100644 --- a/tdeioslave/media/libmediacommon/notifieraction.cpp +++ b/tdeioslave/media/libmediacommon/notifieraction.cpp @@ -20,7 +20,7 @@ #include "notifieraction.h" #include <tqfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kicontheme.h> diff --git a/tdeioslave/media/libmediacommon/notifiernothingaction.cpp b/tdeioslave/media/libmediacommon/notifiernothingaction.cpp index 6a86ad92f..b1c4bae3d 100644 --- a/tdeioslave/media/libmediacommon/notifiernothingaction.cpp +++ b/tdeioslave/media/libmediacommon/notifiernothingaction.cpp @@ -19,7 +19,7 @@ #include "notifiernothingaction.h" -#include <klocale.h> +#include <tdelocale.h> NotifierNothingAction::NotifierNothingAction() : NotifierAction() diff --git a/tdeioslave/media/libmediacommon/notifieropenaction.cpp b/tdeioslave/media/libmediacommon/notifieropenaction.cpp index 4d6d8025c..110b9fe28 100644 --- a/tdeioslave/media/libmediacommon/notifieropenaction.cpp +++ b/tdeioslave/media/libmediacommon/notifieropenaction.cpp @@ -19,7 +19,7 @@ #include "notifieropenaction.h" -#include <klocale.h> +#include <tdelocale.h> NotifierOpenAction::NotifierOpenAction() : NotifierAction() diff --git a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp index c7bece4f8..2405dfb39 100644 --- a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp +++ b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp @@ -24,7 +24,7 @@ #include <tqfileinfo.h> #include <kstddirs.h> #include <kdesktopfile.h> -#include <klocale.h> +#include <tdelocale.h> NotifierServiceAction::NotifierServiceAction() : NotifierAction() diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp index 254e591cb..a7dc7ee21 100644 --- a/tdeioslave/media/libmediacommon/notifiersettings.cpp +++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp @@ -19,7 +19,7 @@ #include "notifiersettings.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kdesktopfile.h> #include <kstandarddirs.h> #include <tqdir.h> diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp index 59dba75cf..e00cedccd 100644 --- a/tdeioslave/media/mediaimpl.cpp +++ b/tdeioslave/media/mediaimpl.cpp @@ -19,7 +19,7 @@ #include "mediaimpl.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/tdeioslave/media/mediamanager/dialog.h b/tdeioslave/media/mediamanager/dialog.h index dc1d552d8..6a164b8e8 100644 --- a/tdeioslave/media/mediamanager/dialog.h +++ b/tdeioslave/media/mediamanager/dialog.h @@ -23,8 +23,8 @@ #ifndef DIALOG_H_ #define DIALOG_H_ -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp index 2f5bea220..84910352d 100644 --- a/tdeioslave/media/mediamanager/fstabbackend.cpp +++ b/tdeioslave/media/mediamanager/fstabbackend.cpp @@ -36,7 +36,7 @@ #include <tqfile.h> #endif -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> #include <kdebug.h> diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp index e3c1b1985..a9db771b9 100644 --- a/tdeioslave/media/mediamanager/halbackend.cpp +++ b/tdeioslave/media/mediamanager/halbackend.cpp @@ -24,17 +24,17 @@ #include <locale.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqeventloop.h> #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kdebug.h> #include <kprocess.h> #include <tdeconfig.h> #include <tqstylesheet.h> #include <kmountpoint.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/job.h> #include <kprotocolinfo.h> #include <kstandarddirs.h> diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp index 295f4269a..9a4089ca5 100644 --- a/tdeioslave/media/mediamanager/mediamanager.cpp +++ b/tdeioslave/media/mediamanager/mediamanager.cpp @@ -22,8 +22,8 @@ #include <tqtimer.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdirnotify_stub.h> #include <kstandarddirs.h> diff --git a/tdeioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp index dc619701a..54df3d6f1 100644 --- a/tdeioslave/media/mediamanager/removablebackend.cpp +++ b/tdeioslave/media/mediamanager/removablebackend.cpp @@ -18,7 +18,7 @@ #include "removablebackend.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdirwatch.h> #include <kurl.h> #include <kmountpoint.h> diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp index 6ee284dc1..31481b6e8 100644 --- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp @@ -23,14 +23,14 @@ #include <tqeventloop.h> #include <tqstylesheet.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeio/job.h> #include <kprocess.h> #include <kmimetype.h> #include <kmountpoint.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <kprotocolinfo.h> diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp index ab9d8ad63..e500731a2 100644 --- a/tdeioslave/media/medianotifier/medianotifier.cpp +++ b/tdeioslave/media/medianotifier/medianotifier.cpp @@ -27,12 +27,12 @@ #include <tqcheckbox.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <krun.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstdguiitem.h> #include <kstandarddirs.h> diff --git a/tdeioslave/media/medianotifier/medianotifier.h b/tdeioslave/media/medianotifier/medianotifier.h index 9e9a772bb..3e30d12b1 100644 --- a/tdeioslave/media/medianotifier/medianotifier.h +++ b/tdeioslave/media/medianotifier/medianotifier.h @@ -23,7 +23,7 @@ #include <kdedmodule.h> #include <tdefileitem.h> #include <tdeio/job.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqstring.h> #include <tqmap.h> diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp index 4efe155d9..981d48e6a 100644 --- a/tdeioslave/media/medianotifier/notificationdialog.cpp +++ b/tdeioslave/media/medianotifier/notificationdialog.cpp @@ -21,7 +21,7 @@ #include <tqlayout.h> #include <krun.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeio/global.h> #include <tdelistbox.h> diff --git a/tdeioslave/media/mounthelper/dialog.h b/tdeioslave/media/mounthelper/dialog.h index dc1d552d8..6a164b8e8 100644 --- a/tdeioslave/media/mounthelper/dialog.h +++ b/tdeioslave/media/mounthelper/dialog.h @@ -23,8 +23,8 @@ #ifndef DIALOG_H_ #define DIALOG_H_ -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index c130d5dcb..230d69715 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp @@ -20,18 +20,18 @@ */ #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <dcopref.h> #include <tqtimer.h> #include <stdlib.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kprocess.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <kmimetype.h> #include "dialog.h" diff --git a/tdeioslave/media/propsdlgplugin/propertiespage.cpp b/tdeioslave/media/propsdlgplugin/propertiespage.cpp index 33d481ef5..5b54c8c5a 100644 --- a/tdeioslave/media/propsdlgplugin/propertiespage.cpp +++ b/tdeioslave/media/propsdlgplugin/propertiespage.cpp @@ -25,8 +25,8 @@ #include <tqlabel.h> #include <tqregexp.h> #include <kpushbutton.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tqcombobox.h> #include <tqtimer.h> #include <kdebug.h> diff --git a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp index 1ceff0bc1..ea830d2e1 100644 --- a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp +++ b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp @@ -27,11 +27,11 @@ #include <kdebug.h> #include <kpushbutton.h> #include <tdefileshare.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kstandarddirs.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <dcopref.h> #include "propertiespage.h" diff --git a/tdeioslave/media/tdecmodule/main.cpp b/tdeioslave/media/tdecmodule/main.cpp index 96d7135b5..e2d367e7d 100644 --- a/tdeioslave/media/tdecmodule/main.cpp +++ b/tdeioslave/media/tdecmodule/main.cpp @@ -22,7 +22,7 @@ #include <tqtabwidget.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kdialog.h> diff --git a/tdeioslave/media/tdecmodule/managermodule.cpp b/tdeioslave/media/tdecmodule/managermodule.cpp index 3a44c446e..39ea8fe00 100644 --- a/tdeioslave/media/tdecmodule/managermodule.cpp +++ b/tdeioslave/media/tdecmodule/managermodule.cpp @@ -22,7 +22,7 @@ #include "managermodule.h" #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopref.h> #include <tqbutton.h> #include <tqcheckbox.h> diff --git a/tdeioslave/media/tdecmodule/notifiermodule.cpp b/tdeioslave/media/tdecmodule/notifiermodule.cpp index 4146c514f..4364d93ad 100644 --- a/tdeioslave/media/tdecmodule/notifiermodule.cpp +++ b/tdeioslave/media/tdecmodule/notifiermodule.cpp @@ -19,7 +19,7 @@ #include "notifiermodule.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <kcombobox.h> diff --git a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp index 989419703..4147e437c 100644 --- a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp +++ b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp @@ -19,7 +19,7 @@ #include "serviceconfigdialog.h" -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <tdeactionselector.h> #include <kicondialog.h> diff --git a/tdeioslave/media/tdeio_media.cpp b/tdeioslave/media/tdeio_media.cpp index be30ec5d5..1d32b14c2 100644 --- a/tdeioslave/media/tdeio_media.cpp +++ b/tdeioslave/media/tdeio_media.cpp @@ -20,7 +20,7 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <dcopclient.h> #include <tdecmdlineargs.h> diff --git a/tdeioslave/nfs/tdeio_nfs.cpp b/tdeioslave/nfs/tdeio_nfs.cpp index d0051e10b..8a7fd94b8 100644 --- a/tdeioslave/nfs/tdeio_nfs.cpp +++ b/tdeioslave/nfs/tdeio_nfs.cpp @@ -50,7 +50,7 @@ #include <kdebug.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/global.h> #include <iostream> diff --git a/tdeioslave/nntp/nntp.cpp b/tdeioslave/nntp/nntp.cpp index 7353e0e2e..7b5fedf6c 100644 --- a/tdeioslave/nntp/nntp.cpp +++ b/tdeioslave/nntp/nntp.cpp @@ -17,8 +17,8 @@ #include <kinstance.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "nntp.h" diff --git a/tdeioslave/pop3/pop3.cc b/tdeioslave/pop3/pop3.cc index 9b45f47f3..4f85c409c 100644 --- a/tdeioslave/pop3/pop3.cc +++ b/tdeioslave/pop3/pop3.cc @@ -53,9 +53,9 @@ extern "C" { #include <kdebug.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> -#include <kprotocolmanager.h> +#include <tdeprotocolmanager.h> #include <ksock.h> #include <tdeio/connection.h> diff --git a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp index 7ed66ce06..5b042295d 100644 --- a/tdeioslave/remote/kdedmodule/remotedirnotify.cpp +++ b/tdeioslave/remote/kdedmodule/remotedirnotify.cpp @@ -19,8 +19,8 @@ #include "remotedirnotify.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdesktopfile.h> diff --git a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp index 04b7a2bee..a93ec7eae 100644 --- a/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp +++ b/tdeioslave/remote/kdedmodule/remotedirnotifymodule.cpp @@ -19,8 +19,8 @@ #include "remotedirnotifymodule.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj) : KDEDModule(obj) diff --git a/tdeioslave/remote/remoteimpl.cpp b/tdeioslave/remote/remoteimpl.cpp index d977781ea..a0f37b624 100644 --- a/tdeioslave/remote/remoteimpl.cpp +++ b/tdeioslave/remote/remoteimpl.cpp @@ -20,11 +20,11 @@ #include "remoteimpl.h" #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <kdesktopfile.h> #include <kservice.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdir.h> #include <tqfile.h> diff --git a/tdeioslave/remote/tdeio_remote.cpp b/tdeioslave/remote/tdeio_remote.cpp index 5cbbb8717..b5350b7e2 100644 --- a/tdeioslave/remote/tdeio_remote.cpp +++ b/tdeioslave/remote/tdeio_remote.cpp @@ -20,11 +20,11 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <dcopclient.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "tdeio_remote.h" diff --git a/tdeioslave/settings/tdeio_settings.cc b/tdeioslave/settings/tdeio_settings.cc index 47635693d..db797fab5 100644 --- a/tdeioslave/settings/tdeio_settings.cc +++ b/tdeioslave/settings/tdeio_settings.cc @@ -21,7 +21,7 @@ #include <kinstance.h> #include <kdebug.h> #include <tqtextstream.h> -#include <klocale.h> +#include <tdelocale.h> #include <sys/stat.h> #include <dcopclient.h> #include <tqdatastream.h> diff --git a/tdeioslave/sftp/ksshprocess.cpp b/tdeioslave/sftp/ksshprocess.cpp index 678806605..0f19126d2 100644 --- a/tdeioslave/sftp/ksshprocess.cpp +++ b/tdeioslave/sftp/ksshprocess.cpp @@ -66,7 +66,7 @@ #endif #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqregexp.h> /* diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp index 2af66f04f..1e529363c 100644 --- a/tdeioslave/sftp/tdeio_sftp.cpp +++ b/tdeioslave/sftp/tdeio_sftp.cpp @@ -55,11 +55,11 @@ So we can't connect. #include <tdeapplication.h> #include <kuser.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tdeio/ioslave_defaults.h> #include <kmimetype.h> diff --git a/tdeioslave/smb/tdeio_smb.h b/tdeioslave/smb/tdeio_smb.h index 0c89eae95..b2566cb5f 100644 --- a/tdeioslave/smb/tdeio_smb.h +++ b/tdeioslave/smb/tdeio_smb.h @@ -53,7 +53,7 @@ #include <tdeio/global.h> #include <tdeio/slavebase.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> //----------------------------- // Standard C library includes diff --git a/tdeioslave/smb/tdeio_smb_browse.cpp b/tdeioslave/smb/tdeio_smb_browse.cpp index e06bb81d1..c8d39b8f8 100644 --- a/tdeioslave/smb/tdeio_smb_browse.cpp +++ b/tdeioslave/smb/tdeio_smb_browse.cpp @@ -36,7 +36,7 @@ #include <tqtextcodec.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "tdeio_smb.h" #include "tdeio_smb_internal.h" diff --git a/tdeioslave/smb/tdeio_smb_internal.cpp b/tdeioslave/smb/tdeio_smb_internal.cpp index de3f98127..ebb91b30a 100644 --- a/tdeioslave/smb/tdeio_smb_internal.cpp +++ b/tdeioslave/smb/tdeio_smb_internal.cpp @@ -34,7 +34,7 @@ #include <tqtextcodec.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> //=========================================================================== diff --git a/tdeioslave/smtp/command.cc b/tdeioslave/smtp/command.cc index 8543f6c03..eaab13fbd 100644 --- a/tdeioslave/smtp/command.cc +++ b/tdeioslave/smtp/command.cc @@ -38,7 +38,7 @@ #include "transactionstate.h" #include <kidna.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kmdcodec.h> #include <tdeio/slavebase.h> // for test_commands, where SMTPProtocol is not derived from TCPSlaveBase diff --git a/tdeioslave/smtp/response.cc b/tdeioslave/smtp/response.cc index 6c29d31bf..b630051de 100644 --- a/tdeioslave/smtp/response.cc +++ b/tdeioslave/smtp/response.cc @@ -33,7 +33,7 @@ #include "response.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/global.h> #include <tqstring.h> diff --git a/tdeioslave/smtp/smtp.cc b/tdeioslave/smtp/smtp.cc index 3dfb8a053..43c15ecd2 100644 --- a/tdeioslave/smtp/smtp.cc +++ b/tdeioslave/smtp/smtp.cc @@ -53,13 +53,13 @@ using KioSMTP::Request; using KioSMTP::Response; using KioSMTP::TransactionState; -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <ksock.h> #include <kdebug.h> #include <kinstance.h> #include <tdeio/connection.h> #include <tdeio/slaveinterface.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> #include <tqstringlist.h> diff --git a/tdeioslave/smtp/transactionstate.cc b/tdeioslave/smtp/transactionstate.cc index 71a3e682c..58e5adf51 100644 --- a/tdeioslave/smtp/transactionstate.cc +++ b/tdeioslave/smtp/transactionstate.cc @@ -34,7 +34,7 @@ #include "transactionstate.h" #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstringlist.h> diff --git a/tdeioslave/system/kdedmodule/systemdirnotify.cpp b/tdeioslave/system/kdedmodule/systemdirnotify.cpp index bd27af597..e61a69f28 100644 --- a/tdeioslave/system/kdedmodule/systemdirnotify.cpp +++ b/tdeioslave/system/kdedmodule/systemdirnotify.cpp @@ -19,8 +19,8 @@ #include "systemdirnotify.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdesktopfile.h> diff --git a/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp index 9f9b422bd..ec95c0e32 100644 --- a/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp +++ b/tdeioslave/system/kdedmodule/systemdirnotifymodule.cpp @@ -19,8 +19,8 @@ #include "systemdirnotifymodule.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj) : KDEDModule(obj) diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp index 84f7c9866..2cd8226a5 100644 --- a/tdeioslave/system/systemimpl.cpp +++ b/tdeioslave/system/systemimpl.cpp @@ -20,7 +20,7 @@ #include "systemimpl.h" #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <kdesktopfile.h> diff --git a/tdeioslave/system/tdeio_system.cpp b/tdeioslave/system/tdeio_system.cpp index 9f2d556ab..d904eda0d 100644 --- a/tdeioslave/system/tdeio_system.cpp +++ b/tdeioslave/system/tdeio_system.cpp @@ -20,7 +20,7 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <dcopclient.h> diff --git a/tdeioslave/tar/tar.cc b/tdeioslave/tar/tar.cc index 1cc8dcfec..6d71d8b21 100644 --- a/tdeioslave/tar/tar.cc +++ b/tdeioslave/tar/tar.cc @@ -9,7 +9,7 @@ #include <tqfile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kurl.h> #include <kdebug.h> #include <kinstance.h> @@ -17,7 +17,7 @@ #include <kzip.h> #include <kar.h> #include <kmimemagic.h> -#include <klocale.h> +#include <tdelocale.h> #include <kde_file.h> #include <tdeio/global.h> #include <kremoteencoding.h> diff --git a/tdeioslave/thumbnail/exrcreator.cpp b/tdeioslave/thumbnail/exrcreator.cpp index 59c1fba76..5708b8996 100644 --- a/tdeioslave/thumbnail/exrcreator.cpp +++ b/tdeioslave/thumbnail/exrcreator.cpp @@ -22,7 +22,7 @@ #include <kimageio.h> #include <kdebug.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqfile.h> #include <ImfInputFile.h> diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp index 63d061d29..764f89937 100644 --- a/tdeioslave/thumbnail/thumbnail.cpp +++ b/tdeioslave/thumbnail/thumbnail.cpp @@ -37,7 +37,7 @@ #include <kdatastream.h> // Do not remove, needed for correct bool serialization #include <kurl.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kimageeffect.h> #include <kmimetype.h> @@ -47,7 +47,7 @@ #include <kservicetype.h> #include <kuserprofile.h> #include <tdefilemetainfo.h> -#include <klocale.h> +#include <tdelocale.h> #include <config.h> // For HAVE_NICE #include "thumbnail.h" diff --git a/tdeioslave/trash/ktrash.cpp b/tdeioslave/trash/ktrash.cpp index c355a2fa8..162d27876 100644 --- a/tdeioslave/trash/ktrash.cpp +++ b/tdeioslave/trash/ktrash.cpp @@ -21,7 +21,7 @@ #include <tdeio/netaccess.h> #include <tdeio/job.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdirnotify_stub.h> #include <kdebug.h> diff --git a/tdeioslave/trash/tdeio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp index 1b29aa5b5..02cda02dd 100644 --- a/tdeioslave/trash/tdeio_trash.cpp +++ b/tdeioslave/trash/tdeio_trash.cpp @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <klargefile.h> #include <tdecmdlineargs.h> #include <kmimetype.h> diff --git a/tdeioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp index c2b6283bc..db2e73fb3 100644 --- a/tdeioslave/trash/testtrash.cpp +++ b/tdeioslave/trash/testtrash.cpp @@ -27,7 +27,7 @@ #include <config.h> #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp index d49123572..cf37b8b94 100644 --- a/tdeioslave/trash/trashimpl.cpp +++ b/tdeioslave/trash/trashimpl.cpp @@ -18,7 +18,7 @@ */ #include "trashimpl.h" -#include <klocale.h> +#include <tdelocale.h> #include <klargefile.h> #include <tdeio/global.h> #include <tdeio/renamedlg.h> @@ -26,9 +26,9 @@ #include <kdebug.h> #include <kurl.h> #include <kdirnotify_stub.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kmountpoint.h> #include <tdefileitem.h> #include <tdeio/chmodjob.h> |