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

List:       kde-commits
Subject:    KDE/kdelibs/kdecore
From:       David Faure <faure () kde ! org>
Date:       2010-11-08 22:49:15
Message-ID: 20101108224915.78471AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1194412 by dfaure:

Finally enable QT_NO_CAST_FROM_ASCII in kdecore.


 M  +1 -1      CMakeLists.txt  
 M  +3 -3      auth/backends/polkit-1/Polkit1Backend.cpp  


--- trunk/KDE/kdelibs/kdecore/CMakeLists.txt #1194411:1194412
@@ -48,7 +48,7 @@
 # same for optional libs
 set(kdecore_OPTIONAL_LIBS)
 
-# TODO add_definitions(-DQT_NO_CAST_FROM_ASCII)
+add_definitions(-DQT_NO_CAST_FROM_ASCII)
 
 if(WIN32)
    set(kdecore_OPTIONAL_LIBS ${kdecore_OPTIONAL_LIBS} ${KDEWIN_LIBRARIES})
--- trunk/KDE/kdelibs/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp \
#1194411:1194412 @@ -93,7 +93,7 @@
     }
 
     // Are we running our KDE auth agent?
-    if (QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.Polkit1AuthAgent")) \
{ +    if (QDBusConnection::sessionBus().interface()->isServiceRegistered(QLatin1String("org.kde.Polkit1AuthAgent"))) \
{  // Check if we actually are entitled to use GUI capabilities
         if (qApp == 0 || QApplication::type() == QApplication::Tty) {
             kDebug() << "Not streaming parent as we are on a TTY application";
@@ -104,8 +104,8 @@
 
         // Send it over the bus to our agent
         QDBusMessage methodCall =
-                QDBusMessage::createMethodCall("org.kde.Polkit1AuthAgent", \
                "/org/kde/Polkit1AuthAgent", "org.kde.Polkit1AuthAgent",
-                                               "setWIdForAction");
+                QDBusMessage::createMethodCall(QLatin1String("org.kde.Polkit1AuthAgent"), \
QLatin1String("/org/kde/Polkit1AuthAgent"), \
QLatin1String("org.kde.Polkit1AuthAgent"), +                                          \
QLatin1String("setWIdForAction"));  
         methodCall << action;
         methodCall << wId;


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