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

List:       kde-commits
Subject:    [Phonon/4.1] 9be02a8: - re-apply Thiago's patch,
From:       Simon Hausmann <hausmann () kde ! org>
Date:       2011-01-02 21:59:09
Message-ID: 20110102215909.7A5D4A6218 () git ! kde ! org
[Download RAW message or body]

commit 9be02a8189825034de4c9b2183e1345f274c70ac
branch 4.1
Author: Simon Hausmann <hausmann@kde.org>
Date:   Sat Jul 1 20:37:17 2006 +0000

    - re-apply Thiago's patch, now that qt-copy is up-to-date with a Qt 4.2 snapshot

diff --git a/audiooutputadaptor.h b/audiooutputadaptor.h
index ea26373..d19094f 100644
--- a/audiooutputadaptor.h
+++ b/audiooutputadaptor.h
@@ -11,7 +11,7 @@
 #define AUDIOOUTPUTADAPTOR_H_56661149284959
 
 #include <QtCore/QObject>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 class QByteArray;
 template<class T> class QList;
 template<class Key, class Value> class QMap;
diff --git a/factory.cpp b/factory.cpp
index f279dcb..3efd795 100644
--- a/factory.cpp
+++ b/factory.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 static KStaticDeleter<Phonon::Factory> sd;
 
diff --git a/kcm/backendselection.cpp b/kcm/backendselection.cpp
index 52c2618..2f44780 100644
--- a/kcm/backendselection.cpp
+++ b/kcm/backendselection.cpp
@@ -27,7 +27,7 @@
 #include <kapplication.h>
 #include <kicon.h>
 #include <QList>
-#include <dbus/qdbus.h>
+#include <QtDBus/QtDBus>
 
 BackendSelection::BackendSelection( QWidget* parent )
 	: QWidget( parent )
@@ -91,8 +91,8 @@ void BackendSelection::save()
 	KServiceTypeProfile::clear();
 
 	QDBusMessage signal = QDBusMessage::signal( "/", "org.kde.Phonon.Factory",
-						    "phononBackendChanged" );
-	QDBus::sessionBus().send(signal);
+						    "phononBackendChanged", QDBus::sessionBus() );
+        signal.send();
 }
 
 void BackendSelection::defaults()
[prev in list] [next in list] [prev in thread] [next in thread]