Merge branch 'v1.1'

src/smtpclient.cpp

@@ -144,6 +144,26 @@ QTcpSocket* SmtpClient::getSocket() {
     return socket;
 }
 
+int SmtpClient::getConnectionTimeout() const
+{
+    return connectionTimeout;
+}
+
+void SmtpClient::setConnectionTimeout(int msec)
+{
+    connectionTimeout = msec;
+}
+
+int SmtpClient::getResponseTimeout() const
+{
+    return responseTimeout;
+}
+
+void SmtpClient::setResponseTimeout(int msec)
+{
+    responseTimeout = msec;
+}
+
 /* [2] --- */
 
 

src/smtpclient.h

@@ -92,6 +92,12 @@ public:
     const QString & getResponseText() const;
     int getResponseCode() const;
 
+    int getConnectionTimeout() const;
+    void setConnectionTimeout(int msec);
+
+    int getResponseTimeout() const;
+    void setResponseTimeout(int msec);
+
     QTcpSocket* getSocket();