From 84f389262cc733bbdc9753baf430d3e48572df8b Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 17 Apr 2014 02:20:58 +0200 Subject: [PATCH] fixes some bugs detected during compilation test * wrong literal in relaySignals (DBus) * removed signals from network proxy * made GUI field readonly --- samples/blackgui/mainwindow.ui | 6 +++++- src/blackcore/context_application_proxy.cpp | 2 +- src/blackcore/context_network_proxy.cpp | 6 ------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/samples/blackgui/mainwindow.ui b/samples/blackgui/mainwindow.ui index 51ee85a76..308ee7a7e 100644 --- a/samples/blackgui/mainwindow.ui +++ b/samples/blackgui/mainwindow.ui @@ -2378,7 +2378,11 @@ QStatusBar QLabel { 0 - + + + true + + diff --git a/src/blackcore/context_application_proxy.cpp b/src/blackcore/context_application_proxy.cpp index 6a40f54eb..34b513d3b 100644 --- a/src/blackcore/context_application_proxy.cpp +++ b/src/blackcore/context_application_proxy.cpp @@ -99,7 +99,7 @@ namespace BlackCore bool CContextApplicationProxy::removeFile(const QString &fileName) { if (fileName.isEmpty()) return false; - return this->m_dBusInterface->callDBusRet(QLatin1Literal("deleteFile"), fileName); + return this->m_dBusInterface->callDBusRet(QLatin1Literal("removeFile"), fileName); } /* diff --git a/src/blackcore/context_network_proxy.cpp b/src/blackcore/context_network_proxy.cpp index ad2306aac..0d10a250f 100644 --- a/src/blackcore/context_network_proxy.cpp +++ b/src/blackcore/context_network_proxy.cpp @@ -40,12 +40,6 @@ namespace BlackCore s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), "connectionTerminated", this, SIGNAL(connectionTerminated())); Q_ASSERT(s); - s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), - "statusMessage", this, SIGNAL(statusMessage(BlackMisc::CStatusMessage))); - Q_ASSERT(s); - s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), - "statusMessages", this, SIGNAL(statusMessages(BlackMisc::CStatusMessageList))); - Q_ASSERT(s); s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(), "textMessagesReceived", this, SIGNAL(textMessagesReceived(BlackMisc::Network::CTextMessageList))); Q_ASSERT(s);