[glibmm] Yet more nullptr instead of 0.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Yet more nullptr instead of 0.
- Date: Fri, 20 Nov 2015 09:37:51 +0000 (UTC)
commit 9b52cea1219d0565bca2e1411a39dbf58b3cf01d
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Nov 19 14:25:33 2015 +0100
Yet more nullptr instead of 0.
gio/src/bufferedinputstream.ccg | 2 +-
glib/src/convert.ccg | 30 +++++++++++++++---------------
glib/src/date.ccg | 6 +++---
3 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/gio/src/bufferedinputstream.ccg b/gio/src/bufferedinputstream.ccg
index af74ea9..11e7d40 100644
--- a/gio/src/bufferedinputstream.ccg
+++ b/gio/src/bufferedinputstream.ccg
@@ -58,7 +58,7 @@ void BufferedInputStream::fill_async(const SlotAsyncReady& slot,
g_buffered_input_stream_fill_async(gobj(),
count,
io_priority,
- 0,
+ nullptr,
&SignalProxy_async_callback,
slot_copy);
}
diff --git a/glib/src/convert.ccg b/glib/src/convert.ccg
index e752313..02a1399 100644
--- a/glib/src/convert.ccg
+++ b/glib/src/convert.ccg
@@ -40,7 +40,7 @@ IConv::IConv(const std::string& to_codeset, const std::string& from_codeset)
// Abuse g_convert() to create a GError object. This may seem a weird
// thing to do, but it gives us consistently translated error messages
// at no further cost.
- g_convert("", 0, to_codeset.c_str(), from_codeset.c_str(), 0, 0, &gerror);
+ g_convert("", 0, to_codeset.c_str(), from_codeset.c_str(), nullptr, nullptr, &gerror);
// If this should ever fail we're fucked.
g_assert(gerror != nullptr);
@@ -83,7 +83,7 @@ std::string IConv::convert(const std::string& str)
GError* gerror = nullptr;
char *const buf = g_convert_with_iconv(
- str.data(), str.size(), gobject_, 0, &bytes_written, &gerror);
+ str.data(), str.size(), gobject_, nullptr, &bytes_written, &gerror);
if(gerror) ::Glib::Error::throw_exception(gerror);
@@ -95,7 +95,7 @@ std::string IConv::convert(const std::string& str)
bool get_charset()
{
- return g_get_charset(0);
+ return g_get_charset(nullptr);
}
bool get_charset(std::string& charset)
@@ -117,7 +117,7 @@ std::string convert(const std::string& str,
char *const buf = g_convert(
str.data(), str.size(), to_codeset.c_str(), from_codeset.c_str(),
- 0, &bytes_written, &gerror);
+ nullptr, &bytes_written, &gerror);
if(gerror) ::Glib::Error::throw_exception(gerror);
@@ -130,11 +130,11 @@ std::string convert_with_fallback(const std::string& str,
const std::string& from_codeset)
{
gsize bytes_written = 0;
- GError* gerror = 0;
+ GError* gerror = nullptr;
char *const buf = g_convert_with_fallback(
- str.data(), str.size(), to_codeset.c_str(), from_codeset.c_str(), 0,
- 0, &bytes_written, &gerror);
+ str.data(), str.size(), to_codeset.c_str(), from_codeset.c_str(), nullptr,
+ nullptr, &bytes_written, &gerror);
if(gerror) ::Glib::Error::throw_exception(gerror);
@@ -148,11 +148,11 @@ std::string convert_with_fallback(const std::string& str,
const Glib::ustring& fallback)
{
gsize bytes_written = 0;
- GError* gerror = 0;
+ GError* gerror = nullptr;
char *const buf = g_convert_with_fallback(
str.data(), str.size(), to_codeset.c_str(), from_codeset.c_str(),
- const_cast<char*>(fallback.c_str()), 0, &bytes_written, &gerror);
+ const_cast<char*>(fallback.c_str()), nullptr, &bytes_written, &gerror);
if(gerror) ::Glib::Error::throw_exception(gerror);
@@ -166,7 +166,7 @@ Glib::ustring locale_to_utf8(const std::string& opsys_string)
GError* gerror = nullptr;
char *const buf = g_locale_to_utf8(
- opsys_string.data(), opsys_string.size(), 0, &bytes_written, &gerror);
+ opsys_string.data(), opsys_string.size(), nullptr, &bytes_written, &gerror);
if(gerror) ::Glib::Error::throw_exception(gerror);
@@ -181,7 +181,7 @@ std::string locale_from_utf8(const Glib::ustring& utf8_string)
GError* gerror = nullptr;
char *const buf = g_locale_from_utf8(
- utf8_string.data(), utf8_string.bytes(), 0, &bytes_written, &gerror);
+ utf8_string.data(), utf8_string.bytes(), nullptr, &bytes_written, &gerror);
if(gerror) ::Glib::Error::throw_exception(gerror);
@@ -195,7 +195,7 @@ Glib::ustring filename_to_utf8(const std::string& opsys_string)
GError* gerror = nullptr;
char *const buf = g_filename_to_utf8(
- opsys_string.data(), opsys_string.size(), 0, &bytes_written, &gerror);
+ opsys_string.data(), opsys_string.size(), nullptr, &bytes_written, &gerror);
if(gerror) ::Glib::Error::throw_exception(gerror);
@@ -210,7 +210,7 @@ std::string filename_from_utf8(const Glib::ustring& utf8_string)
GError* gerror = nullptr;
char *const buf = g_filename_from_utf8(
- utf8_string.data(), utf8_string.bytes(), 0, &bytes_written, &gerror);
+ utf8_string.data(), utf8_string.bytes(), nullptr, &bytes_written, &gerror);
if(gerror) ::Glib::Error::throw_exception(gerror);
@@ -242,7 +242,7 @@ std::string filename_from_uri(const Glib::ustring& uri, Glib::ustring& hostname)
std::string filename_from_uri(const Glib::ustring& uri)
{
GError* gerror = nullptr;
- char *const buf = g_filename_from_uri(uri.c_str(), 0, &gerror);
+ char *const buf = g_filename_from_uri(uri.c_str(), nullptr, &gerror);
if(gerror) ::Glib::Error::throw_exception(gerror);
@@ -264,7 +264,7 @@ Glib::ustring filename_to_uri(const std::string& filename, const Glib::ustring&
Glib::ustring filename_to_uri(const std::string& filename)
{
GError* gerror = nullptr;
- char *const buf = g_filename_to_uri(filename.c_str(), 0, &gerror);
+ char *const buf = g_filename_to_uri(filename.c_str(), nullptr, &gerror);
if(gerror) ::Glib::Error::throw_exception(gerror);
diff --git a/glib/src/date.ccg b/glib/src/date.ccg
index ad6b6ef..bd65cd4 100644
--- a/glib/src/date.ccg
+++ b/glib/src/date.ccg
@@ -101,7 +101,7 @@ void Date::set_time(std::time_t timet)
void Date::set_time_current()
{
//As suggested in the C documentation:
- g_date_set_time_t(&gobject_, time(0));
+ g_date_set_time_t(&gobject_, time(nullptr));
}
void Date::set_time(const GTimeVal& timeval)
@@ -206,13 +206,13 @@ Date& Date::clamp(const Date& min_date, const Date& max_date)
Date& Date::clamp_min(const Date& min_date)
{
- g_date_clamp(&gobject_, &min_date.gobject_, 0 /* see the C docs */);
+ g_date_clamp(&gobject_, &min_date.gobject_, nullptr /* see the C docs */);
return *this;
}
Date& Date::clamp_max(const Date& max_date)
{
- g_date_clamp(&gobject_, 0 /* see the C docs */, &max_date.gobject_);
+ g_date_clamp(&gobject_, nullptr /* see the C docs */, &max_date.gobject_);
return *this;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]