Fix Code Style

1r0b1n0 · Jan 4, 2018 · ab72c36 · ab72c36
1 parent ea5966c
commit ab72c36
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/src/ros_lib/node_handle.cpp b/src/ros_lib/node_handle.cpp
@@ -2,7 +2,7 @@
 
 #ifdef ERROR
   // ach, windows.h polluting everything again,
-      // clashes with autogenerated rosgraph_msgs/Log.h
+  // clashes with autogenerated rosgraph_msgs/Log.h
   #undef ERROR
 #endif
 #include "rosserial_msgs/Log.h"

diff --git a/src/ros_lib/ros/node_handle.h b/src/ros_lib/ros/node_handle.h
@@ -94,12 +94,12 @@ class NodeHandle : public NodeHandleBase_
   uint32_t OUTPUT_SIZE;
 
   /*
-  * Setup Functions
-  */
+   * Setup Functions
+   */
 public:
   NodeHandle(uint32_t input_size=10000, uint32_t output_size=10000, QObject *parent=0);
 
-  void timerEvent(QTimerEvent *event);
+  void timerEvent(QTimerEvent *event) override;
 
   /* Start a named port, which may be network server IP, initialize buffers */
   void open(const std::string &hostName, uint16_t port = 11411);
@@ -126,19 +126,19 @@ class NodeHandle : public NodeHandleBase_
 
 public:
   /* This function goes in your loop() function, it handles
-       *  serial input and callbacks for subscribers.
-       */
+   *  serial input and callbacks for subscribers.
+   */
 
 
-  virtual int spinOnce();
+  virtual int spinOnce() override;
 
 
   /* Are we connected to the PC? */
   bool connected() const override;
 
   /********************************************************************
-       * Time functions
-       */
+   * Time functions
+   */
 
   void requestSyncTime();
 
@@ -149,8 +149,8 @@ class NodeHandle : public NodeHandleBase_
   void setNow( Time & new_now );
 
   /********************************************************************
-    * Topic Management
-    */
+   * Topic Management
+   */
 
   /* Register a new publisher */
   template<typename T>
@@ -194,7 +194,7 @@ class NodeHandle : public NodeHandleBase_
 
   void negotiateTopics();
 
-  virtual int publish(int id, const Msg * msg);
+  virtual int publish(int id, const Msg * msg) override;
 
 public slots:
   void setConfigured(bool isConnected);
@@ -203,8 +203,8 @@ private slots:
   void onReadyRead();
 
   /********************************************************************
-       * Logging
-       */
+   * Logging
+   */
 
 private:
   void log(char byte, const char * msg);
@@ -217,8 +217,8 @@ private slots:
   void logfatal(const char*msg);
 
   /********************************************************************
-       * Parameters
-       */
+   * Parameters
+   */
 
 private:
   bool param_recieved;

diff --git a/src/ros_lib/ros/publisher.h b/src/ros_lib/ros/publisher.h
@@ -32,8 +32,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ROS_PUBLISHER_H_
-#define _ROS_PUBLISHER_H_
+#ifndef ROS_PUBLISHER_H_
+#define ROS_PUBLISHER_H_
 
 #include <string>
 #include "rosserial_msgs/TopicInfo.h"

diff --git a/src/ros_lib/ros/service_client.h b/src/ros_lib/ros/service_client.h
@@ -32,8 +32,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ROS_SERVICE_CLIENT_H_
-#define _ROS_SERVICE_CLIENT_H_
+#ifndef ROS_SERVICE_CLIENT_H_
+#define ROS_SERVICE_CLIENT_H_
 
 #include <functional>
 #include "rosserial_msgs/TopicInfo.h"
@@ -70,7 +70,7 @@ namespace ros {
       const std::string & getMsgMD5() override { return MRes::getMD5(); }
       int getEndpointType() override{ return rosserial_msgs::TopicInfo::ID_SERVICE_CLIENT + rosserial_msgs::TopicInfo::ID_SUBSCRIBER; }
 
-  private:
+    private:
       // these refer to the subscriber
       void callback(unsigned char *data) override{
         MRes ret;
@@ -86,7 +86,7 @@ namespace ros {
       bool waiting;
       CallbackT cb_;
 
-  public:
+    public:
       Publisher<MReq> pub;
   };
 

diff --git a/src/ros_lib/ros/service_server.h b/src/ros_lib/ros/service_server.h
@@ -32,8 +32,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ROS_SERVICE_SERVER_H_
-#define _ROS_SERVICE_SERVER_H_
+#ifndef ROS_SERVICE_SERVER_H_
+#define ROS_SERVICE_SERVER_H_
 
 #include "rosserial_msgs/TopicInfo.h"