Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Commit ea1b59b

Browse files
scunzscunz
committed
Extract logger
1 parent cf9d828 commit ea1b59b

23 files changed

+226
-179
lines changed

‎Libs/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ INCLUDE_DIRECTORIES( BEFORE
1010
${MACGITVER_LIBS_SOURCE_DIR}
1111
)
1212

13+
ADD_SUBDIRECTORY(libLogger)
1314
ADD_SUBDIRECTORY(libDiffViews)
1415
ADD_SUBDIRECTORY(libRepoMan)
1516
ADD_SUBDIRECTORY(libMacGitverCore)

‎Libs/libLogger/Api.hpp‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* MacGitver
3+
* Copyright (C) 2012-2015 The MacGitver-Developers <dev@macgitver.org>
4+
*
5+
* (C) Sascha Cunz <sascha@cunz-rad.com>
6+
* (C) Cunz RaD Ltd.
7+
*
8+
* This program is free software; you can redistribute it and/or modify it under the terms of the
9+
* GNU General Public License (Version 2) as published by the Free Software Foundation.
10+
*
11+
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
12+
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+
* General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License along with this program; if
16+
* not, see <http://www.gnu.org/licenses/>.
17+
*
18+
*/
19+
20+
#pragma once
21+
22+
#include <QtGlobal>
23+
24+
#ifdef Logger_EXPORTS
25+
# define LOGGER_API Q_DECL_EXPORT
26+
#else
27+
# define LOGGER_API Q_DECL_IMPORT
28+
#endif

‎Libs/libLogger/CMakeLists.txt‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
2+
PROJECT(LOGGER)
3+
4+
QT_PREPARE(Core)
5+
6+
INCLUDE_DIRECTORIES( BEFORE
7+
${MGV_CORE_SOURCE_DIR}
8+
${MGV_CORE_BINARY_DIR}
9+
)
10+
11+
SET( SRC_FILES
12+
13+
LogEvent.cpp
14+
LogChannel.cpp
15+
LogTemplate.cpp
16+
LogManager.cpp
17+
LogConsumer.cpp
18+
)
19+
20+
SET( PUB_HDR_FILES
21+
22+
Api.hpp
23+
LogEvent.hpp
24+
LogChannel.hpp
25+
LogTemplate.hpp
26+
LogManager.hpp
27+
LogConsumer.hpp
28+
29+
)
30+
31+
SET( PRI_HDR_FILES
32+
33+
)
34+
35+
SET( HDR_FILES ${PRI_HDR_FILES} ${PUB_HDR_FILES} )
36+
37+
QT_MOC( MOC_FILES ${HDR_FILES} )
38+
39+
ADD_QT_LIBRARY(
40+
Logger SHARED
41+
42+
${SRC_FILES}
43+
${HDR_FILES}
44+
${MOC_FILES}
45+
)
46+
47+
TARGET_LINK_LIBRARIES(
48+
Logger
49+
50+
LINK_PUBLIC
51+
HeavenIcons
52+
)
53+
54+
IF(UNIX AND NOT APPLE)
55+
SET_TARGET_PROPERTIES(
56+
Logger
57+
PROPERTIES INSTALL_RPATH
58+
"\$ORIGIN"
59+
)
60+
ENDIF()
61+
62+
RAD_DEFINE_VERSION(LOGGER 0 0 1)
63+
RAD_SET_TARGET_VERSION(Logger LOGGER)
64+
RAD_INSTALL_LIBRARY (Logger Logger)
65+
RAD_INSTALL_HEADERS (libLogger ${PUB_HDR_FILES})
66+
RAD_SPLIT_SOURCE_TREE (libLogger)

‎Libs/libMacGitverCore/Log/LogChannel.cpp‎ renamed to ‎Libs/libLogger/LogChannel.cpp‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* MacGitver
3-
* Copyright (C) 2012-2013 The MacGitver-Developers <dev@macgitver.org>
3+
* Copyright (C) 2012-2015 The MacGitver-Developers <dev@macgitver.org>
44
*
5-
* (C) Sascha Cunz <sascha@macgitver.org>
5+
* (C) Sascha Cunz <sascha@cunz-rad.com>
66
* (C) Cunz RaD Ltd.
77
*
88
* This program is free software; you can redistribute it and/or modify it under the terms of the
@@ -21,12 +21,10 @@
2121

2222
#include "libHeavenIcons/IconRef.hpp"
2323

24-
#include "libMacGitverCore/App/MacGitver.hpp"
25-
26-
#include "libMacGitverCore/Log/LogChannel.hpp"
27-
#include "libMacGitverCore/Log/LogEvent.hpp"
28-
#include "libMacGitverCore/Log/LogManager.hpp"
29-
#include "libMacGitverCore/Log/LogTemplate.hpp"
24+
#include "libLogger/LogChannel.hpp"
25+
#include "libLogger/LogEvent.hpp"
26+
#include "libLogger/LogManager.hpp"
27+
#include "libLogger/LogTemplate.hpp"
3028

3129
namespace Log
3230
{
@@ -176,7 +174,7 @@ namespace Log
176174
event.setChannel(d.data());
177175
d->events.append(event);
178176

179-
MacGitver::log().eventAdded(event);
177+
log().eventAdded(event);
180178
}
181179
}
182180

‎Libs/libMacGitverCore/Log/LogChannel.hpp‎ renamed to ‎Libs/libLogger/LogChannel.hpp‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* MacGitver
3-
* Copyright (C) 2012-2013 The MacGitver-Developers <dev@macgitver.org>
3+
* Copyright (C) 2012-2015 The MacGitver-Developers <dev@macgitver.org>
44
*
5-
* (C) Sascha Cunz <sascha@macgitver.org>
5+
* (C) Sascha Cunz <sascha@cunz-rad.com>
66
* (C) Cunz RaD Ltd.
77
*
88
* This program is free software; you can redistribute it and/or modify it under the terms of the
@@ -18,21 +18,17 @@
1818
*/
1919

2020
#pragma once
21-
#ifndef MGV_LOG_LOG_CHANNEL_HPP
22-
#define MGV_LOG_LOG_CHANNEL_HPP
21+
22+
#include "libLogger/Api.hpp"
2323

2424
#include <QSharedData>
2525
#include <QVector>
2626

2727
class QString;
2828

29-
#include "libMacGitverCore/MacGitverApi.hpp"
30-
3129
namespace Heaven
3230
{
33-
3431
class IconRef;
35-
3632
}
3733

3834
namespace Log
@@ -41,7 +37,7 @@ namespace Log
4137
class Event;
4238
class Template;
4339

44-
class MGV_CORE_API Channel
40+
class LOGGER_API Channel
4541
{
4642
public:
4743
typedef QVector<Channel> List;
@@ -75,5 +71,3 @@ namespace Log
7571
};
7672

7773
}
78-
79-
#endif

‎Libs/libMacGitverCore/Log/LogConsumer.cpp‎ renamed to ‎Libs/libLogger/LogConsumer.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* MacGitver
3-
* Copyright (C) 2012-2013 The MacGitver-Developers <dev@macgitver.org>
3+
* Copyright (C) 2012-2015 The MacGitver-Developers <dev@macgitver.org>
44
*
5-
* (C) Sascha Cunz <sascha@macgitver.org>
5+
* (C) Sascha Cunz <sascha@cunz-rad.com>
66
* (C) Cunz RaD Ltd.
77
*
88
* This program is free software; you can redistribute it and/or modify it under the terms of the
@@ -17,7 +17,7 @@
1717
*
1818
*/
1919

20-
#include "libMacGitverCore/Log/LogConsumer.hpp"
20+
#include "libLogger/LogConsumer.hpp"
2121

2222
namespace Log
2323
{

‎Libs/libMacGitverCore/Log/LogConsumer.hpp‎ renamed to ‎Libs/libLogger/LogConsumer.hpp‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* MacGitver
3-
* Copyright (C) 2012-2013 The MacGitver-Developers <dev@macgitver.org>
3+
* Copyright (C) 2012-2015 The MacGitver-Developers <dev@macgitver.org>
44
*
5-
* (C) Sascha Cunz <sascha@macgitver.org>
5+
* (C) Sascha Cunz <sascha@cunz-rad.com>
66
* (C) Cunz RaD Ltd.
77
*
88
* This program is free software; you can redistribute it and/or modify it under the terms of the
@@ -18,20 +18,16 @@
1818
*/
1919

2020
#pragma once
21-
#ifndef MGV_LOG_LOG_CONSUMER_HPP
22-
#define MGV_LOG_LOG_CONSUMER_HPP
2321

24-
#include <QtGlobal>
25-
26-
#include "libMacGitverCore/MacGitverApi.hpp"
22+
#include "libLogger/Api.hpp"
2723

2824
namespace Log
2925
{
3026

3127
class Channel;
3228
class Event;
3329

34-
class MGV_CORE_API Consumer
30+
class LOGGER_API Consumer
3531
{
3632
public:
3733
Consumer();
@@ -44,5 +40,3 @@ namespace Log
4440
};
4541

4642
}
47-
48-
#endif

‎Libs/libMacGitverCore/Log/LogEvent.cpp‎ renamed to ‎Libs/libLogger/LogEvent.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@
1919

2020
#include <QHash>
2121
#include <QString>
22+
#include <QStringList>
2223
#include <QDateTime>
2324

24-
#include "libMacGitverCore/Log/LogEvent.hpp"
25-
#include "libMacGitverCore/Log/LogChannel.hpp"
26-
#include "libMacGitverCore/Log/LogManager.hpp"
27-
#include "libMacGitverCore/Log/LogTemplate.hpp"
28-
29-
#include "libMacGitverCore/App/MacGitver.hpp"
25+
#include "libLogger/LogEvent.hpp"
26+
#include "libLogger/LogChannel.hpp"
27+
#include "libLogger/LogManager.hpp"
28+
#include "libLogger/LogTemplate.hpp"
3029

3130
namespace Log
3231
{
@@ -169,7 +168,7 @@ namespace Log
169168
*/
170169
Event Event::create(const QString& templ)
171170
{
172-
Template t = MacGitver::log().findTemplate(templ);
171+
Template t = log().findTemplate(templ);
173172

174173
if (!t.isValid()) {
175174
return Event();
@@ -342,7 +341,7 @@ namespace Log
342341
{
343342
channel = NULL;
344343
timeStamp = QDateTime::currentDateTime();
345-
id = MacGitver::log().nextLogEventId();
344+
id = log().nextLogEventId();
346345
}
347346

348347
}

‎Libs/libMacGitverCore/Log/LogEvent.hpp‎ renamed to ‎Libs/libLogger/LogEvent.hpp‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
* MacGitver
3-
* Copyright (C) 2012-2013 The MacGitver-Developers <dev@macgitver.org>
3+
* Copyright (C) 2012-2015 The MacGitver-Developers <dev@macgitver.org>
44
*
5-
* (C) Sascha Cunz <sascha@macgitver.org>
5+
* (C) Sascha Cunz <sascha@cunz-rad.com>
66
* (C) Cunz RaD Ltd.
77
*
88
* This program is free software; you can redistribute it and/or modify it under the terms of the
@@ -18,25 +18,22 @@
1818
*/
1919

2020
#pragma once
21-
#ifndef MGV_LOG_LOG_EVENT_HPP
22-
#define MGV_LOG_LOG_EVENT_HPP
2321

24-
#include <QtGlobal>
22+
#include "libLogger/LogChannel.hpp"
23+
2524
#include <QSharedData>
2625
#include <QVector>
2726

2827
class QString;
2928
class QStringList;
3029
class QDateTime;
3130

32-
#include "libMacGitverCore/Log/LogChannel.hpp"
33-
3431
namespace Log
3532
{
3633

3734
class Template;
3835

39-
class MGV_CORE_API Event
36+
class LOGGER_API Event
4037
{
4138
friend class Channel;
4239

@@ -81,4 +78,3 @@ namespace Log
8178

8279
}
8380

84-
#endif

0 commit comments

Comments
 (0)