Browse Source

Update addressboook example

- Make None message empty structure
Alexey Edelev 5 years ago
parent
commit
d12370dcdb

+ 0 - 1
examples/addressbook/CMakeLists.txt

@@ -15,7 +15,6 @@ set(GENERATED_HEADERS
     job.h
     listframe.h
     phonenumber.h
-    simpleresult.h
     globalenums.h
     none.h
     callstatus.h)

+ 2 - 7
examples/addressbook/proto/addressbook.proto

@@ -65,10 +65,6 @@ message Contacts {
     repeated Contact list = 1;
 }
 
-message SimpleResult {
-    bool ok = 1;
-}
-
 message CallStatus {
     enum Status {
         Invalid = 0;
@@ -87,7 +83,6 @@ message ListFrame {
 }
 
 message None {
-    bool ok = 1;
 }
 
 service AddressBook {
@@ -96,6 +91,6 @@ service AddressBook {
     rpc contacts(ListFrame) returns (stream Contacts) {}
     rpc callStatus(None) returns (stream CallStatus) {}
     rpc makeCall(PhoneNumber) returns (CallStatus) {}
-    rpc endCall(None) returns (SimpleResult) {}
-    rpc navigateTo(Address) returns (SimpleResult) {}
+    rpc endCall(None) returns (None) {}
+    rpc navigateTo(Address) returns (None) {}
 }

+ 4 - 4
examples/addressbookserver/main.cpp

@@ -5,8 +5,8 @@
 #include <thread>
 
 #include <grpc++/grpc++.h>
-#include "addressbook.pb.h"
-#include "addressbook.grpc.pb.h"
+#include <addressbook.pb.h>
+#include <addressbook.grpc.pb.h>
 using namespace ::qtprotobuf::examples;
 
 class ContactsHandler;
@@ -96,7 +96,7 @@ public:
         return ::grpc::Status();
     }
 
-    ::grpc::Status endCall(grpc::ServerContext *, const None *, SimpleResult *) override
+    ::grpc::Status endCall(grpc::ServerContext *, const None *, None *) override
     {
         if (m_lastCallStatus.status() != CallStatus::Active) {
             return ::grpc::Status();
@@ -125,7 +125,7 @@ public:
         return ::grpc::Status(::grpc::UNIMPLEMENTED, "Unimplemented");
     }
 
-    ::grpc::Status navigateTo(::grpc::ServerContext *, const Address *, SimpleResult *) override
+    ::grpc::Status navigateTo(::grpc::ServerContext *, const Address *, None *) override
     {
         std::cout << "navigateTo called" << std::endl;
         return ::grpc::Status(::grpc::UNIMPLEMENTED, "Unimplemented");