some library refactoring

This commit is contained in:
arcan1s
2015-08-20 00:13:09 +03:00
parent 5efb25dca3
commit d2714dca02
14 changed files with 448 additions and 600 deletions

View File

@ -39,25 +39,25 @@ NetctlAdaptor::~NetctlAdaptor()
// netctlCommand
QString NetctlAdaptor::ActiveProfile()
QStringList NetctlAdaptor::ActiveProfile()
{
if (isNetctlAutoActive())
return netctlCommand->autoGetActiveProfile();
else
return netctlCommand->getActiveProfile().join(QChar('|'));
return netctlCommand->getActiveProfile();
}
QString NetctlAdaptor::ActiveProfileStatus()
QStringList NetctlAdaptor::ActiveProfileStatus()
{
if (isNetctlAutoActive())
return QString("netctl-auto");
return QStringList() << QString("netctl-auto");
else {
QStringList status;
QStringList profiles = ActiveProfile().split(QChar('|'));
QStringList profiles = ActiveProfile();
for (int i=0; i<profiles.count(); i++)
status.append(netctlCommand->getProfileStatus(profiles[i]));
return status.join(QChar('|'));
return status;
}
}
@ -108,9 +108,9 @@ bool NetctlAdaptor::isProfileEnabled(const QString profile)
}
QString NetctlAdaptor::netctlActiveProfile()
QStringList NetctlAdaptor::netctlActiveProfile()
{
return netctlCommand->getActiveProfile().join(QChar('|'));
return netctlCommand->getActiveProfile();
}

View File

@ -37,8 +37,8 @@ public:
public slots:
// netctlCommand
QString ActiveProfile();
QString ActiveProfileStatus();
QStringList ActiveProfile();
QStringList ActiveProfileStatus();
bool autoIsProfileActive(const QString profile);
bool autoIsProfileEnabled(const QString profile);
QStringList Information();
@ -46,7 +46,7 @@ public slots:
bool isNetctlAutoEnabled();
bool isProfileActive(const QString profile);
bool isProfileEnabled(const QString profile);
QString netctlActiveProfile();
QStringList netctlActiveProfile();
QStringList netctlProfileList();
QStringList netctlVerboseProfileList();
QStringList ProfileList();