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 /libkpgp | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libkpgp')
| -rw-r--r-- | libkpgp/kpgp.cpp | 4 | ||||
| -rw-r--r-- | libkpgp/kpgpbase2.cpp | 2 | ||||
| -rw-r--r-- | libkpgp/kpgpbase5.cpp | 2 | ||||
| -rw-r--r-- | libkpgp/kpgpbase6.cpp | 2 | ||||
| -rw-r--r-- | libkpgp/kpgpbaseG.cpp | 2 | ||||
| -rw-r--r-- | libkpgp/kpgpui.cpp | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp index 33aa89954..293b36811 100644 --- a/libkpgp/kpgp.cpp +++ b/libkpgp/kpgp.cpp @@ -35,8 +35,8 @@ #include <tqapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeconfigbase.h> #include <tdeconfig.h> #include <kstaticdeleter.h> diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp index b8a6448ae..2d16951c4 100644 --- a/libkpgp/kpgpbase2.cpp +++ b/libkpgp/kpgpbase2.cpp @@ -28,7 +28,7 @@ #include <tqdatetime.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <kdebug.h> diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp index d7066cb91..7f8e405a6 100644 --- a/libkpgp/kpgpbase5.cpp +++ b/libkpgp/kpgpbase5.cpp @@ -29,7 +29,7 @@ #include <tqregexp.h> #include <tqdatetime.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <kdebug.h> diff --git a/libkpgp/kpgpbase6.cpp b/libkpgp/kpgpbase6.cpp index 7fada7cc6..40bef7abc 100644 --- a/libkpgp/kpgpbase6.cpp +++ b/libkpgp/kpgpbase6.cpp @@ -27,7 +27,7 @@ #include <tqdatetime.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #define PGP6 "pgp" diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp index 52bb6bc7e..7e96b4e93 100644 --- a/libkpgp/kpgpbaseG.cpp +++ b/libkpgp/kpgpbaseG.cpp @@ -23,7 +23,7 @@ #include "kpgpbase.h" #include "kpgp.h" -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <kdebug.h> diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index fbcb3efdd..f4b40a708 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -32,7 +32,7 @@ #include <tqpopupmenu.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include <kcharsets.h> #include <kseparator.h> @@ -44,7 +44,7 @@ #include <tdeapplication.h> #include <twin.h> #if KDE_IS_VERSION( 3, 1, 90 ) -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #endif #include "kpgp.h" |