[glom] Avoid unnecessary c_str() calls.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Avoid unnecessary c_str() calls.
- Date: Tue, 1 Sep 2015 12:13:31 +0000 (UTC)
commit 2cf6e15ac4195f0ff7b0e21bb2f45e60c006954d
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Sep 1 14:12:42 2015 +0200
Avoid unnecessary c_str() calls.
glom/appwindow.cc | 3 +--
glom/frame_glom.cc | 2 +-
glom/import_csv/dialog_import_csv.cc | 2 +-
glom/libglom/utils.cc | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/glom/appwindow.cc b/glom/appwindow.cc
index 949967a..d3268bb 100644
--- a/glom/appwindow.cc
+++ b/glom/appwindow.cc
@@ -760,8 +760,7 @@ void AppWindow::new_instance(const Glib::ustring& uri) //Override
try
{
- Glib::spawn_command_line_sync(
- command.c_str());
+ Glib::spawn_command_line_sync(command);
}
catch(const Glib::Error& ex)
{
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index 3249174..a912297 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -575,7 +575,7 @@ void Frame_Glom::on_menu_file_export()
const auto found_set = m_Notebook_Data.get_found_set();
- std::fstream the_stream(filepath.c_str(), std::ios_base::out | std::ios_base::trunc);
+ std::fstream the_stream(filepath, std::ios_base::out | std::ios_base::trunc);
if(!the_stream)
{
show_ok_dialog(_("Could Not Create File."), _("Glom could not create the specified file."), *pWindowApp,
Gtk::MESSAGE_ERROR);
diff --git a/glom/import_csv/dialog_import_csv.cc b/glom/import_csv/dialog_import_csv.cc
index 3440770..cd1f6a3 100644
--- a/glom/import_csv/dialog_import_csv.cc
+++ b/glom/import_csv/dialog_import_csv.cc
@@ -124,7 +124,7 @@ Dialog_Import_CSV::Dialog_Import_CSV(BaseObjectType* cobject, const Glib::RefPtr
m_encoding_combo->signal_changed().connect(sigc::mem_fun(*this,
&Dialog_Import_CSV::on_combo_encoding_changed));
// TODO: Reset parser encoding on selection changed.
- m_parser = std::make_shared<CsvParser>(get_current_encoding().c_str());
+ m_parser = std::make_shared<CsvParser>(get_current_encoding());
m_parser->signal_file_read_error().connect(sigc::mem_fun(*this,
&Dialog_Import_CSV::on_parser_file_read_error));
m_parser->signal_have_display_name().connect(sigc::mem_fun(*this,
&Dialog_Import_CSV::on_parser_have_display_name));
m_parser->signal_encoding_error().connect(sigc::mem_fun(*this,
&Dialog_Import_CSV::on_parser_encoding_error));
diff --git a/glom/libglom/utils.cc b/glom/libglom/utils.cc
index ef92350..6d923fc 100644
--- a/glom/libglom/utils.cc
+++ b/glom/libglom/utils.cc
@@ -156,7 +156,7 @@ Glib::ustring Utils::string_replace(const Glib::ustring& src, const Glib::ustrin
size_t src_index_section_start = 0;
while(src_index < src_length)
{
- const bool found = (src.find(search_for.c_str(), src_index) == src_index);
+ const bool found = (src.find(search_for, src_index) == src_index);
if(found)
{
result += src.substr(src_index_section_start, src_index - src_index_section_start);
@@ -736,7 +736,7 @@ Glib::ustring Utils::create_local_image_uri(const Gnome::Gda::Value& value)
result = ("/tmp/glom_report_image_" + Glib::ustring(pchExtraNum) + ".png");
++m_temp_image_uri_number;
- std::fstream the_stream(result.c_str(), std::ios_base::out | std::ios_base::trunc |
std::ios_base::binary);
+ std::fstream the_stream(result, std::ios_base::out | std::ios_base::trunc | std::ios_base::binary);
if(the_stream)
{
the_stream.write((char*)pData, size);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]