Use centralized cmake version

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 20cbecd59f)

CMakeLists.txt

@@ -9,12 +9,20 @@
 #
 #################################################
 
-project( dbus-tqt-1 )
 
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
+
+
+##### general package setup #####################
 
-##### cmake setup ###############################
+project( dbus-tqt-1 )
 
-cmake_minimum_required( VERSION 3.1 )
+
+##### include essential cmake modules ###########
 
 include( FindPkgConfig )
 include( CheckCXXSourceCompiles )
@@ -24,11 +32,6 @@ include( TDEMacros )
 include( ConfigureChecks.cmake )
 
 
-##### set version number ########################
-
-tde_set_project_version( )
-
-
 ##### install paths setup #######################
 
 tde_setup_install_path( EXEC_INSTALL_PREFIX   "${CMAKE_INSTALL_PREFIX}" )

connection.cpp

@@ -54,7 +54,7 @@ void Connection::Private::setConnection( DBusConnection *c )
   }
   connection = c;
   integrator = new Integrator( c, q );
-  connect( integrator, TQT_SIGNAL(readReady()), q, TQT_SLOT(dispatchRead()) );
+  connect( integrator, TQ_SIGNAL(readReady()), q, TQ_SLOT(dispatchRead()) );
 }
 
 Connection::Connection( TQObject *parent )

connection.h

@@ -36,7 +36,7 @@ namespace DBusQt {
 
   class Connection : public TQObject
   {
-    Q_OBJECT
+    TQ_OBJECT
     
   public:
     Connection( TQObject *parent =0 );

dbus-qt.h

@@ -29,7 +29,7 @@
  * Two approaches - one presented below a DBusQtConnection
  * object which is a TQt wrapper around DBusConnection
 class DBusQtConnection : public TQObject {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   DBusQtConnection( const char *address=0, TQObject *parent=0,
@@ -55,7 +55,7 @@ private:
  *
  * Second approach is to have a static TQt dispatcher like:
 class DBusQtNotifier : public TQObject {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   static DBusQtNotifier* dbus_qt_notifier();

integrator.cpp

@@ -104,8 +104,8 @@ Timeout::Timeout( TQObject *parent, DBusTimeout *t )
   : TQObject( parent ),  m_timeout( t )
 {
   m_timer = new TQTimer( this );
-  connect( m_timer,  TQT_SIGNAL(timeout()),
-           TQT_SLOT(slotTimeout()) );
+  connect( m_timer,  TQ_SIGNAL(timeout()),
+           TQ_SLOT(slotTimeout()) );
 }
 
 void Timeout::slotTimeout()
@@ -193,12 +193,12 @@ void Integrator::addWatch( DBusWatch *watch )
 
   if ( flags & DBUS_WATCH_READABLE ) {
     qtwatch->readSocket = new TQSocketNotifier( fd, TQSocketNotifier::Read, this );
-    TQObject::connect( qtwatch->readSocket, TQT_SIGNAL(activated(int)), TQT_SLOT(slotRead(int)) );
+    TQObject::connect( qtwatch->readSocket, TQ_SIGNAL(activated(int)), TQ_SLOT(slotRead(int)) );
   }
 
   if (flags & DBUS_WATCH_WRITABLE) {
     qtwatch->writeSocket = new TQSocketNotifier( fd, TQSocketNotifier::Write, this );
-    TQObject::connect( qtwatch->writeSocket, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWrite(int)) );
+    TQObject::connect( qtwatch->writeSocket, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWrite(int)) );
   }
 
   m_watches.insert( fd, qtwatch );
@@ -221,8 +221,8 @@ void Integrator::addTimeout( DBusTimeout *timeout )
 {
   Timeout *mt = new Timeout( this, timeout );
   m_timeouts.insert( timeout, mt );
-  connect( mt, TQT_SIGNAL(timeout(DBusTimeout*)),
-           TQT_SLOT(slotTimeout(DBusTimeout*)) );
+  connect( mt, TQ_SIGNAL(timeout(DBusTimeout*)),
+           TQ_SLOT(slotTimeout(DBusTimeout*)) );
   mt->start();
 }
 

integrator.h

@@ -41,7 +41,7 @@ namespace DBusQt
 
     class Timeout : public TQObject
     {
-      Q_OBJECT
+      TQ_OBJECT
       
     public:
       Timeout( TQObject *parent, DBusTimeout *t );
@@ -58,7 +58,7 @@ namespace DBusQt
 
     class Integrator : public TQObject
     {
-      Q_OBJECT
+      TQ_OBJECT
       
     public:
       Integrator( DBusConnection *connection, TQObject *parent );

server.cpp

@@ -79,8 +79,8 @@ void Server::init( const TQString& addr )
 {
   d->server = dbus_server_listen( addr.ascii(),  &d->error );
   d->integrator = new Integrator( d->server, this );
-  connect( d->integrator, TQT_SIGNAL(newConnection(Connection*)),
-           TQT_SIGNAL(newConnection(Connection*)) );
+  connect( d->integrator, TQ_SIGNAL(newConnection(Connection*)),
+           TQ_SIGNAL(newConnection(Connection*)) );
 }
 
 }

server.h

@@ -31,7 +31,7 @@ namespace DBusQt
   class Connection;
   class Server : public TQObject
   {
-    Q_OBJECT
+    TQ_OBJECT
     
   public:
     Server( const TQString& addr = TQString(), TQObject *parent=0 );