add qAwait() function

hgoldfish · May 29, 2018 · eac5c93 · eac5c93
1 parent cea8a48
commit eac5c93
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 4 deletions.
diff --git a/examples/using_iodevice/main.cpp b/examples/using_iodevice/main.cpp
@@ -0,0 +1,26 @@
+#include <QApplication>
+#include <QPlainTextEdit>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include "../../qtnetworkng.h"
+
+using namespace qtng;
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    QSharedPointer<QPlainTextEdit> text(new QPlainTextEdit);
+    text->show();
+    CoroutineGroup operations;
+    operations.spawn([text] {
+        QNetworkAccessManager manager;
+        QUrl url("http://download.qt.io/online/qt5/linux/x64/online_repository/Updates.xml");
+        QNetworkRequest request(url);
+        QNetworkReply *reply = manager.get(request);
+        qAwait(reply, &QNetworkReply::finished);
+        text->setPlainText(reply->readAll());
+        reply->deleteLater();
+    });
+    return startQtLoop();
+}
diff --git a/examples/using_iodevice/using_iodevice.pro b/examples/using_iodevice/using_iodevice.pro
@@ -0,0 +1,10 @@
+######################################################################
+# Automatically generated by qmake (3.1) Tue May 29 08:36:34 2018
+######################################################################
+
+TEMPLATE = app
+QT+= widgets network
+TARGET = using_iodevice
+DEFINES += QT_DEPRECATED_WARNINGS
+SOURCES += main.cpp
+include(../../qtnetworkng.pri)
diff --git a/include/coroutine_utils.h b/include/coroutine_utils.h
@@ -84,14 +84,20 @@ void runLocalLoop(EventLoop *loop)
 }
 
 
-template<typename Func1>
-void waitSignal(const QObject *obj, Func1 signal, const QObject *context, Qt::ConnectionType type = Qt::DirectConnection)
+template <typename Func>
+void qAwait(const typename QtPrivate::FunctionPointer<Func>::Object *obj, Func signal)
 {
     QSharedPointer<Event> event(new Event);
-    QObject::connect(obj, signal, [event] {
+    const auto connection = QObject::connect(obj, signal, [event] {
         event->set();
     });
-    event->wait();
+    try {
+        event->wait();
+        QObject::disconnect(connection);
+    } catch (...) {
+        QObject::disconnect(connection);
+        throw;
+    }
 }