diff --git a/NameCreater/INameCreater.cpp b/NameCreater/INameCreater.cpp index 1f1f04e..94b139e 100644 --- a/NameCreater/INameCreater.cpp +++ b/NameCreater/INameCreater.cpp @@ -9,7 +9,7 @@ #include #include #include - +#include #define BG_PATH_FORMAT ":/NameCreater/resource/background_%1.jpg" @@ -89,8 +89,8 @@ QList INameCreater::getNameByFile(Name_Type_e type, const QString& f QString type_str = csvList.last();//QString::fromLocal8Bit(csvList.last()); qDebug() << "row :" << row << " " << name1; - type_str = type_str.remove(QRegExp("\r")); - type_str = type_str.remove(QRegExp("\n")); + type_str = type_str.remove(QRegularExpression("\r")); + type_str = type_str.remove(QRegularExpression("\n")); @@ -131,8 +131,8 @@ QList INameCreater::getNameByFileContent(Name_Type_e type, const QBy QString type_str = csvList.last();//QString::fromLocal8Bit(csvList.last()); qDebug() << "row :" << row << " " << name1; - type_str = type_str.remove(QRegExp("\r")); - type_str = type_str.remove(QRegExp("\n")); + type_str = type_str.remove(QRegularExpression("\r")); + type_str = type_str.remove(QRegularExpression("\n")); diff --git a/NameCreater/NameCreater.pro b/NameCreater/NameCreater.pro index ac9f334..cbb3649 100644 --- a/NameCreater/NameCreater.pro +++ b/NameCreater/NameCreater.pro @@ -1,6 +1,7 @@ QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat CONFIG += c++11 resources_big diff --git a/NameCreater/OldFiveCreater.cpp b/NameCreater/OldFiveCreater.cpp index ba60227..bdc8e73 100644 --- a/NameCreater/OldFiveCreater.cpp +++ b/NameCreater/OldFiveCreater.cpp @@ -3,7 +3,7 @@ #include #include #include - +#include #define BG_MIX_PATH ":/NameCreater/resource/background.jpg" #define BG_BOY_PATH ":/NameCreater/resource/background_boy.jpg" @@ -67,7 +67,7 @@ QList OldFiveCreater::getNameByFileContent(Name_Type_e type, const Q info.name1 = name1; info.name2 = name2; - info.bg_type = type_str.contains(QRegExp("boy")) ? 1 : (type_str.contains(QRegExp("girl"))) ? 2 : 0; + info.bg_type = type_str.contains(QRegularExpression("boy")) ? 1 : (type_str.contains(QRegularExpression("girl"))) ? 2 : 0; nameList.append(info);