Browse Source

Clean up misc::isValidFileSystemName() function

adaptive-webui-19844
Christophe Dumez 13 years ago
parent
commit
68041e382d
  1. 9
      src/misc.cpp
  2. 2
      src/misc.h

9
src/misc.cpp

@ -575,13 +575,10 @@ QString misc::toValidFileSystemName(QString filename) { @@ -575,13 +575,10 @@ QString misc::toValidFileSystemName(QString filename) {
return filename;
}
bool misc::isValidFileSystemName(QString filename) {
filename.replace("\\", "/").trimmed();
bool misc::isValidFileSystemName(const QString& filename) {
if(filename.isEmpty()) return false;
const QRegExp regex("[/:?\"*<>|]");
if(filename.contains(regex))
return false;
return true;
const QRegExp regex("[\\\\/:?\"*<>|]");
return !filename.contains(regex);
}
#ifndef DISABLE_GUI

2
src/misc.h

@ -140,7 +140,7 @@ public: @@ -140,7 +140,7 @@ public:
static bool isUrl(const QString &s);
static void copyDir(QString src_path, QString dst_path);
static QString toValidFileSystemName(QString filename);
static bool isValidFileSystemName(QString filename);
static bool isValidFileSystemName(const QString& filename);
/* Ported from Qt4 to drop dependency on QtGui */
static QString QDesktopServicesDataLocation();

Loading…
Cancel
Save