Revert "Add some symbols so we preserve BC."

These symbols are no longer needed.

This reverts commit 2e636e534b81538841694dd392c0aff30d7debb8.

Change-Id: I27581fdc7ef94ee58996206eada0dedffd1a5bf0
Reviewed-by: Zsolt Simon <zsolt.simon@nokia.com>

2 files changed, 1 insertions, 114 deletions

diff --git a/src/logger/logger.pro b/src/logger/logger.pro
index 0670a9a..4dc96b9 100644
--- a/src/logger/logger.pro
+++ b/src/logger/logger.pro
@@ -21,7 +21,6 @@ PRIVATE_HEADERS += \
     qlogger_p.h
 
 SOURCES += \
-    qlogger.cpp \
-    qlogger_compat.cpp
+    qlogger.cpp
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
diff --git a/src/logger/qlogger_compat.cpp b/src/logger/qlogger_compat.cpp
deleted file mode 100644
index 83505bf..0000000
--- a/src/logger/qlogger_compat.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the logger module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qlogger.h>
-
-QT_USE_NAMESPACE
-QT_LOGGER_BEGIN_NAMESPACE
-
-typedef QLoggingCategory NewLoggingCategory;
-
-// These are legacy symbols that exist for BC purposes only
-namespace QLoggingCategories {
-    class Q_LOGGER_EXPORT QLoggingCategory {
-    public:
-        QLoggingCategory(const char *cat);
-        bool statusMessageType(const QtMsgType &type);
-        void setStatusMessageType(const QtMsgType &type, bool status);
-        bool _enabledDebug;
-        bool _enabledWarning;
-        bool _enabledCritical;
-        bool _registered;
-        const char *_category;
-    };
-    Q_LOGGER_EXPORT QLoggingCategory& defaultCategory();
-    Q_LOGGER_EXPORT bool isEnabled(QLoggingCategory &category, QtMsgType type);
-    Q_LOGGER_EXPORT bool isEnabled();
-
-    QLoggingCategory::QLoggingCategory(const char *cat)
-    {
-        NewLoggingCategory *nc = 0;
-        if (QLatin1String(cat) == QLatin1String("default")) {
-            nc = &NewLoggingCategory::defaultCategory();
-        } else {
-            // Never freed, but this object only exists as a static global so I don't care
-            nc = new NewLoggingCategory(cat);
-        }
-        _category = reinterpret_cast<const char*>(nc);
-    }
-
-    bool QLoggingCategory::statusMessageType(const QtMsgType &type)
-    {
-        NewLoggingCategory *nc = reinterpret_cast<NewLoggingCategory*>(const_cast<char*>(_category));
-        return nc->isEnabled(type);
-    }
-
-    void QLoggingCategory::setStatusMessageType(const QtMsgType &/*type*/, bool /*status*/)
-    {
-        // not used
-    }
-
-    bool isEnabled(QLoggingCategories::QLoggingCategory &category, QtMsgType type)
-    {
-        NewLoggingCategory *nc = reinterpret_cast<NewLoggingCategory*>(const_cast<char*>(category._category));
-        return nc->isEnabled(type);
-    }
-
-    bool isEnabled()
-    {
-        return true;
-    }
-
-    QLoggingCategory& defaultCategory()
-    {
-        static QLoggingCategory *cat = 0;
-        if (!cat) {
-            // Not thread-safe but I don't care
-            cat = new QLoggingCategory("default");
-        }
-        return *cat;
-    }
-
-}
-
-QT_LOGGER_END_NAMESPACE