From 3ef4b2384666087c439a08cb169f52ecf6111406 Mon Sep 17 00:00:00 2001 From: ExAMYEs Date: Tue, 19 Jul 2016 11:19:24 +0800 Subject: [PATCH 1/3] move head and source files to CuteLogger.pri. --- CuteLogger.pri | 26 ++++++++++++++++++++++++++ CuteLogger.pro | 27 +-------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 CuteLogger.pri diff --git a/CuteLogger.pri b/CuteLogger.pri new file mode 100644 index 0000000..f71e032 --- /dev/null +++ b/CuteLogger.pri @@ -0,0 +1,26 @@ +INCLUDEPATH += ./include + +SOURCES += src/Logger.cpp \ + src/AbstractAppender.cpp \ + src/AbstractStringAppender.cpp \ + src/ConsoleAppender.cpp \ + src/FileAppender.cpp \ + src/RollingFileAppender.cpp + +HEADERS += include/Logger.h \ + include/CuteLogger_global.h \ + include/AbstractAppender.h \ + include/AbstractStringAppender.h \ + include/ConsoleAppender.h \ + include/FileAppender.h \ + include/RollingFileAppender.h + +win32 { + SOURCES += src/OutputDebugAppender.cpp + HEADERS += include/OutputDebugAppender.h +} + +android { + SOURCES += src/AndroidAppender.cpp + HEADERS += include/AndroidAppender.h +} diff --git a/CuteLogger.pro b/CuteLogger.pro index 66bba66..e4b306f 100644 --- a/CuteLogger.pro +++ b/CuteLogger.pro @@ -5,32 +5,7 @@ TEMPLATE = lib DEFINES += CUTELOGGER_LIBRARY -INCLUDEPATH += ./include - -SOURCES += src/Logger.cpp \ - src/AbstractAppender.cpp \ - src/AbstractStringAppender.cpp \ - src/ConsoleAppender.cpp \ - src/FileAppender.cpp \ - src/RollingFileAppender.cpp - -HEADERS += include/Logger.h \ - include/CuteLogger_global.h \ - include/AbstractAppender.h \ - include/AbstractStringAppender.h \ - include/ConsoleAppender.h \ - include/FileAppender.h \ - include/RollingFileAppender.h - -win32 { - SOURCES += src/OutputDebugAppender.cpp - HEADERS += include/OutputDebugAppender.h -} - -android { - SOURCES += src/AndroidAppender.cpp - HEADERS += include/AndroidAppender.h -} +include(./CuteLogger.pri) symbian { MMP_RULES += EXPORTUNFROZEN From 307a774ab15185a373613d1139e7ffe7ebf8bb95 Mon Sep 17 00:00:00 2001 From: ExAMYEs Date: Tue, 19 Jul 2016 11:20:18 +0800 Subject: [PATCH 2/3] add macro CUTELOGGER_USE_SRC use to include source files in another project directly. --- include/CuteLogger_global.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/CuteLogger_global.h b/include/CuteLogger_global.h index 43e74af..4178d99 100644 --- a/include/CuteLogger_global.h +++ b/include/CuteLogger_global.h @@ -1,12 +1,18 @@ -#ifndef CUTELOGGER_GLOBAL_H +#ifndef CUTELOGGER_GLOBAL_H #define CUTELOGGER_GLOBAL_H #include +#if defined(CUTELOGGER_USE_SRC) +# define CUTELOGGERSHARED_EXPORT +#else + #if defined(CUTELOGGER_LIBRARY) # define CUTELOGGERSHARED_EXPORT Q_DECL_EXPORT #else # define CUTELOGGERSHARED_EXPORT Q_DECL_IMPORT #endif +#endif + #endif // CUTELOGGER_GLOBAL_H From 98ca8d217630a9e7c73174493fb54e0dfc6215de Mon Sep 17 00:00:00 2001 From: ExAMYEs Date: Tue, 19 Jul 2016 14:04:46 +0800 Subject: [PATCH 3/3] add private keyword before Q_DISABLE_COPY. --- include/Logger.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/Logger.h b/include/Logger.h index 230f7f0..1c91b7b 100644 --- a/include/Logger.h +++ b/include/Logger.h @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2012 Boris Moiseev (cyberbobs at gmail dot com) This program is free software: you can redistribute it and/or modify @@ -71,6 +71,7 @@ CUTELOGGERSHARED_EXPORT Logger* loggerInstance(); class LoggerPrivate; class CUTELOGGERSHARED_EXPORT Logger { + private: Q_DISABLE_COPY(Logger) public: @@ -128,6 +129,7 @@ class CUTELOGGERSHARED_EXPORT Logger class CUTELOGGERSHARED_EXPORT CuteMessageLogger { + private: Q_DISABLE_COPY(CuteMessageLogger) public: @@ -175,6 +177,7 @@ class CUTELOGGERSHARED_EXPORT CuteMessageLogger class CUTELOGGERSHARED_EXPORT LoggerTimingHelper { + private: Q_DISABLE_COPY(LoggerTimingHelper) public: