From 7757d32b5a820623c469b7851354374427142598 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 4 Oct 2016 15:57:17 +0200
Subject: Backwards comaptible names and some cleanup

---
 common/domain/applicationdomaintype.cpp | 4 ++--
 common/listener.cpp                     | 2 +-
 sinksh/sinksh_utils.cpp                 | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index f6db626..2a0d977 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -303,13 +303,13 @@ QByteArray getTypeName<Todo>()
 template<>
 QByteArray getTypeName<SinkResource>()
 {
-    return "sinkresource";
+    return "resource";
 }
 
 template<>
 QByteArray getTypeName<SinkAccount>()
 {
-    return "sinkaccount";
+    return "account";
 }
 
 template<>
diff --git a/common/listener.cpp b/common/listener.cpp
index 027d9ae..db9b21b 100644
--- a/common/listener.cpp
+++ b/common/listener.cpp
@@ -60,7 +60,7 @@ Listener::Listener(const QByteArray &resourceInstanceIdentifier, const QByteArra
     }
 
     if (m_server->isListening()) {
-        SinkLog() << QString("Listening on %1").arg(m_server->serverName());
+        SinkTrace() << QString("Listening on %1").arg(m_server->serverName());
     }
 
     m_checkConnectionsTimer = std::unique_ptr<QTimer>(new QTimer);
diff --git a/sinksh/sinksh_utils.cpp b/sinksh/sinksh_utils.cpp
index 0b9a34d..ec07e47 100644
--- a/sinksh/sinksh_utils.cpp
+++ b/sinksh/sinksh_utils.cpp
@@ -48,14 +48,13 @@ StoreBase &getStore(const QString &type)
     } else if (type == getTypeName<SinkResource>()) {
         static Store<SinkResource> store;
         return store;
-    } else if (type == getTypeName<SinkResource>()) {
+    } else if (type == getTypeName<SinkAccount>()) {
         static Store<SinkAccount> store;
         return store;
     }
 
-    // TODO: reinstate the warning+assert
-    // Q_ASSERT(false);
-    // qWarning() << "Trying to get a store that doesn't exist, falling back to event";
+    qWarning() << "Trying to get a store that doesn't exist, falling back to event";
+    Q_ASSERT(false);
     static Store<Sink::ApplicationDomain::Event> store;
     return store;
 }
-- 
cgit v1.2.3