Commit c101a0caa54eeb3049b95ad58f6c334052928ee2

Authored by Peter M. Groen
1 parent 26f93877

Processed Review Comments

examples/pub/main.cpp
@@ -78,7 +78,7 @@ int main( int argc, char* argv[] ) @@ -78,7 +78,7 @@ int main( int argc, char* argv[] )
78 { 78 {
79 std::cout << "{OK}" << std::endl; 79 std::cout << "{OK}" << std::endl;
80 std::cout << "Connecting to the broker : "; 80 std::cout << "Connecting to the broker : ";
81 - pPublisher->connect( "office.osdev.nl", 1883, "", "" ); 81 + pPublisher->connect( "localhost", 1883, "", "" );
82 82
83 // Assume we are connected now, start publishing. 83 // Assume we are connected now, start publishing.
84 while( 1 ) 84 while( 1 )
examples/pub/publisher.cpp
@@ -20,9 +20,6 @@ @@ -20,9 +20,6 @@
20 * DEALINGS IN THE SOFTWARE. * 20 * DEALINGS IN THE SOFTWARE. *
21 * ***************************************************************************/ 21 * ***************************************************************************/
22 22
23 -// osdev::components::mqtt  
24 -// #include "token.h"  
25 -  
26 // mqtt_tests 23 // mqtt_tests
27 #include "publisher.h" 24 #include "publisher.h"
28 25
examples/sub/main.cpp
@@ -76,7 +76,7 @@ int main( int argc, char* argv[] ) @@ -76,7 +76,7 @@ int main( int argc, char* argv[] )
76 { 76 {
77 std::cout << "[OK]" << std::endl; 77 std::cout << "[OK]" << std::endl;
78 std::cout << "Connecting to the test-broker : " << std::endl; 78 std::cout << "Connecting to the test-broker : " << std::endl;
79 - pSubscriber->connect( "office.osdev.nl", 1883, "", "" ); 79 + pSubscriber->connect( "localhost", 1883, "", "" );
80 std::cout << "Subscribing to the test-topic....." << std::endl; 80 std::cout << "Subscribing to the test-topic....." << std::endl;
81 pSubscriber->subscribe( "test/publisher/#" ); 81 pSubscriber->subscribe( "test/publisher/#" );
82 82
include/mqttsubscriberbase.h
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
25 #include <memory> 25 #include <memory>
26 #include <string> 26 #include <string>
27 27
  28 +// osdev::components::mqtt
28 #include "mqttclient.h" 29 #include "mqttclient.h"
29 30
30 31
src/CMakeLists.txt
@@ -59,24 +59,6 @@ set(SRC_LIST @@ -59,24 +59,6 @@ set(SRC_LIST
59 ${CMAKE_CURRENT_SOURCE_DIR}/sharedreaderlock.cpp 59 ${CMAKE_CURRENT_SOURCE_DIR}/sharedreaderlock.cpp
60 ${CMAKE_CURRENT_SOURCE_DIR}/stringutils.cpp 60 ${CMAKE_CURRENT_SOURCE_DIR}/stringutils.cpp
61 ${CMAKE_CURRENT_SOURCE_DIR}/uriparser.cpp 61 ${CMAKE_CURRENT_SOURCE_DIR}/uriparser.cpp
62 - # Helper files ( Utillities )  
63 - # ${CMAKE_CURRENT_SOURCE_DIR}/bimap.h  
64 - # ${CMAKE_CURRENT_SOURCE_DIR}/compat-c++14.h  
65 - # ${CMAKE_CURRENT_SOURCE_DIR}/compat-chrono.h  
66 - # ${CMAKE_CURRENT_SOURCE_DIR}/histogram.h  
67 - # ${CMAKE_CURRENT_SOURCE_DIR}/histogramprovider.h  
68 - # ${CMAKE_CURRENT_SOURCE_DIR}/imqttclient.h  
69 - # ${CMAKE_CURRENT_SOURCE_DIR}/imqttclientimpl.h  
70 - # ${CMAKE_CURRENT_SOURCE_DIR}/lockguard.h  
71 - # ${CMAKE_CURRENT_SOURCE_DIR}/macrodefs.h  
72 - # ${CMAKE_CURRENT_SOURCE_DIR}/measure.h  
73 - # ${CMAKE_CURRENT_SOURCE_DIR}/metaprogrammingdefs.h  
74 - # ${CMAKE_CURRENT_SOURCE_DIR}/mqttstream.h  
75 - # ${CMAKE_CURRENT_SOURCE_DIR}/stringify.h  
76 - # ${CMAKE_CURRENT_SOURCE_DIR}/stringutils.h  
77 - # ${CMAKE_CURRENT_SOURCE_DIR}/synchronizedqueue.h  
78 - # ${CMAKE_CURRENT_SOURCE_DIR}/utils.h  
79 - # ${CMAKE_CURRENT_SOURCE_DIR}/uriutils.h  
80 ) 62 )
81 63
82 include(library) 64 include(library)
src/mqttsubscriberbase.cpp
@@ -19,6 +19,8 @@ @@ -19,6 +19,8 @@
19 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * 19 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER *
20 * DEALINGS IN THE SOFTWARE. * 20 * DEALINGS IN THE SOFTWARE. *
21 * ***************************************************************************/ 21 * ***************************************************************************/
  22 +
  23 +// osdev::components::mqtt
22 #include "mqttclient.h" 24 #include "mqttclient.h"
23 #include "mqttsubscriberbase.h" 25 #include "mqttsubscriberbase.h"
24 #include "mqttmessage.h" 26 #include "mqttmessage.h"