Conforming to style guide (HACKING)

2 files changed, 15 insertions, 15 deletions

diff --git a/TelepathyQt4Yell/Farsight/channel.cpp b/TelepathyQt4Yell/Farsight/channel.cpp
index 8b99109..6f776ec 100644
--- a/TelepathyQt4Yell/Farsight/channel.cpp
+++ b/TelepathyQt4Yell/Farsight/channel.cpp
@@ -21,6 +21,8 @@
 
 #include <TelepathyQt4Yell/Farsight/Channel>
 
+#include "TelepathyQt4Yell/Farsight/_gen/channel.moc.hpp"
+
 #include <TelepathyQt4/Channel>
 #include <TelepathyQt4/Connection>
 #include <TelepathyQt4Yell/CallChannel>
@@ -30,13 +32,11 @@
 #include <telepathy-glib/connection.h>
 #include <telepathy-glib/dbus.h>
 
-#include "TelepathyQt4Yell/Farsight/_gen/channel.moc.hpp"
-
 namespace Tpy
 {
 
-FarsightChannel::FarsightChannel() :
-    mTfChannel(0)
+FarsightChannel::FarsightChannel() 
+    : mTfChannel(0)
 {
 }
 
@@ -87,24 +87,24 @@ void FarsightChannel::createFarsightChannel(const CallChannelPtr &channel)
         return;
     }
 
-    tf_channel_new_async(gchannel, FarsightChannel::on_tf_channel_new_finish, this);
+    tf_channel_new_async(gchannel, FarsightChannel::onTfChannelNewFinish, this);
 }
 
-void FarsightChannel::on_tf_channel_new_finish (GObject *source_object, GAsyncResult *res, gpointer user_data)
+void FarsightChannel::onTfChannelNewFinish(GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
-    qDebug() << "FarsightChannel::on_tf_channel_new_finish: ";
+    qDebug() << "FarsightChannel::onTfChannelNewFinish: ";
     qDebug() << "    source_object=" << source_object;
     qDebug() << "    result=" << res;
 
-    FarsightChannel * self = reinterpret_cast<FarsightChannel *> (user_data);
+    FarsightChannel *self = reinterpret_cast<FarsightChannel *>(user_data);
 
     GError *error = NULL;
-    TfChannel *ret = (TfChannel *) TF_CHANNEL (g_async_initable_new_finish ( G_ASYNC_INITABLE (source_object), res, &error));
+    TfChannel *ret = /*(TfChannel *)*/ TF_CHANNEL(g_async_initable_new_finish(G_ASYNC_INITABLE(source_object), res, &error));
     self->mTfChannel = ret;
 
     if (error) {
-	qDebug() << "FarsightChannel::on_tf_channel_new_finish: error " << error->message;
-        g_clear_error (&error);
+	qDebug() << "FarsightChannel::onTfChannelNewFinish: error " << error->message;
+        g_clear_error(&error);
         Q_EMIT self->farsightChannelCreated(true);
     } else {
         Q_EMIT self->farsightChannelCreated(false);
diff --git a/TelepathyQt4Yell/Farsight/channel.h b/TelepathyQt4Yell/Farsight/channel.h
index 836d4ee..666a81b 100644
--- a/TelepathyQt4Yell/Farsight/channel.h
+++ b/TelepathyQt4Yell/Farsight/channel.h
@@ -41,7 +41,7 @@ namespace Tpy
 class TELEPATHY_QT4_YELL_FS_EXPORT FarsightChannel : public QObject
 {
     Q_OBJECT
-    //Q_DISABLE_COPY(FarsightChannel)
+    Q_DISABLE_COPY(FarsightChannel)
 
 public:
     FarsightChannel();
@@ -54,11 +54,11 @@ Q_SIGNALS:
     void farsightChannelCreated(bool error);
 
 private:
-    static void on_tf_channel_new_finish(GObject *source_object, GAsyncResult *res, gpointer user_data);
+    static void onTfChannelNewFinish(GObject *source_object, GAsyncResult *res, gpointer user_data);
 
-    TfChannel * mTfChannel;
+    TfChannel *mTfChannel;
 };
 
-} // Tp
+} // Tpy
 
 #endif