From 6096b289b776678e3a6f938dddd7367f784a83fe Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Thu, 14 Aug 2014 23:59:31 -0700
Subject: Bootmanager: changed `filename` to std::string

---
 src/citra/emu_window/emu_window_glfw.cpp | 1 -
 src/citra_qt/bootmanager.cpp             | 8 +++++---
 src/citra_qt/bootmanager.hxx             | 4 ++--
 src/citra_qt/main.cpp                    | 5 ++---
 src/citra_qt/main.hxx                    | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index f882a825..02f524e0 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -6,7 +6,6 @@
 
 #include "video_core/video_core.h"
 
-#include "citra/citra.h"
 #include "citra/emu_window/emu_window_glfw.h"
 
 static void OnKeyEvent(GLFWwindow* win, int key, int action) {
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index a162e6df..b0aa1e56 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -17,13 +17,15 @@
 #define APP_TITLE       APP_NAME " " APP_VERSION
 #define COPYRIGHT       "Copyright (C) 2013-2014 Citra Team"
 
-EmuThread::EmuThread(GRenderWindow* render_window) : exec_cpu_step(false), cpu_running(false), render_window(render_window)
+EmuThread::EmuThread(GRenderWindow* render_window) : 
+    exec_cpu_step(false), cpu_running(false), 
+    render_window(render_window), filename("")
 {
 }
 
-void EmuThread::SetFilename(const char* filename)
+void EmuThread::SetFilename(std::string filename)
 {
-    strcpy(this->filename, filename);
+    this->filename = filename;
 }
 
 void EmuThread::run()
diff --git a/src/citra_qt/bootmanager.hxx b/src/citra_qt/bootmanager.hxx
index 1001e1ee..b4005ccb 100644
--- a/src/citra_qt/bootmanager.hxx
+++ b/src/citra_qt/bootmanager.hxx
@@ -17,7 +17,7 @@ public:
      * @param filename
      * @warning Only call when not running!
      */
-    void SetFilename(const char* filename);
+    void SetFilename(std::string filename);
 
     /**
      * Start emulation (on new thread)
@@ -62,7 +62,7 @@ private:
 
     EmuThread(GRenderWindow* render_window);
 
-    char filename[MAX_PATH];
+    std::string filename;
 
     bool exec_cpu_step;
     bool cpu_running;
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 997e82cc..e5190d48 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -123,7 +123,7 @@ GMainWindow::~GMainWindow()
         delete render_window;
 }
 
-void GMainWindow::BootGame(const char* filename)
+void GMainWindow::BootGame(std::string filename)
 {
     NOTICE_LOG(MASTER_LOG, "citra starting...\n");
 
@@ -134,8 +134,7 @@ void GMainWindow::BootGame(const char* filename)
     }
 
     // Load a game or die...
-    std::string boot_filename = filename;
-    if (Loader::ResultStatus::Success != Loader::LoadFile(boot_filename)) {
+    if (Loader::ResultStatus::Success != Loader::LoadFile(filename)) {
         ERROR_LOG(BOOT, "Failed to load ROM!");
     }
 
diff --git a/src/citra_qt/main.hxx b/src/citra_qt/main.hxx
index 6bcb37a3..a0b41f5f 100644
--- a/src/citra_qt/main.hxx
+++ b/src/citra_qt/main.hxx
@@ -30,7 +30,7 @@ public:
     ~GMainWindow();
 
 private:
-    void BootGame(const char* filename);
+    void BootGame(std::string filename);
 
     void closeEvent(QCloseEvent* event);
 
-- 
cgit v1.2.3