diff options
Diffstat (limited to 'certmanager')
52 files changed, 85 insertions, 85 deletions
diff --git a/certmanager/CMakeLists.txt b/certmanager/CMakeLists.txt index 8ff147bba..51465610c 100644 --- a/certmanager/CMakeLists.txt +++ b/certmanager/CMakeLists.txt @@ -50,7 +50,7 @@ tde_add_executable( kleopatra AUTOMOC hierarchyanalyser.cpp certificatewizard.ui certificatewizardimpl.cpp certificateinfowidget.ui certificateinfowidgetimpl.cpp crlview.cpp storedtransferjob.cpp certlistview.cpp - LINK conf-static kleopatra-shared tdeutils-shared kabc-shared + LINK conf-static kleopatra-shared tdeutils-shared tdeabc-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/certmanager/aboutdata.cpp b/certmanager/aboutdata.cpp index 8941ae00d..21cae2286 100644 --- a/certmanager/aboutdata.cpp +++ b/certmanager/aboutdata.cpp @@ -36,7 +36,7 @@ #include "aboutdata.h" -#include <klocale.h> +#include <tdelocale.h> static const char kleopatra_version[] = "0.40"; static const char description[] = I18N_NOOP("TDE Key Manager"); diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp index c6add9515..79b02b24c 100644 --- a/certmanager/certificateinfowidgetimpl.cpp +++ b/certmanager/certificateinfowidgetimpl.cpp @@ -47,12 +47,12 @@ #include <gpgmepp/keylistresult.h> // KDE -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kprocio.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // TQt #include <tqlistview.h> diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index 583470e9c..d220a10af 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -49,11 +49,11 @@ #include <gpgmepp/keygenerationresult.h> // KDE -#include <kabc/stdaddressbook.h> -#include <kabc/addressee.h> +#include <tdeabc/stdaddressbook.h> +#include <tdeabc/addressee.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kdebug.h> #include <kdialog.h> diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index bed7d94ae..044566f43 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -75,8 +75,8 @@ #include <kprocess.h> #include <tdeaction.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <tdetoolbar.h> #include <kstatusbar.h> @@ -84,7 +84,7 @@ #include <kdebug.h> #include <kdialogbase.h> #include <kkeydialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> #include <tdestdaccel.h> diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index 53030bbd7..c31fa9007 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -32,8 +32,8 @@ #include "appearanceconfigpage.h" #include <tqlayout.h> #include "appearanceconfigwidget.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdepimmacros.h> diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp index 19224cf9f..54c677cab 100644 --- a/certmanager/conf/appearanceconfigwidget.cpp +++ b/certmanager/conf/appearanceconfigwidget.cpp @@ -43,9 +43,9 @@ #include <tdelistview.h> #include <tdeconfig.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefontdialog.h> #include <kcolordialog.h> diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp index b1e994137..4d0d1e682 100644 --- a/certmanager/conf/configuredialog.cpp +++ b/certmanager/conf/configuredialog.cpp @@ -36,7 +36,7 @@ #include <twin.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal ) : KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), parent, name, modal ) diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index 769b95323..7a19d4515 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -34,8 +34,8 @@ #include <kleo/cryptobackendfactory.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> #include <knuminput.h> @@ -62,7 +62,7 @@ public: KURL::List readCurrentList() const { KURL::List lst; - // stolen from kabc/ldapclient.cpp + // stolen from tdeabc/ldapclient.cpp const uint numHosts = mConfig.readUnsignedNumEntry( "NumSelectedHosts" ); for ( uint j = 0; j < numHosts; j++ ) { const TQString num = TQString::number( j ); diff --git a/certmanager/crlview.cpp b/certmanager/crlview.cpp index 49c27d3e6..f94a45574 100644 --- a/certmanager/crlview.cpp +++ b/certmanager/crlview.cpp @@ -36,12 +36,12 @@ #include "crlview.h" -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kstdguiitem.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/certmanager/kwatchgnupg/aboutdata.cpp b/certmanager/kwatchgnupg/aboutdata.cpp index 5727003f0..78944269c 100644 --- a/certmanager/kwatchgnupg/aboutdata.cpp +++ b/certmanager/kwatchgnupg/aboutdata.cpp @@ -32,7 +32,7 @@ #include "aboutdata.h" -#include <klocale.h> +#include <tdelocale.h> static const char kwatchgnupg_version[] = "1.0"; static const char description[] = I18N_NOOP("GnuPG log viewer"); diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp index 8b1101716..6b1861787 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp @@ -32,7 +32,7 @@ #include "kwatchgnupgconfig.h" -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include <tdeconfig.h> #include <tdeapplication.h> diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index 9ce5f6b16..3fd96db65 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -38,8 +38,8 @@ #include <kleo/cryptoconfig.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeaction.h> #include <kstdaction.h> diff --git a/certmanager/kwatchgnupg/main.cpp b/certmanager/kwatchgnupg/main.cpp index 323c8b5ef..975b45c74 100644 --- a/certmanager/kwatchgnupg/main.cpp +++ b/certmanager/kwatchgnupg/main.cpp @@ -39,9 +39,9 @@ #include <kuniqueapplication.h> #include <tdecmdlineargs.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/certmanager/kwatchgnupg/tray.cpp b/certmanager/kwatchgnupg/tray.cpp index a8d2f5872..3ce760d9f 100644 --- a/certmanager/kwatchgnupg/tray.cpp +++ b/certmanager/kwatchgnupg/tray.cpp @@ -34,8 +34,8 @@ #include "kwatchgnupgmainwin.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tqtooltip.h> diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index 53ad316d5..7ed31197d 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -42,7 +42,7 @@ #include "kleo/cryptoconfig.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kshell.h> #include <kdebug.h> diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp index 2154f7aa6..265d759b7 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp @@ -44,9 +44,9 @@ #include <gpg-error.h> #include <kshell.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqtimer.h> #include <tqfileinfo.h> diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp index 002bf0182..6bb588d63 100644 --- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp @@ -39,7 +39,7 @@ #include <klibloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp index 677fc6ec2..d7ae22c1f 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp @@ -40,8 +40,8 @@ #include "kleo/cryptoconfig.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kshell.h> #include <tqdir.h> diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp index ec396537e..9391f023f 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp @@ -32,7 +32,7 @@ #include "symcryptrunprocessbase.h" -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kshell.h> diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp index 2395dc6e6..b5b006b56 100644 --- a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp +++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp @@ -41,7 +41,7 @@ #include "pgp6backend.h" #include "gpg1backend.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp index 744dd1133..c38097ed1 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp @@ -42,7 +42,7 @@ #include <gpgmepp/context.h> #include <gpgmepp/engineinfo.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tqfile.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index 191ff4279..e73b4363f 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -34,11 +34,11 @@ #include <kdebug.h> #include <kprocio.h> #include <errno.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <assert.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqfile.h> #include <stdlib.h> #include <tqtextcodec.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp index 480e6c8a5..433859bd4 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp @@ -45,7 +45,7 @@ #include <gpgmepp/encryptionresult.h> #include <gpgmepp/data.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp index 847b92f31..ee879742c 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp @@ -46,7 +46,7 @@ #include <gpgmepp/context.h> #include <gpgmepp/data.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tqstring.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp index c6370674b..5561625c8 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp @@ -43,8 +43,8 @@ #include <gpgmepp/keylistresult.h> #include <gpg-error.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqstringlist.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp index c2e21bb9b..bc0d232eb 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp @@ -36,7 +36,7 @@ #include "qgpgmeprogresstokenmapper.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp index 1392afd5e..70ff6b8fd 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp @@ -45,7 +45,7 @@ #include <gpgmepp/data.h> #include <gpgmepp/key.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp index db5c225e8..032514cd3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp @@ -46,7 +46,7 @@ #include <gpgmepp/data.h> #include <gpgmepp/key.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> diff --git a/certmanager/lib/cryptplugfactory.cpp b/certmanager/lib/cryptplugfactory.cpp index 6165cadda..12adac0f0 100644 --- a/certmanager/lib/cryptplugfactory.cpp +++ b/certmanager/lib/cryptplugfactory.cpp @@ -38,9 +38,9 @@ #include "cryptplugwrapperlist.h" #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <assert.h> diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp index b1ee42746..5bd5675b3 100644 --- a/certmanager/lib/cryptplugwrapper.cpp +++ b/certmanager/lib/cryptplugwrapper.cpp @@ -62,8 +62,8 @@ // kde #include <kdebug.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> // other diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp index f6af5283d..ce31cc9a5 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.cpp +++ b/certmanager/lib/kleo/cryptobackendfactory.cpp @@ -47,9 +47,9 @@ #include <ui/backendconfigwidget.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <iterator> diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp index b5b016447..d4ed13018 100644 --- a/certmanager/lib/kleo/dn.cpp +++ b/certmanager/lib/kleo/dn.cpp @@ -41,7 +41,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstringlist.h> #include <tqvaluevector.h> diff --git a/certmanager/lib/kleo/enum.cpp b/certmanager/lib/kleo/enum.cpp index 1d48c6b6e..bc9011fc2 100644 --- a/certmanager/lib/kleo/enum.cpp +++ b/certmanager/lib/kleo/enum.cpp @@ -32,7 +32,7 @@ #include "enum.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> #include <tqstringlist.h> diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp index ffd3c6db9..65b597255 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp @@ -38,7 +38,7 @@ #include "cryptobackend.h" #include "keylistjob.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqstringlist.h> #include <tqtl.h> diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp index 7d1a27302..7c83c24bc 100644 --- a/certmanager/lib/kleo/multideletejob.cpp +++ b/certmanager/lib/kleo/multideletejob.cpp @@ -38,7 +38,7 @@ #include "cryptobackend.h" #include "deletejob.h" -#include <klocale.h> +#include <tdelocale.h> #include <gpgmepp/key.h> #include <gpgmepp/context.h> diff --git a/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp index 05c6d04d5..fd0766b9e 100644 --- a/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp +++ b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp @@ -37,7 +37,7 @@ #include "tdeconfigbasedkeyfilter.h" #include <tdeconfigbase.h> -#include <klocale.h> +#include <tdelocale.h> static const struct { const char * name; diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index ea7ccae73..01e5d1091 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -41,7 +41,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tqstringlist.h> diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp index e5b4bcd92..b678e29d7 100644 --- a/certmanager/lib/tests/test_keygen.cpp +++ b/certmanager/lib/tests/test_keygen.cpp @@ -46,7 +46,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tqmessagebox.h> diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp index 6e1fa7df9..f3a73d516 100644 --- a/certmanager/lib/tests/test_keyselectiondialog.cpp +++ b/certmanager/lib/tests/test_keyselectiondialog.cpp @@ -37,7 +37,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 7b65a538f..2589e4d62 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -43,9 +43,9 @@ #include <tdelistview.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <dcopclient.h> diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index 410f4348c..52402d6da 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -31,7 +31,7 @@ #include "cryptoconfigdialog.h" #include "cryptoconfigmodule.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeaccelmanager.h> Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name ) diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index c1c710d2a..135958c0d 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -37,12 +37,12 @@ #include <kleo/cryptoconfig.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include <kdebug.h> #include <knuminput.h> #include <kiconloader.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kurlrequester.h> #include <tqgrid.h> diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index 71ac8a951..262ad6c71 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -38,7 +38,7 @@ #include "kleo/dn.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdialog.h> #include <kiconloader.h> diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 434699d06..0ee6d8657 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -45,8 +45,8 @@ #include <cryptplugfactory.h> #include <kleo/cryptobackend.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <kseparator.h> #include <tqstringlist.h> diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index c3bcf0244..53db6ce9b 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -63,11 +63,11 @@ #include <gpgmepp/keylistresult.h> // KDE -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdialog.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpushbutton.h> // TQt diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 53d658439..9e005d583 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -52,14 +52,14 @@ #include <gpgmepp/keylistresult.h> // KDE -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kdebug.h> #include <twin.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kactivelabel.h> #include <kurl.h> diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index 571ceccd4..935084bd6 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.cpp @@ -43,7 +43,7 @@ #include <tdefiledialog.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksavefile.h> #include <kguiitem.h> #include <kdebug.h> diff --git a/certmanager/lib/ui/messagebox.h b/certmanager/lib/ui/messagebox.h index 69dea34c5..083c16030 100644 --- a/certmanager/lib/ui/messagebox.h +++ b/certmanager/lib/ui/messagebox.h @@ -33,7 +33,7 @@ #ifndef __KLEO_UI_MESSAGEBOX_H__ #define __KLEO_UI_MESSAGEBOX_H__ -#include <kmessagebox.h> +#include <tdemessagebox.h> namespace GpgME { class SigningResult; diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index 5c7c44bd8..a2d0e7c36 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -54,7 +54,7 @@ #include <kpassdlg.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index d6552922c..692ee4cbf 100644 --- a/certmanager/lib/ui/progressdialog.cpp +++ b/certmanager/lib/ui/progressdialog.cpp @@ -37,7 +37,7 @@ #include <kleo/job.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtimer.h> diff --git a/certmanager/main.cpp b/certmanager/main.cpp index 8bdb346d8..bccb8d477 100644 --- a/certmanager/main.cpp +++ b/certmanager/main.cpp @@ -41,9 +41,9 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> int main( int argc, char** argv ) |