author | schurig <schurig> | 2003-06-13 10:49:17 (UTC) |
---|---|---|
committer | schurig <schurig> | 2003-06-13 10:49:17 (UTC) |
commit | c48af71638614aaff280178693448916e0e98102 (patch) (side-by-side diff) | |
tree | 127db502aedb7411dd68e0a49861018e1b09d262 | |
parent | 60ba51b33a060dde352caa678f2e337f5f5590f5 (diff) | |
download | opie-c48af71638614aaff280178693448916e0e98102.zip opie-c48af71638614aaff280178693448916e0e98102.tar.gz opie-c48af71638614aaff280178693448916e0e98102.tar.bz2 |
little simplificatin -> less code size
-rw-r--r-- | noncore/settings/networksettings/interfaces/interfaces.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp index 8d3e151..a62a90c 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.cpp +++ b/noncore/settings/networksettings/interfaces/interfaces.cpp @@ -18,17 +18,17 @@ Interfaces::Interfaces(QString useInterfacesFile){ acceptedFamily.append(INTERFACES_FAMILY_INET); acceptedFamily.append(INTERFACES_FAMILY_IPX); acceptedFamily.append(INTERFACES_FAMILY_INET6); interfacesFile = useInterfacesFile; QFile file(interfacesFile); if (!file.open(IO_ReadOnly)){ - qDebug(QString("Interfaces: Can't open file: %1 for reading.").arg(interfacesFile).latin1()); + qDebug("Interfaces: Can't open file: %s for reading.", interfacesFile.latin1() ); currentIface = interfaces.end(); currentMapping = interfaces.end(); return; } QTextStream stream( &file ); QString line; while ( !stream.eof() ) { line += stream.readLine(); @@ -71,19 +71,17 @@ QStringList Interfaces::getInterfaceList(){ * @param interface interface to check to see if it is on or not. * @return true is interface is in auto */ bool Interfaces::isAuto(const QString &interface) const { QStringList autoLines = interfaces.grep(QRegExp(AUTO)); QStringList awi = autoLines.grep(QRegExp(interface)); if(awi.count() > 1) qDebug(QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1()); - if(awi.count() < 1) - return false; - return true; + return awi.count() > 0; } /** * Attempt to set the auto option for interface to setAuto. * @param interface the interface to set * @param setAuto the value to set interface to. * @return false if already set to setAuto. * */ |