Conversion of 'agent' library module.

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 67 insertions, 77 deletions

diff --git a/agent/listeneradapter.cpp b/agent/listeneradapter.cpp
index 968704e37..ad4730ed5 100644
--- a/agent/listeneradapter.cpp
+++ b/agent/listeneradapter.cpp
@@ -18,129 +18,119 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "listeneradapter_p.h"
-#include <TQtCore/TQDebug>
 #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE 1
 #include <polkitagent/polkitagent.h>
 
+#include "listeneradapter.h"
+
+
 namespace PolkitTQt
 {
 
 namespace Agent
 {
 
-class ListenerAdapterHelper
-{
-public:
-    ListenerAdapterHelper() : q(0) {}
-    ~ListenerAdapterHelper() {
-        delete q;
-    }
-    ListenerAdapter *q;
-};
+//--------------------------------------
+// ListenerAdapter
+//--------------------------------------
 
-TQ_GLOBAL_STATIC(ListenerAdapterHelper, s_globalListenerAdapter)
+ListenerAdapter *ListenerAdapter::m_theListenerAdapter = NULL;
 
 ListenerAdapter *ListenerAdapter::instance()
 {
-    if (!s_globalListenerAdapter()->q) {
-        new ListenerAdapter();
-    }
-
-    return s_globalListenerAdapter()->q;
+  if (!m_theListenerAdapter)
+  {
+    m_theListenerAdapter = new ListenerAdapter();
+  }
+  return m_theListenerAdapter;
 }
 
-ListenerAdapter::ListenerAdapter(TQObject *parent)
-        : TQObject(parent)
+ListenerAdapter::ListenerAdapter(TQObject *parent) : TQObject(parent)
 {
-    Q_ASSERT(!s_globalListenerAdapter()->q);
-    s_globalListenerAdapter()->q = this;
 }
 
 Listener* ListenerAdapter::findListener(PolkitAgentListener *listener)
 {
-    Listener *listItem;
-
-    TQ_FOREACH(listItem, m_listeners) {
-        Q_ASSERT(listItem);
-
-        if (listItem->listener() == listener) {
-            return listItem;
-        }
+  TQValueList<Listener*>::iterator listerIt;
+  for (listerIt = m_listeners.begin(); listerIt != m_listeners.end(); ++listerIt)
+  {
+    Listener *listItem = *listerIt;
+    if (listItem && listItem->listener() == listener)
+    {
+      return listItem;
     }
+  }
 
-    return NULL;
+  return NULL;
 }
 
-void ListenerAdapter::polkit_tqt_listener_initiate_authentication(PolkitAgentListener  *listener,
-        const gchar          *action_id,
-        const gchar          *message,
-        const gchar          *icon_name,
-        PolkitDetails        *details,
-        const gchar          *cookie,
-        GList                *identities,
-        GCancellable         *cancellable,
-        GSimpleAsyncResult *result)
+void ListenerAdapter::polkit_tqt_listener_initiate_authentication(PolkitAgentListener *listener,
+        const gchar *action_id, const gchar *message, const gchar *icon_name,
+        PolkitDetails *details, const gchar *cookie, GList *identities,
+        GCancellable *cancellable, GSimpleAsyncResult *result)
 {
-    tqDebug() << "polkit_tqt_listener_initiate_authentication callback for " << listener;
-
-    PolkitTQt::Identity::List idents;
-    PolkitTQt::Details dets(details);
-
-    Listener *list = findListener(listener);
-
-    for (GList *identity = g_list_first(identities); identity != NULL; identity = g_list_next(identity)) {
-         idents.append(PolkitTQt::Identity((PolkitIdentity *)identity->data));
-    }
-
-    list->initiateAuthentication(TQString::fromUtf8(action_id),
-                                 TQString::fromUtf8(message),
-                                 TQString::fromUtf8(icon_name),
-                                 dets,
-                                 TQString::fromUtf8(cookie),
-                                 idents,
-                                 new AsyncResult(result));
+  tqDebug("polkit_tqt_listener_initiate_authentication callback for %p", listener);
+
+  Identity::List idents;
+  Details dets(details);
+  GList *identity;
+  for (identity = g_list_first(identities); identity != NULL; identity = g_list_next(identity))
+  {
+    idents.append(Identity((PolkitIdentity*)identity->data));
+  }
+
+  Listener *list = findListener(listener);
+  list->initiateAuthentication(TQString::fromUtf8(action_id), TQString::fromUtf8(message),
+          TQString::fromUtf8(icon_name), dets, TQString::fromUtf8(cookie), idents,
+          new AsyncResult(result));
 }
 
-gboolean ListenerAdapter::polkit_tqt_listener_initiate_authentication_finish(PolkitAgentListener  *listener,
-        GAsyncResult         *res,
-        GError              **error)
+gboolean ListenerAdapter::polkit_tqt_listener_initiate_authentication_finish(
+        PolkitAgentListener *listener, GAsyncResult *res, GError **error)
 {
-    tqDebug() << "polkit_tqt_listener_initiate_authentication_finish callback for " << listener;
-
-    GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT(res);
-    if (g_simple_async_result_propagate_error(simple, error)) {
-        return false;
-    }
-    return true;
+  tqDebug("polkit_tqt_listener_initiate_authentication_finish callback for %p", listener);
+
+  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT(res);
+  if (g_simple_async_result_propagate_error(simple, error))
+  {
+    return false;
+  }
+  return true;
 }
 
 void ListenerAdapter::cancelled_cb(PolkitAgentListener *listener)
 {
-    tqDebug() << "cancelled_cb for " << listener;
-
-    Listener *list = findListener(listener);
+  tqDebug("cancelled_cb for %p", listener);
 
+  Listener *list = findListener(listener);
+  if (list)
+  {
     list->cancelAuthentication();
+  }
 }
 
 void ListenerAdapter::addListener(Listener *listener)
 {
-    tqDebug() << "Adding new listener " << listener << "for " << listener->listener();
+  tqDebug("Adding new listener %p for %p", listener, listener->listener());
 
-    m_listeners.append(listener);
+  m_listeners.append(listener);
 }
 
 void ListenerAdapter::removeListener(Listener *listener)
 {
-    tqDebug() << "Removing listener " << listener;
-
-    // should be safe as we don't have more than one same listener registered in one time
-    m_listeners.removeOne(listener);
+  tqDebug("Removing listener %p", listener);
+
+  // should be safe as we don't have more than one same listener registered in one time
+  TQValueList<Listener*>::iterator listerIt = m_listeners.find(listener);
+  if (listerIt != m_listeners.end())
+  {
+    m_listeners.remove(listerIt);
+  }
 }
 
 }
 
 }
 
-#include "listeneradapter_p.moc"
+#include "listeneradapter.moc"
+