From cd7cc84fbc6a3b449e01c4a6273f1a4fe86936c6 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Mon, 19 May 2014 23:15:38 +0100 Subject: [PATCH] refs #116 removed firstBlackMetaType as it is no longer needed --- src/blackmisc/blackmiscfreefunctions.cpp | 14 +------------- src/blackmisc/blackmiscfreefunctions.h | 14 -------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp index f54d8be33..ebe638e90 100644 --- a/src/blackmisc/blackmiscfreefunctions.cpp +++ b/src/blackmisc/blackmiscfreefunctions.cpp @@ -131,10 +131,7 @@ void BlackMisc::Hardware::registerMetadata() */ void BlackMisc::registerMetadata() { - CVariant::registerMetadata(); // before the others because it's not a CValueObject - - // !! make sure the first valueobject id is correctly returned by - // !! firstBlackMetaType + CVariant::registerMetadata(); CIndexVariantMap::registerMetadata(); CStatusMessage::registerMetadata(); @@ -151,15 +148,6 @@ void BlackMisc::registerMetadata() Hardware::registerMetadata(); } -/* - * First of our ids - */ -int BlackMisc::firstBlackMetaType() -{ - // must be the first registered above - return qMetaTypeId(); -} - /* * Init resources */ diff --git a/src/blackmisc/blackmiscfreefunctions.h b/src/blackmisc/blackmiscfreefunctions.h index 793ada92c..e2c273214 100644 --- a/src/blackmisc/blackmiscfreefunctions.h +++ b/src/blackmisc/blackmiscfreefunctions.h @@ -83,20 +83,6 @@ namespace BlackMisc //! Register all relevant metadata in BlackMisc void registerMetadata(); - /*! - * Deals with the issue, that the BlackMisc metatypes do not always start with - * the same id, but dependent on enabled Qt modules. E.g. with GUI enabled: - * type: 1024 name: QPaintBufferCacheEntry - * type: 1025 .... some classes I cannot foresee - * type: 1027 name: BlackMisc::CValueMap - * - * This is important when marshalling Variants via DBus among different - * binaries, as an offset has to be considered - * - * \return - */ - int firstBlackMetaType(); - //! Init resources void initResources();