author | schurig <schurig> | 2003-06-13 10:49:17 (UTC) |
---|---|---|
committer | schurig <schurig> | 2003-06-13 10:49:17 (UTC) |
commit | c48af71638614aaff280178693448916e0e98102 (patch) (unidiff) | |
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 | 8 |
1 files changed, 3 insertions, 5 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 | |||
@@ -23,7 +23,7 @@ Interfaces::Interfaces(QString useInterfacesFile){ | |||
23 | interfacesFile = useInterfacesFile; | 23 | interfacesFile = useInterfacesFile; |
24 | QFile file(interfacesFile); | 24 | QFile file(interfacesFile); |
25 | if (!file.open(IO_ReadOnly)){ | 25 | if (!file.open(IO_ReadOnly)){ |
26 | qDebug(QString("Interfaces: Can't open file: %1 for reading.").arg(interfacesFile).latin1()); | 26 | qDebug("Interfaces: Can't open file: %s for reading.", interfacesFile.latin1() ); |
27 | currentIface = interfaces.end(); | 27 | currentIface = interfaces.end(); |
28 | currentMapping = interfaces.end(); | 28 | currentMapping = interfaces.end(); |
29 | return; | 29 | return; |
@@ -67,7 +67,7 @@ QStringList Interfaces::getInterfaceList(){ | |||
67 | 67 | ||
68 | /** | 68 | /** |
69 | * Find out if interface is in an "auto" group or not. | 69 | * Find out if interface is in an "auto" group or not. |
70 | * Report any duplicates such as eth0 being in two differnt auto's | 70 | * Report any duplicates such as eth0 being in two differnt auto's |
71 | * @param interface interface to check to see if it is on or not. | 71 | * @param interface interface to check to see if it is on or not. |
72 | * @return true is interface is in auto | 72 | * @return true is interface is in auto |
73 | */ | 73 | */ |
@@ -76,9 +76,7 @@ bool Interfaces::isAuto(const QString &interface) const { | |||
76 | QStringList awi = autoLines.grep(QRegExp(interface)); | 76 | QStringList awi = autoLines.grep(QRegExp(interface)); |
77 | if(awi.count() > 1) | 77 | if(awi.count() > 1) |
78 | qDebug(QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1()); | 78 | qDebug(QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1()); |
79 | if(awi.count() < 1) | 79 | return awi.count() > 0; |
80 | return false; | ||
81 | return true; | ||
82 | } | 80 | } |
83 | 81 | ||
84 | /** | 82 | /** |