[svn] gpgme - r1260 - trunk/gpgme

[svn author marcus]

Author: marcus
Date: 2007-09-25 18:34:02 +0200 (Tue, 25 Sep 2007)
New Revision: 1260

Modified:
   trunk/gpgme/ChangeLog
   trunk/gpgme/kdpipeiodevice.cpp
   trunk/gpgme/kdpipeiodevice.h
   trunk/gpgme/w32-qt-io.cpp
Log:
2007-09-25  Marcus Brinkmann  <marcus at 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.


Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2007-09-25 15:08:14 UTC (rev 1259)
+++ trunk/gpgme/ChangeLog	2007-09-25 16:34:02 UTC (rev 1260)
@@ -1,3 +1,11 @@
+2007-09-25  Marcus Brinkmann  <marcus at 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 at g10code.com>
 
 	* rungpg.c (gpg_new): Make robust against undefined ttyname or

Modified: trunk/gpgme/kdpipeiodevice.cpp
===================================================================
--- trunk/gpgme/kdpipeiodevice.cpp	2007-09-25 15:08:14 UTC (rev 1259)
+++ trunk/gpgme/kdpipeiodevice.cpp	2007-09-25 16:34:02 UTC (rev 1260)
@@ -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

Modified: trunk/gpgme/kdpipeiodevice.h
===================================================================
--- trunk/gpgme/kdpipeiodevice.h	2007-09-25 15:08:14 UTC (rev 1259)
+++ trunk/gpgme/kdpipeiodevice.h	2007-09-25 16:34:02 UTC (rev 1260)
@@ -26,6 +26,8 @@
 
 //#include "checker.h"
 
+namespace _gpgme_ {
+
 class KDPipeIODevice : public QIODevice {
     Q_OBJECT
     //KDAB_MAKE_CHECKABLE( KDPipeIODevice )

Modified: trunk/gpgme/w32-qt-io.cpp
===================================================================
--- trunk/gpgme/w32-qt-io.cpp	2007-09-25 15:08:14 UTC (rev 1259)
+++ trunk/gpgme/w32-qt-io.cpp	2007-09-25 16:34:02 UTC (rev 1260)
@@ -53,9 +53,12 @@
 #endif
 #endif
 
+using _gpgme_::KDPipeIODevice;
+
 
 /* This file is an ugly hack to get GPGME working with Qt on Windows
    targets.  On Windows, you can not select() on file descriptors.
+
    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.