Mercurial > hg > forks > UniversalIndentGUI

changeset 188:5fdaa220aa11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added additional parameter order for calling the indenter, in this case specially for HTML tidy. The output file can now be set before the input file. git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@392 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Wed, 06 Jun 2007 15:48:10 +0000
parents d3739b2f111a
children 81366131c5f1
files src/indenthandler.cpp
diffstat 1 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/indenthandler.cpp	Wed Jun 06 15:46:24 2007 +0000
+++ b/src/indenthandler.cpp	Wed Jun 06 15:48:10 2007 +0000
@@ -140,6 +140,9 @@
 	else if ( parameterOrder == "pio" ) {
 		indentCallString = parameterParameterFile + parameterInputFile + parameterOuputFile;
 	}
+    else if ( parameterOrder == "poi" ) {
+		indentCallString = parameterParameterFile + parameterOuputFile + parameterInputFile;
+	}
 	else {
 		indentCallString = parameterInputFile + parameterOuputFile + parameterParameterFile;
 	}
@@ -190,7 +193,7 @@
 	QString indentCallString;
 	QString parameterInputFile;
 	QString parameterOuputFile;
-	QString parameterParamterFile;
+	QString parameterParameterFile;
 	QProcess indentProcess;
 	QString processReturnString;
 	bool indenterExecutableExists = false;
@@ -216,22 +219,25 @@
 
 	// If the config file name is empty it is assumed that all parameters are sent via command line call
 	if ( configFilename.isEmpty() ) {
-		parameterParamterFile = " " + parameterString;
+		parameterParameterFile = " " + parameterString;
 	}
 	// if needed add the parameter to the indenter call string where the config file can be found
 	else if (useCfgFileParameter != "none") {
-		parameterParamterFile = " " + useCfgFileParameter + "\"" + QFileInfo(dataDirctoryStr).absoluteFilePath() + "/" + configFilename + "\"";
+		parameterParameterFile = " " + useCfgFileParameter + "\"" + QFileInfo(dataDirctoryStr).absoluteFilePath() + "/" + configFilename + "\"";
 	}
 
 	// Assemble indenter call string for parameters according to the set order.
 	if ( parameterOrder == "ipo" ) {
-		indentCallString = parameterInputFile + parameterParamterFile + parameterOuputFile;
+		indentCallString = parameterInputFile + parameterParameterFile + parameterOuputFile;
 	} 
 	else if ( parameterOrder == "pio" ) {
-		indentCallString = parameterParamterFile + parameterInputFile + parameterOuputFile;
+		indentCallString = parameterParameterFile + parameterInputFile + parameterOuputFile;
+	}
+    else if ( parameterOrder == "poi" ) {
+		indentCallString = parameterParameterFile + parameterOuputFile + parameterInputFile;
 	}
 	else {
-		indentCallString = parameterInputFile + parameterOuputFile + parameterParamterFile;
+		indentCallString = parameterInputFile + parameterOuputFile + parameterParameterFile;
 	}
 
     // Test if the indenter executable exists. If not show a dialog box once and return