summaryrefslogtreecommitdiffstats
path: root/Source/cmServerProtocol.h
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2016-09-09 08:01:44 (GMT)
committerTobias Hunger <tobias.hunger@qt.io>2016-09-20 18:48:10 (GMT)
commitca7799482cbbb38b667fd5d045a0fc95d09a8cf2 (patch)
treed79dc456a8130dcd7ee86137df98b0fe39ae29fd /Source/cmServerProtocol.h
parent70b8ba9a0f4403729b9d68719503243982b883f4 (diff)
downloadCMake-ca7799482cbbb38b667fd5d045a0fc95d09a8cf2.zip
CMake-ca7799482cbbb38b667fd5d045a0fc95d09a8cf2.tar.gz
CMake-ca7799482cbbb38b667fd5d045a0fc95d09a8cf2.tar.bz2
server-mode: Automate progress reporting
Wire up cmake::SetProgressUpdate to do progress reporting via the cmake server.
Diffstat (limited to 'Source/cmServerProtocol.h')
-rw-r--r--Source/cmServerProtocol.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmServerProtocol.h b/Source/cmServerProtocol.h
index e95c2f1..03d4300 100644
--- a/Source/cmServerProtocol.h
+++ b/Source/cmServerProtocol.h
@@ -57,9 +57,6 @@ private:
class cmServerRequest
{
public:
- void ReportProgress(int min, int current, int max,
- const std::string& message) const;
-
cmServerResponse Reply(const Json::Value& data) const;
cmServerResponse ReportError(const std::string& message) const;
@@ -71,6 +68,9 @@ private:
cmServerRequest(cmServer* server, const std::string& t, const std::string& c,
const Json::Value& d);
+ void ReportProgress(int min, int current, int max,
+ const std::string& message) const;
+
cmServer* m_Server;
friend class cmServer;
@@ -95,6 +95,8 @@ protected:
private:
std::unique_ptr<cmake> m_CMakeInstance;
+
+ friend class cmServer;
};
class cmServerProtocol1_0 : public cmServerProtocol