From 60b7ffde19bebf40ab94338f5f7f752e48551e0a Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 12 Mar 2014 02:27:18 +0100 Subject: [PATCH] refs #85 , removed "blackmisc_cpp2xml" --- client.pro | 1 - src/blackmisc_cpp2xml/blackmisc_cpp2xml.pro | 22 --------------- src/blackmisc_cpp2xml/blackmiscplugin.cpp | 15 ----------- src/blackmisc_cpp2xml/blackmiscplugin.h | 30 --------------------- 4 files changed, 68 deletions(-) delete mode 100644 src/blackmisc_cpp2xml/blackmisc_cpp2xml.pro delete mode 100644 src/blackmisc_cpp2xml/blackmiscplugin.cpp delete mode 100644 src/blackmisc_cpp2xml/blackmiscplugin.h diff --git a/client.pro b/client.pro index 8c0292413..32d3e7de4 100644 --- a/client.pro +++ b/client.pro @@ -5,7 +5,6 @@ CONFIG += ordered contains(BLACK_CONFIG, BlackMisc) { SUBDIRS += src/blackmisc -# SUBDIRS += src/blackmisc_cpp2xml } contains(BLACK_CONFIG, BlackSound) { diff --git a/src/blackmisc_cpp2xml/blackmisc_cpp2xml.pro b/src/blackmisc_cpp2xml/blackmisc_cpp2xml.pro deleted file mode 100644 index 469a5a7e7..000000000 --- a/src/blackmisc_cpp2xml/blackmisc_cpp2xml.pro +++ /dev/null @@ -1,22 +0,0 @@ -include (../../config.pri) -include (../../build.pri) - -QT += core dbus network - -TARGET = blackmisc_cpp2xml -TEMPLATE = lib - -CONFIG += plugin -CONFIG += blackmisc - -DEPENDPATH += . ../../src/blackmisc -INCLUDEPATH += . ../../src -win32:!win32-g++*: PRE_TARGETDEPS += ../../lib/blackmisc.lib -else: PRE_TARGETDEPS += ../../lib/libblackmisc.a - -DESTDIR = ../../bin - -HEADERS += *.h -SOURCES += *.cpp - -include (../../libraries.pri) diff --git a/src/blackmisc_cpp2xml/blackmiscplugin.cpp b/src/blackmisc_cpp2xml/blackmiscplugin.cpp deleted file mode 100644 index 93beffe00..000000000 --- a/src/blackmisc_cpp2xml/blackmiscplugin.cpp +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright (C) 2013 VATSIM Community / contributors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "blackmiscplugin.h" -#include "blackmisc/blackmiscfreefunctions.h" - -/* - * Register all metatypes - */ -void BlackmiscPlugin::registerMetaTypes() -{ - BlackMisc::registerMetadata(); -} diff --git a/src/blackmisc_cpp2xml/blackmiscplugin.h b/src/blackmisc_cpp2xml/blackmiscplugin.h deleted file mode 100644 index fb42bfbef..000000000 --- a/src/blackmisc_cpp2xml/blackmiscplugin.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 2013 VATSIM Community / contributors - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BLACKMISC_CPP2XML_H -#define BLACKMISC_CPP2XML_H - -#include -#include - -/*! - * Plugin to register all relevant blackmisc classes for QDBusCpp2XmlPlugin - * This needs to be recompiled whenever a new DBus compliant class has been created. - * Compile as "release", otherwise plugin will not work. - */ -class BlackmiscPlugin : public QObject, public QDBusCpp2XmlPlugin -{ - Q_OBJECT - Q_INTERFACES(QDBusCpp2XmlPlugin) - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.DBus.Cpp2XmlPlugin") - -public: - /*! - * \brief Register Metatypes - */ - virtual void registerMetaTypes(); -}; - -#endif // guard