diff options
Diffstat (limited to 'certmanager')
60 files changed, 68 insertions, 74 deletions
diff --git a/certmanager/certificatewizard.ui b/certmanager/certificatewizard.ui index cb544807..6eddb9cb 100644 --- a/certmanager/certificatewizard.ui +++ b/certmanager/certificatewizard.ui @@ -552,10 +552,8 @@ If you want to change anything, press Back and make your changes; otherwise, pre </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 86ee531a..a972ce9b 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -96,7 +96,7 @@ // other #include <algorithm> #include <assert.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kinputdialog.h> namespace { diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h index c61ce7db..cf03a710 100644 --- a/certmanager/certmanager.h +++ b/certmanager/certmanager.h @@ -1,4 +1,4 @@ -/* -*- mode: c++; c-basic-offset:4 -*- +/* certmanager.h This file is part of Kleopatra, the KDE keymanager @@ -36,7 +36,7 @@ //#include <gpgme.h> #include <tdemainwindow.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kurl.h> #include <tqcstring.h> #include <tqptrlist.h> diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index c31fa900..087e237e 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -36,7 +36,7 @@ #include <tdelocale.h> #include <kdebug.h> -#include <tdepimmacros.h> +#include <kdemacros.h> AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, const char * name ) : TDECModule( parent, name ) diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index 7a19d451..43373e72 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -47,7 +47,7 @@ #include <tqcheckbox.h> #include <tqlayout.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #if 0 // disabled, since it is apparently confusing // For sync'ing kabldaprc diff --git a/certmanager/conf/dirservconfigpage.h b/certmanager/conf/dirservconfigpage.h index f6a32301..e9bdd51a 100644 --- a/certmanager/conf/dirservconfigpage.h +++ b/certmanager/conf/dirservconfigpage.h @@ -34,7 +34,7 @@ #include <tdecmodule.h> #include <kleo/cryptoconfig.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQCheckBox; class TQTimeEdit; diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp index a802a06f..18668684 100644 --- a/certmanager/conf/dnorderconfigpage.cpp +++ b/certmanager/conf/dnorderconfigpage.cpp @@ -34,7 +34,7 @@ #include <ui/dnattributeorderconfigwidget.h> #include <kleo/dn.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqlayout.h> diff --git a/certmanager/hierarchyanalyser.h b/certmanager/hierarchyanalyser.h index dede3814..45ef9ccb 100644 --- a/certmanager/hierarchyanalyser.h +++ b/certmanager/hierarchyanalyser.h @@ -1,4 +1,4 @@ -/* -*- mode: c++ -*- +/* hierarchyanalyser.h This file is part of Kleopatra, the KDE keymanager diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.h b/certmanager/lib/backends/chiasmus/chiasmusbackend.h index 1619f9ea..17f7572c 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.h +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* chiasmusbackend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.h b/certmanager/lib/backends/chiasmus/chiasmusjob.h index 1ca6ba19..69274d10 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.h +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* chiasmusjob.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.h b/certmanager/lib/backends/chiasmus/chiasmuslibrary.h index fa1adc73..3a3536af 100644 --- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.h +++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* chiasmuslibrary.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.h b/certmanager/lib/backends/chiasmus/obtainkeysjob.h index 10ed5d5f..09a1c7c3 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* obtainkeysjob.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/gpg1backend.h b/certmanager/lib/backends/kpgp/gpg1backend.h index a1ff723c..96729f33 100644 --- a/certmanager/lib/backends/kpgp/gpg1backend.h +++ b/certmanager/lib/backends/kpgp/gpg1backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* gpg1backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp index b5b006b5..dfa88af6 100644 --- a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp +++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpbackendbase.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.h b/certmanager/lib/backends/kpgp/kpgpbackendbase.h index 6fdf29bf..d9dbf579 100644 --- a/certmanager/lib/backends/kpgp/kpgpbackendbase.h +++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpbackendbase.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h index d126ea67..3434dd97 100644 --- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.h +++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.h @@ -1,4 +1,4 @@ -/* -*- mode: C++ -*- +/* kpgpkeylistjob.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp index 71c08293..6778f45d 100644 --- a/certmanager/lib/backends/kpgp/kpgpwrapper.cpp +++ b/certmanager/lib/backends/kpgp/kpgpwrapper.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpwrapper.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/kpgpwrapper.h b/certmanager/lib/backends/kpgp/kpgpwrapper.h index 8dc7dbc2..7776e98c 100644 --- a/certmanager/lib/backends/kpgp/kpgpwrapper.h +++ b/certmanager/lib/backends/kpgp/kpgpwrapper.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* kpgpwrapper.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/pgp2backend.h b/certmanager/lib/backends/kpgp/pgp2backend.h index b486bfd6..622566e1 100644 --- a/certmanager/lib/backends/kpgp/pgp2backend.h +++ b/certmanager/lib/backends/kpgp/pgp2backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* pgp2backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/pgp5backend.h b/certmanager/lib/backends/kpgp/pgp5backend.h index 2db55932..b02183de 100644 --- a/certmanager/lib/backends/kpgp/pgp5backend.h +++ b/certmanager/lib/backends/kpgp/pgp5backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* pgp5backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/kpgp/pgp6backend.h b/certmanager/lib/backends/kpgp/pgp6backend.h index c5f9eeff..46494244 100644 --- a/certmanager/lib/backends/kpgp/pgp6backend.h +++ b/certmanager/lib/backends/kpgp/pgp6backend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* pgp6backend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp index c38097ed..ee4128bf 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* qgpgmebackend.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.h b/certmanager/lib/backends/qgpgme/qgpgmebackend.h index a23c08d4..9d6aca81 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmebackend.h +++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.h @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* qgpgmebackend.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h index 79ff268b..7e4eda03 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h @@ -38,7 +38,7 @@ #include "qgpgmejob.h" #include <tqcstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Error; diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h index 844ca974..64ce36bc 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h @@ -43,7 +43,7 @@ #include <tqstring.h> #include <vector> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Data; diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h index c9e16474..0b1362c9 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h @@ -36,7 +36,7 @@ #include <kleo/keygenerationjob.h> #include "qgpgmejob.h" -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Error; diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp index bc0d232e..54d13358 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* qgpgmeprogresstokenmapper.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h index 24672d83..90079706 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h @@ -44,7 +44,7 @@ #include <utility> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Error; class Context; diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp index 77a91451..20747457 100644 --- a/certmanager/lib/cryptplug.cpp +++ b/certmanager/lib/cryptplug.cpp @@ -1,5 +1,4 @@ -/* -*- Mode: C++ -*- - +/* this is a C++-ification of: GPGMEPLUG - an GPGME based cryptography plug-in following the common CRYPTPLUG specification. diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h index d633e639..fce71937 100644 --- a/certmanager/lib/cryptplug.h +++ b/certmanager/lib/cryptplug.h @@ -1,5 +1,4 @@ -/* -*- Mode: C++ -*- - +/* this is a C++-ification of: CRYPTPLUG - an independent cryptography plug-in API @@ -26,7 +25,7 @@ #include <gpgmepp/context.h> #include <gpgme.h> // need it for gpgme_protocol_t :( -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class ImportResult; diff --git a/certmanager/lib/cryptplugfactory.h b/certmanager/lib/cryptplugfactory.h index 3eb5f7e6..6f3f6f3d 100644 --- a/certmanager/lib/cryptplugfactory.h +++ b/certmanager/lib/cryptplugfactory.h @@ -35,7 +35,7 @@ #include "kleo/cryptobackendfactory.h" -#include <tdepimmacros.h> +#include <kdemacros.h> #ifndef LIBKLEOPATRA_NO_COMPAT namespace Kleo { diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h index 39fd680a..651c9f9f 100644 --- a/certmanager/lib/cryptplugwrapper.h +++ b/certmanager/lib/cryptplugwrapper.h @@ -54,7 +54,7 @@ #include <tqpair.h> #include <tqstringlist.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TDEConfigBase; diff --git a/certmanager/lib/cryptplugwrapperlist.cpp b/certmanager/lib/cryptplugwrapperlist.cpp index 43f88670..94d8a48c 100644 --- a/certmanager/lib/cryptplugwrapperlist.cpp +++ b/certmanager/lib/cryptplugwrapperlist.cpp @@ -1,5 +1,4 @@ -/* -*- c++ -*- - +/* CRYPTPLUG - an independent cryptography plug-in API. CryptPlugWrapperList holds any number of crypto plug-ins. diff --git a/certmanager/lib/cryptplugwrapperlist.h b/certmanager/lib/cryptplugwrapperlist.h index 30d4fcd9..01691338 100644 --- a/certmanager/lib/cryptplugwrapperlist.h +++ b/certmanager/lib/cryptplugwrapperlist.h @@ -1,5 +1,4 @@ -/* -*- Mode: C++ -*- - +/* CRYPTPLUG - an independent cryptography plug-in API. CryptPlugWrapperList holds any number of crypto plug-ins. diff --git a/certmanager/lib/kleo/cryptobackendfactory.h b/certmanager/lib/kleo/cryptobackendfactory.h index 09012da3..3fa642f3 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.h +++ b/certmanager/lib/kleo/cryptobackendfactory.h @@ -36,7 +36,7 @@ #include <tqobject.h> #include "cryptobackend.h" -#include <tdepimmacros.h> +#include <kdemacros.h> #include <vector> #include <map> diff --git a/certmanager/lib/kleo/dn.h b/certmanager/lib/kleo/dn.h index c9bdbffd..c194d58e 100644 --- a/certmanager/lib/kleo/dn.h +++ b/certmanager/lib/kleo/dn.h @@ -35,7 +35,7 @@ #include <tqstring.h> #include <tqvaluevector.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQStringList; class TQWidget; diff --git a/certmanager/lib/kleo/enum.h b/certmanager/lib/kleo/enum.h index 07e93c49..723f65ae 100644 --- a/certmanager/lib/kleo/enum.h +++ b/certmanager/lib/kleo/enum.h @@ -33,7 +33,7 @@ #ifndef __KLEO_ENUM_H__ #define __KLEO_ENUM_H__ -#include <tdepimmacros.h> +#include <kdemacros.h> class TQString; class TQStringList; diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.h b/certmanager/lib/kleo/hierarchicalkeylistjob.h index 0b74d2f9..ebce19f2 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.h +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.h @@ -35,7 +35,7 @@ #include <kleo/keylistjob.h> #include <kleo/cryptobackend.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <gpgmepp/keylistresult.h> diff --git a/certmanager/lib/kleo/keyfiltermanager.h b/certmanager/lib/kleo/keyfiltermanager.h index a573934d..e65be1d2 100644 --- a/certmanager/lib/kleo/keyfiltermanager.h +++ b/certmanager/lib/kleo/keyfiltermanager.h @@ -34,7 +34,7 @@ #define __KLEO_KEYFILTERMANAGER_H__ #include <tqobject.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace GpgME { class Key; } diff --git a/certmanager/lib/kleo/multideletejob.h b/certmanager/lib/kleo/multideletejob.h index d927c927..31d9d9e9 100644 --- a/certmanager/lib/kleo/multideletejob.h +++ b/certmanager/lib/kleo/multideletejob.h @@ -36,7 +36,7 @@ #include <kleo/job.h> #include <kleo/cryptobackend.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <tqguardedptr.h> #include <vector> diff --git a/certmanager/lib/tests/test.data b/certmanager/lib/tests/test.data index a4109fbd..5a63ff09 100644 --- a/certmanager/lib/tests/test.data +++ b/certmanager/lib/tests/test.data @@ -1,4 +1,4 @@ -/* -*- mode: c++; c-basic-offset:4 -*- +/* tests/test_uiserver.cpp This file is part of Kleopatra, the KDE keymanager diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index a97b0020..9d8f4d40 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* backendconfigwidget.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/backendconfigwidget.h b/certmanager/lib/ui/backendconfigwidget.h index f0131547..ad60654b 100644 --- a/certmanager/lib/ui/backendconfigwidget.h +++ b/certmanager/lib/ui/backendconfigwidget.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* backendconfigwidget.h This file is part of libkleopatra, the KDE keymanagement library @@ -35,7 +35,7 @@ #define __KLEO_UI_BACKENDCONFIGWIDGET_H__ #include <tqwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { class CryptoBackendFactory; diff --git a/certmanager/lib/ui/cryptoconfigdialog.h b/certmanager/lib/ui/cryptoconfigdialog.h index 3f6ba328..0ef8009c 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.h +++ b/certmanager/lib/ui/cryptoconfigdialog.h @@ -33,7 +33,7 @@ #define CRYPTOCONFIGDIALOG_H #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { diff --git a/certmanager/lib/ui/directoryserviceswidget.h b/certmanager/lib/ui/directoryserviceswidget.h index a98bc5fe..950a87e9 100644 --- a/certmanager/lib/ui/directoryserviceswidget.h +++ b/certmanager/lib/ui/directoryserviceswidget.h @@ -34,7 +34,7 @@ #define DIRECTORYSERVICESWIDGET_H #include "directoryserviceswidgetbase.h" #include <kurl.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class CryptPlugWrapper; namespace Kleo { diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index b2f1343a..874ba0fa 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* dnattributeorderconfigwidget.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.h b/certmanager/lib/ui/dnattributeorderconfigwidget.h index b7ba1330..d39220ac 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.h +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* dnattributeorderconfigwidget.h This file is part of libkleopatra, the KDE keymanagement library @@ -34,7 +34,7 @@ #define __KLEO_UI_DNATTRIBUTEORDERCONFIGWIDGET_H__ #include <tqwidget.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { class DNAttributeMapper; } diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index 118b6b10..2892a05e 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* KD Tools - a set of useful widgets for TQt */ diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h index 71c1c928..4cae46b1 100644 --- a/certmanager/lib/ui/kdhorizontalline.h +++ b/certmanager/lib/ui/kdhorizontalline.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++ -*- +/* KD Tools - a set of useful widgets for TQt */ diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 0ee6d865..900605ae 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyapprovaldialog.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/keyapprovaldialog.h b/certmanager/lib/ui/keyapprovaldialog.h index bd953fa3..a83e124b 100644 --- a/certmanager/lib/ui/keyapprovaldialog.h +++ b/certmanager/lib/ui/keyapprovaldialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyselectiondialog.h This file is part of libkleopatra, the KDE keymanagement library @@ -40,7 +40,7 @@ #include <kleo/enum.h> #include <kdialogbase.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <kpgpkey.h> // for EncryptPref #include <gpgmepp/key.h> diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 4149cb41..6eeef5d8 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -36,7 +36,7 @@ #include <tdelistview.h> #include <gpgmepp/key.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQPainter; class TQColorGroup; diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index c9516a2b..e245898e 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyrequester.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/keyrequester.h b/certmanager/lib/ui/keyrequester.h index 899d3cde..30fba80d 100644 --- a/certmanager/lib/ui/keyrequester.h +++ b/certmanager/lib/ui/keyrequester.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyrequester.h This file is part of libkleopatra, the KDE keymanagement library @@ -53,7 +53,7 @@ #include <kleo/cryptobackend.h> #include <vector> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { class KeyListView; diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index c46228a4..25a1a225 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyselectiondialog.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/keyselectiondialog.h b/certmanager/lib/ui/keyselectiondialog.h index 630255c1..126baa73 100644 --- a/certmanager/lib/ui/keyselectiondialog.h +++ b/certmanager/lib/ui/keyselectiondialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* keyselectiondialog.h This file is part of libkleopatra, the KDE keymanagement library @@ -41,7 +41,7 @@ #include <kleo/cryptobackend.h> #include <gpgmepp/key.h> -#include <tdepimmacros.h> +#include <kdemacros.h> #include <vector> class TQVBoxLayout; diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index a2d0e7c3..5fce3838 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* passphrasedialog.cpp This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/passphrasedialog.h b/certmanager/lib/ui/passphrasedialog.h index e83eca42..48fc4716 100644 --- a/certmanager/lib/ui/passphrasedialog.h +++ b/certmanager/lib/ui/passphrasedialog.h @@ -1,4 +1,4 @@ -/* -*- c++ -*- +/* passphrasedialog.h This file is part of libkleopatra, the KDE keymanagement library diff --git a/certmanager/lib/ui/progressbar.h b/certmanager/lib/ui/progressbar.h index 51f86dad..c5495d39 100644 --- a/certmanager/lib/ui/progressbar.h +++ b/certmanager/lib/ui/progressbar.h @@ -34,7 +34,7 @@ #define __KLEO_PROGRESSBAR_H__ #include <tqprogressbar.h> -#include <tdepimmacros.h> +#include <kdemacros.h> class TQTimer; namespace Kleo { diff --git a/certmanager/lib/ui/progressdialog.h b/certmanager/lib/ui/progressdialog.h index dadfd769..eb1b95b7 100644 --- a/certmanager/lib/ui/progressdialog.h +++ b/certmanager/lib/ui/progressdialog.h @@ -35,7 +35,7 @@ #include <tqprogressdialog.h> #include <tqstring.h> -#include <tdepimmacros.h> +#include <kdemacros.h> namespace Kleo { class Job; |