More PolkitTQt1 -> PolkitTQt renaming.

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

9 files changed, 27 insertions, 27 deletions

diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt
index 4f5159c90..08af11e1b 100644
--- a/agent/CMakeLists.txt
+++ b/agent/CMakeLists.txt
@@ -30,7 +30,7 @@ install( FILES
 ##### polkit-tqt-agent (shared) #########################
 
 tde_add_library( polkit-tqt-agent SHARED AUTOMOC
-  SOURCES ${polkit_tqt_MOCS}
+  SOURCES ${polkit_tqt_agent_MOCS}
 	  dummy-agent.cpp
   VERSION 0.0.0
   LINK ${TQT_LIBRARIES}
@@ -53,6 +53,6 @@ tde_add_library( polkit-tqt-agent SHARED AUTOMOC
 ##		
 ##		set_target_properties(polkit-tqt-agent-1 PROPERTIES VERSION ${POLKITTQT-1_LIBRARY_VERSION}
 ##		                                SOVERSION ${POLKITTQT-1_ABI_VERSION}
-##		                                DEFINE_SYMBOL MAKE_POLKITTQT1_LIB)
+##		                                DEFINE_SYMBOL MAKE_POLKIT_TQT_LIB)
 ##		
 ##		install(TARGETS polkit-tqt-agent-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/agent/dummy-agent.h b/agent/dummy-agent.h
index 4a69b208d..c01d0e748 100644
--- a/agent/dummy-agent.h
+++ b/agent/dummy-agent.h
@@ -28,7 +28,7 @@
 
 
 /**
- * \namespace PolkitTQt1 PolkitTQt
+ * \namespace PolkitTQt PolkitTQt
  *
  * \brief Namespace wrapping Polkit-TQt classes
  *
diff --git a/agent/listeneradapter.cpp b/agent/listeneradapter.cpp
index 7a531dfd5..968704e37 100644
--- a/agent/listeneradapter.cpp
+++ b/agent/listeneradapter.cpp
@@ -23,7 +23,7 @@
 #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE 1
 #include <polkitagent/polkitagent.h>
 
-namespace PolkitTQt1
+namespace PolkitTQt
 {
 
 namespace Agent
@@ -84,13 +84,13 @@ void ListenerAdapter::polkit_tqt_listener_initiate_authentication(PolkitAgentLis
 {
     tqDebug() << "polkit_tqt_listener_initiate_authentication callback for " << listener;
 
-    PolkitTQt1::Identity::List idents;
-    PolkitTQt1::Details dets(details);
+    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(PolkitTQt1::Identity((PolkitIdentity *)identity->data));
+         idents.append(PolkitTQt::Identity((PolkitIdentity *)identity->data));
     }
 
     list->initiateAuthentication(TQString::fromUtf8(action_id),
diff --git a/agent/listeneradapter_p.h b/agent/listeneradapter_p.h
index ed85f0470..98cb302d4 100644
--- a/agent/listeneradapter_p.h
+++ b/agent/listeneradapter_p.h
@@ -35,7 +35,7 @@ typedef struct _GError GError;
 typedef int gboolean;
 typedef char gchar;
 
-namespace PolkitTQt1
+namespace PolkitTQt
 {
 
 namespace Agent
diff --git a/agent/polkitqt1-agent-listener.cpp b/agent/polkitqt1-agent-listener.cpp
index e6e3a9b00..456794878 100644
--- a/agent/polkitqt1-agent-listener.cpp
+++ b/agent/polkitqt1-agent-listener.cpp
@@ -29,7 +29,7 @@
 #include "polkittqt1-identity.h"
 #include "polkittqt1-details.h"
 
-namespace PolkitTQt1
+namespace PolkitTQt
 {
 
 namespace Agent
@@ -79,7 +79,7 @@ Listener::~Listener()
     }
 }
 
-bool Listener::registerListener(const PolkitTQt1::Subject &subject, const TQString &objectPath)
+bool Listener::registerListener(const PolkitTQt::Subject &subject, const TQString &objectPath)
 {
     GError *error = NULL;
 
diff --git a/agent/polkitqt1-agent-listener.h b/agent/polkitqt1-agent-listener.h
index 964cc84a2..d8fdb76d3 100644
--- a/agent/polkitqt1-agent-listener.h
+++ b/agent/polkitqt1-agent-listener.h
@@ -18,8 +18,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef POLKITTQT1_AGENT_LISTENER_H
-#define POLKITTQT1_AGENT_LISTENER_H
+#ifndef POLKIT_TQT_AGENT_LISTENER_H
+#define POLKIT_TQT_AGENT_LISTENER_H
 
 #include "polkit-tqt-export.h"
 
@@ -31,14 +31,14 @@
 
 typedef struct _PolkitAgentListener PolkitAgentListener;
 
-namespace PolkitTQt1
+namespace PolkitTQt
 {
 class Subject;
 class Identity;
 class Details;
 }
 
-namespace PolkitTQt1
+namespace PolkitTQt
 {
 
 namespace Agent
@@ -58,7 +58,7 @@ class ListenerPrivate;
  * You can also use Session class to authenticate users however it isn't required.
  * \sa Session
  */
-class POLKITTQT1_EXPORT Listener : public TQObject
+class POLKIT_TQT_EXPORT Listener : public TQObject
 {
     Q_OBJECT
     TQ_DISABLE_COPY(Listener)
@@ -93,7 +93,7 @@ public:
      * \param objectPath DBus object path
      * \return \c True if the polkittqt1-agent-listener.has been registered, \c False otherwise
      */
-    bool registerListener(const PolkitTQt1::Subject &subject, const TQString &objectPath);
+    bool registerListener(const PolkitTQt::Subject &subject, const TQString &objectPath);
 
     /**
      * \brief Returns pointer to the PolkitAgentListener.
@@ -126,9 +126,9 @@ public Q_SLOTS:
     virtual void initiateAuthentication(const TQString &actionId,
                                         const TQString &message,
                                         const TQString &iconName,
-                                        const PolkitTQt1::Details &details,
+                                        const PolkitTQt::Details &details,
                                         const TQString &cookie,
-                                        const PolkitTQt1::Identity::List &identities,
+                                        const PolkitTQt::Identity::List &identities,
                                         AsyncResult *result) = 0;
 
     /**
diff --git a/agent/polkitqt1-agent-session.cpp b/agent/polkitqt1-agent-session.cpp
index c39600ff2..1b5591dda 100644
--- a/agent/polkitqt1-agent-session.cpp
+++ b/agent/polkitqt1-agent-session.cpp
@@ -27,7 +27,7 @@
 #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE 1
 #include <polkitagent/polkitagent.h>
 
-using namespace PolkitTQt1::Agent;
+using namespace PolkitTQt::Agent;
 
 class Session::Private
 {
@@ -49,7 +49,7 @@ Session::Private::~Private()
     // polkitAgentSession is freed in Session d'tor
 }
 
-Session::Session(const PolkitTQt1::Identity &identity, const TQString &cookie, AsyncResult *result, TQObject *parent)
+Session::Session(const PolkitTQt::Identity &identity, const TQString &cookie, AsyncResult *result, TQObject *parent)
         : TQObject(parent)
         , d(new Private)
 {
diff --git a/agent/polkitqt1-agent-session.h b/agent/polkitqt1-agent-session.h
index a40b5b867..c4a5ac531 100644
--- a/agent/polkitqt1-agent-session.h
+++ b/agent/polkitqt1-agent-session.h
@@ -18,8 +18,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef POLKITTQT1_AGENT_SESSION_H
-#define POLKITTQT1_AGENT_SESSION_H
+#ifndef POLKIT_TQT_AGENT_SESSION_H
+#define POLKIT_TQT_AGENT_SESSION_H
 
 #include <TQtCore/TQObject>
 #include "polkittqt1-identity.h"
@@ -27,7 +27,7 @@
 typedef struct _GSimpleAsyncResult GSimpleAsyncResult;
 typedef struct _PolkitAgentSession PolkitAgentSession;
 
-namespace PolkitTQt1
+namespace PolkitTQt
 {
 
 /**
@@ -45,7 +45,7 @@ namespace Agent
  * \internal
  * \brief Encapsulation of GSimpleAsyncResult to TQObject class
  */
-class POLKITTQT1_EXPORT AsyncResult
+class POLKIT_TQT_EXPORT AsyncResult
 {
 public:
     explicit AsyncResult(GSimpleAsyncResult *result);
@@ -77,7 +77,7 @@ private:
  * authentication system for obtaining authorizations.
  *
  */
-class POLKITTQT1_EXPORT Session : public TQObject
+class POLKIT_TQT_EXPORT Session : public TQObject
 {
     Q_OBJECT
     TQ_DISABLE_COPY(Session)
@@ -90,7 +90,7 @@ public:
      * \param result Result of the authentication action. Must be finished using complete() method.
      * \param parent
      */
-    Session(const PolkitTQt1::Identity& identity, const TQString &cookie, AsyncResult *result = 0, TQObject *parent = 0);
+    Session(const PolkitTQt::Identity& identity, const TQString &cookie, AsyncResult *result = 0, TQObject *parent = 0);
 
     /**
      * Create a new authentication session from PolkitAgentSession object
diff --git a/agent/polkitqtlistener.cpp b/agent/polkitqtlistener.cpp
index dc5beb052..8baf335eb 100644
--- a/agent/polkitqtlistener.cpp
+++ b/agent/polkitqtlistener.cpp
@@ -28,7 +28,7 @@
 
 #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE 1
 
-using namespace PolkitTQt1::Agent;
+using namespace PolkitTQt::Agent;
 
 /**
   * \internal