[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [okteta/Applications/17.04] /: Default to no debug logging in Okteta & Kasten libs for Qt >= 5.5
From:       Friedrich W. H. Kossebau <null () kde ! org>
Date:       2017-04-30 17:46:43
Message-ID: E1d4svj-00089n-JN () code ! kde ! org
[Download RAW message or body]

Git commit e58a847995cab01d00dd4cfc33de31d35f6dfdc1 by Friedrich W. H. Kossebau.
Committed on 30/04/2017 at 17:44.
Pushed by kossebau into branch 'Applications/17.04'.

Default to no debug logging in Okteta & Kasten libs for Qt >= 5.5

M  +4    -0    core/oktetacore.cpp
M  +4    -0    gui/oktetagui.cpp
M  +4    -0    kasten/controllers/view/checksum/checksumlogging.cpp
M  +4    -0    kasten/controllers/view/structures/structlogging.cpp
M  +4    -0    kasten/gui/oktetakastengui.cpp
M  +4    -0    libs/kasten/core/kastencore.cpp
M  +4    -0    libs/kasten/gui/kastengui.cpp
M  +2    -0    program/program.cpp

https://commits.kde.org/okteta/e58a847995cab01d00dd4cfc33de31d35f6dfdc1

diff --git a/core/oktetacore.cpp b/core/oktetacore.cpp
index 65e836e0..0bc2b2b5 100644
--- a/core/oktetacore.cpp
+++ b/core/oktetacore.cpp
@@ -22,4 +22,8 @@
 
 #include "oktetacore.h"
 
+#if QT_VERSION >= 0x050500
+Q_LOGGING_CATEGORY(LOG_OKTETA_CORE, "okteta.core", QtInfoMsg)
+#else
 Q_LOGGING_CATEGORY(LOG_OKTETA_CORE, "okteta.core")
+#endif
diff --git a/gui/oktetagui.cpp b/gui/oktetagui.cpp
index d5727346..b6623e06 100644
--- a/gui/oktetagui.cpp
+++ b/gui/oktetagui.cpp
@@ -22,4 +22,8 @@
 
 #include "oktetagui.h"
 
+#if QT_VERSION >= 0x050500
+Q_LOGGING_CATEGORY(LOG_OKTETA_GUI, "okteta.gui", QtInfoMsg)
+#else
 Q_LOGGING_CATEGORY(LOG_OKTETA_GUI, "okteta.gui")
+#endif
diff --git a/kasten/controllers/view/checksum/checksumlogging.cpp \
b/kasten/controllers/view/checksum/checksumlogging.cpp index 023d9076..2cd2cfc4 \
                100644
--- a/kasten/controllers/view/checksum/checksumlogging.cpp
+++ b/kasten/controllers/view/checksum/checksumlogging.cpp
@@ -22,4 +22,8 @@
 
 #include "checksumlogging.h"
 
+#if QT_VERSION >= 0x050500
+Q_LOGGING_CATEGORY(LOG_OKTETA_KASTEN_CONTROLLER_CHECKSUM, \
"kasten.okteta.controllers.checksum", QtInfoMsg) +#else
 Q_LOGGING_CATEGORY(LOG_OKTETA_KASTEN_CONTROLLER_CHECKSUM, \
"kasten.okteta.controllers.checksum") +#endif
diff --git a/kasten/controllers/view/structures/structlogging.cpp \
b/kasten/controllers/view/structures/structlogging.cpp index bd2bbdb6..14b4da19 \
                100644
--- a/kasten/controllers/view/structures/structlogging.cpp
+++ b/kasten/controllers/view/structures/structlogging.cpp
@@ -22,4 +22,8 @@
 
 #include "structlogging.h"
 
+#if QT_VERSION >= 0x050500
+Q_LOGGING_CATEGORY(LOG_KASTEN_OKTETA_CONTROLLERS_STRUCTURES, \
"kasten.okteta.controllers.structures", QtInfoMsg) +#else
 Q_LOGGING_CATEGORY(LOG_KASTEN_OKTETA_CONTROLLERS_STRUCTURES, \
"kasten.okteta.controllers.structures") +#endif
diff --git a/kasten/gui/oktetakastengui.cpp b/kasten/gui/oktetakastengui.cpp
index 56cd8439..165e58f8 100644
--- a/kasten/gui/oktetakastengui.cpp
+++ b/kasten/gui/oktetakastengui.cpp
@@ -22,4 +22,8 @@
 
 #include "oktetakastengui.h"
 
+#if QT_VERSION >= 0x050500
+Q_LOGGING_CATEGORY(LOG_KASTEN_OKTETA_GUI, "kasten.okteta.gui", QtInfoMsg)
+#else
 Q_LOGGING_CATEGORY(LOG_KASTEN_OKTETA_GUI, "kasten.okteta.gui")
+#endif
diff --git a/libs/kasten/core/kastencore.cpp b/libs/kasten/core/kastencore.cpp
index 206300e4..4f2fbcb8 100644
--- a/libs/kasten/core/kastencore.cpp
+++ b/libs/kasten/core/kastencore.cpp
@@ -22,4 +22,8 @@
 
 #include "kastencore.h"
 
+#if QT_VERSION >= 0x050500
+Q_LOGGING_CATEGORY(LOG_KASTEN_CORE, "kasten.core", QtInfoMsg)
+#else
 Q_LOGGING_CATEGORY(LOG_KASTEN_CORE, "kasten.core")
+#endif
diff --git a/libs/kasten/gui/kastengui.cpp b/libs/kasten/gui/kastengui.cpp
index ec594c6e..b9ca57fd 100644
--- a/libs/kasten/gui/kastengui.cpp
+++ b/libs/kasten/gui/kastengui.cpp
@@ -22,4 +22,8 @@
 
 #include "kastengui.h"
 
+#if QT_VERSION >= 0x050500
+Q_LOGGING_CATEGORY(LOG_KASTEN_GUI, "kasten.gui", QtInfoMsg)
+#else
 Q_LOGGING_CATEGORY(LOG_KASTEN_GUI, "kasten.gui")
+#endif
diff --git a/program/program.cpp b/program/program.cpp
index 91e8dc3f..a09c7dda 100644
--- a/program/program.cpp
+++ b/program/program.cpp
@@ -64,6 +64,7 @@ namespace Kasten
 OktetaProgram::OktetaProgram( int &argc, char* argv[] )
   : mApp( argc, argv )
 {
+#if QT_VERSION < 0x050500
 #ifndef QT_NO_DEBUG
     // MSVC complains about mismatched strings... (wide vs normal)
     // fix it using QT_UNICODE_LITERAL
@@ -76,6 +77,7 @@ OktetaProgram::OktetaProgram( int &argc, char* argv[] )
         QT_UNICODE_LITERAL("kasten.okteta.gui = false\n")
         QT_UNICODE_LITERAL("kasten.okteta.controllers.structures.debug = \
false\n")));  #endif
+#endif
 
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     KLocalizedString::setApplicationDomain( "okteta" );


[prev in list] [next in list] [prev in thread] [next in thread]