Merge branch 'master' into mynamebyebye

GPSBabel · Nov 6, 2024 · ddbe287 · ddbe287
2 parents 400dcfb + dfadba0
commit ddbe287
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/core/logging.cc b/src/core/logging.cc
@@ -22,9 +22,9 @@
 #include "src/core/logging.h"
 
 
-QDebug operator<< (QDebug debug, const DebugIndent& indent)
+QDebug& operator<< (QDebug& debug, const DebugIndent& indent)
 {
-  for (int i = 1; i<indent.level; i++) {
+  for (int i = 1; i<indent.level_; i++) {
     debug << '.';
   }
   return debug;

diff --git a/src/core/logging.h b/src/core/logging.h
@@ -52,18 +52,20 @@ class FatalMsg : public QDebug
 class DebugIndent
 {
 public:
-  explicit DebugIndent(int l) : level(l) {}
+  explicit DebugIndent(int level) : level_(level) {}
+  friend QDebug& operator<<(QDebug& debug, const DebugIndent& indent);
 
-  int level;
+private:
+  int level_;
 };
 
-QDebug operator<< (QDebug debug, const DebugIndent& indent);
+QDebug& operator<< (QDebug& debug, const DebugIndent& indent);
 
 class Debug : public QDebug
 {
 public:
   Debug() : QDebug(QtDebugMsg) {nospace().noquote();}
-  explicit Debug(int l) : QDebug(QtDebugMsg) {nospace().noquote() << DebugIndent(l);}
+  explicit Debug(int level) : QDebug(QtDebugMsg) {nospace().noquote() << DebugIndent(level);}
 };
 
 #endif //  SRC_CORE_LOGGING_H_