1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need to stat with QFile::exists before QFile::open, for reading.

Browse Source 
Change-Id: I14ca7f8a377bca39004defc96d69d62c151181f5
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
This commit is contained in:
David Faure 2012-02-17 14:16:55 +01:00 committed by Qt by Nokia
parent aee4cbf22a
commit e5bcb4844d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qstandardpaths_unix.cpp
View File

@ -137,7 +137,7 @@ QString QStandardPaths::writableLocation(StandardLocation type)
if (xdgConfigHome.isEmpty())
xdgConfigHome = QDir::homePath() + QLatin1String("/.config");
QFile file(xdgConfigHome + QLatin1String("/user-dirs.dirs"));
if (file.exists() && file.open(QIODevice::ReadOnly)) {
if (file.open(QIODevice::ReadOnly)) {
QHash<QString, QString> lines;
QTextStream stream(&file);
// Only look for lines like: XDG_DESKTOP_DIR="$HOME/Desktop"

4
src/plugins/bearer/connman/qconnmanengine.cpp
View File

@ -255,7 +255,7 @@ quint64 QConnmanEngine::bytesWritten(const QString &id)
quint64 result = 0;
QString devFile = getInterfaceFromId(id);
QFile tx("/sys/class/net/"+devFile+"/statistics/tx_bytes");
if(tx.exists() && tx.open(QIODevice::ReadOnly | QIODevice::Text)) {
if (tx.open(QIODevice::ReadOnly | QIODevice::Text)) {
QTextStream in(&tx);
in >> result;
tx.close();
@ -270,7 +270,7 @@ quint64 QConnmanEngine::bytesReceived(const QString &id)
quint64 result = 0;
QString devFile = getInterfaceFromId(id);
QFile rx("/sys/class/net/"+devFile+"/statistics/rx_bytes");
if(rx.exists() && rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
if (rx.open(QIODevice::ReadOnly | QIODevice::Text)) {
QTextStream in(&rx);
in >> result;
rx.close();

4
src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
View File

@ -837,7 +837,7 @@ quint64 QNetworkManagerEngine::bytesWritten(const QString &id)
quint64 result = Q_UINT64_C(0);
QFile tx(devFile);
if (tx.exists() && tx.open(QIODevice::ReadOnly | QIODevice::Text)) {
if (tx.open(QIODevice::ReadOnly | QIODevice::Text)) {
QTextStream in(&tx);
in >> result;
tx.close();
@ -865,7 +865,7 @@ quint64 QNetworkManagerEngine::bytesReceived(const QString &id)
quint64 result = Q_UINT64_C(0);
QFile tx(devFile);
if (tx.exists() && tx.open(QIODevice::ReadOnly | QIODevice::Text)) {
if (tx.open(QIODevice::ReadOnly | QIODevice::Text)) {
QTextStream in(&tx);
in >> result;
tx.close();

2
src/widgets/styles/qgtkstyle_p.cpp
View File

@ -661,7 +661,7 @@ QString QGtkStylePrivate::getThemeName()
foreach (const QString &rcPath, paths) {
if (!rcPath.isEmpty()) {
QFile rcFile(rcPath);
if (rcFile.exists() && rcFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
if (rcFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
QTextStream in(&rcFile);
while(!in.atEnd()) {
QString line = in.readLine();