ldforge: comparison src/primitives.cc

-:2983f7c7e7c9
+:3dd6f343ec06
 extern_cfg (String, ld_defaultname);
 extern_cfg (String, ld_defaultuser);
 extern_cfg (Int, ld_defaultlicense);
-static const str g_radialNameRoots[] =
+static const QStringList g_radialNameRoots =
 {
 	"edge",
 	"cyli",
 	"disc",
 	"ndis",
 		PrimitiveLister::start();
 	}
 	else
 	{
 		// Read primitives from prims.cfg
-		for (str line : conf)
+		for (QString line : conf)
 		{
 			int space = line.indexOf (" ");
 			if (space == -1)
 				continue;
 	}
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-static void recursiveGetFilenames (QDir dir, QList<str>& fnames)
+static void recursiveGetFilenames (QDir dir, QList<QString>& fnames)
 {
 	QFileInfoList flist = dir.entryInfoList();
 	for (const QFileInfo & info : flist)
 	{
 	int j = min (m_i + 300, m_files.size());
 	log ("PrimitiveLister::work: %1 -> %2\n", m_i, j);
 	for (; m_i < j; ++m_i)
 	{
-		str fname = m_files[m_i];
+		QString fname = m_files[m_i];
 		File f (fname, File::Read);
 		Primitive info;
 		info.name = fname.mid (m_baselen + 1);  // make full path relative
 		info.name.replace ('/', '\\');  // use DOS backslashes, they're expected
 		info.cat = null;
 	lister->work();
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-PrimitiveCategory::PrimitiveCategory (str name, QObject* parent) :
+PrimitiveCategory::PrimitiveCategory (QString name, QObject* parent) :
 	QObject (parent),
 	m_Name (name) {}
 // =============================================================================
 // -----------------------------------------------------------------------------
 	if (f)
 	{
 		PrimitiveCategory* cat = null;
-		for (str line : f)
+		for (QString line : f)
 		{
 			int colon;
 			if (line.length() == 0 || line[0] == '#')
 				continue;
 				cat = new PrimitiveCategory (line);
 			}
 			elif (cat != null)
 			{
-				str cmd = line.left (colon);
+				QString cmd = line.left (colon);
 				ERegexType type = EFilenameRegex;
 				if (cmd == "f")
 					type = EFilenameRegex;
 				elif (cmd == "t")
 	return objs;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-static str primitiveTypeName (PrimitiveType type)
+static QString primitiveTypeName (PrimitiveType type)
 {
 	// Not translated as primitives are in English.
 	return type == Circle   ? "Circle" :
 		   type == Cylinder ? "Cylinder" :
 		   type == Disc     ? "Disc" :
 		   type == Ring     ? "Ring" : "Cone";
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-str radialFileName (PrimitiveType type, int segs, int divs, int num)
+QString radialFileName (PrimitiveType type, int segs, int divs, int num)
 {
 	int numer = segs,
 			denom = divs;
 	// Simplify the fractional part, but the denominator must be at least 4.
 		numer *= factor;
 		denom *= factor;
 	}
 	// Compose some general information: prefix, fraction, root, ring number
-	str prefix = (divs == lores) ? "" : fmt ("%1/", divs);
+	QString prefix = (divs == lores) ? "" : fmt ("%1/", divs);
-	str frac = fmt ("%1-%2", numer, denom);
+	QString frac = fmt ("%1-%2", numer, denom);
-	str root = g_radialNameRoots[type];
+	QString root = g_radialNameRoots[type];
-	str numstr = (type == Ring || type == Cone) ? fmt ("%1", num) : "";
+	QString numstr = (type == Ring || type == Cone) ? fmt ("%1", num) : "";
 	// Truncate the root if necessary (7-16rin4.dat for instance).
 	// However, always keep the root at least 2 characters.
 	int extra = (frac.length() + numstr.length() + root.length()) - 8;
 	root.chop (clamp (extra, 0, 2));
 // =============================================================================
 // -----------------------------------------------------------------------------
 LDDocument* generatePrimitive (PrimitiveType type, int segs, int divs, int num)
 {
 	// Make the description
-	str frac = str::number ((float) segs / divs);
+	QString frac = QString::number ((float) segs / divs);
-	str name = radialFileName (type, segs, divs, num);
+	QString name = radialFileName (type, segs, divs, num);
-	str descr;
+	QString descr;
 	// Ensure that there's decimals, even if they're 0.
 	if (frac.indexOf (".") == -1)
 		frac += ".0";
 	if (type == Ring || type == Cone)
 	{
-		str spacing =
+		QString spacing =
 			(num < 10) ? "  " :
 			(num < 100) ? " "  : "";
 		descr = fmt ("%1 %2%3 x %4", primitiveTypeName (type), spacing, num, frac);
 	}
 		descr.insert (0, "Hi-Res ");
 	LDDocument* f = new LDDocument;
 	f->setDefaultName (name);
-	str author = APPNAME;
+	QString author = APPNAME;
-	str license = "";
+	QString license = "";
 	if (ld_defaultname.isEmpty() == false)
 	{
 		license = getLicenseText (ld_defaultlicense);
 		author = fmt ("%1 [%2]", ld_defaultname, ld_defaultuser);
 // =============================================================================
 // -----------------------------------------------------------------------------
 LDDocument* getPrimitive (PrimitiveType type, int segs, int divs, int num)
 {
-	str name = radialFileName (type, segs, divs, num);
+	QString name = radialFileName (type, segs, divs, num);
 	LDDocument* f = getDocument (name);
 	if (f != null)
 		return f;

Mercurial > ldforge / file comparison

comparison: src/primitives.cc

src/primitives.cc