rename CONTROL to CTRL

This commit is contained in:
arcan1s
2014-08-09 20:55:14 +04:00
parent 558a206a8d
commit 42194295cc
8 changed files with 25 additions and 25 deletions

View File

@ -36,7 +36,7 @@ bool checkExistSession()
{
QDBusConnection bus = QDBusConnection::systemBus();
QDBusMessage request = QDBusMessage::createMethodCall(DBUS_HELPER_SERVICE,
DBUS_CONTROL_PATH,
DBUS_CTRL_PATH,
DBUS_HELPER_INTERFACE,
QString("Active"));
QDBusMessage response = bus.call(request);

View File

@ -93,7 +93,7 @@ QString infoMessage()
infoMessage += QString("\tDBUS_OBJECT_PATH=%1\n").arg(QString(DBUS_OBJECT_PATH));
infoMessage += QString("\tDBUS_HELPER_SERVICE=%1\n").arg(QString(DBUS_HELPER_SERVICE));
infoMessage += QString("\tDBUS_HELPER_INTERFACE=%1\n").arg(QString(DBUS_HELPER_INTERFACE));
infoMessage += QString("\tDBUS_CONTROL_PATH=%1\n").arg(QString(DBUS_CONTROL_PATH));
infoMessage += QString("\tDBUS_CTRL_PATH=%1\n").arg(QString(DBUS_CTRL_PATH));
infoMessage += QString("\tDBUS_LIB_PATH=%1\n").arg(QString(DBUS_LIB_PATH));
return infoMessage;

View File

@ -135,7 +135,7 @@ void NetctlHelper::createInterface()
if (debug) qDebug() << "[NetctlHelper]" << "[createInterface]" << ":" << bus.lastError().message();
return quitHelper();
}
if (!bus.registerObject(DBUS_CONTROL_PATH,
if (!bus.registerObject(DBUS_CTRL_PATH,
new ControlAdaptor(this, configuration),
QDBusConnection::ExportAllContents)) {
if (debug) qDebug() << "[NetctlHelper]" << "[createInterface]" << ":" << "Could not register control object";
@ -150,7 +150,7 @@ void NetctlHelper::deleteInterface()
if (debug) qDebug() << "[NetctlHelper]" << "[deleteInterface]";
QDBusConnection::systemBus().unregisterObject(DBUS_LIB_PATH);
QDBusConnection::systemBus().unregisterObject(DBUS_CONTROL_PATH);
QDBusConnection::systemBus().unregisterObject(DBUS_CTRL_PATH);
QDBusConnection::systemBus().unregisterService(DBUS_HELPER_SERVICE);
}