From 2cd16db6fbc36ef83cc7909dd9a4bc739d62a59d Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 27 Mar 2012 11:46:32 +0200 Subject: [PATCH] Wizards: blacklisting more characters for file names Change-Id: Idddfe95eeee0df31c6737e11fe7b4b095b594111 Reviewed-by: Alessandro Portale --- src/libs/utils/filenamevalidatinglineedit.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/libs/utils/filenamevalidatinglineedit.cpp b/src/libs/utils/filenamevalidatinglineedit.cpp index 8c3cdeaabff..8aab1aea733 100644 --- a/src/libs/utils/filenamevalidatinglineedit.cpp +++ b/src/libs/utils/filenamevalidatinglineedit.cpp @@ -84,14 +84,11 @@ void FileNameValidatingLineEdit::setAllowDirectories(bool v) /* Validate a file base name, check for forbidden characters/strings. */ -#ifdef Q_OS_WIN -# define SLASHES "/\\" -#else -# define SLASHES "/" -#endif -static const char notAllowedCharsSubDir[] = "={}[]~!?:&*\"|#%<>$\"'();`' "; -static const char notAllowedCharsNoSubDir[] = "={}[]~!?:&*\"|#%<>$\"'();`' "SLASHES; +#define SLASHES "/\\" + +static const char notAllowedCharsSubDir[] = ",^@=+{}[]~!?:&*\"|#%<>$\"'();`' "; +static const char notAllowedCharsNoSubDir[] = ",^@=+{}[]~!?:&*\"|#%<>$\"'();`' "SLASHES; static const char *notAllowedSubStrings[] = {".."};