rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/dbus-tqt@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 8f9c3391a8
commit e271940e6e

@ -233,7 +233,7 @@
* qt/qdbusabstractadaptor.cpp: * qt/qdbusabstractadaptor.cpp:
* qt/qdbusabstractadaptor.h: Make QDBusAdaptorConnector be a * qt/qdbusabstractadaptor.h: Make QDBusAdaptorConnector be a
sibling of the QDBusAbstractAdaptor objects instead of the sibling of the QDBusAbstractAdaptor objects instead of the
tqparent. (r535848) parent. (r535848)
* qt/dbusidl2cpp.cpp: * qt/dbusidl2cpp.cpp:
* qt/qdbusabstractinterface.cpp: * qt/qdbusabstractinterface.cpp:
@ -400,7 +400,7 @@
2006-04-13 Thiago Macieira <thiago.macieira@trolltech.com> 2006-04-13 Thiago Macieira <thiago.macieira@trolltech.com>
* qt/qdbusinternalfilters.cpp: Don't show the tqparent's * qt/qdbusinternalfilters.cpp: Don't show the parent's
contents (r528208) contents (r528208)
2006-04-10 Thiago Macieira <thiago.macieira@trolltech.com> 2006-04-10 Thiago Macieira <thiago.macieira@trolltech.com>
@ -1179,7 +1179,7 @@
* python/service.py: Major changes to allow multiple inheritance * python/service.py: Major changes to allow multiple inheritance
from classes that define D-Bus interfaces: from classes that define D-Bus interfaces:
1. Create a new Interface class which is the tqparent class of 1. Create a new Interface class which is the parent class of
Object, and make the ObjectType metaclass into InterfaceType. Object, and make the ObjectType metaclass into InterfaceType.
2. Patch written with Rob Taylor to replace use of method_vtable 2. Patch written with Rob Taylor to replace use of method_vtable
@ -3496,7 +3496,7 @@
2005-05-08 Havoc Pennington <hp@redhat.com> 2005-05-08 Havoc Pennington <hp@redhat.com>
* dbus/dbus-sysdeps-util.c (_dbus_become_daemon): write the * dbus/dbus-sysdeps-util.c (_dbus_become_daemon): write the
daemon's pid, not the tqparent's pid, to the file descriptor. daemon's pid, not the parent's pid, to the file descriptor.
Reported by Taj Morton. Reported by Taj Morton.
2005-05-05 Havoc Pennington <hp@redhat.com> 2005-05-05 Havoc Pennington <hp@redhat.com>
@ -7147,8 +7147,8 @@
* bus/config-parser.c (struct BusConfigParser): Added * bus/config-parser.c (struct BusConfigParser): Added
included_files field. included_files field.
(seen_include): Added. Checks whether or not a file has already (seen_include): Added. Checks whether or not a file has already
been included by any tqparent BusConfigParser. been included by any parent BusConfigParser.
(bus_config_parser_new): Copy the tqparent's included_files. (bus_config_parser_new): Copy the parent's included_files.
(include_file): Track which files have been included, and fail on (include_file): Track which files have been included, and fail on
circular inclusions. circular inclusions.
(process_test_valid_subdir): Changed printf to report if we are (process_test_valid_subdir): Changed printf to report if we are
@ -7159,12 +7159,12 @@
2004-04-09 Jon Trowbridge <trow@ximian.com> 2004-04-09 Jon Trowbridge <trow@ximian.com>
* bus/config-parser.c (bus_config_parser_new): Added a 'tqparent' * bus/config-parser.c (bus_config_parser_new): Added a 'parent'
argument. If non-null, the newly-constructed BusConfigParser will argument. If non-null, the newly-constructed BusConfigParser will
be initialized with the tqparent's BusLimits instead of the default be initialized with the parent's BusLimits instead of the default
values. values.
(include_file): When including a config file, pass in (include_file): When including a config file, pass in
the current parser as the tqparent and then copy the BusLimits the current parser as the parent and then copy the BusLimits
from the included BusConfigParser pack to the current parser. from the included BusConfigParser pack to the current parser.
(process_test_valid_subdir): Renamed from process_test_subdir. (process_test_valid_subdir): Renamed from process_test_subdir.
(process_test_equiv_subdir): Added. Walks through a directory, (process_test_equiv_subdir): Added. Walks through a directory,
@ -7175,15 +7175,15 @@
(bus_config_parser_test): Call both process_test_valid_subdir and (bus_config_parser_test): Call both process_test_valid_subdir and
process_test_equiv_subdir. process_test_equiv_subdir.
* bus/config-loader-libxml.c (bus_config_load): Take a tqparent * bus/config-loader-libxml.c (bus_config_load): Take a parent
argument and pass it along to the call to bus_config_parser_new. argument and pass it along to the call to bus_config_parser_new.
Also made a few small changes to allow this code to compile. Also made a few small changes to allow this code to compile.
* bus/config-loader-expat.c (bus_config_load): Take a tqparent * bus/config-loader-expat.c (bus_config_load): Take a parent
argument and pass it along to the call to bus_config_parser_new. argument and pass it along to the call to bus_config_parser_new.
* bus/bus.c (bus_context_new): Load the config file * bus/bus.c (bus_context_new): Load the config file
with a NULL tqparent argument. with a NULL parent argument.
2004-03-29 Michael Meeks <michael@ximian.com> 2004-03-29 Michael Meeks <michael@ximian.com>
@ -7981,7 +7981,7 @@
2003-09-23 Havoc Pennington <hp@pobox.com> 2003-09-23 Havoc Pennington <hp@pobox.com>
* glib/dbus-gproxy.c (struct DBusGProxy): convert to a GObject * glib/dbus-gproxy.c (struct DBusGProxy): convert to a GObject
subclass. This means dropping the transtqparent thread safety of the subclass. This means dropping the transparent thread safety of the
proxy; you now need a separate proxy per-thread, or your own proxy; you now need a separate proxy per-thread, or your own
locking on the proxy. Probably right anyway. locking on the proxy. Probably right anyway.
(dbus_gproxy_ref, dbus_gproxy_unref): nuke, just use g_object_ref (dbus_gproxy_ref, dbus_gproxy_unref): nuke, just use g_object_ref
@ -9610,7 +9610,7 @@
2003-04-10 Havoc Pennington <hp@pobox.com> 2003-04-10 Havoc Pennington <hp@pobox.com>
* dbus/dbus-spawn.c (_dbus_spawn_async_with_babysitter): move all * dbus/dbus-spawn.c (_dbus_spawn_async_with_babysitter): move all
the possible tqparent failures before we fork, so that we don't the possible parent failures before we fork, so that we don't
fail to create a babysitter after creating the child. fail to create a babysitter after creating the child.
* bus/activation.c (bus_activation_activate_service): kill child * bus/activation.c (bus_activation_activate_service): kill child
@ -9935,8 +9935,8 @@
2003-04-06 Havoc Pennington <hp@pobox.com> 2003-04-06 Havoc Pennington <hp@pobox.com>
* dbus/dbus-sysdeps.c (_dbus_become_daemon): write the pidfile * dbus/dbus-sysdeps.c (_dbus_become_daemon): write the pidfile
here in the tqparent process, so we can return an error if it here in the parent process, so we can return an error if it
fails. Also, move some of the code into the child so the tqparent fails. Also, move some of the code into the child so the parent
is less hosed if we fail midway through. is less hosed if we fail midway through.
* bus/bus.c (bus_context_new): move pidfile detection further up * bus/bus.c (bus_context_new): move pidfile detection further up

@ -58,14 +58,14 @@ void Connection::Private::setConnection( DBusConnection *c )
connect( integrator, TQT_SIGNAL(readReady()), q, TQT_SLOT(dispatchRead()) ); connect( integrator, TQT_SIGNAL(readReady()), q, TQT_SLOT(dispatchRead()) );
} }
Connection::Connection( TQObject *tqparent ) Connection::Connection( TQObject *parent )
: TQObject( tqparent ) : TQObject( parent )
{ {
d = new Private( this ); d = new Private( this );
} }
Connection::Connection( const TQString& host, TQObject *tqparent ) Connection::Connection( const TQString& host, TQObject *parent )
: TQObject( tqparent ) : TQObject( parent )
{ {
d = new Private( this ); d = new Private( this );
@ -73,8 +73,8 @@ Connection::Connection( const TQString& host, TQObject *tqparent )
init( host ); init( host );
} }
Connection::Connection( DBusBusType type, TQObject* tqparent ) Connection::Connection( DBusBusType type, TQObject* parent )
: TQObject( tqparent ) : TQObject( parent )
{ {
d = new Private( this ); d = new Private( this );
d->setConnection( dbus_bus_get(type, &d->error) ); d->setConnection( dbus_bus_get(type, &d->error) );
@ -125,8 +125,8 @@ DBusConnection* Connection::connection() const
return d->connection; return d->connection;
} }
Connection::Connection( DBusConnection *connection, TQObject *tqparent ) Connection::Connection( DBusConnection *connection, TQObject *parent )
: TQObject( tqparent ) : TQObject( parent )
{ {
d = new Private(this); d = new Private(this);
d->setConnection(connection); d->setConnection(connection);

@ -40,10 +40,10 @@ namespace DBusQt {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
Connection( TQObject *tqparent =0 ); Connection( TQObject *parent =0 );
Connection( const TQString& host, Connection( const TQString& host,
TQObject *tqparent = 0 ); TQObject *parent = 0 );
Connection( DBusBusType type, TQObject* tqparent = 0 ); Connection( DBusBusType type, TQObject* parent = 0 );
bool isConnected() const; bool isConnected() const;
bool isAuthenticated() const; bool isAuthenticated() const;
@ -71,7 +71,7 @@ namespace DBusQt {
private: private:
friend class Internal::Integrator; friend class Internal::Integrator;
DBusConnection *connection() const; DBusConnection *connection() const;
Connection( DBusConnection *connection, TQObject *tqparent ); Connection( DBusConnection *connection, TQObject *parent );
private: private:
struct Private; struct Private;

@ -33,7 +33,7 @@ class DBusQtConnection : public TQObject {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
DBusQtConnection( const char *address=0, TQObject *tqparent=0, DBusQtConnection( const char *address=0, TQObject *parent=0,
const char *name=0 ); const char *name=0 );
bool open( const char *address ); bool open( const char *address );
@ -65,7 +65,7 @@ signals:
void message (DBusConnection* connection, DBusMessage* message); void message (DBusConnection* connection, DBusMessage* message);
private: private:
DBusQtNotifier(TQObject *tqparent); DBusQtNotifier(TQObject *parent);
private slots: private slots:
void processNotifiers( int socket ); void processNotifiers( int socket );
private: private:

@ -101,8 +101,8 @@ void dbusNewConnection( DBusServer *server,
} }
///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////
Timeout::Timeout( TQObject *tqparent, DBusTimeout *t ) Timeout::Timeout( TQObject *parent, DBusTimeout *t )
: TQObject( tqparent ), m_timeout( t ) : TQObject( parent ), m_timeout( t )
{ {
m_timer = new TQTimer( this ); m_timer = new TQTimer( this );
connect( m_timer, TQT_SIGNAL(timeout()), connect( m_timer, TQT_SIGNAL(timeout()),
@ -119,8 +119,8 @@ void Timeout::start()
m_timer->start( dbus_timeout_get_interval( m_timeout ) ); m_timer->start( dbus_timeout_get_interval( m_timeout ) );
} }
Integrator::Integrator( DBusConnection *conn, TQObject *tqparent ) Integrator::Integrator( DBusConnection *conn, TQObject *parent )
: TQObject( tqparent ), m_connection( conn ) : TQObject( parent ), m_connection( conn )
{ {
m_timeouts.setAutoDelete( true ); m_timeouts.setAutoDelete( true );
@ -139,8 +139,8 @@ Integrator::Integrator( DBusConnection *conn, TQObject *tqparent )
this, 0 ); this, 0 );
} }
Integrator::Integrator( DBusServer *server, TQObject *tqparent ) Integrator::Integrator( DBusServer *server, TQObject *parent )
: TQObject( tqparent ), m_server( server ) : TQObject( parent ), m_server( server )
{ {
m_connection = reinterpret_cast<DBusConnection*>( m_server ); m_connection = reinterpret_cast<DBusConnection*>( m_server );
m_timeouts.setAutoDelete( true ); m_timeouts.setAutoDelete( true );

@ -45,7 +45,7 @@ namespace DBusQt
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
Timeout( TQObject *tqparent, DBusTimeout *t ); Timeout( TQObject *parent, DBusTimeout *t );
public: public:
void start(); void start();
signals: signals:
@ -62,8 +62,8 @@ namespace DBusQt
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
Integrator( DBusConnection *connection, TQObject *tqparent ); Integrator( DBusConnection *connection, TQObject *parent );
Integrator( DBusServer *server, TQObject *tqparent ); Integrator( DBusServer *server, TQObject *parent );
signals: signals:
void readReady(); void readReady();

@ -161,10 +161,10 @@ func_mktempdir ()
# Failing that, at least try and use $RANDOM to avoid a race # Failing that, at least try and use $RANDOM to avoid a race
my_tmpdir="${my_template}-${RANDOM-0}$$" my_tmpdir="${my_template}-${RANDOM-0}$$"
save_mktempdir_utqmask=`utqmask` save_mktempdir_umask=`umask`
utqmask 0077 umask 0077
$mkdir "$my_tmpdir" $mkdir "$my_tmpdir"
utqmask $save_mktempdir_utqmask umask $save_mktempdir_umask
fi fi
# If we're not in dry-run mode, bomb out on failure # If we're not in dry-run mode, bomb out on failure

@ -38,8 +38,8 @@ struct Server::Private {
DBusError error; DBusError error;
}; };
Server::Server( const TQString& addr, TQObject *tqparent ) Server::Server( const TQString& addr, TQObject *parent )
: TQObject( tqparent ) : TQObject( parent )
{ {
d = new Private; d = new Private;

@ -35,7 +35,7 @@ namespace DBusQt
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
Server( const TQString& addr = TQString(), TQObject *tqparent=0 ); Server( const TQString& addr = TQString(), TQObject *parent=0 );
~Server(); ~Server();
bool isConnected() const; bool isConnected() const;

Loading…
Cancel
Save