[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/network/kvpnc/src
From:       Christoph Thielecke <christoph.thielecke () gmx ! de>
Date:       2009-07-29 7:04:19
Message-ID: 1248851059.038543.15173.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1004033 by crissi:

some optimizions

 M  +11 -16    networkinterface.cpp  


--- trunk/playground/network/kvpnc/src/networkinterface.cpp #1004032:1004033
@@ -66,9 +66,9 @@
         QFile NetdevFile("/proc/net/dev");
         QTextStream stream(&NetdevFile);
         if (NetdevFile.open(QIODevice::ReadOnly)) {
-            QString line = "";
-            while (!stream.atEnd()) {
-                line = stream.readLine(); // line of text excluding '\n' and replace \
all white chars with one blank +			QStringList contentlist = \
QString(NetdevFile.readAll()).split("\n"); +			for (int i = 0; i < \
contentlist.size(); ++i) { +				QString line = contentlist.at(i);
                 if (line.indexOf(':') > -1) {
                     QString tmpdev = line.section(':', 0, 0).trimmed();
                     if (tmpdev == Interface) {
@@ -77,8 +77,8 @@
                     }
                 }
             }
+			NetdevFile.close();
         }
-        NetdevFile.close();
     }
     return false;
 }
@@ -88,15 +88,15 @@
     QFile NetdevFile("/proc/net/dev");
     QTextStream stream(&NetdevFile);
     if (NetdevFile.open(QIODevice::ReadOnly)) {
-        QString line = "";
-        while (!stream.atEnd()) {
-            line = stream.readLine(); // line of text excluding '\n' and replace all \
white chars with one blank +		QStringList contentlist = \
QString(NetdevFile.readAll()).split("\n"); +		for (int i = 0; i < contentlist.size(); \
++i) { +			QString line = contentlist.at(i);
             if (line.indexOf(':') > -1) {
                 InterfaceList.append(line.section(':', 0, 0).trimmed());
             }
         }
+		NetdevFile.close();
     }
-    NetdevFile.close();
     InterfaceList.sort();
     return InterfaceList;
 }
@@ -259,9 +259,8 @@
                 return tmpmask;
             }
         }
+		NetRouteFile .close();
     }
-    NetRouteFile .close();
-
     return "0.0.0.0";
 }
 
@@ -271,7 +270,6 @@
     QString tmpdev;
     if (NetRouteFile.open(QIODevice::ReadOnly)) {
 		QStringList contentlist = QString(NetRouteFile.readAll()).split("\n");
-        QString line = "";
 		for (int i = 0; i < contentlist.size(); ++i) {
 			QString line = contentlist.at(i);
 			//std::cout << qPrintable("line: "+line) << std::endl;
@@ -283,8 +281,8 @@
                 return tmpdev;
             }
         }
+		NetRouteFile.close();
     }
-    NetRouteFile.close();
     return "";
 }
 
@@ -303,7 +301,6 @@
         }
         NetRouteFile.close();
     }
-
     return defaultroutecount;
 }
 
@@ -325,9 +322,8 @@
                 return tmpgw;
             }
         }
+		NetRouteFile .close();
     }
-    NetRouteFile .close();
-
     return "0.0.0.0";
 }
 
@@ -351,7 +347,6 @@
         }
         NetRouteFile.close();
     }
-
     return "";
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]