[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/dbus-kde4/qt-dbus
From:       Kevin Ottens <ervin () kde ! org>
Date:       2005-09-01 15:22:41
Message-ID: 1125588161.627823.14684.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 455867 by ervin:

Normalize the slot name, otherwise connect() will fail in most cases.



 M  +3 -3      configure.in.in  
 M  +2 -1      qdbusintegrator.cpp  


--- branches/work/dbus-kde4/qt-dbus/configure.in.in #455866:455867
@@ -6,10 +6,10 @@
   dbus_lib=NOTFOUND
   dbus=NOTFOUND
 
-  search_incs="$kde_includes /usr/include /usr/include/dbus-1.0 /usr/local/include \
/usr/local/include/dbus-1.0" +  search_incs="$kde_includes /opt/fdo/include/dbus-1.0 \
/usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"  \
AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir)  
-  search_incs_arch_deps="$kde_includes /usr/lib/dbus-1.0/include \
/usr/local/lib/dbus-1.0/include" +  search_incs_arch_deps="$kde_includes \
/opt/fdo/lib/dbus-1.0/include /usr/lib/dbus-1.0/include \
/usr/local/lib/dbus-1.0/include"  AC_FIND_FILE(dbus/dbus-arch-deps.h, \
$search_incs_arch_deps, dbus_incdir_arch_deps)  
   if [test -r $dbus_incdir/dbus/dbus.h] && [test -r \
$dbus_incdir_arch_deps/dbus/dbus-arch-deps.h] ; then @@ -17,7 +17,7 @@
     dbus_inc=FOUND
   fi
 
-  search_libs="$kde_libraries /usr/lib /usr/local/lib"
+  search_libs="$kde_libraries /opt/fdo/lib /usr/lib /usr/local/lib"
   AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir)
 
   if test -r $dbus_libdir/libdbus-1.so ; then
--- branches/work/dbus-kde4/qt-dbus/qdbusintegrator.cpp #455866:455867
@@ -315,8 +315,9 @@
 {
     Q_ASSERT(static_cast<QObject *>(obj)); Q_ASSERT(slotName);
 
+    QByteArray normalizedName = QMetaObject::normalizedSignature(slotName);
     const QMetaObject *mo = obj->metaObject();
-    midx = mo->indexOfMethod(slotName);
+    midx = mo->indexOfMethod(normalizedName);
     if (midx < 0)
         return false;
 


[prev in list] [next in list] [prev in thread] [next in thread]