- coding style (sync with libstorage-ng)

diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
index f3432e03d5a4791f9989836ce21639655f09395c..3f91cd38e9f373e46aa84d4e8463592fc7cb72c5 100644 (file)
--- a/snapper/AppUtil.cc
+++ b/snapper/AppUtil.cc
@@ -411,14 +411,14 @@ namespace snapper
     }
 
 
-    StopWatch::StopWatch()
+    Stopwatch::Stopwatch()
        : start_time(chrono::steady_clock::now())
     {
     }
 
 
     double
-    StopWatch::read() const
+    Stopwatch::read() const
     {
        chrono::steady_clock::time_point stop_time = chrono::steady_clock::now();
        chrono::steady_clock::duration duration = stop_time - start_time;
@@ -427,10 +427,10 @@ namespace snapper
 
 
     std::ostream&
-    operator<<(std::ostream& s, const StopWatch& sw)
+    operator<<(std::ostream& s, const Stopwatch& stopwatch)
     {
        boost::io::ios_all_saver ias(s);
-       return s << fixed << sw.read() << "s";
+       return s << fixed << stopwatch.read() << "s";
     }
 
 

diff --git a/snapper/AppUtil.h b/snapper/AppUtil.h
index c136c1f01a88b062fd21dc75cce49a7eb22f6a4c..d9c95603e3c774579efa319401aa2d3b76f122d6 100644 (file)
--- a/snapper/AppUtil.h
+++ b/snapper/AppUtil.h
@@ -119,15 +119,15 @@ namespace snapper
     vector<gid_t> getgrouplist(const char* username, gid_t gid);
 
 
-    class StopWatch
+    class Stopwatch
     {
     public:
 
-       StopWatch();
+       Stopwatch();
 
        double read() const;
 
-       friend std::ostream& operator<<(std::ostream& s, const StopWatch& sw);
+       friend std::ostream& operator<<(std::ostream& s, const Stopwatch& sopwatch);
 
     protected:
 

diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
index 8ebdcf6002834b70fe32d9e0e97cd96f8bd856b2..cd6a9ac1823f6978610438465eec914edd5b172b 100644 (file)
--- a/snapper/Btrfs.cc
+++ b/snapper/Btrfs.cc
@@ -1361,7 +1361,7 @@ namespace snapper
 
        try
        {
-           StopWatch stopwatch;
+           Stopwatch stopwatch;
 
            const SDir subvolume(openSubvolumeDir());
 

diff --git a/snapper/Compare.cc b/snapper/Compare.cc
index d713b9b27aa03cdf6500f016a48657683639c729..afebdb61ea1fbefef2043d27f5c24593f609482a 100644 (file)
--- a/snapper/Compare.cc
+++ b/snapper/Compare.cc
@@ -450,7 +450,7 @@ namespace snapper
 
        y2mil("dev1:" << cmp_data.dev1 << " dev2:" << cmp_data.dev2);
 
-       StopWatch stopwatch;
+       Stopwatch stopwatch;
        cmpDirsWorker(cmp_data, dir1, dir2, "");
        y2mil("stopwatch " << stopwatch << " for comparing directories");
     }

diff --git a/snapper/SystemCmd.cc b/snapper/SystemCmd.cc
index d3bded76b0c94558596230a0218b173e2f1409b7..bdda70ac3c2d209060120e4bfbb3d7c73568ea82 100644 (file)
--- a/snapper/SystemCmd.cc
+++ b/snapper/SystemCmd.cc
@@ -81,7 +81,7 @@ SystemCmd::~SystemCmd()
     void
     SystemCmd::execute()
     {
-    StopWatch stopwatch;
+    Stopwatch stopwatch;
 
     File_aC[IDX_STDERR] = File_aC[IDX_STDOUT] = NULL;
     invalidate();

diff --git a/testsuite-cmp/cmp.cc b/testsuite-cmp/cmp.cc
index 17a08038f4fb8bec66d3e942417274b2232999a9..6812edef56f9e146c7545ea53027f0f12949c40b 100644 (file)
--- a/testsuite-cmp/cmp.cc
+++ b/testsuite-cmp/cmp.cc
@@ -36,7 +36,7 @@ cmp(const string& fstype, const string& subvolume, unsigned int num1, unsigned i
     double t1;
 
     {
-       StopWatch sw1;
+       Stopwatch sw1;
 
 #if 1
        cmpdirs_cb_t cb1 = helper(result1);
@@ -58,7 +58,7 @@ cmp(const string& fstype, const string& subvolume, unsigned int num1, unsigned i
     double t2;
 
     {
-       StopWatch sw2;
+       Stopwatch sw2;
 
 #if 1
        cmpdirs_cb_t cb2 = helper(result2);