diff options
| author | Ben McGinnes <[email protected]> | 2018-12-04 21:49:41 +0000 |
|---|---|---|
| committer | Ben McGinnes <[email protected]> | 2018-12-04 21:49:41 +0000 |
| commit | 8d2621fcad3ded2a4184c00a04ca1002b4de98cc (patch) | |
| tree | c80dde4d38e975b58454046303c286b60f4556bf /lang/cpp/src/eventloopinteractor.cpp | |
| parent | python: docs update (diff) | |
| parent | build: Remove --with-*-prefix, which is no need any more. (diff) | |
| download | gpgme-8d2621fcad3ded2a4184c00a04ca1002b4de98cc.tar.gz gpgme-8d2621fcad3ded2a4184c00a04ca1002b4de98cc.zip | |
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
Diffstat (limited to 'lang/cpp/src/eventloopinteractor.cpp')
| -rw-r--r-- | lang/cpp/src/eventloopinteractor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lang/cpp/src/eventloopinteractor.cpp b/lang/cpp/src/eventloopinteractor.cpp index a30b793c..09710ad4 100644 --- a/lang/cpp/src/eventloopinteractor.cpp +++ b/lang/cpp/src/eventloopinteractor.cpp @@ -77,10 +77,10 @@ public: const gpgme_io_cbs EventLoopInteractor::Private::iocbs = { &EventLoopInteractor::Private::registerIOCb, - 0, + nullptr, &EventLoopInteractor::Private::removeIOCb, &EventLoopInteractor::Private::eventIOCb, - 0 + nullptr }; // @@ -114,7 +114,7 @@ void EventLoopInteractor::Private::removeIOCb(void *tag) it != instance()->d->mCallbacks.end() ; ++it) { if (*it == tag) { instance()->unregisterWatcher((*it)->externalTag); - delete *it; *it = 0; + delete *it; *it = nullptr; instance()->d->mCallbacks.erase(it); return; } @@ -159,7 +159,7 @@ void EventLoopInteractor::Private::eventIOCb(void *data, gpgme_event_io_t type, // EventLoopInteractor Implementation // -EventLoopInteractor *EventLoopInteractor::mSelf = 0; +EventLoopInteractor *EventLoopInteractor::mSelf = nullptr; EventLoopInteractor::EventLoopInteractor() : d(new Private) { @@ -170,7 +170,7 @@ EventLoopInteractor::EventLoopInteractor() : d(new Private) EventLoopInteractor::~EventLoopInteractor() { // warn if there are still callbacks registered - mSelf = 0; + mSelf = nullptr; delete d; } |