Get rid of getSatIdFromLine2

Author: 10110111

plugins/Satellites/src/Satellites.cpp

@@ -2995,12 +2995,20 @@ void Satellites::parseTleFile(QFile& openFile, TleDataHash& tleList, bool addFla
 				lastData.second = line;
 				// The Satellite Catalogue Number is the second number
 				// on the second line.
-				QString id = getSatIdFromLine2(line);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+				QString id = line.split(' ',  Qt::SkipEmptyParts).at(1).trimmed();
+#else
+				QString id = line.split(' ',  QString::SkipEmptyParts).at(1).trimmed();
+#endif
 				if (id.isEmpty())
 				{
 					qDebug() << "[Satellites] failed to extract SatId from \"" << line << "\"";
 					continue;
 				}
+				// Strip any leading zeros as they should be unique ints as strings.
+				static const QRegularExpression re("^[0]*\\B");
+				id.remove(re);
+
 				lastData.id = id;
 
 				// This is the second line and there will be no more,
@@ -3156,22 +3164,6 @@ void Satellites::parseCsvFile(QFile& openFile, const QStringList& headerEntries,
 	}
 }
 
-QString Satellites::getSatIdFromLine2(const QString& line)
-{
-	#if (QT_VERSION>=QT_VERSION_CHECK(5, 14, 0))
-	QString id = line.split(' ',  Qt::SkipEmptyParts).at(1).trimmed();
-	#else
-	QString id = line.split(' ',  QString::SkipEmptyParts).at(1).trimmed();
-	#endif
-	if (!id.isEmpty())
-	{
-		// Strip any leading zeros as they should be unique ints as strings.
-		static const QRegularExpression re("^[0]*\\B");
-		id.remove(re);
-	}
-	return id;
-}
-
 void Satellites::loadExtraData()
 {
 	// regular expression to find the comments and empty lines

plugins/Satellites/src/Satellites.hpp

@@ -392,10 +392,6 @@ class Satellites : public StelObjectModule
 
 	static void parseDataFile(QFile& openFile, TleDataHash& tleList, bool addFlagValue = false, const QString& tleURL = "");
 
-	//! Insert a three line TLE into the hash array.
-	//! @param[in] line The second line from the TLE
-	static QString getSatIdFromLine2(const QString& line);
-
 	//! Reads qs.mag and rcs files and its parsing for getting id,  standard magnitude and RCS values
 	//! for satellites.
 	//! @note We are having permissions for use this file from Mike McCants.