- coding style

diff --git a/client/errors.h b/client/errors.h
index 44f465cabc646beedd00424622ccf32d7d3bc5f9..0b6dc7331a6e3648b409c602ad00add2d7e8c267 100644 (file)
--- a/client/errors.h
+++ b/client/errors.h
@@ -21,10 +21,6 @@
  */
 
 
-#include <string>
-
-using std::string;
-
 #include "dbus/DBusConnection.h"
 
 

diff --git a/server/FilesTransferTask.cc b/server/FilesTransferTask.cc
index 27d55d9f8f7fb12826eaa0e269b819ed04f44326..b708e23d8ac86cecaa25d38181ae3f50162a91e8 100644 (file)
--- a/server/FilesTransferTask.cc
+++ b/server/FilesTransferTask.cc
@@ -19,7 +19,7 @@
  */
 
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "FilesTransferTask.h"
 

diff --git a/server/snapperd.cc b/server/snapperd.cc
index a0277c212fcc77c9858791ad9acadbea9dedd86c..d9adb93c4435b2f43cf7aee246cd07fd057f126a 100644 (file)
--- a/server/snapperd.cc
+++ b/server/snapperd.cc
@@ -21,9 +21,9 @@
  */
 
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <getopt.h>
-#include <signal.h>
+#include <csignal>
 #include <iostream>
 #include <string>
 

diff --git a/snapper/Acls.cc b/snapper/Acls.cc
index cfd2cc58619a5bf20deef454bd3d8233c84e45ec..3886f723fcdd96140da7c7a9c5ca5ef9fc2cdd35 100644 (file)
--- a/snapper/Acls.cc
+++ b/snapper/Acls.cc
@@ -18,10 +18,11 @@
  *
  */
 
+
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <errno.h>
+#include <cerrno>
 
 #include "snapper/Acls.h"
 #include "snapper/AppUtil.h"

diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
index 995657074de53c17f7586e1ccf6e819980d0191d..f3432e03d5a4791f9989836ce21639655f09395c 100644 (file)
--- a/snapper/AppUtil.cc
+++ b/snapper/AppUtil.cc
@@ -21,12 +21,12 @@
  */
 
 
-#include <errno.h>
-#include <stdarg.h>
+#include <cerrno>
+#include <cstdarg>
 #include <unistd.h>
 #include <fcntl.h>
 #include <glob.h>
-#include <string.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/utsname.h>

diff --git a/snapper/AppUtil2.cc b/snapper/AppUtil2.cc
index 8316c7d195970f1bd63497b8e4f4e6004ebe45be..4766f57d676ad980bf64cfea305e0a8971caacc0 100644 (file)
--- a/snapper/AppUtil2.cc
+++ b/snapper/AppUtil2.cc
@@ -28,7 +28,7 @@
 #define _POSIX_C_SOURCE 200809L
 #undef _GNU_SOURCE
 
-#include <string.h>
+#include <cstring>
 #include <string>
 
 

diff --git a/snapper/Compare.cc b/snapper/Compare.cc
index 45b932dcc4d9e9fbca527438a23ff6ec6c702a9d..9c072c8767a886f09739ca5bd5655276886495db 100644 (file)
--- a/snapper/Compare.cc
+++ b/snapper/Compare.cc
@@ -22,13 +22,13 @@
 
 #include "config.h"
 
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <algorithm>
 #include <boost/thread.hpp>
 

diff --git a/snapper/Comparison.cc b/snapper/Comparison.cc
index 986a389e469228d67cd5b114655447c7bbe7c39c..7bcd80e5cee281eca3eb083ac15897b5625364f6 100644 (file)
--- a/snapper/Comparison.cc
+++ b/snapper/Comparison.cc
@@ -26,8 +26,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <string.h>
-#include <errno.h>
+#include <cstring>
+#include <cerrno>
 #include <regex>
 
 #include "snapper/Comparison.h"

diff --git a/snapper/Exception.cc b/snapper/Exception.cc
index f3c99d2b95e2ea6545c07b5c8fd881e2a57a708b..16f73c91929bb94c7e2a3c1b35c8b3c298c18fd2 100644 (file)
--- a/snapper/Exception.cc
+++ b/snapper/Exception.cc
@@ -25,8 +25,8 @@
  */
 
 
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 #include <sstream>
 
 #include "snapper/Exception.h"

diff --git a/snapper/Logger.cc b/snapper/Logger.cc
index e5d5784de5857835e98c08e7222560ab898abbb6..3befe1ef7934e12fc02b7177bdf5450264451b49 100644 (file)
--- a/snapper/Logger.cc
+++ b/snapper/Logger.cc
@@ -23,7 +23,7 @@
 
 #include <pwd.h>
 #include <unistd.h>
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <libxml/xmlerror.h>
 #include <string>

diff --git a/snapper/XAttributes.cc b/snapper/XAttributes.cc
index 266ed2b9255295d303cc02bcfe14df453dfd777a..ccce8edf6232a66cfa6876606cd9e5882cdefbad 100644 (file)
--- a/snapper/XAttributes.cc
+++ b/snapper/XAttributes.cc
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
 #include <iomanip>
 #include <boost/scoped_array.hpp>
 #include <algorithm>