Skip to content

Commit a50b8b3

Browse files
author
Saurabh Garg
committed
Updated license in examples.
Added virtual destructor in AbstractFormatter. Changed tracelLevel to level in SLOGLIB_LOG_MESSAGE.
1 parent f7e80e9 commit a50b8b3

File tree

6 files changed

+83
-31
lines changed

6 files changed

+83
-31
lines changed
Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11

2+
// This file is part of SLogLib; you can redistribute it and/or
3+
// modify it under the terms of the MIT License.
4+
//
25
// Copyright (c) 2015 Saurabh Garg
36
//
4-
// This file is part of SLogLib; you can redistribute it and/or
5-
// modify it under the terms of the GNU Lesser General Public License v2.1 as
6-
// published by the Free Software Foundation.
7+
// Permission is hereby granted, free of charge, to any person obtaining a copy
8+
// of this software and associated documentation files (the "Software"), to deal
9+
// in the Software without restriction, including without limitation the rights
10+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
// copies of the Software, and to permit persons to whom the Software is
12+
// furnished to do so, subject to the following conditions:
13+
//
14+
// The above copyright notice and this permission notice shall be included in all
15+
// copies or substantial portions of the Software.
16+
//
17+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23+
// SOFTWARE.
724
//
8-
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
9-
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
10-
//
1125
// Author(s): Saurabh Garg
1226

1327
#include "SLogLib/SLogLib"
@@ -27,11 +41,5 @@ int main()
2741
SLOGLIB_LOG_MSG_INFO("a = " << a << " b = " << b);
2842
SLOGLIB_LOG_MSG_INFO(c);
2943

30-
unsigned int a1 = MESSAGE_LEVEL_INFO;
31-
unsigned int a2 = MESSAGE_LEVEL_WARNING;
32-
unsigned int a3 = MESSAGE_LEVEL_ERROR;
33-
unsigned int a4 = MESSAGE_LEVEL_DEBUG;
34-
unsigned int a5 = MESSAGE_LEVEL_DETAIL;
35-
3644
return 0;
3745
}

Examples/QWidgetLoggerDemo/Main.cpp

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11

2+
// This file is part of SLogLib; you can redistribute it and/or
3+
// modify it under the terms of the MIT License.
4+
//
25
// Copyright (c) 2015 Saurabh Garg
36
//
4-
// This file is part of SLogLib; you can redistribute it and/or
5-
// modify it under the terms of the GNU Lesser General Public License v2.1 as
6-
// published by the Free Software Foundation.
7+
// Permission is hereby granted, free of charge, to any person obtaining a copy
8+
// of this software and associated documentation files (the "Software"), to deal
9+
// in the Software without restriction, including without limitation the rights
10+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
// copies of the Software, and to permit persons to whom the Software is
12+
// furnished to do so, subject to the following conditions:
13+
//
14+
// The above copyright notice and this permission notice shall be included in all
15+
// copies or substantial portions of the Software.
16+
//
17+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23+
// SOFTWARE.
724
//
8-
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
9-
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
10-
//
1125
// Author(s): Saurabh Garg
1226

1327
#include <QtCore/QtGlobal>

Examples/QWidgetLoggerDemo/QWidgetLogger.cpp

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11

2+
// This file is part of SLogLib; you can redistribute it and/or
3+
// modify it under the terms of the MIT License.
4+
//
25
// Copyright (c) 2015 Saurabh Garg
36
//
4-
// This file is part of SLogLib; you can redistribute it and/or
5-
// modify it under the terms of the GNU Lesser General Public License v2.1 as
6-
// published by the Free Software Foundation.
7+
// Permission is hereby granted, free of charge, to any person obtaining a copy
8+
// of this software and associated documentation files (the "Software"), to deal
9+
// in the Software without restriction, including without limitation the rights
10+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
// copies of the Software, and to permit persons to whom the Software is
12+
// furnished to do so, subject to the following conditions:
13+
//
14+
// The above copyright notice and this permission notice shall be included in all
15+
// copies or substantial portions of the Software.
16+
//
17+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23+
// SOFTWARE.
724
//
8-
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
9-
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
10-
//
1125
// Author(s): Saurabh Garg
1226

1327
#include "QWidgetLogger.h"

Examples/QWidgetLoggerDemo/QWidgetLogger.h

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11

2+
// This file is part of SLogLib; you can redistribute it and/or
3+
// modify it under the terms of the MIT License.
4+
//
25
// Copyright (c) 2015 Saurabh Garg
36
//
4-
// This file is part of SLogLib; you can redistribute it and/or
5-
// modify it under the terms of the GNU Lesser General Public License v2.1 as
6-
// published by the Free Software Foundation.
7+
// Permission is hereby granted, free of charge, to any person obtaining a copy
8+
// of this software and associated documentation files (the "Software"), to deal
9+
// in the Software without restriction, including without limitation the rights
10+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
// copies of the Software, and to permit persons to whom the Software is
12+
// furnished to do so, subject to the following conditions:
13+
//
14+
// The above copyright notice and this permission notice shall be included in all
15+
// copies or substantial portions of the Software.
16+
//
17+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23+
// SOFTWARE.
724
//
8-
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
9-
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
10-
//
1125
// Author(s): Saurabh Garg
1226

1327
#ifndef QWIDGETLOGGER_H

SLogLib/Formatters/AbstractFormatter.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ class AbstractFormatter
4949
: mNewLineFlag(newLineflag)
5050
{}
5151

52+
virtual ~AbstractFormatter() {}
53+
5254
///! Format a message to std::string.
5355
virtual std::string FormatMessage(const Message& msg) const = 0;
5456

SLogLib/SLogLib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
SLogLib::writeMessage(__FILE__, \
4747
__FUNCTION__, \
4848
_lineNo, \
49-
traceLevel, \
49+
level, \
5050
__stream__unique__.str()); \
5151
}
5252

0 commit comments

Comments
 (0)