ldforge: comparison src/extprogs.cc

-:2983f7c7e7c9
+:3dd6f343ec06
 cfg (String, prog_coverer, "");
 cfg (String, prog_ytruder, "");
 cfg (String, prog_rectifier, "");
 cfg (String, prog_edger2, "");
-str* const g_extProgPaths[] =
+QString* const g_extProgPaths[] =
 {
 	&prog_isecalc,
 	&prog_intersector,
 	&prog_coverer,
 	&prog_ytruder,
 // =============================================================================
 // -----------------------------------------------------------------------------
 static bool checkProgPath (const extprog prog)
 {
-	str& path = *g_extProgPaths[prog];
+	QString& path = *g_extProgPaths[prog];
 	if (path.length() > 0)
 		return true;
 	ExtProgPathPrompt* dlg = new ExtProgPathPrompt (g_extProgNames[prog]);
 	return false;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-static str processErrorString (extprog prog, QProcess& proc)
+static QString processErrorString (extprog prog, QProcess& proc)
 {
 	switch (proc.error())
 	{
 		case QProcess::FailedToStart:
 		{
-			str wineblurb;
+			QString wineblurb;
 #ifndef _WIN32
 			if (*g_extProgWine[prog])
 				wineblurb = "make sure Wine is installed and ";
 #endif
 	return "";
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-static bool mkTempFile (QTemporaryFile& tmp, str& fname)
+static bool mkTempFile (QTemporaryFile& tmp, QString& fname)
 {
 	if (!tmp.open())
 		return false;
 	fname = tmp.fileName();
 	}
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-static void writeObjects (const QList<LDObject*>& objects, str fname)
+static void writeObjects (const QList<LDObject*>& objects, QString fname)
 {
 	// Write the input file
 	File f (fname, File::Write);
 	if (!f)
 #endif
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-void writeSelection (str fname)
+void writeSelection (QString fname)
 {
 	writeObjects (selection(), fname);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-void writeColorGroup (const int colnum, str fname)
+void writeColorGroup (const int colnum, QString fname)
 {
 	QList<LDObject*> objects;
 	for (LDObject* obj : getCurrentDocument()->getObjects())
 	{
 	writeObjects (objects, fname);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-bool runUtilityProcess (extprog prog, str path, str argvstr)
+bool runUtilityProcess (extprog prog, QString path, QString argvstr)
 {
 	QTemporaryFile input, output;
-	str inputname, outputname;
+	QString inputname, outputname;
 	QStringList argv = argvstr.split (" ", QString::SkipEmptyParts);
 #ifndef _WIN32
 	if (*g_extProgWine[prog])
 	{
 	stdinfp.write ("\n");
 	// Wait while it runs
 	proc.waitForFinished();
-	str err = "";
+	QString err = "";
 	if (proc.exitStatus() != QProcess::NormalExit)
 		err = processErrorString (prog, proc);
 	// Check the return code
 	return true;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-static void insertOutput (str fname, bool replace, QList<int> colorsToReplace)
+static void insertOutput (QString fname, bool replace, QList<int> colorsToReplace)
 {
 #ifdef DEBUG
 	QFile::copy (fname, "./debug_lastOutput");
 #endif // RELEASE
 	const double depth = ui.planeDepth->value(),
 				 condAngle = ui.condAngle->value();
 	QTemporaryFile indat, outdat;
-	str inDATName, outDATName;
+	QString inDATName, outDATName;
 	// Make temp files for the input and output files
 	if (!mkTempFile (indat, inDATName) || !mkTempFile (outdat, outDATName))
 		return;
 	// Compose the command-line arguments
-	str argv = join (
+	QString argv = join (
 	{
 		(axis == X) ? "-x" : (axis == Y) ? "-y" : "-z",
 		(mode == Distance) ? "-d" : (mode == Symmetry) ? "-s" : (mode == Projection) ? "-p" : "-r",
 		depth,
 		"-a",
 	if (!dlg->exec())
 		return;
 	QTemporaryFile indat, outdat;
-	str inDATName, outDATName;
+	QString inDATName, outDATName;
 	// Make temp files for the input and output files
 	if (!mkTempFile (indat, inDATName) || !mkTempFile (outdat, outDATName))
 		return;
 	// Compose arguments
-	str argv = join (
+	QString argv = join (
 	{
 		(!ui.cb_condense->isChecked()) ? "-q" : "",
 		(!ui.cb_subst->isChecked()) ? "-r" : "",
 		(ui.cb_condlineCheck->isChecked()) ? "-a" : "",
 		(ui.cb_colorize->isChecked()) ? "-c" : "",
 	// cutdat = cutter group file
 	// outdat = primary output
 	// outdat2 = inverse output
 	// edgesdat = edges output (isecalc)
 	QTemporaryFile indat, cutdat, outdat, outdat2, edgesdat;
-	str inDATName, cutDATName, outDATName, outDAT2Name, edgesDATName;
+	QString inDATName, cutDATName, outDATName, outDAT2Name, edgesDATName;
 	if (!mkTempFile (indat, inDATName) || !mkTempFile (cutdat, cutDATName) ||
 			!mkTempFile (outdat, outDATName) || !mkTempFile (outdat2, outDAT2Name) ||
 			!mkTempFile (edgesdat, edgesDATName))
 	{
 		return;
 	}
-	str parms = join (
+	QString parms = join (
 	{
 		(ui.cb_colorize->isChecked()) ? "-c" : "",
 		(ui.cb_nocondense->isChecked()) ? "-t" : "",
 		"-s",
 		ui.dsb_prescale->value()
 	});
-	str argv_normal = join (
+	QString argv_normal = join (
 	{
 		parms,
 		inDATName,
 		cutDATName,
 		outDATName
 	});
-	str argv_inverse = join (
+	QString argv_inverse = join (
 	{
 		parms,
 		cutDATName,
 		inDATName,
 		outDAT2Name
 		break;
 	}
 	QTemporaryFile in1dat, in2dat, outdat;
-	str in1DATName, in2DATName, outDATName;
+	QString in1DATName, in2DATName, outDATName;
 	if (!mkTempFile (in1dat, in1DATName) || !mkTempFile (in2dat, in2DATName) || !mkTempFile (outdat, outDATName))
 		return;
-	str argv = join (
+	QString argv = join (
 	{
 		(ui.cb_oldsweep->isChecked() ? "-s" : ""),
 		(ui.cb_reverse->isChecked() ? "-r" : ""),
 		(ui.dsb_segsplit->value() != 0 ? fmt ("-l %1", ui.dsb_segsplit->value()) : ""),
 		(ui.sb_bias->value() != 0 ? fmt ("-s %1", ui.sb_bias->value()) : ""),
 		break;
 	}
 	QTemporaryFile in1dat, in2dat, outdat;
-	str in1DATName, in2DATName, outDATName;
+	QString in1DATName, in2DATName, outDATName;
 	if (!mkTempFile (in1dat, in1DATName) || !mkTempFile (in2dat, in2DATName) || !mkTempFile (outdat, outDATName))
 		return;
-	str argv = join (
+	QString argv = join (
 	{
 		in1DATName,
 		in2DATName,
 		outDATName
 	});
 	if (!dlg->exec())
 		return;
 	QTemporaryFile in, out;
-	str inName, outName;
+	QString inName, outName;
 	if (!mkTempFile (in, inName) || !mkTempFile (out, outName))
 		return;
 	int unmatched = ui.unmatched->currentIndex();
-	str argv = join (
+	QString argv = join (
 	{
 		fmt ("-p %1", ui.precision->value()),
 		fmt ("-af %1", ui.flatAngle->value()),
 		fmt ("-ac %1", ui.condAngle->value()),
 		fmt ("-ae %1", ui.edgeAngle->value()),

Mercurial > ldforge / file comparison

comparison: src/extprogs.cc

src/extprogs.cc