Merge tag 'upstream/3.0.5'

Upstream version 3.0.5

# gpg: Signature made Sun 19 Apr 2015 10:30:41 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 44 insertions, 0 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/common/blockingsocket.h b/SQLiteStudio3/coreSQLiteStudio/common/blockingsocket.h
new file mode 100644
index 0000000..2a42df7
--- /dev/null
+++ b/SQLiteStudio3/coreSQLiteStudio/common/blockingsocket.h
@@ -0,0 +1,44 @@
+#ifndef THREADEDSOCKET_H
+#define THREADEDSOCKET_H
+
+#include "coreSQLiteStudio_global.h"
+#include <QObject>
+#include <QAbstractSocket>
+#include <QMutex>
+
+class BlockingSocketPrivate;
+class ThreadWithEventLoop;
+
+class API_EXPORT BlockingSocket : public QObject
+{
+        Q_OBJECT
+
+    public:
+        BlockingSocket(QObject* parent = nullptr);
+        ~BlockingSocket();
+
+        QString getErrorText();
+        QAbstractSocket::SocketError getErrorCode();
+        bool connectToHost(const QString& host, int port);
+        void disconnectFromHost();
+        bool isConnected();
+        bool send(const QByteArray& bytes);
+        QByteArray read(qint64 count, int timeout = 30000, bool* ok = nullptr);
+        void quit();
+        void exit();
+
+    private:
+        ThreadWithEventLoop* socketThread = nullptr;
+        BlockingSocketPrivate* socket = nullptr;
+        QMutex socketOperationMutex;
+
+    signals:
+        void callForConnect(const QString& host, int port, bool& result);
+        void callForDisconnect();
+        void callForIsConnected(bool& connected);
+        void callForSend(const QByteArray& bytes, bool& result);
+        void callForRead(qint64 count, int timeout, QByteArray& resultBytes, bool& result);
+        void disconnected();
+};
+
+#endif // THREADEDSOCKET_H