apply a variant of icecc#106

darrengarvey · Nov 1, 2014 · 8076c0e · 8076c0e
1 parent 9692d57
commit 8076c0e
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 21 deletions.
diff --git a/daemon/environment.h b/daemon/environment.h
@@ -20,8 +20,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef _ENVIRONMENT_H
-#define _ENVIRONMENT_H
+#ifndef ICECREAM_ENVIRONMENT_H
+#define ICECREAM_ENVIRONMENT_H
 
 #include <comm.h>
 #include <list>

diff --git a/daemon/load.h b/daemon/load.h
@@ -20,8 +20,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef _LOAD_H_
-#define _LOAD_H_
+#ifndef ICECREAM_LOAD_H
+#define ICECREAM_LOAD_H
 
 #include <comm.h>
 

diff --git a/daemon/serve.h b/daemon/serve.h
@@ -21,8 +21,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef _SERVE_H
-#define _SERVE_H
+#ifndef ICECREAM_SERVE_H
+#define ICECREAM_SERVE_H
 
 #include <string>
 

diff --git a/daemon/workit.h b/daemon/workit.h
@@ -21,8 +21,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef _WORKIT_H
-#define _WORKIT_H
+#ifndef ICECREAM_WORKIT_H
+#define ICECREAM_WORKIT_H
 
 #include <job.h>
 #include <sys/types.h>

diff --git a/services/comm.h b/services/comm.h
@@ -22,8 +22,8 @@
 */
 
 
-#ifndef _COMM_H
-#define _COMM_H
+#ifndef ICECREAM_COMM_H
+#define ICECREAM_COMM_H
 
 #ifdef __linux__
 #  include <stdint.h>

diff --git a/services/exitcode.h b/services/exitcode.h
@@ -20,8 +20,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef _DISTCC_EXITCODE_H
-#define _DISTCC_EXITCODE_H
+#ifndef DISTCC_EXITCODE_H
+#define DISTCC_EXITCODE_H
 
 /**
  * @file

diff --git a/services/getifaddrs.h b/services/getifaddrs.h
@@ -46,8 +46,8 @@
 
 #else
 
-#ifndef _GETIFADDRS_H
-#define _GETIFADDRS_H
+#ifndef GETIFADDRS_H
+#define GETIFADDRS_H
 
 
 #include <sys/socket.h>

diff --git a/services/job.cpp b/services/job.cpp
@@ -67,7 +67,7 @@ list<string> CompileJob::allFlags() const
     return args;
 }
 
-void CompileJob::__setTargetPlatform()
+void CompileJob::setTargetPlatform()
 {
     m_target_platform = determine_platform();
 }

diff --git a/services/job.h b/services/job.h
@@ -20,8 +20,8 @@
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef _COMPILE_JOB_H
-#define _COMPILE_JOB_H
+#ifndef ICECREAM_COMPILE_JOB_H
+#define ICECREAM_COMPILE_JOB_H
 
 #include <list>
 #include <string>
@@ -65,7 +65,7 @@ class CompileJob
     CompileJob()
         : m_id(0)
     {
-        __setTargetPlatform();
+        setTargetPlatform();
     }
 
     void setCompilerName(const std::string &name)
@@ -176,7 +176,7 @@ class CompileJob
 
 private:
     std::list<std::string> flags(Argument_Type argumentType) const;
-    void __setTargetPlatform();
+    void setTargetPlatform();
 
     unsigned int m_id;
     Language m_language;

diff --git a/services/logging.h b/services/logging.h
@@ -20,8 +20,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef _LOGGING_H
-#define _LOGGING_H
+#ifndef ICECREAM_LOGGING_H
+#define ICECREAM_LOGGING_H
 
 #include <sys/time.h>
 #include <stdlib.h>