arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-07-12 21:35:51 +00:00
Code Issues Projects Releases Wiki Activity

rewrite plasmoid, de and helper to use pdebug

Browse Source
This commit is contained in:
arcan1s
2014-08-13 07:26:15 +04:00
parent 5c8dca22d0
commit 07e07ee777
6 changed files with 100 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
sources/helper/src/netctlhelper.cpp
View File

@ -27,6 +27,7 @@
#include "controladaptor.h"
#include "netctladaptor.h"
#include "pdebug.h"
#include "version.h"
@ -44,7 +45,7 @@ NetctlHelper::NetctlHelper(QObject *parent, QMap<QString, QVariant> args)
NetctlHelper::~NetctlHelper()
{
if (debug) qDebug() << "[NetctlHelper]" << "[~NetctlHelper]";
if (debug) qDebug() << PDEBUG;
deleteInterface();
}
@ -52,7 +53,7 @@ NetctlHelper::~NetctlHelper()
QStringList NetctlHelper::printSettings()
{
if (debug) qDebug() << "[NetctlHelper]" << "[printSettings]";
if (debug) qDebug() << PDEBUG;
QStringList settingsList;
for (int i=0; i<configuration.keys().count(); i++)
@ -65,26 +66,26 @@ QStringList NetctlHelper::printSettings()
void NetctlHelper::createInterface()
{
if (debug) qDebug() << "[NetctlHelper]" << "[createInterface]";
if (debug) qDebug() << PDEBUG;
QDBusConnection bus = QDBusConnection::systemBus();
if (!bus.registerService(DBUS_HELPER_SERVICE)) {
if (debug) qDebug() << "[NetctlHelper]" << "[createInterface]" << ":" << "Could not register service";
if (debug) qDebug() << "[NetctlHelper]" << "[createInterface]" << ":" << bus.lastError().message();
if (debug) qDebug() << PDEBUG << ":" << "Could not register service";
if (debug) qDebug() << PDEBUG << ":" << bus.lastError().message();
return quitHelper();
}
if (!bus.registerObject(DBUS_LIB_PATH,
new NetctlAdaptor(this, debug, configuration),
QDBusConnection::ExportAllContents)) {
if (debug) qDebug() << "[NetctlHelper]" << "[createInterface]" << ":" << "Could not register library object";
if (debug) qDebug() << "[NetctlHelper]" << "[createInterface]" << ":" << bus.lastError().message();
if (debug) qDebug() << PDEBUG << ":" << "Could not register library object";
if (debug) qDebug() << PDEBUG << ":" << bus.lastError().message();
return quitHelper();
}
if (!bus.registerObject(DBUS_CTRL_PATH,
new ControlAdaptor(this, debug, configuration),
QDBusConnection::ExportAllContents)) {
if (debug) qDebug() << "[NetctlHelper]" << "[createInterface]" << ":" << "Could not register control object";
if (debug) qDebug() << "[NetctlHelper]" << "[createInterface]" << ":" << bus.lastError().message();
if (debug) qDebug() << PDEBUG << ":" << "Could not register control object";
if (debug) qDebug() << PDEBUG << ":" << bus.lastError().message();
return quitHelper();
}
}
@ -92,7 +93,7 @@ void NetctlHelper::createInterface()
void NetctlHelper::deleteInterface()
{
if (debug) qDebug() << "[NetctlHelper]" << "[deleteInterface]";
if (debug) qDebug() << PDEBUG;
QDBusConnection::systemBus().unregisterObject(DBUS_LIB_PATH);
QDBusConnection::systemBus().unregisterObject(DBUS_CTRL_PATH);
@ -102,7 +103,7 @@ void NetctlHelper::deleteInterface()
QMap<QString, QString> NetctlHelper::getDefault()
{
if (debug) qDebug() << "[NetctlHelper]" << "[getDefault]";
if (debug) qDebug() << PDEBUG;
QMap<QString, QString> settings;
settings[QString("CLOSE_HELPER")] = QString("false");
@ -130,8 +131,7 @@ QMap<QString, QString> NetctlHelper::getDefault()
settings[QString("WPASUP_PATH")] = QString("/usr/bin/wpa_supplicant");
settings[QString("WPA_DRIVERS")] = QString("nl80211,wext");
for (int i=0; i<settings.keys().count(); i++)
if (debug) qDebug() << "[NetctlHelper]" << "[getDefault]" << ":" <<
settings.keys()[i] + QString("=") + settings[settings.keys()[i]];
if (debug) qDebug() << PDEBUG << ":" << settings.keys()[i] + QString("=") + settings[settings.keys()[i]];
return settings;
}
@ -139,7 +139,7 @@ QMap<QString, QString> NetctlHelper::getDefault()
QMap<QString, QString> NetctlHelper::getSettings(const QString file, const QMap<QString, QString> existing)
{
if (debug) qDebug() << "[NetctlHelper]" << "[getSettings]";
if (debug) qDebug() << PDEBUG;
QMap<QString, QString> settings;
if (existing.isEmpty())
@ -161,8 +161,7 @@ QMap<QString, QString> NetctlHelper::getSettings(const QString file, const QMap<
}
configFile.close();
for (int i=0; i<settings.keys().count(); i++)
if (debug) qDebug() << "[NetctlHelper]" << "[getSettings]" << ":" <<
settings.keys()[i] + QString("=") + settings[settings.keys()[i]];
if (debug) qDebug() << PDEBUG << ":" << settings.keys()[i] + QString("=") + settings[settings.keys()[i]];
return settings;
}
@ -170,7 +169,7 @@ QMap<QString, QString> NetctlHelper::getSettings(const QString file, const QMap<
void NetctlHelper::updateConfiguration()
{
if (debug) qDebug() << "[NetctlHelper]" << "[updateConfiguration]";
if (debug) qDebug() << PDEBUG;
deleteInterface();
configuration = getSettings(QString("/etc/netctlgui-helper.conf"));
@ -182,7 +181,7 @@ void NetctlHelper::updateConfiguration()
void NetctlHelper::quitHelper()
{
if (debug) qDebug() << "[NetctlHelper]" << "[quitHelper]";
if (debug) qDebug() << PDEBUG;
QCoreApplication::instance()->quit();
}

1
sources/helper/src/pdebug.h Symbolic link
View File

@ -0,0 +1 @@
../../3rdparty/pdebug/pdebug.h