summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt16
m---------cmake0
-rw-r--r--connection.cpp3
-rw-r--r--connection.h3
-rw-r--r--dbus-qt.h5
-rw-r--r--dbus-qthread.cpp1
-rw-r--r--integrator.cpp13
-rw-r--r--integrator.h5
-rw-r--r--message.cpp1
-rw-r--r--message.h1
-rw-r--r--server.cpp5
-rw-r--r--server.h3
13 files changed, 26 insertions, 33 deletions
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 69dd7b2..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "cmake"]
- path = cmake
- url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebc982e..37fea1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,19 +9,25 @@
#
#################################################
-project( dbus-tqt-1 )
-set( VERSION R14.1.0 )
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
+
+
+##### general package setup #####################
+
+project( dbus-tqt-1 )
-##### cmake setup ###############################
-cmake_minimum_required( VERSION 2.8 )
+##### include essential cmake modules ###########
include( FindPkgConfig )
include( CheckCXXSourceCompiles )
include( CheckSymbolExists )
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )
include( ConfigureChecks.cmake )
diff --git a/cmake b/cmake
deleted file mode 160000
-Subproject 48b1e42b64d8c5c47461db1bf0ca3db9ce3fe72
diff --git a/connection.cpp b/connection.cpp
index cc0e6ca..5b3d7d1 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/* connection.cpp: TQt wrapper for DBusConnection
*
* Copyright (C) 2003 Zack Rusin <zack@kde.org>
@@ -55,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 )
diff --git a/connection.h b/connection.h
index c7d2e35..95134ae 100644
--- a/connection.h
+++ b/connection.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/* connection.h: TQt wrapper for DBusConnection
*
* Copyright (C) 2003 Zack Rusin <zack@kde.org>
@@ -37,7 +36,7 @@ namespace DBusQt {
class Connection : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Connection( TQObject *parent =0 );
diff --git a/dbus-qt.h b/dbus-qt.h
index db16bbd..668601f 100644
--- a/dbus-qt.h
+++ b/dbus-qt.h
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
/*
* dbus-qt.h TQt integration
*
@@ -30,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,
@@ -56,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();
diff --git a/dbus-qthread.cpp b/dbus-qthread.cpp
index 92356b6..d796d38 100644
--- a/dbus-qthread.cpp
+++ b/dbus-qthread.cpp
@@ -1,4 +1,3 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
/* dbus-qthread.cpp TQt threads integration
*
* Copyright (C) 2002 Zack Rusin <zack@kde.org>
diff --git a/integrator.cpp b/integrator.cpp
index 6e8528b..085f2a0 100644
--- a/integrator.cpp
+++ b/integrator.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/* integrator.h: integrates D-BUS into TQt event loop
*
* Copyright (C) 2003 Zack Rusin <zack@kde.org>
@@ -105,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()
@@ -194,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 );
@@ -222,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();
}
diff --git a/integrator.h b/integrator.h
index 98ecbad..e67eb9d 100644
--- a/integrator.h
+++ b/integrator.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/* integrator.h: integrates D-BUS into TQt event loop
*
* Copyright (C) 2003 Zack Rusin <zack@kde.org>
@@ -42,7 +41,7 @@ namespace DBusQt
class Timeout : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Timeout( TQObject *parent, DBusTimeout *t );
@@ -59,7 +58,7 @@ namespace DBusQt
class Integrator : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Integrator( DBusConnection *connection, TQObject *parent );
diff --git a/message.cpp b/message.cpp
index 9f94955..ea50158 100644
--- a/message.cpp
+++ b/message.cpp
@@ -1,4 +1,3 @@
-/* -*- mode: C++; c-file-style: "gnu" -*- */
/* message.cpp: TQt wrapper for DBusMessage
*
* Copyright (C) 2003 Zack Rusin <zack@kde.org>
diff --git a/message.h b/message.h
index c882543..948aaea 100644
--- a/message.h
+++ b/message.h
@@ -1,4 +1,3 @@
-/* -*- mode: C++; c-file-style: "gnu" -*- */
/* message.h: TQt wrapper for DBusMessage
*
* Copyright (C) 2003 Zack Rusin <zack@kde.org>
diff --git a/server.cpp b/server.cpp
index f09d8a2..dc8badd 100644
--- a/server.cpp
+++ b/server.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/* server.h: TQt wrapper for DBusServer
*
* Copyright (C) 2003 Zack Rusin <zack@kde.org>
@@ -80,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*)) );
}
}
diff --git a/server.h b/server.h
index 3186bc1..f571c5b 100644
--- a/server.h
+++ b/server.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/* server.h: TQt wrapper for DBusServer
*
* Copyright (C) 2003 Zack Rusin <zack@kde.org>
@@ -32,7 +31,7 @@ namespace DBusQt
class Connection;
class Server : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Server( const TQString& addr = TQString(), TQObject *parent=0 );
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 21:26:09 +0000