Merge pull request #62 from Anna-/pathsDC

yurii-litvinov · yurii-litvinov · commit 092a15e3396b · 2014-09-30T14:47:25.000+04:00
#Short paths with '-d' and '-c'
diff --git a/trikGui/main.cpp b/trikGui/main.cpp
@@ -87,6 +87,7 @@ int main(int argc, char *argv[])
 		}
 
 		configPath = app.arguments()[index + 1];
+		configPath = QDir(configPath).absolutePath();
 		if (configPath.right(1) != "/") {
 			configPath += "/";
 		}
@@ -101,6 +102,7 @@ int main(int argc, char *argv[])
 		}
 
 		startDirPath = app.arguments()[index + 1];
+		startDirPath = QDir(startDirPath).absolutePath();
 	}
 
 	if (startDirPath.right(1) != "/") {

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ int main(int argc, char *argv[])`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`configPath = app.arguments()[index + 1];`
	`90`	`+ configPath = QDir(configPath).absolutePath();`
`90`	`91`	`if (configPath.right(1) != "/") {`
`91`	`92`	`configPath += "/";`
`92`	`93`	`}`
`@@ -101,6 +102,7 @@ int main(int argc, char *argv[])`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`startDirPath = app.arguments()[index + 1];`
	`105`	`+ startDirPath = QDir(startDirPath).absolutePath();`
`104`	`106`	`}`
`105`	`107`
`106`	`108`	`if (startDirPath.right(1) != "/") {`