2007-09-25 Marcus Brinkmann <marcus@g10code.de>

	* kdpipeiodevice.h: Use namespace _gpgme_.
	* kdpipeiodevice.cpp: Use namespace _gpgme_.
	[Q_OS_WIN32 && NOMINMAX]: Do not define NOMINMAX again.
	* w32-qt-io.cpp: Change namespace of KDPipeIODevice to
	_gpgme_::KDPipeIODevice.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 9465509e92c7b5c8b79c6110bb640321a4445779..3f1da55827d421063e5137b6be3e46a97e20c630 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-25  Marcus Brinkmann  <marcus@g10code.de>
+
+       * kdpipeiodevice.h: Use namespace _gpgme_.
+       * kdpipeiodevice.cpp: Use namespace _gpgme_.
+       [Q_OS_WIN32 && NOMINMAX]: Do not define NOMINMAX again.
+       * w32-qt-io.cpp: Change namespace of KDPipeIODevice to
+       _gpgme_::KDPipeIODevice.
+
 2007-09-17  Werner Koch  <wk@g10code.com>
 
        * rungpg.c (gpg_new): Make robust against undefined ttyname or

diff --git a/trunk/gpgme/kdpipeiodevice.cpp b/trunk/gpgme/kdpipeiodevice.cpp
index f4acebeed34feb7cfde6d7490161ec5e6852581b..6f48292af621fa72c52a8070593b45658487103e 100644 (file)
--- a/trunk/gpgme/kdpipeiodevice.cpp
+++ b/trunk/gpgme/kdpipeiodevice.cpp
@@ -26,7 +26,9 @@
 #include <algorithm>
 
 #ifdef Q_OS_WIN32
-# define NOMINMAX
+# ifndef NOMINMAX
+#  define NOMINMAX
+# endif
 # include <windows.h>
 # include <io.h>
 #else
@@ -34,6 +36,8 @@
 # include <errno.h>
 #endif
 
+using namespace _gpgme_;
+
 #ifndef KDAB_CHECK_THIS
 # define KDAB_CHECK_CTOR (void)1
 # define KDAB_CHECK_DTOR KDAB_CHECK_CTOR

diff --git a/trunk/gpgme/kdpipeiodevice.h b/trunk/gpgme/kdpipeiodevice.h
index ce2873f9978e8aec1580ea3b57ce8fe11193f2ad..37d2a96b0ddc5c8c1df9f596a0e53563edf8da9f 100644 (file)
--- a/trunk/gpgme/kdpipeiodevice.h
+++ b/trunk/gpgme/kdpipeiodevice.h
@@ -26,6 +26,8 @@
 
 //#include "checker.h"
 
+namespace _gpgme_ {
+
 class KDPipeIODevice : public QIODevice {
     Q_OBJECT
     //KDAB_MAKE_CHECKABLE( KDPipeIODevice )

diff --git a/trunk/gpgme/w32-qt-io.cpp b/trunk/gpgme/w32-qt-io.cpp
index c2a231aa11eac8c6d61373f324c24cc572c06dee..989d9936220619cd7959659dabe7f881a7122225 100644 (file)
--- a/trunk/gpgme/w32-qt-io.cpp
+++ b/trunk/gpgme/w32-qt-io.cpp
@@ -53,9 +53,12 @@ extern "C"
 #endif
 #endif
 
+using _gpgme_::KDPipeIODevice;
+
 \f
 /* This file is an ugly hack to get GPGME working with Qt on Windows
    targets.  On Windows, you can not select() on file descriptors.
+\f
    The only way to check if there is something to read is to read
    something.  This means that GPGME can not let Qt check for data
    without letting Qt also handle the data on Windows targets.