[patch] Re: mac build issues

[Håvard Wall]

On Monday 18 June 2007 13:57, Richard wrote:
> Matthias:
>
> With the new .pro file, I'm almost able to build it on mac straight
> out of the repository.
> But the qdbus stuff is still present. Needed to remove the following
> to make it build:
>
> ==== audiooutput.cpp ====
> 23c23
> < #include "audiooutputadaptor.h"
> ---
>
>  > //#include "audiooutputadaptor.h"
>
> 45,46c45,46
> <     new AudioOutputAdaptor(this);
> <     for (int i = 0; !QDBusConnection::sessionBus().registerObject("/
> AudioOutputs/" + QString::number(i), this); ++i);
> ---
>
>  > //    new AudioOutputAdaptor(this);
>  > //    for (int i = 0; !QDBusConnection::sessionBus().registerObject
>
> ("/AudioOutputs/" + QString::number(i), this); ++i);
>
>
> ====  factory.cpp ====
> 104,105c104,105
> <     QDBusConnection::sessionBus().connect(QString(), QString(),
> "org.kde.Phonon.Factory",
> <             "phononBackendChanged", this, SLOT(phononBackendChanged
> ()));
> ---
>
>  > //    QDBusConnection::sessionBus().connect(QString(), QString(),
>
> "org.kde.Phonon.Factory",
>
>  > //            "phononBackendChanged", this, SLOT
>
> (phononBackendChanged()));

I believe this patch might be a better compromise -)

===================================================================
--- audiooutput.cpp     (revision 677025)
+++ audiooutput.cpp     (working copy)
@@ -42,8 +42,10 @@
     d->outputDeviceIndex = GlobalConfig().audioOutputDeviceFor(d->category);

     d->createBackendObject();
+#ifndef QT_NO_DBUS
     new AudioOutputAdaptor(this);
     for (int i = 
0; !QDBusConnection::sessionBus().registerObject("/AudioOutputs/" + 
QString::number(i), this); ++i);
+#endif

     connect(Factory::sender(), SIGNAL(availableAudioOutputDevicesChanged()), 
SLOT(_k_deviceListChanged()));
 }
Index: factory.cpp
===================================================================
--- factory.cpp (revision 677025)
+++ factory.cpp (working copy)
@@ -101,8 +101,10 @@
     // are still available. If the FactoryPrivate dtor is called too late 
many bad things can happen
     // as the whole backend might still be alive.
     qAddPostRoutine(globalFactory.destroy);
+#ifndef QT_NO_DBUS
     QDBusConnection::sessionBus().connect(QString(), 
QString(), "org.kde.Phonon.Factory",
             "phononBackendChanged", this, SLOT(phononBackendChanged()));
+#endif
 }

 FactoryPrivate::~FactoryPrivate()