From f43f3013fe3fb3e840685f5c69edf0a8121d8cf5 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Tue, 2 Sep 2014 21:28:56 +0200
Subject: [PATCH] refs #308 QMetaObject always requires the full namespace for
 string based lookup

---
 src/plugins/simulator/fs9/blacksimplugin_freefunctions.cpp | 1 -
 src/plugins/simulator/fs9/fs9_client.h                     | 2 +-
 src/plugins/simulator/fs9/fs9_host.h                       | 2 +-
 src/plugins/simulator/fs9/simulator_fs9.cpp                | 2 +-
 src/plugins/simulator/fs9/simulator_fs9.h                  | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/plugins/simulator/fs9/blacksimplugin_freefunctions.cpp b/src/plugins/simulator/fs9/blacksimplugin_freefunctions.cpp
index 17842f4d5..a9c688e86 100644
--- a/src/plugins/simulator/fs9/blacksimplugin_freefunctions.cpp
+++ b/src/plugins/simulator/fs9/blacksimplugin_freefunctions.cpp
@@ -23,7 +23,6 @@ namespace BlackSimPlugin
         void registerMetadata()
         {
             qRegisterMetaType<CFs9Host::HostStatus>();
-            qRegisterMetaType<CFs9Host::HostStatus>("CFs9Host::HostStatus");
             qRegisterMetaType<CFs9Client::ClientStatus>();
         }
 
diff --git a/src/plugins/simulator/fs9/fs9_client.h b/src/plugins/simulator/fs9/fs9_client.h
index 0a45e2284..7e0749a2f 100644
--- a/src/plugins/simulator/fs9/fs9_client.h
+++ b/src/plugins/simulator/fs9/fs9_client.h
@@ -69,7 +69,7 @@ namespace BlackSimPlugin
             void clientTimedOut(const QString &callsign);
 
             //! Client status changed
-            void statusChanged(CFs9Client::ClientStatus);
+            void statusChanged(const QString &callsign, BlackSimPlugin::Fs9::CFs9Client::ClientStatus);
 
         protected slots:
 
diff --git a/src/plugins/simulator/fs9/fs9_host.h b/src/plugins/simulator/fs9/fs9_host.h
index b0c586b7e..e2e5a0598 100644
--- a/src/plugins/simulator/fs9/fs9_host.h
+++ b/src/plugins/simulator/fs9/fs9_host.h
@@ -55,7 +55,7 @@ namespace BlackSimPlugin
         signals:
 
             //! Hosting status changed
-            void statusChanged(CFs9Host::HostStatus);
+            void statusChanged(BlackSimPlugin::Fs9::CFs9Host::HostStatus);
 
         private:
 
diff --git a/src/plugins/simulator/fs9/simulator_fs9.cpp b/src/plugins/simulator/fs9/simulator_fs9.cpp
index ae6920157..0275892d5 100644
--- a/src/plugins/simulator/fs9/simulator_fs9.cpp
+++ b/src/plugins/simulator/fs9/simulator_fs9.cpp
@@ -284,7 +284,7 @@ namespace BlackSimPlugin
             emit aircraftModelChanged(m_aircraftModel);
         }
 
-        void CSimulatorFs9::ps_changeHostStatus(CFs9Host::HostStatus status)
+        void CSimulatorFs9::ps_changeHostStatus(BlackSimPlugin::Fs9::CFs9Host::HostStatus status)
         {
             switch (status)
             {
diff --git a/src/plugins/simulator/fs9/simulator_fs9.h b/src/plugins/simulator/fs9/simulator_fs9.h
index 5b13dbbb8..94a059e8d 100644
--- a/src/plugins/simulator/fs9/simulator_fs9.h
+++ b/src/plugins/simulator/fs9/simulator_fs9.h
@@ -136,7 +136,7 @@ namespace BlackSimPlugin
             void ps_changeOwnAircraftModel(const QString &modelname);
 
             //! Change DirectPlay host status
-            void ps_changeHostStatus(CFs9Host::HostStatus status);
+            void ps_changeHostStatus(BlackSimPlugin::Fs9::CFs9Host::HostStatus status);
 
             void ps_changeClientStatus(const QString &callsign, BlackSimPlugin::Fs9::CFs9Client::ClientStatus status);