diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /certmanager/lib | |
parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'certmanager/lib')
36 files changed, 50 insertions, 50 deletions
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index 53ad316d..7ed31197 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 2154f7aa..265d759b 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 002bf018..6bb588d6 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 677fc6ec..d7ae22c1 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 ec396537..9391f023 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 2395dc6e..b5b006b5 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 744dd113..c38097ed 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 191ff427..e73b4363 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 480e6c8a..433859bd 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 847b92f3..ee879742 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 c6370674..5561625c 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 c2e21bb9..bc0d232e 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 1392afd5..70ff6b8f 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 db5c225e..032514cd 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 6165cadd..12adac0f 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 b1ee4274..5bd5675b 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 f6af5283..ce31cc9a 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 b5b01644..d4ed1301 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 1d48c6b6..bc9011fc 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 ffd3c6db..65b59725 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 7d1a2730..7c83c24b 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 05c6d04d..fd0766b9 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 ea7ccae7..01e5d109 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 e5b4bcd9..b678e29d 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 6e1fa7df..f3a73d51 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 7b65a538..2589e4d6 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 410f4348..52402d6d 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 c1c710d2..135958c0 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 71ac8a95..262ad6c7 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 434699d0..0ee6d865 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 c3bcf024..53db6ce9 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 53d65843..9e005d58 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 571ceccd..935084bd 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 69dea34c..083c1603 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 5c7c44bd..a2d0e7c3 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 d6552922..692ee4cb 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> |