fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-07 06:18:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

* qt/qdbusintegrator.cpp: Work around g++ 3.3 bug.

Browse source 
Patch by Stefan Eilers. (r529537)
This commit is contained in:
Thiago Macieira 2006-04-13 17:36:03 +00:00
parent 788a8967a1
commit d371f6fa44
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,9 +1,14 @@
2006-04-13 Thiago Macieira <thiago.macieira@trolltech.com 2006-04-13 Thiago Macieira <thiago.macieira@trolltech.com>
* qt/qdbusintegrator.cpp: Work around g++ 3.3 bug.
Patch by Stefan Eilers. (r529537)
2006-04-13 Thiago Macieira <thiago.macieira@trolltech.com>
* qt/qdbusinternalfilters.cpp: Don't show the parent'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>
* qt/Makefile.am: fix the dependency for * qt/Makefile.am: fix the dependency for
qdbusconnection_p.moc. It's included in qdbusintegrator.cpp, qdbusconnection_p.moc. It's included in qdbusintegrator.cpp,

4
qt/qdbusintegrator.cpp
View file

@ -1221,12 +1221,12 @@ void QDBusConnectionPrivate::setConnection(DBusConnection *dbc)
//qDebug("base service: %s", service); //qDebug("base service: %s", service);
} }
extern "C" extern "C"{
static void qDBusResultReceived(DBusPendingCall *pending, void *user_data) static void qDBusResultReceived(DBusPendingCall *pending, void *user_data)
{ {
QDBusConnectionPrivate::messageResultReceived(pending, user_data); QDBusConnectionPrivate::messageResultReceived(pending, user_data);
} }
}
void QDBusConnectionPrivate::messageResultReceived(DBusPendingCall *pending, void *user_data) void QDBusConnectionPrivate::messageResultReceived(DBusPendingCall *pending, void *user_data)
{ {
QDBusPendingCall *call = reinterpret_cast<QDBusPendingCall *>(user_data); QDBusPendingCall *call = reinterpret_cast<QDBusPendingCall *>(user_data);