From 3062983d075761c457249b8c3c1248aa0d45e46a Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 9 Apr 2015 14:00:26 +0200
Subject: Use QByteArray instead of QString

All identifiers should be latin1 and we make this explicit by using
QByteArray. QString is reserved for strings that can be UTF-8 or alike.
---
 synchronizer/listener.cpp | 12 ++++++------
 synchronizer/listener.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'synchronizer')

diff --git a/synchronizer/listener.cpp b/synchronizer/listener.cpp
index edd9123..00d9207 100644
--- a/synchronizer/listener.cpp
+++ b/synchronizer/listener.cpp
@@ -35,7 +35,7 @@
 #include <QLocalSocket>
 #include <QTimer>
 
-Listener::Listener(const QString &resourceName, QObject *parent)
+Listener::Listener(const QByteArray &resourceName, QObject *parent)
     : QObject(parent),
       m_server(new QLocalServer(this)),
       m_resourceName(resourceName),
@@ -48,11 +48,11 @@ Listener::Listener(const QString &resourceName, QObject *parent)
             this, &Listener::refreshRevision);
     connect(m_server, &QLocalServer::newConnection,
              this, &Listener::acceptConnection);
-    Log() << QString("Trying to open %1").arg(resourceName);
-    if (!m_server->listen(resourceName)) {
+    Log() << "Trying to open " << m_resourceName;
+    if (!m_server->listen(QString::fromLatin1(resourceName))) {
         // FIXME: multiple starts need to be handled here
         m_server->removeServer(resourceName);
-        if (!m_server->listen(resourceName)) {
+        if (!m_server->listen(QString::fromLatin1(resourceName))) {
             Warning() << "Utter failure to start server";
             exit(-1);
         }
@@ -365,10 +365,10 @@ void Listener::loadResource()
         Log() << QString("Resource factory: %1").arg((qlonglong)resourceFactory);
         Log() << QString("\tResource: %1").arg((qlonglong)m_resource);
         //TODO: this doesn't really list all the facades .. fix
-        Log() << QString("\tFacades: %1").arg(Akonadi2::FacadeFactory::instance().getFacade<Akonadi2::Domain::Event>(m_resourceName)->type());
+        Log() << "\tFacades: " << Akonadi2::FacadeFactory::instance().getFacade<Akonadi2::Domain::Event>(m_resourceName)->type();
         m_resource->configurePipeline(m_pipeline);
     } else {
-        Error() << QString("Failed to load resource %1").arg(m_resourceName);
+        Error() << "Failed to load resource " << m_resourceName;
     }
     //TODO: on failure ... what?
     //Enter broken state?
diff --git a/synchronizer/listener.h b/synchronizer/listener.h
index 8dad3a4..d2ef0fc 100644
--- a/synchronizer/listener.h
+++ b/synchronizer/listener.h
@@ -58,7 +58,7 @@ class Listener : public QObject
     Q_OBJECT
 
 public:
-    Listener(const QString &resourceName, QObject *parent = 0);
+    Listener(const QByteArray &resourceName, QObject *parent = 0);
     ~Listener();
 
 Q_SIGNALS:
@@ -87,7 +87,7 @@ private:
     QLocalServer *m_server;
     QVector<Client> m_connections;
     flatbuffers::FlatBufferBuilder m_fbb;
-    const QString m_resourceName;
+    const QByteArray m_resourceName;
     Akonadi2::Resource *m_resource;
     Akonadi2::Pipeline *m_pipeline;
     QTimer *m_clientBufferProcessesTimer;
-- 
cgit v1.2.3