From 0e3c60e8a18d4092f74524fda0791c579eaaf140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BChler?= Date: Mon, 9 Apr 2012 21:16:56 +0200 Subject: [PATCH] replace simple regexp with .endsWith() --- qcross/cnewgamedialog.cpp | 3 +-- qcross/constants.h | 2 +- qcrossedit/cmainwindow.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/qcross/cnewgamedialog.cpp b/qcross/cnewgamedialog.cpp index 80b7c36..c1bffec 100644 --- a/qcross/cnewgamedialog.cpp +++ b/qcross/cnewgamedialog.cpp @@ -140,8 +140,7 @@ namespace qcross { QString fileName = QFileDialog::getOpenFileName(this, tr("Select a package to import"), QString(), tr("QCross Package (*.cpk)")); if (!fileName.isEmpty()) { -/* if (!File::exists(QCROSS_STRING_DATAPATH)) - QDir::mkpath(QCROSS_STRING_DATAPATH);*/ + QDir().mkpath(QCROSS_STRING_DATAPATH); QString newFileName = QCROSS_STRING_DATAPATH + QDir::separator() + fileName.section(QDir::separator(), -1); if (QFile::copy(fileName, newFileName)) diff --git a/qcross/constants.h b/qcross/constants.h index aa089f6..cc8bca5 100644 --- a/qcross/constants.h +++ b/qcross/constants.h @@ -23,7 +23,7 @@ #include -#define QCROSS_STRING_DATAPATH ((QDir::homePath() + QDir::separator()) + ".qcross") +#define QCROSS_STRING_DATAPATH (QDir::homePath() + QDir::separator() + ".config" + QDir::separator() + "qcross") #define QCROSS_STRING_PACKAGE_EXT ".cpk" #endif diff --git a/qcrossedit/cmainwindow.cpp b/qcrossedit/cmainwindow.cpp index 746d48d..482392a 100644 --- a/qcrossedit/cmainwindow.cpp +++ b/qcrossedit/cmainwindow.cpp @@ -153,7 +153,7 @@ namespace qcrossedit { QString fileName = QFileDialog::getSaveFileName(this, tr("Select a file name for the current package"), QString(), tr("QCross Package (*.cpk)")); if (!fileName.isEmpty()) { - if (!QRegExp("*.cpk").exactMatch(fileName)) + if (!fileName.endsWith(".cpk", Qt::CaseInsensitive)) fileName.append(".cpk"); m_Package->setFileName(fileName);