From b9f80edea979e78d69a339cbe8ca1c90f9f399dc Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Tue, 19 Apr 2011 08:48:02 -0400
Subject: [PATCH] Move infosystem register meta types to the location as the
other register statements
---
src/libtomahawk/infosystem/infosystem.cpp | 4 ----
src/tomahawkapp.cpp | 5 +++++
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/libtomahawk/infosystem/infosystem.cpp b/src/libtomahawk/infosystem/infosystem.cpp
index 588ef2940..8567a3b8b 100644
--- a/src/libtomahawk/infosystem/infosystem.cpp
+++ b/src/libtomahawk/infosystem/infosystem.cpp
@@ -74,10 +74,6 @@ InfoSystem::InfoSystem(QObject *parent)
s_instance = this;
qDebug() << Q_FUNC_INFO;
- qRegisterMetaType< QMap< QString, QMap< QString, QString > > >( "Tomahawk::InfoSystem::InfoGenericMap" );
- qRegisterMetaType< QHash< QString, QVariant > >( "Tomahawk::InfoSystem::InfoCustomData" );
- qRegisterMetaType< QHash< QString, QString > >( "Tomahawk::InfoSystem::InfoCriteriaHash" );
- qRegisterMetaType< Tomahawk::InfoSystem::InfoType >( "Tomahawk::InfoSystem::InfoType" );
m_infoSystemCacheThreadController = new QThread( this );
m_cache = new InfoSystemCache();
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index 77c33ab96..f6e71bf78 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -371,6 +371,11 @@ TomahawkApp::registerMetaTypes()
qRegisterMetaType< Tomahawk::QID >("Tomahawk::QID");
qRegisterMetaType< AudioErrorCode >("AudioErrorCode");
+
+ qRegisterMetaType< QMap< QString, QMap< QString, QString > > >( "Tomahawk::InfoSystem::InfoGenericMap" );
+ qRegisterMetaType< QHash< QString, QVariant > >( "Tomahawk::InfoSystem::InfoCustomData" );
+ qRegisterMetaType< QHash< QString, QString > >( "Tomahawk::InfoSystem::InfoCriteriaHash" );
+ qRegisterMetaType< Tomahawk::InfoSystem::InfoType >( "Tomahawk::InfoSystem::InfoType" );
}