summaryrefslogtreecommitdiffstats
path: root/libkdenetwork/gpgmepp
diff options
context:
space:
mode:
Diffstat (limited to 'libkdenetwork/gpgmepp')
-rw-r--r--libkdenetwork/gpgmepp/configure.in.bot2
-rw-r--r--libkdenetwork/gpgmepp/configure.in.in14
-rw-r--r--libkdenetwork/gpgmepp/context.h2
-rw-r--r--libkdenetwork/gpgmepp/data.h2
-rw-r--r--libkdenetwork/gpgmepp/decryptionresult.h2
-rw-r--r--libkdenetwork/gpgmepp/encryptionresult.h2
-rw-r--r--libkdenetwork/gpgmepp/engineinfo.h2
-rw-r--r--libkdenetwork/gpgmepp/eventloopinteractor.h2
-rw-r--r--libkdenetwork/gpgmepp/importresult.h2
-rw-r--r--libkdenetwork/gpgmepp/interfaces/dataprovider.h2
-rw-r--r--libkdenetwork/gpgmepp/key.h2
-rw-r--r--libkdenetwork/gpgmepp/keygenerationresult.h2
-rw-r--r--libkdenetwork/gpgmepp/keylistresult.h2
-rw-r--r--libkdenetwork/gpgmepp/signingresult.h2
-rw-r--r--libkdenetwork/gpgmepp/verificationresult.h2
15 files changed, 21 insertions, 21 deletions
diff --git a/libkdenetwork/gpgmepp/configure.in.bot b/libkdenetwork/gpgmepp/configure.in.bot
index fba6871d5..100cc65c7 100644
--- a/libkdenetwork/gpgmepp/configure.in.bot
+++ b/libkdenetwork/gpgmepp/configure.in.bot
@@ -1,4 +1,4 @@
-if test -z "$GPGME_LIBS" || test -n "$kdepim_needs_gpgme_copy" ; then
+if test -z "$GPGME_LIBS" || test -n "$tdepim_needs_gpgme_copy" ; then
echo
echo "You are missing gpgme 0.4.5 or higher."
echo "Gpgme will be built statically from libkdenetwork/libgpgme-copy."
diff --git a/libkdenetwork/gpgmepp/configure.in.in b/libkdenetwork/gpgmepp/configure.in.in
index 7ffaa1e67..e277b73bd 100644
--- a/libkdenetwork/gpgmepp/configure.in.in
+++ b/libkdenetwork/gpgmepp/configure.in.in
@@ -90,12 +90,12 @@ dnl END inline of gpgme.m4
# It was the first useable one for C++ (class keyword) and KDE (largefile support).
# If you change this minimum version here, update also configure.in.bot
-kdepim_needs_gpgme_copy=""
+tdepim_needs_gpgme_copy=""
KDEPIM_PATH_GPGME(0.4.5,[
AC_LANG_SAVE
AC_LANG_C
- kdepim_gpgmepp_save_cflags="$CFLAGS"
- kdepim_gpgmepp_save_libs="$LIBS"
+ tdepim_gpgmepp_save_cflags="$CFLAGS"
+ tdepim_gpgmepp_save_libs="$LIBS"
CFLAGS="$GPGME_CFLAGS"
LIBS="$GPGME_LIBS"
@@ -165,12 +165,12 @@ KDEPIM_PATH_GPGME(0.4.5,[
AC_MSG_RESULT([no])
])
- CFLAGS="$kdepim_gpgmepp_save_cflags"
- LIBS="$kdepim_gpgmepp_save_libs"
+ CFLAGS="$tdepim_gpgmepp_save_cflags"
+ LIBS="$tdepim_gpgmepp_save_libs"
AC_LANG_RESTORE
],[
- kdepim_needs_gpgme_copy="true"
+ tdepim_needs_gpgme_copy="true"
GPGME_CFLAGS='-I$(top_srcdir)/libkdenetwork/libgpgme-copy/gpgme -I$(top_srcdir)/libkdenetwork/libgpg-error-copy -I$(top_builddir)/libkdenetwork/libgpg-error-copy'
GPGME_LIBS='$(top_builddir)/libkdenetwork/libgpgme-copy/gpgme/libgpgme.la'
GPGME_LIBS_DEP='$(GPGME_LIBS)'
@@ -182,7 +182,7 @@ KDEPIM_PATH_GPGME(0.4.5,[
AC_SUBST(GPGME_LIBS_DEP)
-AM_CONDITIONAL(needs_gpgme_copy, test -n "$kdepim_needs_gpgme_copy")
+AM_CONDITIONAL(needs_gpgme_copy, test -n "$tdepim_needs_gpgme_copy")
dnl Always true - either from the local copy or from the system lib.
dnl Still used in gpgmepp/gpgmefw.h for some reason.
diff --git a/libkdenetwork/gpgmepp/context.h b/libkdenetwork/gpgmepp/context.h
index b07e722ef..054f8bee7 100644
--- a/libkdenetwork/gpgmepp/context.h
+++ b/libkdenetwork/gpgmepp/context.h
@@ -27,7 +27,7 @@
#include <utility>
#include <iosfwd>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace GpgME {
diff --git a/libkdenetwork/gpgmepp/data.h b/libkdenetwork/gpgmepp/data.h
index 143bde5ff..e12064729 100644
--- a/libkdenetwork/gpgmepp/data.h
+++ b/libkdenetwork/gpgmepp/data.h
@@ -25,7 +25,7 @@
#include <sys/types.h> // for size_t, off_t
#include <cstdio> // FILE
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace GpgME {
diff --git a/libkdenetwork/gpgmepp/decryptionresult.h b/libkdenetwork/gpgmepp/decryptionresult.h
index b97f59aed..da4833bbd 100644
--- a/libkdenetwork/gpgmepp/decryptionresult.h
+++ b/libkdenetwork/gpgmepp/decryptionresult.h
@@ -26,7 +26,7 @@
#include <iosfwd>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace GpgME {
diff --git a/libkdenetwork/gpgmepp/encryptionresult.h b/libkdenetwork/gpgmepp/encryptionresult.h
index 7267afc01..4339bef56 100644
--- a/libkdenetwork/gpgmepp/encryptionresult.h
+++ b/libkdenetwork/gpgmepp/encryptionresult.h
@@ -27,7 +27,7 @@
#include <vector>
#include <iosfwd>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace GpgME {
diff --git a/libkdenetwork/gpgmepp/engineinfo.h b/libkdenetwork/gpgmepp/engineinfo.h
index d41706eab..c07d2817a 100644
--- a/libkdenetwork/gpgmepp/engineinfo.h
+++ b/libkdenetwork/gpgmepp/engineinfo.h
@@ -24,7 +24,7 @@
#include <gpgmepp/gpgmefw.h>
#include <gpgmepp/context.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace GpgME {
diff --git a/libkdenetwork/gpgmepp/eventloopinteractor.h b/libkdenetwork/gpgmepp/eventloopinteractor.h
index f924569e6..c3688833c 100644
--- a/libkdenetwork/gpgmepp/eventloopinteractor.h
+++ b/libkdenetwork/gpgmepp/eventloopinteractor.h
@@ -21,7 +21,7 @@
#ifndef __GPGMEPP_EVENTLOOPINTERACTOR_H__
#define __GPGMEPP_EVENTLOOPINTERACTOR_H__
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace GpgME {
diff --git a/libkdenetwork/gpgmepp/importresult.h b/libkdenetwork/gpgmepp/importresult.h
index 9a79b7b30..61675a299 100644
--- a/libkdenetwork/gpgmepp/importresult.h
+++ b/libkdenetwork/gpgmepp/importresult.h
@@ -25,7 +25,7 @@
#include <gpgmepp/result.h>
#include <vector>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace GpgME {
diff --git a/libkdenetwork/gpgmepp/interfaces/dataprovider.h b/libkdenetwork/gpgmepp/interfaces/dataprovider.h
index c13ed19b6..34dd4a7e1 100644
--- a/libkdenetwork/gpgmepp/interfaces/dataprovider.h
+++ b/libkdenetwork/gpgmepp/interfaces/dataprovider.h
@@ -23,7 +23,7 @@
#include <sys/types.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace GpgME {
diff --git a/libkdenetwork/gpgmepp/key.h b/libkdenetwork/gpgmepp/key.h
index e143b47e0..15d09371e 100644
--- a/libkdenetwork/gpgmepp/key.h
+++ b/libkdenetwork/gpgmepp/key.h
@@ -27,7 +27,7 @@
#include <sys/time.h>
#include <vector>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace GpgME {
diff --git a/libkdenetwork/gpgmepp/keygenerationresult.h b/libkdenetwork/gpgmepp/keygenerationresult.h
index 4b5dd96fb..7b2d98e84 100644
--- a/libkdenetwork/gpgmepp/keygenerationresult.h
+++ b/libkdenetwork/gpgmepp/keygenerationresult.h
@@ -23,7 +23,7 @@
#include <gpgmepp/gpgmefw.h>
#include <gpgmepp/result.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace GpgME {
class Error;
diff --git a/libkdenetwork/gpgmepp/keylistresult.h b/libkdenetwork/gpgmepp/keylistresult.h
index 6b13417e4..068210c02 100644
--- a/libkdenetwork/gpgmepp/keylistresult.h
+++ b/libkdenetwork/gpgmepp/keylistresult.h
@@ -23,7 +23,7 @@
#include <gpgmepp/gpgmefw.h>
#include <gpgmepp/result.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace GpgME {
diff --git a/libkdenetwork/gpgmepp/signingresult.h b/libkdenetwork/gpgmepp/signingresult.h
index 202d09b41..1ee7a8def 100644
--- a/libkdenetwork/gpgmepp/signingresult.h
+++ b/libkdenetwork/gpgmepp/signingresult.h
@@ -30,7 +30,7 @@
#include <vector>
#include <iosfwd>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace GpgME {
diff --git a/libkdenetwork/gpgmepp/verificationresult.h b/libkdenetwork/gpgmepp/verificationresult.h
index edcd02787..e572ecfee 100644
--- a/libkdenetwork/gpgmepp/verificationresult.h
+++ b/libkdenetwork/gpgmepp/verificationresult.h
@@ -29,7 +29,7 @@
#include <vector>
#include <iosfwd>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace GpgME {