GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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.
This commit is contained in:
Marcus Brinkmann 2007-09-25 16:34:02 +00:00
parent 11df38d465
commit e7f0767e97
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gpgme/ChangeLog
View File

@ -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> 2007-09-17 Werner Koch <wk@g10code.com>
* rungpg.c (gpg_new): Make robust against undefined ttyname or * rungpg.c (gpg_new): Make robust against undefined ttyname or

6
gpgme/kdpipeiodevice.cpp
View File

@ -26,7 +26,9 @@
#include <algorithm> #include <algorithm>
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
# define NOMINMAX # ifndef NOMINMAX
# define NOMINMAX
# endif
# include <windows.h> # include <windows.h>
# include <io.h> # include <io.h>
#else #else
@ -34,6 +36,8 @@
# include <errno.h> # include <errno.h>
#endif #endif
using namespace _gpgme_;
#ifndef KDAB_CHECK_THIS #ifndef KDAB_CHECK_THIS
# define KDAB_CHECK_CTOR (void)1 # define KDAB_CHECK_CTOR (void)1
# define KDAB_CHECK_DTOR KDAB_CHECK_CTOR # define KDAB_CHECK_DTOR KDAB_CHECK_CTOR

2
gpgme/kdpipeiodevice.h
View File

@ -26,6 +26,8 @@
//#include "checker.h" //#include "checker.h"
namespace _gpgme_ {
class KDPipeIODevice : public QIODevice { class KDPipeIODevice : public QIODevice {
Q_OBJECT Q_OBJECT
//KDAB_MAKE_CHECKABLE( KDPipeIODevice ) //KDAB_MAKE_CHECKABLE( KDPipeIODevice )

3
gpgme/w32-qt-io.cpp
View File

@ -53,9 +53,12 @@ extern "C"
#endif #endif
#endif #endif
using _gpgme_::KDPipeIODevice;
/* This file is an ugly hack to get GPGME working with Qt on Windows /* This file is an ugly hack to get GPGME working with Qt on Windows
targets. On Windows, you can not select() on file descriptors. targets. On Windows, you can not select() on file descriptors.
The only way to check if there is something to read is to read 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 something. This means that GPGME can not let Qt check for data
without letting Qt also handle the data on Windows targets. without letting Qt also handle the data on Windows targets.