diff --git a/NameCreater/main.cpp b/NameCreater/main.cpp index 46a89a8..d268915 100644 --- a/NameCreater/main.cpp +++ b/NameCreater/main.cpp @@ -122,11 +122,11 @@ QList getNameByFile(const QString& filename) { QString name1 = csvList.at(0); QString type_str = csvList.last();//QString::fromLocal8Bit(csvList.last()); qDebug() << "row :" << row << " " << name1; -#ifdef Q_OS_MAC + + type_str = type_str.remove(QRegExp("\r")); type_str = type_str.remove(QRegExp("\n")); -#else - type_str = type_str.remove(QRegExp("\r\n")); -#endif + + if (name1.compare("name_1") == 0) { continue;