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 /noncore/settings | |
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 | |||
@@ -20,13 +20,13 @@ Interfaces::Interfaces(QString useInterfacesFile){ | |||
20 | acceptedFamily.append(INTERFACES_FAMILY_IPX); | 20 | acceptedFamily.append(INTERFACES_FAMILY_IPX); |
21 | acceptedFamily.append(INTERFACES_FAMILY_INET6); | 21 | acceptedFamily.append(INTERFACES_FAMILY_INET6); |
22 | 22 | ||
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; |
30 | } | 30 | } |
31 | QTextStream stream( &file ); | 31 | QTextStream stream( &file ); |
32 | QString line; | 32 | QString line; |
@@ -73,15 +73,13 @@ QStringList Interfaces::getInterfaceList(){ | |||
73 | */ | 73 | */ |
74 | bool Interfaces::isAuto(const QString &interface) const { | 74 | bool Interfaces::isAuto(const QString &interface) const { |
75 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); | 75 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); |
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 | /** |
85 | * Attempt to set the auto option for interface to setAuto. | 83 | * Attempt to set the auto option for interface to setAuto. |
86 | * @param interface the interface to set | 84 | * @param interface the interface to set |
87 | * @param setAuto the value to set interface to. | 85 | * @param setAuto the value to set interface to. |