summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2016-03-31 12:38:17 +0200
committerMurray Cumming <murrayc@murrayc.com>2016-03-31 12:38:43 +0200
commitc8210d7c80044e10872a00351d775c29e631cf69 (patch)
tree8b6d054558dbdbb98718a741cb7b26b6fa0c3c18
parentbd184b3d2204b5a3790046f090f427da12c2e793 (diff)
downloadglibmm-2-48.tar.gz
C++11: .hg\.ccg files: Replace more typedefs with using.glibmm-2-48
-rw-r--r--gio/src/actionmap.hg6
-rw-r--r--gio/src/asyncresult.hg2
-rw-r--r--gio/src/file.hg6
-rw-r--r--glib/src/bytearray.hg2
-rw-r--r--glib/src/optioncontext.hg2
-rw-r--r--glib/src/optiongroup.hg6
6 files changed, 12 insertions, 12 deletions
diff --git a/gio/src/actionmap.hg b/gio/src/actionmap.hg
index e401fc82..6bbc46d1 100644
--- a/gio/src/actionmap.hg
+++ b/gio/src/actionmap.hg
@@ -59,7 +59,7 @@ public:
* For instance,
* void on_slot_activated(const Glib::VariantBase& parameter);
*/
- typedef sigc::slot< void, const Glib::VariantBase& > ActivateWithParameterSlot;
+ using ActivateWithParameterSlot = sigc::slot<void, const Glib::VariantBase&>;
//This is an equivalent for g_action_map_add_action_entries().
/** A convenience method for creating a SimpleAction instance
@@ -136,7 +136,7 @@ public:
* For instance,
* void on_slot_activated(const Glib::VariantBase& parameter);
*/
- typedef sigc::slot< void, const Glib::ustring& > ActivateWithStringParameterSlot;
+ using ActivateWithStringParameterSlot = sigc::slot<void, const Glib::ustring&>;
//TODO: Docs: Add hints about how to specify the various possible states in the GtkBuilder XML.
/** A convenience method for creating a string-based radio SimpleAction instance
@@ -165,7 +165,7 @@ public:
* For instance,
* void on_slot_activated(const Glib::VariantBase& parameter);
*/
- typedef sigc::slot< void, int > ActivateWithIntParameterSlot;
+ using ActivateWithIntParameterSlot = sigc::slot<void, int>;
//TODO: Docs: Add hints about how to specify the various possible states in the GtkBuilder XML.
/** A convenience method for creating an integer-based radio SimpleAction instance
diff --git a/gio/src/asyncresult.hg b/gio/src/asyncresult.hg
index 395b63fd..7d9567c7 100644
--- a/gio/src/asyncresult.hg
+++ b/gio/src/asyncresult.hg
@@ -42,7 +42,7 @@ class AsyncResult;
*
* @newin{2,16}
*/
-typedef sigc::slot<void, Glib::RefPtr<AsyncResult>& > SlotAsyncReady;
+using SlotAsyncReady = sigc::slot<void, Glib::RefPtr<AsyncResult>&>;
/** Provides a base class for implementing asynchronous function results.
* Asynchronous operations are broken up into two separate operations which are chained together by a SlotAsyncReady.
diff --git a/gio/src/file.hg b/gio/src/file.hg
index 859cf252..71e1ca96 100644
--- a/gio/src/file.hg
+++ b/gio/src/file.hg
@@ -1118,7 +1118,7 @@ public:
/** A signal handler would be, for instance:
* void on_file_progress(goffset current_num_bytes, goffset total_num_bytes);
*/
- typedef sigc::slot<void, goffset, goffset> SlotFileProgress;
+ using SlotFileProgress = sigc::slot<void, goffset, goffset>;
/** Copies the file source to the location specified by destination. Can not handle recursive copies of directories.
* If the flag FILE_COPY_OVERWRITE is specified an already existing destination file is overwritten.
@@ -1803,7 +1803,7 @@ public:
*
* @newin{2,38}
*/
- typedef sigc::slot<void, bool, guint64, guint64, guint64> SlotFileMeasureProgress;
+ using SlotFileMeasureProgress = sigc::slot<void, bool, guint64, guint64, guint64>;
//We do not use the {callback} syntax with _WRAP_METHOD here, because it expects to use user_data rather than progress_data.
//We ignore the gboolean result, because we throw an exception if it is false.
@@ -2097,7 +2097,7 @@ public:
/** A signal handler would be, for instance:
* bool on_read_more(const char* file_contents, goffset file_size);
*/
- typedef sigc::slot<bool, const char*, goffset> SlotReadMore;
+ using SlotReadMore = sigc::slot<bool, const char*, goffset>;
//Note that slot_read_more can be nullptr but that would not be a useful method overload, because the documentation says that it would
//then be equivalent to load_contents_async.
diff --git a/glib/src/bytearray.hg b/glib/src/bytearray.hg
index 1db85d84..a921a656 100644
--- a/glib/src/bytearray.hg
+++ b/glib/src/bytearray.hg
@@ -58,7 +58,7 @@ public:
* int compare(const guint8* first, const guint8* second);
* </code>
*/
- typedef sigc::slot<int, const guint8*, const guint8*> SlotCompare;
+ using SlotCompare = sigc::slot<int, const guint8*, const guint8*>;
_WRAP_METHOD(static Glib::RefPtr<ByteArray> create(), g_byte_array_new)
diff --git a/glib/src/optioncontext.hg b/glib/src/optioncontext.hg
index f20ec36d..9d0eb6c7 100644
--- a/glib/src/optioncontext.hg
+++ b/glib/src/optioncontext.hg
@@ -178,7 +178,7 @@ public:
* This function is used to translate user-visible strings, for --help output.
* The function takes an untranslated string and returns a translated string
*/
- typedef sigc::slot<Glib::ustring, const Glib::ustring&> SlotTranslate;
+ using SlotTranslate = sigc::slot<Glib::ustring, const Glib::ustring&>;
/**
* Sets the function which is used to translate user-visible
diff --git a/glib/src/optiongroup.hg b/glib/src/optiongroup.hg
index b4e08464..9995d5f8 100644
--- a/glib/src/optiongroup.hg
+++ b/glib/src/optiongroup.hg
@@ -49,17 +49,17 @@ class OptionGroup
public:
/** For example Glib::ustring on_translate(const Glib::ustring& original);.
*/
- typedef sigc::slot<Glib::ustring, const Glib::ustring&> SlotTranslate;
+ using SlotTranslate = sigc::slot<Glib::ustring, const Glib::ustring&>;
/** For example bool on_option_arg_string(const Glib::ustring& option_name,
* const Glib::ustring& value, bool has_value);.
*/
- typedef sigc::slot<bool, const Glib::ustring&, const Glib::ustring&, bool> SlotOptionArgString;
+ using SlotOptionArgString = sigc::slot<bool, const Glib::ustring&, const Glib::ustring&, bool>;
/** For example bool on_option_arg_filename(const Glib::ustring& option_name,
* const std::string& value, bool has_value);.
*/
- typedef sigc::slot<bool, const Glib::ustring&, const std::string&, bool> SlotOptionArgFilename;
+ using SlotOptionArgFilename = sigc::slot<bool, const Glib::ustring&, const std::string&, bool>;
OptionGroup(const Glib::ustring& name, const Glib::ustring& description, const Glib::ustring& help_description = Glib::ustring());