From 4fa3d9dc1cc248d982eb82d74781b697e3109d2f Mon Sep 17 00:00:00 2001
From: shouchih_chen <asd921150@hotmail.com>
Date: Sun, 20 Feb 2022 11:07:11 +0800
Subject: [PATCH] fix bg type string '/r/n'

---
 NameCreater/main.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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<NameInfo_t> 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;