summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago@kde.org>2006-04-13 17:36:03 +0000
committerThiago Macieira <thiago@kde.org>2006-04-13 17:36:03 +0000
commitd371f6fa44ffe112e6cc74da247948c5bb00bec4 (patch)
treebab3be241360ab6de5c5a2ef43e20ba59b99c4eb
parent788a8967a1661d48886f214f8f16d5a12f6685a9 (diff)
* qt/qdbusintegrator.cpp: Work around g++ 3.3 bug.
Patch by Stefan Eilers. (r529537)
-rw-r--r--ChangeLog9
-rw-r--r--qt/qdbusintegrator.cpp4
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b0fb670a..84488b1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
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
qdbusconnection_p.moc. It's included in qdbusintegrator.cpp,
diff --git a/qt/qdbusintegrator.cpp b/qt/qdbusintegrator.cpp
index a9467c00..4a72d197 100644
--- a/qt/qdbusintegrator.cpp
+++ b/qt/qdbusintegrator.cpp
@@ -1221,12 +1221,12 @@ void QDBusConnectionPrivate::setConnection(DBusConnection *dbc)
//qDebug("base service: %s", service);
}
-extern "C"
+extern "C"{
static void qDBusResultReceived(DBusPendingCall *pending, void *user_data)
{
QDBusConnectionPrivate::messageResultReceived(pending, user_data);
}
-
+}
void QDBusConnectionPrivate::messageResultReceived(DBusPendingCall *pending, void *user_data)
{
QDBusPendingCall *call = reinterpret_cast<QDBusPendingCall *>(user_data);