[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [Phonon/4.1] 76aa3de: Revert thiago's merge to kdelibs /trunk that
From: Michael Pyne <mpyne () kde ! org>
Date: 2011-01-02 21:59:09
Message-ID: 20110102215909.571DCA6217 () git ! kde ! org
[Download RAW message or body]
commit 76aa3deae8e101da01717cf4f94d8ef30130ceb3
branch 4.1
Author: Michael Pyne <mpyne@kde.org>
Date: Fri Jun 30 19:09:42 2006 +0000
Revert thiago's merge to kdelibs /trunk that broke lotsa stuff for now.
diff --git a/audiooutputadaptor.h b/audiooutputadaptor.h
index d19094f..ea26373 100644
--- a/audiooutputadaptor.h
+++ b/audiooutputadaptor.h
@@ -11,7 +11,7 @@
#define AUDIOOUTPUTADAPTOR_H_56661149284959
#include <QtCore/QObject>
-#include <QtDBus/QtDBus>
+#include <dbus/qdbus.h>
class QByteArray;
template<class T> class QList;
template<class Key, class Value> class QMap;
diff --git a/factory.cpp b/factory.cpp
index 3efd795..f279dcb 100644
--- a/factory.cpp
+++ b/factory.cpp
@@ -30,7 +30,7 @@
#include <kdebug.h>
#include <kstaticdeleter.h>
-#include <QtDBus/QtDBus>
+#include <dbus/qdbus.h>
static KStaticDeleter<Phonon::Factory> sd;
diff --git a/kcm/backendselection.cpp b/kcm/backendselection.cpp
index 2f44780..52c2618 100644
--- a/kcm/backendselection.cpp
+++ b/kcm/backendselection.cpp
@@ -27,7 +27,7 @@
#include <kapplication.h>
#include <kicon.h>
#include <QList>
-#include <QtDBus/QtDBus>
+#include <dbus/qdbus.h>
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() );
- signal.send();
+ "phononBackendChanged" );
+ QDBus::sessionBus().send(signal);
}
void BackendSelection::defaults()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic