From 2e3359331c0b7ef3ddf302f35f616d3fe11f4f04 Mon Sep 17 00:00:00 2001
From: Patrick von Reth <vonreth@kde.org>
Date: Fri, 14 Feb 2014 16:28:06 +0100
Subject: [PATCH] cleanup

---
 src/core/application_p.cpp             | 2 --
 src/core/application_p.h               | 2 --
 src/core/notification/notification.cpp | 2 --
 src/core/notification/notification_p.h | 1 -
 src/core/snore.cpp                     | 5 +++--
 src/core/snore_p.cpp                   | 6 ++++++
 src/core/snore_p.h                     | 4 ++++
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/core/application_p.cpp b/src/core/application_p.cpp
index 8bda222..88b5a6c 100644
--- a/src/core/application_p.cpp
+++ b/src/core/application_p.cpp
@@ -21,8 +21,6 @@
 
 using namespace Snore;
 
-int ApplicationData::applicationMetaID = qRegisterMetaType<Application>();
-
 ApplicationData::ApplicationData(const QString &name, const Icon &icon):
     m_name(name),
     m_icon(icon)
diff --git a/src/core/application_p.h b/src/core/application_p.h
index 5cd28d7..e20576c 100644
--- a/src/core/application_p.h
+++ b/src/core/application_p.h
@@ -37,8 +37,6 @@ public:
     Icon m_icon;
     QHash<QString,Alert> m_alerts;
     Hint m_hint;
-
-    static int applicationMetaID;
 };
 
 }
diff --git a/src/core/notification/notification.cpp b/src/core/notification/notification.cpp
index 2a7cf9e..eef5e80 100644
--- a/src/core/notification/notification.cpp
+++ b/src/core/notification/notification.cpp
@@ -30,8 +30,6 @@ using namespace Snore;
 
 int Notification::m_defaultTimeout = 10;
 
-int NotificationData::notificationMetaID = qRegisterMetaType<Notification>();
-
 
 Notification::Notification () :
     d(NULL)
diff --git a/src/core/notification/notification_p.h b/src/core/notification/notification_p.h
index 9710a28..0269599 100644
--- a/src/core/notification/notification_p.h
+++ b/src/core/notification/notification_p.h
@@ -82,7 +82,6 @@ private:
 
     static uint notificationCount;
     static uint m_idCount;
-    static int notificationMetaID;
 
 };
 
diff --git a/src/core/snore.cpp b/src/core/snore.cpp
index 8e18e91..ffbbb14 100644
--- a/src/core/snore.cpp
+++ b/src/core/snore.cpp
@@ -38,9 +38,10 @@
 using namespace Snore;
 
 
-SnoreCore::SnoreCore(QSystemTrayIcon *trayIcon ):
-    d_ptr(new SnoreCorePrivate(trayIcon ))
+SnoreCore::SnoreCore(QSystemTrayIcon *trayIcon )
 {
+    SnoreCorePrivate::registerMetaTypes();
+    d_ptr = new SnoreCorePrivate(trayIcon );
     Q_D(SnoreCore);
     d->q_ptr = this;
 }
diff --git a/src/core/snore_p.cpp b/src/core/snore_p.cpp
index 0136b5b..68a7780 100644
--- a/src/core/snore_p.cpp
+++ b/src/core/snore_p.cpp
@@ -64,6 +64,12 @@ bool SnoreCorePrivate::setBackendIfAvailible(const QString &backend)
     return false;
 }
 
+void SnoreCorePrivate::registerMetaTypes()
+{
+    qRegisterMetaType<Notification>();
+    qRegisterMetaType<Application>();
+}
+
 bool SnoreCorePrivate::primaryBackendCanUpdateNotification() const
 {
     return m_notificationBackend->canUpdateNotification();
diff --git a/src/core/snore_p.h b/src/core/snore_p.h
index a91b64f..2a78483 100644
--- a/src/core/snore_p.h
+++ b/src/core/snore_p.h
@@ -40,6 +40,8 @@ public:
     {
         return QCryptographicHash::hash(data,QCryptographicHash::Md5).toHex();
     }
+
+    static void registerMetaTypes();
 public:
     SnoreCorePrivate(QSystemTrayIcon *trayIcon);
     ~SnoreCorePrivate();
@@ -51,6 +53,8 @@ public:
     bool setBackendIfAvailible(const QString & backend);
 
 
+
+
     /**
      *
      * @return whether the backend can update a notification