- use namespace in header protection defines

diff --git a/snapper/AppUtil.h b/snapper/AppUtil.h
index 6ba044c12b3ec0e142d5fbf5c1e76c7b430b9a43..344722632cf1f3ae525b274dfc8c3b0417e55245 100644 (file)
--- a/snapper/AppUtil.h
+++ b/snapper/AppUtil.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef APP_UTIL_H
-#define APP_UTIL_H
+#ifndef SNAPPER_APP_UTIL_H
+#define SNAPPER_APP_UTIL_H
 
 #include <libintl.h>
 #include <sys/time.h>

diff --git a/snapper/AsciiFile.h b/snapper/AsciiFile.h
index 1d37d7a9f554df89c92da56bd757262260e726d7..8089bed1120cf69f68f5b55361145e909a741347 100644 (file)
--- a/snapper/AsciiFile.h
+++ b/snapper/AsciiFile.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef ASCII_FILE_H
-#define ASCII_FILE_H
+#ifndef SNAPPER_ASCII_FILE_H
+#define SNAPPER_ASCII_FILE_H
 
 
 #include <string>

diff --git a/snapper/Compare.h b/snapper/Compare.h
index 3e8cb24a5bc4702ee9c84c1baef651af40e08804..ed6cbd85221c8a42f9c028e37e2040c54309ce80 100644 (file)
--- a/snapper/Compare.h
+++ b/snapper/Compare.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef COMPARE_H
-#define COMPARE_H
+#ifndef SNAPPER_COMPARE_H
+#define SNAPPER_COMPARE_H
 
 
 #include <string>

diff --git a/snapper/Comparison.h b/snapper/Comparison.h
index 8a677a7157c9a9d84d171a6e58cd8c0a735b97fa..e4ac8cd67302e007a945c768fdbc83d59f12d72e 100644 (file)
--- a/snapper/Comparison.h
+++ b/snapper/Comparison.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef COMPARISON_H
-#define COMPARISON_H
+#ifndef SNAPPER_COMPARISON_H
+#define SNAPPER_COMPARISON_H
 
 
 #include "snapper/Comparison.h"

diff --git a/snapper/Enum.h b/snapper/Enum.h
index d7a8765dfcf3f89011496b3e35016583e3d80e22..f2abd7f62721c800c34473bbddd369e2765a9229 100644 (file)
--- a/snapper/Enum.h
+++ b/snapper/Enum.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef ENUM_H
-#define ENUM_H
+#ifndef SNAPPER_ENUM_H
+#define SNAPPER_ENUM_H
 
 
 #include <string>

diff --git a/snapper/Exception.h b/snapper/Exception.h
index 0c628fa42b19350e96a425ac09615478a00459ef..0043fdd55e0dd1d27201ad1dc6146fdff5c06765 100644 (file)
--- a/snapper/Exception.h
+++ b/snapper/Exception.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef EXCEPTION_H
-#define EXCEPTION_H
+#ifndef SNAPPER_EXCEPTION_H
+#define SNAPPER_EXCEPTION_H
 
 
 #include <exception>

diff --git a/snapper/Factory.h b/snapper/Factory.h
index ff2bb6d4d63ec01b241bf2359bf068271739c05c..dd4cd4f0165e80274997a36ac4557640d2118318 100644 (file)
--- a/snapper/Factory.h
+++ b/snapper/Factory.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef FACTORY_H
-#define FACTORY_H
+#ifndef SNAPPER_FACTORY_H
+#define SNAPPER_FACTORY_H
 
 
 #include <string>

diff --git a/snapper/File.h b/snapper/File.h
index e17c8e6e96af5e54a5b86dfb641497bea4715088..5e301da010cd56355027261d99215e5e5049158e 100644 (file)
--- a/snapper/File.h
+++ b/snapper/File.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef FILE_H
-#define FILE_H
+#ifndef SNAPPER_FILE_H
+#define SNAPPER_FILE_H
 
 
 #include <sys/stat.h>

diff --git a/snapper/Filesystem.h b/snapper/Filesystem.h
index 7eb3ecd30b81f2f1f3ba860234e584d7808b1405..c5ff827f81026e7e8bb26cfb5599565640d2e468 100644 (file)
--- a/snapper/Filesystem.h
+++ b/snapper/Filesystem.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef FILESYSTEM_H
-#define FILESYSTEM_H
+#ifndef SNAPPER_FILESYSTEM_H
+#define SNAPPER_FILESYSTEM_H
 
 
 #include <string>

diff --git a/snapper/Log.h b/snapper/Log.h
index 60fdb125f5c9659e38f64bbcbf874cce5f73f0dc..374ab5698f10a612f31b7a65c1f1b09629259a8a 100644 (file)
--- a/snapper/Log.h
+++ b/snapper/Log.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef LOG_H
-#define LOG_H
+#ifndef SNAPPER_LOG_H
+#define SNAPPER_LOG_H
 
 #include <sstream>
 #include <string>

diff --git a/snapper/Regex.h b/snapper/Regex.h
index 27aa18169eaf729f36936d03532d4303a20314f8..9c3146c35d80bf099c7340c788aa6adc4fd7020f 100644 (file)
--- a/snapper/Regex.h
+++ b/snapper/Regex.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef REGEX_H
-#define REGEX_H
+#ifndef SNAPPER_REGEX_H
+#define SNAPPER_REGEX_H
 
 
 #include <regex.h>

diff --git a/snapper/Snapper.h b/snapper/Snapper.h
index 86aae1e3796d73ea6b45a3ee0e65adb84efd053a..6b234904f330ffb42c2c98f827cb8d94644123a9 100644 (file)
--- a/snapper/Snapper.h
+++ b/snapper/Snapper.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef SNAPPER_H
-#define SNAPPER_H
+#ifndef SNAPPER_SNAPPER_H
+#define SNAPPER_SNAPPER_H
 
 
 #include <vector>

diff --git a/snapper/SnapperDefines.h b/snapper/SnapperDefines.h
index ade941a96ab8cae27620bedbe0d2b6337adddaee..88e1a8737841ed3f1d33ff614f0468e6d92f48a3 100644 (file)
--- a/snapper/SnapperDefines.h
+++ b/snapper/SnapperDefines.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef SNAPPER_DEFINES_H
-#define SNAPPER_DEFINES_H
+#ifndef SNAPPER_SNAPPER_DEFINES_H
+#define SNAPPER_SNAPPER_DEFINES_H
 
 
 #define SYSCONFIGFILE "/etc/sysconfig/snapper"

diff --git a/snapper/SnapperTmpl.h b/snapper/SnapperTmpl.h
index 55ff600adc3dbd91b8fdda2cd664e7e508efca40..85f5c7dfca02043ed165423cac450092e46d37ea 100644 (file)
--- a/snapper/SnapperTmpl.h
+++ b/snapper/SnapperTmpl.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef SNAPPER_TMPL_H
-#define SNAPPER_TMPL_H
+#ifndef SNAPPER_SNAPPER_TMPL_H
+#define SNAPPER_SNAPPER_TMPL_H
 
 #include <functional>
 #include <ostream>

diff --git a/snapper/SnapperTypes.h b/snapper/SnapperTypes.h
index 7bc480108931558a85c4f6a1a514dbbcf1197a07..6b482ce3e57003bc79a749379cc5c5a2eb43cfec 100644 (file)
--- a/snapper/SnapperTypes.h
+++ b/snapper/SnapperTypes.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef SNAPPER_TYPES_H
-#define SNAPPER_TYPES_H
+#ifndef SNAPPER_SNAPPER_TYPES_H
+#define SNAPPER_SNAPPER_TYPES_H
 
 
 #include <string>

diff --git a/snapper/Snapshot.h b/snapper/Snapshot.h
index ff2aabef6ccb85c5684dacf66605b71789d8e8e1..ee54eaba669fbbf4fb70773913a3724a129f6d8b 100644 (file)
--- a/snapper/Snapshot.h
+++ b/snapper/Snapshot.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef SNAPSHOT_H
-#define SNAPSHOT_H
+#ifndef SNAPPER_SNAPSHOT_H
+#define SNAPPER_SNAPSHOT_H
 
 
 #include <time.h>

diff --git a/snapper/SystemCmd.h b/snapper/SystemCmd.h
index 8e72e26f0271544b377ba8ed2b68a5f550d3063f..742d541f094836f0ca538e338646f42915d19821 100644 (file)
--- a/snapper/SystemCmd.h
+++ b/snapper/SystemCmd.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef SYSTEM_CMD_H
-#define SYSTEM_CMD_H
+#ifndef SNAPPER_SYSTEM_CMD_H
+#define SNAPPER_SYSTEM_CMD_H
 
 #include <sys/poll.h>
 #include <stdio.h>

diff --git a/snapper/XmlFile.h b/snapper/XmlFile.h
index 4a92a7bf2e7d83bc1ffa395ccd060dbdece9fa6a..d6228ab07ead700135963d20f1eb7b8758a3baf8 100644 (file)
--- a/snapper/XmlFile.h
+++ b/snapper/XmlFile.h
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef XML_FILE_H
-#define XML_FILE_H
+#ifndef SNAPPER_XML_FILE_H
+#define SNAPPER_XML_FILE_H
 
 
 #include <libxml/tree.h>