From 35bc0f3609ab1e37daa3171356c4db80a4f839f9 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 11 Feb 2010 12:41:16 +0100
Subject: [PATCH] simplify exists() implementation
---
src/shared/proparser/profileevaluator.cpp | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 76b1965cba6..5082b57ea09 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -2771,16 +2771,13 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
if (IoUtils::exists(file)) {
return ProItem::ReturnTrue;
}
- //regular expression I guess
- QString dirstr = currentDirectory();
- int slsh = file.lastIndexOf(m_option->dir_sep);
- if (slsh != -1) {
- dirstr = file.left(slsh+1);
- file = file.right(file.length() - slsh - 1);
- }
- if (file.contains(QLatin1Char('*')) || file.contains(QLatin1Char('?')))
- if (!QDir(dirstr).entryList(QStringList(file)).isEmpty())
+ int slsh = file.lastIndexOf(QLatin1Char('/'));
+ QString fn = file.mid(slsh+1);
+ if (fn.contains(QLatin1Char('*')) || fn.contains(QLatin1Char('?'))) {
+ QString dirstr = file.left(slsh+1);
+ if (!QDir(dirstr).entryList(QStringList(fn)).isEmpty())
return ProItem::ReturnTrue;
+ }
return ProItem::ReturnFalse;
}
--
GitLab