Merge branch 'master' of git://github.com/peterix/MultiMC5

2 files changed, 6 insertions, 6 deletions

diff --git a/libmultimc/include/appsettings.h b/libmultimc/include/appsettings.h
index 66ffb7b5..8447d58b 100644
--- a/libmultimc/include/appsettings.h
+++ b/libmultimc/include/appsettings.h
@@ -18,11 +18,11 @@
 
 #include <QObject>
 
-#include <basicsettingsobject.h>
+#include <inisettingsobject.h>
 
 #include "libmmc_config.h"
 
-class LIBMULTIMC_EXPORT AppSettings : public BasicSettingsObject
+class LIBMULTIMC_EXPORT AppSettings : public INISettingsObject
 {
 	Q_OBJECT
 public:
diff --git a/libmultimc/include/logintask.h b/libmultimc/include/logintask.h
index c1efb223..e00609ec 100644
--- a/libmultimc/include/logintask.h
+++ b/libmultimc/include/logintask.h
@@ -30,20 +30,20 @@ class LIBMULTIMC_EXPORT LoginTask : public Task
 {
 	Q_OBJECT
 public:
-	explicit LoginTask(const UserInfo& uInfo, QObject *parent = 0);
+	explicit LoginTask(const UserInfo& uInfo, QString inst, QObject *parent = 0);
 	
 public slots:
 	void processNetReply(QNetworkReply* reply);
 	
 signals:
-	void loginComplete(LoginResponse loginResponse);
-	void loginFailed(const QString& errorMsg);
+	void loginComplete(QString inst, LoginResponse loginResponse);
+	void loginFailed(QString inst, const QString& errorMsg);
 	
 protected:
 	void executeTask();
 	
 	QNetworkReply* netReply;
-	
+	QString inst;
 	UserInfo uInfo;
 };