Fix plog and QString

variar · May 21, 2021 · 51f6eb8 · 51f6eb8
1 parent 60fd9a4
commit 51f6eb8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/3rdparty/plog/include/plog/Record.h b/3rdparty/plog/include/plog/Record.h
@@ -149,23 +149,6 @@ namespace plog
             return *this;
         }
 
-#ifdef QT_VERSION
-        Record& operator<<(const QString& data)
-        {
-#   ifdef _WIN32
-            return *this << data.toStdWString();
-#   else
-            return *this << data.toStdString();
-#   endif
-        }
-
-        Record& operator<<(const QStringRef& data)
-        {
-            QString qstr;
-            return *this << qstr.append(data);
-        }
-#endif
-
         template<typename T>
         Record& operator<<(const T& data)
         {

diff --git a/src/utils/include/log.h b/src/utils/include/log.h
@@ -23,6 +23,7 @@
 #include <chrono>
 
 #include <QLatin1String>
+#include <QtGlobal>
 
 #include <optional>
 
@@ -85,6 +86,21 @@ inline Record& operator<<( Record& r, const QLatin1String s )
     return r << s.data();
 }
 
+inline Record& operator<<( Record& r, const QString& data )
+{
+#ifdef Q_OS_WIN
+    return r << data.toStdWString();
+#else
+    return r << data.toStdString();
+#endif
+}
+
+inline Record& operator<<( Record& r, const QStringRef& data )
+{
+    QString qstr;
+    return r << qstr.append( data );
+}
+
 inline Record& operator<<( Record& r, const std::chrono::milliseconds& duration )
 {
     return r << static_cast<float>( duration.count() ) / 1000.f << " ms";