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/kwatchgnupg | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'certmanager/kwatchgnupg')
| -rw-r--r-- | certmanager/kwatchgnupg/aboutdata.cpp | 2 | ||||
| -rw-r--r-- | certmanager/kwatchgnupg/kwatchgnupgconfig.cpp | 2 | ||||
| -rw-r--r-- | certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp | 4 | ||||
| -rw-r--r-- | certmanager/kwatchgnupg/main.cpp | 6 | ||||
| -rw-r--r-- | certmanager/kwatchgnupg/tray.cpp | 4 |
5 files changed, 9 insertions, 9 deletions
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> |