Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add qt6 support #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add qt6 support #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec57743
增加了对Qt6的支持
Jul 11, 2022
be4744a
类型增加中括号
Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion QsLog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static const char ErrorString[] = "ERROR";
static const char FatalString[] = "FATAL";

// not using Qt::ISODate because we need the milliseconds too
static const QString fmtDateTime("yyyy-MM-ddThh:mm:ss.zzz");
static const QString fmtDateTime("yyyy-MM-dd hh:mm:ss.zzz");

static Logger* sInstance = 0;

Expand Down
50 changes: 25 additions & 25 deletions QsLog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class QSLOG_SHARED_OBJECT Logger
Level level;
QString buffer;
QDebug qtDebug;
};
};

private:
Logger();
Expand All @@ -100,43 +100,43 @@ class QSLOG_SHARED_OBJECT Logger
//! Logging macros: define QS_LOG_LINE_NUMBERS to get the file and line number
//! in the log output.
#ifndef QS_LOG_LINE_NUMBERS
#define QLOG_TRACE() \
#define QLOG_TRACE(TYPE) \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::TraceLevel) {} \
else QsLogging::Logger::Helper(QsLogging::TraceLevel).stream()
#define QLOG_DEBUG() \
else QsLogging::Logger::Helper(QsLogging::TraceLevel).stream() << "["##TYPE##"]"
#define QLOG_DEBUG(TYPE) \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::DebugLevel) {} \
else QsLogging::Logger::Helper(QsLogging::DebugLevel).stream()
#define QLOG_INFO() \
else QsLogging::Logger::Helper(QsLogging::DebugLevel).stream() << "["##TYPE##"]"
#define QLOG_INFO(TYPE) \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::InfoLevel) {} \
else QsLogging::Logger::Helper(QsLogging::InfoLevel).stream()
#define QLOG_WARN() \
else QsLogging::Logger::Helper(QsLogging::InfoLevel).stream() << "["##TYPE##"]"
#define QLOG_WARN(TYPE) \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::WarnLevel) {} \
else QsLogging::Logger::Helper(QsLogging::WarnLevel).stream()
#define QLOG_ERROR() \
else QsLogging::Logger::Helper(QsLogging::WarnLevel).stream() << "["##TYPE##"]"
#define QLOG_ERROR(TYPE) \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::ErrorLevel) {} \
else QsLogging::Logger::Helper(QsLogging::ErrorLevel).stream()
#define QLOG_FATAL() \
else QsLogging::Logger::Helper(QsLogging::ErrorLevel).stream() << "["##TYPE##"]"
#define QLOG_FATAL(TYPE) \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::FatalLevel) {} \
else QsLogging::Logger::Helper(QsLogging::FatalLevel).stream()
else QsLogging::Logger::Helper(QsLogging::FatalLevel).stream() << "["##TYPE##"]"
#else
#define QLOG_TRACE() \
#define QLOG_TRACE(TYPE) \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::TraceLevel) {} \
else QsLogging::Logger::Helper(QsLogging::TraceLevel).stream() << __FILE__ << '@' << __LINE__
#define QLOG_DEBUG() \
else QsLogging::Logger::Helper(QsLogging::TraceLevel).stream() << __FILE__ << '@' << __LINE__ << "["##TYPE##"]"
#define QLOG_DEBUG(TYPE) \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::DebugLevel) {} \
else QsLogging::Logger::Helper(QsLogging::DebugLevel).stream() << __FILE__ << '@' << __LINE__
#define QLOG_INFO() \
else QsLogging::Logger::Helper(QsLogging::DebugLevel).stream() << __FILE__ << '@' << __LINE__ << "["##TYPE##"]"
#define QLOG_INFO(TYPE) \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::InfoLevel) {} \
else QsLogging::Logger::Helper(QsLogging::InfoLevel).stream() << __FILE__ << '@' << __LINE__
#define QLOG_WARN() \
else QsLogging::Logger::Helper(QsLogging::InfoLevel).stream() << __FILE__ << '@' << __LINE__ << "["##TYPE##"]"
#define QLOG_WARN(TYPE) \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::WarnLevel) {} \
else QsLogging::Logger::Helper(QsLogging::WarnLevel).stream() << __FILE__ << '@' << __LINE__
#define QLOG_ERROR() \
else QsLogging::Logger::Helper(QsLogging::WarnLevel).stream() << __FILE__ << '@' << __LINE__ << "["##TYPE##"]"
#define QLOG_ERROR(TYPE) \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::ErrorLevel) {} \
else QsLogging::Logger::Helper(QsLogging::ErrorLevel).stream() << __FILE__ << '@' << __LINE__
#define QLOG_FATAL() \
else QsLogging::Logger::Helper(QsLogging::ErrorLevel).stream() << __FILE__ << '@' << __LINE__ << "["##TYPE##"]"
#define QLOG_FATAL(TYPE) \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::FatalLevel) {} \
else QsLogging::Logger::Helper(QsLogging::FatalLevel).stream() << __FILE__ << '@' << __LINE__
else QsLogging::Logger::Helper(QsLogging::FatalLevel).stream() << __FILE__ << '@' << __LINE__ << "["##TYPE##"]"
#endif

#ifdef QS_LOG_DISABLE
Expand Down
6 changes: 3 additions & 3 deletions QsLog.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
INCLUDEPATH += $$PWD
#DEFINES += QS_LOG_LINE_NUMBERS # automatically writes the file and line for each log message
#DEFINES += QS_LOG_DISABLE # logging code is replaced with a no-op
#DEFINES += QS_LOG_SEPARATE_THREAD # messages are queued and written from a separate thread
#DEFINES += QS_LOG_LINE_NUMBERS # automatically writes the file and line for each log message
#DEFINES += QS_LOG_DISABLE # logging code is replaced with a no-op
DEFINES += QS_LOG_SEPARATE_THREAD # messages are queued and written from a separate thread
SOURCES += $$PWD/QsLogDest.cpp \
$$PWD/QsLog.cpp \
$$PWD/QsLogDestConsole.cpp \
Expand Down
7 changes: 6 additions & 1 deletion QsLogDestFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
// OF THE POSSIBILITY OF SUCH DAMAGE.

#include "QsLogDestFile.h"

#include <QTextCodec>

#include <QDateTime>
#include <QtGlobal>
#include <iostream>
Expand Down Expand Up @@ -132,8 +134,11 @@ QsLogging::FileDestination::FileDestination(const QString& filePath, RotationStr
if (!mFile.open(QFile::WriteOnly | QFile::Text | mRotationStrategy->recommendedOpenModeFlag()))
std::cerr << "QsLog: could not open log file " << qPrintable(filePath);
mOutputStream.setDevice(&mFile);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
mOutputStream.setCodec(QTextCodec::codecForName("UTF-8"));

#else
mOutputStream.setEncoding(QStringConverter::Utf8);
#endif
mRotationStrategy->setInitialInfo(mFile);
}

Expand Down
2 changes: 2 additions & 0 deletions QsLogSharedLibrary.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ DESTDIR = $$PWD/build-QsLogShared
OBJECTS_DIR = $$DESTDIR/obj
MOC_DIR = $$DESTDIR/moc

greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat

win32 {
DEFINES += QSLOG_IS_SHARED_LIBRARY
}
Expand Down