summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2016-02-26 13:13:34 +0100
committerMurray Cumming <murrayc@murrayc.com>2016-02-26 13:13:34 +0100
commitcdeaa23ae06d1871fae7e6c82c1e118b3cd8fbc1 (patch)
tree0ba633150121ba6c70e962c7219d5074348b1b99
parent4f9304b2a6e0ff786706a8e19025c10e3ef093de (diff)
downloadglibmm-cdeaa23ae06d1871fae7e6c82c1e118b3cd8fbc1.tar.gz
Run clang-format on gio .h files.
-rw-r--r--gio/giomm/contenttype.h16
-rw-r--r--gio/giomm/init.h3
-rw-r--r--gio/giomm/slot_async.h5
-rw-r--r--gio/giomm/socketsource.h11
-rw-r--r--gio/giomm/wrap_init.h3
5 files changed, 16 insertions, 22 deletions
diff --git a/gio/giomm/contenttype.h b/gio/giomm/contenttype.h
index 476d916d..2785d86c 100644
--- a/gio/giomm/contenttype.h
+++ b/gio/giomm/contenttype.h
@@ -45,8 +45,7 @@ namespace Gio
*
* @return true if the two strings are identical or equivalent, false otherwise.
*/
-bool content_type_equals(const Glib::ustring& type1,
- const Glib::ustring& type2);
+bool content_type_equals(const Glib::ustring& type1, const Glib::ustring& type2);
/**
* Determines if @a type is a subset of @a supertype.
@@ -56,8 +55,7 @@ bool content_type_equals(const Glib::ustring& type1,
*
* @return true if @a type is a kind of @a supertype, false otherwise.
*/
-bool content_type_is_a(const Glib::ustring& type,
- const Glib::ustring& supertype);
+bool content_type_is_a(const Glib::ustring& type, const Glib::ustring& supertype);
/**
* Checks if the content type is the generic "unknown" type.
@@ -142,9 +140,8 @@ Glib::ustring content_type_from_mime_type(const Glib::ustring& mime_type);
* @return A string indicating a guessed content type for the
* given data.
*/
-Glib::ustring content_type_guess(const std::string& filename,
- const guchar* data, gsize data_size,
- bool& result_uncertain);
+Glib::ustring content_type_guess(
+ const std::string& filename, const guchar* data, gsize data_size, bool& result_uncertain);
/**
* Guesses the content type based on example data. If the function is uncertain,
@@ -157,9 +154,8 @@ Glib::ustring content_type_guess(const std::string& filename,
* @return A string indicating a guessed content type for the
* given data.
*/
-Glib::ustring content_type_guess(const std::string& filename,
- const std::string& data,
- bool& result_uncertain);
+Glib::ustring content_type_guess(
+ const std::string& filename, const std::string& data, bool& result_uncertain);
/** Tries to guess the type of the tree with root @a root, by
* looking at the files it contains. The result is a list
diff --git a/gio/giomm/init.h b/gio/giomm/init.h
index c8804044..a7e69e28 100644
--- a/gio/giomm/init.h
+++ b/gio/giomm/init.h
@@ -30,7 +30,6 @@ namespace Gio
*/
void init();
-}//end namespace Gio
+} // end namespace Gio
#endif //_GIOMM_INIT_H
-
diff --git a/gio/giomm/slot_async.h b/gio/giomm/slot_async.h
index 75ee1c8f..ba840e10 100644
--- a/gio/giomm/slot_async.h
+++ b/gio/giomm/slot_async.h
@@ -21,7 +21,6 @@
namespace Gio
{
-void
-SignalProxy_async_callback(GObject*, GAsyncResult* res, void* data);
+void SignalProxy_async_callback(GObject*, GAsyncResult* res, void* data);
-} //namespace Gio
+} // namespace Gio
diff --git a/gio/giomm/socketsource.h b/gio/giomm/socketsource.h
index 2d60af53..2096816f 100644
--- a/gio/giomm/socketsource.h
+++ b/gio/giomm/socketsource.h
@@ -56,7 +56,8 @@ public:
*
* @newin{2,42}
*
- * @param slot A slot to call when polling @a socket results in an event that matches @a condition.
+ * @param slot A slot to call when polling @a socket results in an event that matches @a
+ * condition.
* The event will be passed as a parameter to @a slot.
* If <tt>io_handler()</tt> returns <tt>false</tt> the handler is disconnected.
* @param socket The Socket object to watch.
@@ -80,7 +81,6 @@ private:
SignalSocket& operator=(const SignalSocket&);
};
-
/** Convenience socket signal.
* @param context The main context to which the signal shall be attached.
* @return A signal proxy; you want to use SignalSocket::connect().
@@ -88,8 +88,8 @@ private:
* @newin{2,42}
* @ingroup NetworkIO
*/
-SignalSocket signal_socket(const Glib::RefPtr<Glib::MainContext>& context = Glib::RefPtr<Glib::MainContext>());
-
+SignalSocket signal_socket(
+ const Glib::RefPtr<Glib::MainContext>& context = Glib::RefPtr<Glib::MainContext>());
/** An event source that can monitor a Gio::Socket.
* @see Gio::Socket::create_source().
@@ -102,7 +102,8 @@ class SocketSource : public Glib::IOSource
public:
typedef Gio::SocketSource CppObjectType;
- static Glib::RefPtr<SocketSource> create(const Glib::RefPtr<Socket>& socket, Glib::IOCondition condition,
+ static Glib::RefPtr<SocketSource> create(const Glib::RefPtr<Socket>& socket,
+ Glib::IOCondition condition,
const Glib::RefPtr<Cancellable>& cancellable = Glib::RefPtr<Cancellable>());
protected:
diff --git a/gio/giomm/wrap_init.h b/gio/giomm/wrap_init.h
index c86ee49f..cb9de97f 100644
--- a/gio/giomm/wrap_init.h
+++ b/gio/giomm/wrap_init.h
@@ -23,8 +23,7 @@
namespace Gio
{
- void wrap_init() ;
+void wrap_init();
}
#endif //_GIOMM_WRAP_INIT_H
-