summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Alburquerque <jaalburqu@svn.gnome.org>2010-12-08 01:55:24 -0500
committerJosé Alburquerque <jaalburqu@svn.gnome.org>2010-12-08 01:55:24 -0500
commit187571e425ed341787a166645172605fc6bf6f3d (patch)
tree07ab6c6731e1f9c993546b2a26362d175537be27
parentb06c7783658abd4ddce3bc5a05e7e9c88ab14ac3 (diff)
downloadglibmm-187571e425ed341787a166645172605fc6bf6f3d.tar.gz
DBusConnection: Use static keyword for create methods.
* gio/src/dbusconnection.{ccg,hg}: Add the forgotten 'static' keyword to all the create methods (that's what happens when coding too quickly without thinking about what's being done). Fortunately it seems to have happened only here.
-rw-r--r--ChangeLog9
-rw-r--r--gio/src/dbusconnection.ccg8
-rw-r--r--gio/src/dbusconnection.hg16
3 files changed, 25 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index a86dc394..ea5617e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2010-12-08 José Alburquerque <jaalburqu@svn.gnome.org>
+ DBusConnection: Use static keyword for create methods.
+
+ * gio/src/dbusconnection.{ccg,hg}: Add the forgotten 'static' keyword
+ to all the create methods (that's what happens when coding too quickly
+ without thinking about what's being done). Fortunately it seems to
+ have happened only here.
+
+2010-12-08 José Alburquerque <jaalburqu@svn.gnome.org>
+
DBus: Client Example: Correct typo.
* examples/dbus/client.cc: Correct a typo in a comment.
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg
index 6d73c5f2..7a775460 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -185,6 +185,7 @@ DBusConnection::DBusConnection(const Glib::ustring& address,
init();
}
+//static
void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
const Glib::ustring& guid,
const Glib::RefPtr<DBusAuthObserver>& observer,
@@ -203,6 +204,7 @@ void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
slot, cancellable, flags))->reference();
}
+//static
void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
const Glib::ustring& guid,
const Glib::RefPtr<DBusAuthObserver>& observer,
@@ -220,6 +222,7 @@ void DBusConnection::create(const Glib::RefPtr<IOStream>& stream,
slot, flags))->reference();
}
+//static
Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
const Glib::RefPtr<IOStream>& stream,
const Glib::ustring& guid,
@@ -231,6 +234,7 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
observer, cancellable, flags));
}
+//static
Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
const Glib::RefPtr<IOStream>& stream,
const Glib::ustring& guid,
@@ -241,6 +245,7 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_sync(
observer, flags));
}
+//static
void DBusConnection::create_for_address(const Glib::ustring& address,
const Glib::RefPtr<DBusAuthObserver>& observer,
const SlotAsyncReady& slot,
@@ -258,6 +263,7 @@ void DBusConnection::create_for_address(const Glib::ustring& address,
cancellable, flags))->reference();
}
+//static
void DBusConnection::create_for_address(const Glib::ustring& address,
const Glib::RefPtr<DBusAuthObserver>& observer,
const SlotAsyncReady& slot,
@@ -274,6 +280,7 @@ void DBusConnection::create_for_address(const Glib::ustring& address,
flags))->reference();
}
+//static
Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
const Glib::ustring& address,
const Glib::RefPtr<DBusAuthObserver>& observer,
@@ -284,6 +291,7 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
cancellable, flags));
}
+//static
Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
const Glib::ustring& address,
const Glib::RefPtr<DBusAuthObserver>& observer,
diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index 72607acd..2a71767d 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -172,7 +172,7 @@ public:
_WRAP_METHOD(static Glib::RefPtr<DBusConnection> get_finish(const Glib::RefPtr<AsyncResult>& res), g_bus_get_finish, errthrow)
_WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new)
- void create(const Glib::RefPtr<IOStream>& stream,
+ static void create(const Glib::RefPtr<IOStream>& stream,
const Glib::ustring& guid,
const Glib::RefPtr<DBusAuthObserver>& observer,
const SlotAsyncReady& slot,
@@ -180,7 +180,7 @@ public:
DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
/// Non-cancellable version of create().
- void create(const Glib::RefPtr<IOStream>& stream,
+ static void create(const Glib::RefPtr<IOStream>& stream,
const Glib::ustring& guid,
const Glib::RefPtr<DBusAuthObserver>& observer,
const SlotAsyncReady& slot,
@@ -190,14 +190,14 @@ public:
_WRAP_METHOD(static Glib::RefPtr<DBusConnection> create_finish(const Glib::RefPtr<AsyncResult>& res), g_dbus_connection_new_finish, errthrow)
_WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_for_address)
- void create_for_address(const Glib::ustring& address,
+ static void create_for_address(const Glib::ustring& address,
const Glib::RefPtr<DBusAuthObserver>& observer,
const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable,
DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
/// Non-cancellable version of create_for_address().
- void create_for_address(const Glib::ustring& address,
+ static void create_for_address(const Glib::ustring& address,
const Glib::RefPtr<DBusAuthObserver>& observer,
const SlotAsyncReady& slot,
DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);
@@ -208,7 +208,7 @@ public:
_WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_sync)
/** @throw Glib::Error.
*/
- Glib::RefPtr<DBusConnection> create_sync(
+ static Glib::RefPtr<DBusConnection> create_sync(
const Glib::RefPtr<IOStream>& stream,
const Glib::ustring& guid,
const Glib::RefPtr<DBusAuthObserver>& observer,
@@ -217,7 +217,7 @@ public:
/** Non-cancellable version of create_sync().
*/
- Glib::RefPtr<DBusConnection> create_sync(
+ static Glib::RefPtr<DBusConnection> create_sync(
const Glib::RefPtr<IOStream>& stream,
const Glib::ustring& guid,
const Glib::RefPtr<DBusAuthObserver>& observer,
@@ -226,7 +226,7 @@ public:
_WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new_for_address_sync)
/** @throw Glib::Error.
*/
- Glib::RefPtr<DBusConnection> create_for_address_sync(
+ static Glib::RefPtr<DBusConnection> create_for_address_sync(
const Glib::ustring& address,
const Glib::RefPtr<DBusAuthObserver>& observer,
const Glib::RefPtr<Cancellable>& cancellable,
@@ -234,7 +234,7 @@ public:
/** Non-cancellable version of create_for_address_sync().
*/
- Glib::RefPtr<DBusConnection> create_for_address_sync(
+ static Glib::RefPtr<DBusConnection> create_for_address_sync(
const Glib::ustring& address,
const Glib::RefPtr<DBusAuthObserver>& observer,
DBusConnectionFlags flags = Gio::DBUS_CONNECTION_FLAGS_NONE);