diff options
author | Andrew <forkk@forkk.net> | 2013-02-25 14:44:36 -0600 |
---|---|---|
committer | Andrew <forkk@forkk.net> | 2013-02-25 14:44:36 -0600 |
commit | 4ca35a760dfc53fd69f0f2030868ebeda250ed59 (patch) | |
tree | 1fa312da2d051676830e222b3959a100a2fa6e05 /main.cpp | |
parent | b56b819c35843db0d135a5bbbee5fc9916bd06df (diff) | |
download | MultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.tar MultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.tar.gz MultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.tar.lz MultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.tar.xz MultiMC-4ca35a760dfc53fd69f0f2030868ebeda250ed59.zip |
Fixed a lot of MSVC problems
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -52,7 +52,7 @@ private: MinecraftProcess *proc; ConsoleWindow *console; public: - InstanceLauncher(QString instId) : QObject(), instances(settings->get("InstanceDir").toString()) + InstanceLauncher(QString instId) : QObject(), instances(globalSettings->get("InstanceDir").toString()) { this->instId = instId; } @@ -85,7 +85,7 @@ private slots: { // TODO: console console = new ConsoleWindow(); - proc = new MinecraftProcess(instance, response.getUsername(), response.getSessionID(), console); + proc = new MinecraftProcess(instance, response.username(), response.sessionID(), console); //if (instance->getShowConsole()) console->show(); connect(proc, SIGNAL(ended()), SLOT(onTerminated())); @@ -217,7 +217,7 @@ int main(int argc, char *argv[]) QDir::setCurrent(args["dir"].toString()); // load settings - settings = new AppSettings(&app); + globalSettings = new AppSettings(&app); // Register meta types. qRegisterMetaType<LoginResponse>("LoginResponse"); |