summaryrefslogtreecommitdiffstats
path: root/libmultimc/include
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-03-11 22:19:17 +0100
committerPetr Mrázek <peterix@gmail.com>2013-03-11 22:19:17 +0100
commit46f93311afc9f1e2afc306f63cee0e4f462758e2 (patch)
treecc945d66e6ca5e68c43b354d3f8f6d6e70cf5326 /libmultimc/include
parent36396f7c6aca9fcc61c8620e10c31ed2c8999ebd (diff)
downloadMultiMC-46f93311afc9f1e2afc306f63cee0e4f462758e2.tar
MultiMC-46f93311afc9f1e2afc306f63cee0e4f462758e2.tar.gz
MultiMC-46f93311afc9f1e2afc306f63cee0e4f462758e2.tar.lz
MultiMC-46f93311afc9f1e2afc306f63cee0e4f462758e2.tar.xz
MultiMC-46f93311afc9f1e2afc306f63cee0e4f462758e2.zip
Instance view, model, delegate.
Diffstat (limited to 'libmultimc/include')
-rw-r--r--libmultimc/include/appsettings.h4
-rw-r--r--libmultimc/include/logintask.h8
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;
};