summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorMaarten ter Huurne <maarten@treewalker.org>2008-08-28 19:22:36 +0000
committerMaarten ter Huurne <maarten@treewalker.org>2008-08-28 19:22:36 +0000
commit1716ef46bbfe9826014bb32293561b4c1174a181 (patch)
treeeafdffef810949d0bfa4926bf943542bab62d272 /Source/Core
parentcfd31f4385182de89dc9747c7bb8139762cf2c4c (diff)
Use compact syntax for converting C strings to C++ strings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@374 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/src/GameListCtrl.cpp6
-rw-r--r--Source/Core/DolphinWX/src/MainNoGUI.cpp5
-rw-r--r--Source/Core/DolphinWX/src/PluginManager.cpp4
3 files changed, 6 insertions, 9 deletions
diff --git a/Source/Core/DolphinWX/src/GameListCtrl.cpp b/Source/Core/DolphinWX/src/GameListCtrl.cpp
index dcc8090292..da9da12257 100644
--- a/Source/Core/DolphinWX/src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/src/GameListCtrl.cpp
@@ -87,9 +87,9 @@ CGameListCtrl::BrowseForDirectory()
if (dialog.ShowModal() == wxID_OK)
{
- std::string temp;
- temp.insert(0, dialog.GetPath().ToAscii()); //Manual conversion to C++ string
- SConfig::GetInstance().m_ISOFolder.push_back(temp);
+ SConfig::GetInstance().m_ISOFolder.push_back(
+ std::string(dialog.GetPath().ToAscii())
+ );
SConfig::GetInstance().SaveSettings();
Update();
}
diff --git a/Source/Core/DolphinWX/src/MainNoGUI.cpp b/Source/Core/DolphinWX/src/MainNoGUI.cpp
index 57dcba4d7b..917e51ee35 100644
--- a/Source/Core/DolphinWX/src/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/src/MainNoGUI.cpp
@@ -67,11 +67,10 @@ int main(int argc, char* argv[])
puts("Please supply at least one argument - the ISO to boot.\n");
return(1);
}
- std::string temp;
- temp.insert(0, argv[1]); //Need to convert to C++ style string first
+ std::string bootFile(argv[1]);
DetectCPU();
- BootManager::BootCore(temp);
+ BootManager::BootCore(bootFile);
usleep(2000 * 1000 * 1000);
// while (!getch()) {
// usleep(20);
diff --git a/Source/Core/DolphinWX/src/PluginManager.cpp b/Source/Core/DolphinWX/src/PluginManager.cpp
index 246f9780c1..c94a9fbc5b 100644
--- a/Source/Core/DolphinWX/src/PluginManager.cpp
+++ b/Source/Core/DolphinWX/src/PluginManager.cpp
@@ -41,9 +41,7 @@ CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
m_PluginInfos.clear();
CFileSearch::XStringVector Directories;
- std::string temp;
- temp.insert(0, "Plugins");
- Directories.push_back(temp);
+ Directories.push_back(std::string("Plugins"));
CFileSearch::XStringVector Extensions;
#ifdef _WIN32