Merge branch 'master' into network_handler

[situare] / src / network / networkaccessmanager.h

diff --git a/src/network/networkaccessmanager.h b/src/network/networkaccessmanager.h
index 10a2ae3..f10c05a 100644 (file)
--- a/src/network/networkaccessmanager.h
+++ b/src/network/networkaccessmanager.h
@@ -54,12 +54,19 @@ public:
     static NetworkAccessManager *instance();
 
     /**
+    * @brief Returns connection state.
+    *
+    * @return true if connected, false otherwise
+    */
+    bool isConnected();
+
+    /**
     * @brief Makes request and return reply.
     *
     * @param request QNetworkRequest
     * @return QNetworkReply
     */
-    QNetworkReply *get(const QNetworkRequest &request);
+    QNetworkReply *get(const QNetworkRequest &request, bool onlineRequestsOnly = false);
 
     /**
     * @brief Sets cache.
@@ -90,6 +97,11 @@ private slots:
     void connected();
 
     /**
+    * @brief Slot for network disconnected state.
+    */
+    void disconnected();
+
+    /**
     * @brief Slot for finished download.
     *
     * @param reply reply from network
@@ -111,6 +123,7 @@ signals:
  * DATA MEMBERS
  ******************************************************************************/
 private:
+    bool m_connected;                                       ///< Connection flag
     static NetworkAccessManager *m_instance;                ///< Instance of NetworkAccessManager
     NetworkHandler *m_networkHandler;                       ///< Instance of NetworkHandler
     QNetworkAccessManager *m_networkAccessManagerPrivate;   ///< Instance of QNetworkAccessManager