From 4ca35a760dfc53fd69f0f2030868ebeda250ed59 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 25 Feb 2013 14:44:36 -0600 Subject: Fixed a lot of MSVC problems --- main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 27e86d5f..2969ca6f 100644 --- a/main.cpp +++ b/main.cpp @@ -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"); -- cgit