summaryrefslogtreecommitdiffstats
path: root/synchronizer/listener.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'synchronizer/listener.cpp')
-rw-r--r--synchronizer/listener.cpp12
1 files changed, 6 insertions, 6 deletions
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 @@
35#include <QLocalSocket> 35#include <QLocalSocket>
36#include <QTimer> 36#include <QTimer>
37 37
38Listener::Listener(const QString &resourceName, QObject *parent) 38Listener::Listener(const QByteArray &resourceName, QObject *parent)
39 : QObject(parent), 39 : QObject(parent),
40 m_server(new QLocalServer(this)), 40 m_server(new QLocalServer(this)),
41 m_resourceName(resourceName), 41 m_resourceName(resourceName),
@@ -48,11 +48,11 @@ Listener::Listener(const QString &resourceName, QObject *parent)
48 this, &Listener::refreshRevision); 48 this, &Listener::refreshRevision);
49 connect(m_server, &QLocalServer::newConnection, 49 connect(m_server, &QLocalServer::newConnection,
50 this, &Listener::acceptConnection); 50 this, &Listener::acceptConnection);
51 Log() << QString("Trying to open %1").arg(resourceName); 51 Log() << "Trying to open " << m_resourceName;
52 if (!m_server->listen(resourceName)) { 52 if (!m_server->listen(QString::fromLatin1(resourceName))) {
53 // FIXME: multiple starts need to be handled here 53 // FIXME: multiple starts need to be handled here
54 m_server->removeServer(resourceName); 54 m_server->removeServer(resourceName);
55 if (!m_server->listen(resourceName)) { 55 if (!m_server->listen(QString::fromLatin1(resourceName))) {
56 Warning() << "Utter failure to start server"; 56 Warning() << "Utter failure to start server";
57 exit(-1); 57 exit(-1);
58 } 58 }
@@ -365,10 +365,10 @@ void Listener::loadResource()
365 Log() << QString("Resource factory: %1").arg((qlonglong)resourceFactory); 365 Log() << QString("Resource factory: %1").arg((qlonglong)resourceFactory);
366 Log() << QString("\tResource: %1").arg((qlonglong)m_resource); 366 Log() << QString("\tResource: %1").arg((qlonglong)m_resource);
367 //TODO: this doesn't really list all the facades .. fix 367 //TODO: this doesn't really list all the facades .. fix
368 Log() << QString("\tFacades: %1").arg(Akonadi2::FacadeFactory::instance().getFacade<Akonadi2::Domain::Event>(m_resourceName)->type()); 368 Log() << "\tFacades: " << Akonadi2::FacadeFactory::instance().getFacade<Akonadi2::Domain::Event>(m_resourceName)->type();
369 m_resource->configurePipeline(m_pipeline); 369 m_resource->configurePipeline(m_pipeline);
370 } else { 370 } else {
371 Error() << QString("Failed to load resource %1").arg(m_resourceName); 371 Error() << "Failed to load resource " << m_resourceName;
372 } 372 }
373 //TODO: on failure ... what? 373 //TODO: on failure ... what?
374 //Enter broken state? 374 //Enter broken state?