From 4b11eb3f836a0ef10f7abd0b250dfe2696570457 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 7 May 2016 20:10:43 +0200
Subject: [PATCH] refs #648, refs #640 review of MS
 https://dev.vatsim-germany.org/issues/648#note-5

---
 src/blackmisc/datastore.h                             | 4 ----
 src/blackmisc/orderable.h                             | 4 +---
 src/blackmisc/simulation/distributor.h                | 3 ---
 src/blackmisc/simulation/distributorlistpreferences.h | 3 ++-
 src/blackmisc/timestampbased.h                        | 2 --
 src/blackmisc/valuecache.cpp                          | 2 +-
 6 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/blackmisc/datastore.h b/src/blackmisc/datastore.h
index 1302d9faf..6916bfc34 100644
--- a/src/blackmisc/datastore.h
+++ b/src/blackmisc/datastore.h
@@ -24,8 +24,6 @@ namespace BlackMisc
      */
     class BLACKMISC_EXPORT IDatastoreObjectWithIntegerKey : public ITimestampBased
     {
-        Q_INTERFACES(BlackMisc::ITimestampBased)
-
     public:
         //! Property index
         enum ColumnIndex
@@ -97,8 +95,6 @@ namespace BlackMisc
      */
     class BLACKMISC_EXPORT IDatastoreObjectWithStringKey : public ITimestampBased
     {
-        Q_INTERFACES(BlackMisc::ITimestampBased)
-
     public:
         //! Property index
         enum ColumnIndex
diff --git a/src/blackmisc/orderable.h b/src/blackmisc/orderable.h
index 5eb725d1b..7cbf2040c 100644
--- a/src/blackmisc/orderable.h
+++ b/src/blackmisc/orderable.h
@@ -17,7 +17,7 @@
 
 namespace BlackMisc
 {
-    //! Entity with timestamp
+    //! Entity with order attribute (can be manually ordered in views)
     class BLACKMISC_EXPORT IOrderable
     {
     public:
@@ -63,6 +63,4 @@ namespace BlackMisc
     };
 } // namespace
 
-Q_DECLARE_INTERFACE(BlackMisc::IOrderable, "org.swift-project.blackmisc.iorderable")
-
 #endif // guard
diff --git a/src/blackmisc/simulation/distributor.h b/src/blackmisc/simulation/distributor.h
index 0741af226..cb0510a9a 100644
--- a/src/blackmisc/simulation/distributor.h
+++ b/src/blackmisc/simulation/distributor.h
@@ -30,9 +30,6 @@ namespace BlackMisc
             public BlackMisc::IDatastoreObjectWithStringKey,
             public BlackMisc::IOrderable
         {
-            Q_INTERFACES(BlackMisc::IDatastoreObjectWithStringKey)
-            Q_INTERFACES(BlackMisc::IOrderable)
-
         public:
             //! Property indexes
             enum ColumnIndex
diff --git a/src/blackmisc/simulation/distributorlistpreferences.h b/src/blackmisc/simulation/distributorlistpreferences.h
index bd71ce54e..fb48e6208 100644
--- a/src/blackmisc/simulation/distributorlistpreferences.h
+++ b/src/blackmisc/simulation/distributorlistpreferences.h
@@ -55,7 +55,8 @@ namespace BlackMisc
                 BLACK_METAMEMBER(distributorsFsx),
                 BLACK_METAMEMBER(distributorsP3d),
                 BLACK_METAMEMBER(distributorsFs9),
-                BLACK_METAMEMBER(distributorsXPlane)
+                BLACK_METAMEMBER(distributorsXPlane),
+                BLACK_METAMEMBER(lastUpdatedSimulator)
             );
         };
     } //namespace
diff --git a/src/blackmisc/timestampbased.h b/src/blackmisc/timestampbased.h
index 14a6ebcdb..dfba42005 100644
--- a/src/blackmisc/timestampbased.h
+++ b/src/blackmisc/timestampbased.h
@@ -117,6 +117,4 @@ namespace BlackMisc
     };
 } // namespace
 
-Q_DECLARE_INTERFACE(BlackMisc::ITimestampBased, "org.swift-project.blackmisc.itimestampbased")
-
 #endif // guard
diff --git a/src/blackmisc/valuecache.cpp b/src/blackmisc/valuecache.cpp
index 1690a658d..b6c8c3291 100644
--- a/src/blackmisc/valuecache.cpp
+++ b/src/blackmisc/valuecache.cpp
@@ -492,7 +492,7 @@ namespace BlackMisc
                 emit valuesWantToCache({ { { element.m_key, value } }, timestamp, save });
             }
             // All good info
-            status = CStatusMessage(this, CStatusMessage::SeverityInfo, "Set values in " + this->getKey(element));
+            status = CStatusMessage(this, CStatusMessage::SeverityInfo, "Set values in " + element.m_key);
         }
         return status;
     }