refactor indendation, fix a bug in MinecraftProcess & fix a bug in

InstanceLauncher

libmultimc/include/minecraftprocess.h

@@ -85,7 +85,7 @@ protected:
     QStringList m_arguments;
 
     void genArgs();
-    void log(QString text);
+	void log(QString text, ConsoleWindow::WriteMode mode = ConsoleWindow::MULTIMC);
 
 protected slots:
     void finish(int, QProcess::ExitStatus status);

libmultimc/src/minecraftprocess.cpp

@@ -197,6 +197,8 @@ void MinecraftProcess::launch()
 	start(m_instance->settings().get("JavaPath").toString(), m_arguments);
 	if (!waitForStarted())
 	{
+		log("Could not launch minecraft!", ConsoleWindow::ERROR);
+		return;
 		//TODO: error handling
 	}
 	

libsettings/src/stubkeyring.cpp

@@ -70,7 +70,7 @@ QString StubKeyring::getPassword(QString service, QString username)
 	return unscramble64(m_settings.value(key).toString());
 }
 
-inline bool StubKeyring::hasPassword(QString service, QString username)
+bool StubKeyring::hasPassword(QString service, QString username)
 {
 	return m_settings.contains(generateKey(service, username));
 }

libutil/include/cmdutils.h

@@ -73,15 +73,6 @@ enum LIBUTIL_EXPORT Enum
 };
 }
 
-namespace OptionType
-{
-enum LIBUTIL_EXPORT Enum
-{
-	Switch,
-	Option
-};
-}
-
 /**
  * @brief The ParsingError class
  */
@@ -211,6 +202,12 @@ private:
 	FlagStyle::Enum m_flagStyle;
 	ArgumentStyle::Enum m_argStyle;
 
+	enum OptionType
+	{
+		otSwitch,
+		otOption
+	};
+	
 	// Important: the common part MUST BE COMMON ON ALL THREE structs
 	struct CommonDef {
 		QString name;
@@ -226,7 +223,7 @@ private:
 		QString metavar;
 		QVariant def;
 		// option
-		OptionType::Enum type;
+		OptionType type;
 		QChar flag;
 	};
 	

libutil/src/cmdutils.cpp

@@ -56,7 +56,7 @@ void Parser::addSwitch(QString name, bool def)
 		throw "Name not unique";
 	
 	OptionDef *param = new OptionDef;
-	param->type = OptionType::Switch;
+	param->type = otSwitch;
 	param->name = name;
 	param->metavar = QString("<%1>").arg(name);
 	param->def = def;
@@ -72,7 +72,7 @@ void Parser::addOption(QString name, QVariant def)
 		throw "Name not unique";
 	
 	OptionDef *param = new OptionDef;
-	param->type = OptionType::Option;
+	param->type = otOption;
 	param->name = name;
 	param->metavar = QString("<%1>").arg(name);
 	param->def = def;
@@ -161,7 +161,7 @@ QString Parser::compileHelp(QString progName, int helpIndent, bool useFlags)
 				help << flagPrefix << option->flag << ", ";
 			}
 			help << optPrefix << option->name;
-			if (option->type == OptionType::Option)
+			if (option->type == otOption)
 			{
 				QString arg = QString("%1%2").arg(((m_argStyle == ArgumentStyle::Equals) ? "=" : " "), option->metavar);
 				nameLength += arg.length();
@@ -193,7 +193,7 @@ QString Parser::compileUsage(QString progName, bool useFlags)
 			usage << flagPrefix << option->flag;
 		else
 			usage << optPrefix << option->name;
-		if (option->type == OptionType::Option)
+		if (option->type == otOption)
 			usage << ((m_argStyle == ArgumentStyle::Equals) ? "=" : " ") <<  option->metavar;
 		usage << "]";
 	}
@@ -265,9 +265,9 @@ QHash<QString, QVariant> Parser::parse(QStringList argv)
 					throw ParsingError(QString("Option %2%1 was given multiple times").arg(name, optionPrefix));
 				
 				OptionDef *option = m_options[name];
-				if (option->type == OptionType::Switch)
+				if (option->type == otSwitch)
 					map[name] = true;
-				else //if (option->type == OptionType::Option)
+				else //if (option->type == otOption)
 				{
 					if (m_argStyle == ArgumentStyle::Space)
 						expecting.append(name);
@@ -312,9 +312,9 @@ QHash<QString, QVariant> Parser::parse(QStringList argv)
 				if (map.contains(option->name))
 					throw ParsingError(QString("Option %2%1 was given multiple times").arg(option->name, optionPrefix));
 				
-				if (option->type == OptionType::Switch)
+				if (option->type == otSwitch)
 					map[option->name] = true;
-				else //if (option->type == OptionType::Option)
+				else //if (option->type == otOption)
 				{
 					if (m_argStyle == ArgumentStyle::Space)
 						expecting.append(option->name);

main.cpp

@@ -66,12 +66,9 @@ private:
 		{
 			inst = iter.next();
 			if (inst->id() == instId)
-				break;
+				return inst;
 		}
-		if (inst->id() != instId)
 		return InstancePtr();
-		else
-			return iter.peekPrevious();
 	}
 	
 private slots: