From 1b1dde3fc80a6e8b9d55269676e8bf3126fdff66 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 9 Jan 2010 22:09:20 +0000 Subject: [PATCH] - Fix '!' support in label names --- src/misc.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/misc.h b/src/misc.h index 04511b6d1..0d46fba21 100644 --- a/src/misc.h +++ b/src/misc.h @@ -184,13 +184,17 @@ public: } static QString toValidFileSystemName(QString filename) { - filename = filename.replace("\\", "/"); - QRegExp regex("[/:!?\"*<>|]"); - return filename.replace(regex, " "); + qDebug("toValidFSName: %s", filename.toLocal8Bit().data()); + filename = filename.replace("\\", "/").trimmed(); + QRegExp regex("[/:?\"*<>|]"); + filename = filename.replace(regex, " ").trimmed(); + qDebug("toValidFSName, result: %s", filename.toLocal8Bit().data()); + return filename; } static bool isValidFileSystemName(QString filename) { - filename = filename.replace("\\", "/"); + filename = filename.replace("\\", "/").trimmed(); + if(filename.isEmpty()) return false; QRegExp regex("[/:?\"*<>|]"); if(filename.contains(regex)) return false;