diff options
| author | Philipp Andreas <github@smurfy.de> | 2014-07-20 22:25:45 +0200 |
|---|---|---|
| committer | Philipp Andreas <github@smurfy.de> | 2014-07-20 23:21:05 +0200 |
| commit | c9c1ed9faee07c0067827872ffe465d465c81470 (patch) | |
| tree | 91b87b5ad63956bda1254cb4b083f3fc8d6551e4 /ext/Log4Qt/src/layout.cpp | |
| parent | 9bbba72939248388dfc832a5bf20cb9539ab0675 (diff) | |
| parent | c47315faa12bbb36772c3f5897751bf74fa122f4 (diff) | |
Merge branch 'master' into notifications
Conflicts:
daemon/daemon.cpp
daemon/manager.cpp
daemon/manager.h
ext/Log4Qt
Diffstat (limited to 'ext/Log4Qt/src/layout.cpp')
| -rw-r--r-- | ext/Log4Qt/src/layout.cpp | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/ext/Log4Qt/src/layout.cpp b/ext/Log4Qt/src/layout.cpp deleted file mode 100644 index 19c5059..0000000 --- a/ext/Log4Qt/src/layout.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/****************************************************************************** - * - * package: Log4Qt - * file: layout.cpp - * created: September 2007 - * author: Martin Heinrich - * - * - * Copyright 2007 Martin Heinrich - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************************/ - - - -/****************************************************************************** - * Dependencies - ******************************************************************************/ - - -#include "layout.h" - -#include <QtCore/QDebug> -#include "loggingevent.h" -#include "logmanager.h" - - - -namespace Log4Qt -{ - - - /*************************************************************************** - * Declarations - **************************************************************************/ - - - - /************************************************************************** - * C helper functions - **************************************************************************/ - - - - /************************************************************************** - * Class implementation: Layout - **************************************************************************/ - - - QString Layout::contentType() const - { - return QString::fromLatin1("text/plain"); - } - - - void Layout::activateOptions() - { - } - - - QString Layout::endOfLine() - { - // There seams to be no function in Qt for this. MinGW enter '\r\n' automatically - return QLatin1String("\n"); - } - - - /************************************************************************** - * Implementation: Operators, Helper - **************************************************************************/ - - -} // namespace Log4Qt |