[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs
From: Allen Winter <winter () kde ! org>
Date: 2007-03-31 23:04:14
Message-ID: 1175382254.661992.30119.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 648662 by winterz:
phonon_export.h
M +0 -7 kdelibs_export.h
M +0 -40 kdelibs_export_win.h
M +1 -0 phonon/CMakeLists.txt
M +1 -1 phonon/abstractvideooutput_p.h
M +1 -1 phonon/addoninterface.h
M +1 -1 phonon/audiodevice.h
M +1 -1 phonon/audiooutput.h
M +2 -2 phonon/audioplayer.h
M +3 -3 phonon/backendcapabilities.h
M +3 -2 phonon/backendinterface.h
M +1 -1 phonon/base.h
M +1 -1 phonon/brightnesscontrol.h
M +1 -1 phonon/bytestream.h
M +1 -1 phonon/bytestreaminterface.h
M +1 -1 phonon/chapterinterface.h
M +1 -1 phonon/deinterlacefilter.h
M +1 -1 phonon/effect.h
M +3 -2 phonon/effectparameter.h
M +3 -3 phonon/factory.h
M +1 -1 phonon/guiinterface.h
M +1 -1 phonon/kiofallback.h
M +2 -2 phonon/mediaobject.h
M +3 -4 phonon/mediaobjectinterface.h
M +1 -1 phonon/mediaqueue.h
M +2 -1 phonon/objectdescription.h
M +2 -2 phonon/objectdescriptionmodel.h
A phonon/phonon_export.h [License: LGPL (v2+)]
M +1 -1 phonon/phononnamespace.h
M +4 -3 phonon/tests/fakebackend/backend.h
M +1 -1 phonon/tests/fakebackend/ui/backend.h
M +1 -1 phonon/trackinterface.h
M +1 -1 phonon/ui/effectwidget.h
M +1 -1 phonon/ui/factory.h
M +2 -2 phonon/ui/mediacontrols.h
M +2 -2 phonon/ui/seekslider.h
M +2 -2 phonon/ui/videoplayer.h
M +2 -2 phonon/ui/videowidget.h
M +1 -1 phonon/ui/volumeslider.h
M +1 -1 phonon/volumefadereffect.h
--- trunk/KDE/kdelibs/kdelibs_export.h #648661:648662
@@ -42,13 +42,6 @@
#define KJS_EXPORT KDE_EXPORT
#endif
-
-#define PHONONCORE_EXPORT KDE_EXPORT
-#define PHONONUI_EXPORT KDE_EXPORT
-#define PHONON_FAKE_EXPORT KDE_EXPORT
-#define PHONON_FAKEUI_EXPORT KDE_EXPORT
-#define KAUDIODEVICELIST_EXPORT KDE_EXPORT
-
#define KIOSLAVE_FILE_EXPORT KDE_EXPORT
#ifndef O_BINARY
--- trunk/KDE/kdelibs/kdelibs_export_win.h #648661:648662
@@ -43,46 +43,6 @@
# endif
#endif
-#ifndef PHONONCORE_EXPORT
-# ifdef MAKE_PHONONCORE_LIB
-# define PHONONCORE_EXPORT KDE_EXPORT
-# else
-# define PHONONCORE_EXPORT KDE_IMPORT
-# endif
-#endif
-
-#ifndef PHONONUI_EXPORT
-# ifdef MAKE_PHONONUI_LIB
-# define PHONONUI_EXPORT KDE_EXPORT
-# else
-# define PHONONUI_EXPORT KDE_IMPORT
-# endif
-#endif
-
-#ifndef PHONON_FAKE_EXPORT
-# ifdef MAKE_PHONON_FAKE_LIB
-# define PHONON_FAKE_EXPORT KDE_EXPORT
-# else
-# define PHONON_FAKE_EXPORT KDE_IMPORT
-# endif
-#endif
-
-#ifndef PHONON_FAKEUI_EXPORT
-# ifdef MAKE_PHONON_FAKEUI_LIB
-# define PHONON_FAKEUI_EXPORT KDE_EXPORT
-# else
-# define PHONON_FAKEUI_EXPORT KDE_IMPORT
-# endif
-#endif
-
-#ifndef KAUDIODEVICELIST_EXPORT
-# ifdef MAKE_KAUDIODEVICELIST_LIB
-# define KAUDIODEVICELIST_EXPORT KDE_EXPORT
-# else
-# define KAUDIODEVICELIST_EXPORT KDE_IMPORT
-# endif
-#endif
-
#ifndef KIOSLAVE_FILE_EXPORT
# ifdef MAKE_KIO_FILE_LIB
# define KIOSLAVE_FILE_EXPORT KDE_EXPORT
--- trunk/KDE/kdelibs/phonon/CMakeLists.txt #648661:648662
@@ -67,6 +67,7 @@
########### install files ###############
install( FILES
+ phonon_export.h
objectdescription.h
objectdescriptionmodel.h
phononnamespace.h
--- trunk/KDE/kdelibs/phonon/abstractvideooutput_p.h #648661:648662
@@ -20,9 +20,9 @@
#ifndef ABSTRACTVIDEOOUTPUT_P_H
#define ABSTRACTVIDEOOUTPUT_P_H
+#include <phonon/phonon_export.h>
#include "abstractvideooutput.h"
#include "base_p.h"
-#include <kdelibs_export.h>
namespace Phonon
{
--- trunk/KDE/kdelibs/phonon/addoninterface.h #648661:648662
@@ -20,7 +20,7 @@
#ifndef PHONON_ADDONINTERFACE_H
#define PHONON_ADDONINTERFACE_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
#include <QList>
#include <QVariant>
--- trunk/KDE/kdelibs/phonon/audiodevice.h #648661:648662
@@ -20,7 +20,7 @@
#ifndef PHONON_AUDIODEVICE_H
#define PHONON_AUDIODEVICE_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
#include <solid/audiohw.h>
#include <ksharedconfig.h>
class QString;
--- trunk/KDE/kdelibs/phonon/audiooutput.h #648661:648662
@@ -19,8 +19,8 @@
#ifndef Phonon_AUDIOOUTPUT_H
#define Phonon_AUDIOOUTPUT_H
+#include <phonon/phonon_export.h>
#include "abstractaudiooutput.h"
-#include <kdelibs_export.h>
#include "phonondefs.h"
#include "phononnamespace.h"
#include "objectdescription.h"
--- trunk/KDE/kdelibs/phonon/audioplayer.h #648661:648662
@@ -20,9 +20,9 @@
#ifndef Phonon_AUDIOPLAYER_H
#define Phonon_AUDIOPLAYER_H
+#include <phonon/phonon_export.h>
+#include "phononnamespace.h"
#include <QObject>
-#include "phononnamespace.h"
-#include <kdelibs_export.h>
class KUrl;
--- trunk/KDE/kdelibs/phonon/backendcapabilities.h #648661:648662
@@ -20,12 +20,12 @@
#ifndef Phonon_BACKENDCAPABILITIES_H
#define Phonon_BACKENDCAPABILITIES_H
-#include <QObject>
-
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
#include "objectdescription.h"
#include <kglobal.h>
+#include <QObject>
+
template<class T> class QList;
class QStringList;
--- trunk/KDE/kdelibs/phonon/backendinterface.h #648661:648662
@@ -20,10 +20,11 @@
#ifndef PHONON_BACKENDINTERFACE_H
#define PHONON_BACKENDINTERFACE_H
-#include <kdelibs_export.h>
-#include <Qt/qglobal.h>
+#include <phonon/phonon_export.h>
#include "objectdescription.h"
+#include <Qt/qglobal.h>
+
class QVariant;
namespace Phonon
--- trunk/KDE/kdelibs/phonon/base.h #648661:648662
@@ -20,8 +20,8 @@
#ifndef PHONON_BASE_H
#define PHONON_BASE_H
+#include <phonon/phonon_export.h>
#include "phonondefs.h"
-#include <kdelibs_export.h>
class QObject;
namespace Phonon
--- trunk/KDE/kdelibs/phonon/brightnesscontrol.h #648661:648662
@@ -20,7 +20,7 @@
#ifndef PHONON_BRIGHTNESSCONTROL_H
#define PHONON_BRIGHTNESSCONTROL_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
#include "videoeffect.h"
namespace Phonon
--- trunk/KDE/kdelibs/phonon/bytestream.h #648661:648662
@@ -19,8 +19,8 @@
#ifndef PHONON_BYTESTREAM_H
#define PHONON_BYTESTREAM_H
+#include <phonon/phonon_export.h>
#include "abstractmediaproducer.h"
-#include <kdelibs_export.h>
#include "phonondefs.h"
class QString;
--- trunk/KDE/kdelibs/phonon/bytestreaminterface.h #648661:648662
@@ -20,7 +20,7 @@
#ifndef PHONON_BYTESTREAMINTERFACE_H
#define PHONON_BYTESTREAMINTERFACE_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
#include <QtCore/QObject>
--- trunk/KDE/kdelibs/phonon/chapterinterface.h #648661:648662
@@ -20,7 +20,7 @@
#ifndef PHONON_CHAPTERINTERFACE_H
#define PHONON_CHAPTERINTERFACE_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
#include <ksharedptr.h>
namespace Phonon
--- trunk/KDE/kdelibs/phonon/deinterlacefilter.h #648661:648662
@@ -20,7 +20,7 @@
#ifndef PHONON_DEINTERLACEFILTER_H
#define PHONON_DEINTERLACEFILTER_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
#include "videoeffect.h"
namespace Phonon
--- trunk/KDE/kdelibs/phonon/effect.h #648661:648662
@@ -20,7 +20,7 @@
#ifndef PHONON_EFFECT_H
#define PHONON_EFFECT_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
#include <QVariant>
template<class T> class QList;
--- trunk/KDE/kdelibs/phonon/effectparameter.h #648661:648662
@@ -20,10 +20,11 @@
#ifndef PHONON_EFFECTPARAMETER_H
#define PHONON_EFFECTPARAMETER_H
+#include <phonon/phonon_export.h>
+#include <ksharedptr.h>
+
#include <QString>
-#include <kdelibs_export.h>
#include <QVariant>
-#include <ksharedptr.h>
namespace Phonon
{
--- trunk/KDE/kdelibs/phonon/factory.h #648661:648662
@@ -20,11 +20,11 @@
#ifndef PHONON_FACTORY_H
#define PHONON_FACTORY_H
+#include <phonon/phonon_export.h>
+#include <kglobal.h>
+
#include <QObject>
-#include <kdelibs_export.h>
-#include <kglobal.h>
-
namespace Phonon
{
class BasePrivate;
--- trunk/KDE/kdelibs/phonon/guiinterface.h #648661:648662
@@ -20,7 +20,7 @@
#ifndef GUIINTERFACE_H
#define GUIINTERFACE_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
#include <QStringList>
#include <QString>
#include <QVariant>
--- trunk/KDE/kdelibs/phonon/kiofallback.h #648661:648662
@@ -20,7 +20,7 @@
#ifndef KIOFALLBACK_H
#define KIOFALLBACK_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
#include "phononnamespace.h"
#include "mediaobject.h"
--- trunk/KDE/kdelibs/phonon/mediaobject.h #648661:648662
@@ -19,9 +19,9 @@
#ifndef Phonon_MEDIAOBJECT_H
#define Phonon_MEDIAOBJECT_H
+#include <phonon/phonon_export.h>
+#include "phonondefs.h"
#include "abstractmediaproducer.h"
-#include <kdelibs_export.h>
-#include "phonondefs.h"
class KUrl;
--- trunk/KDE/kdelibs/phonon/mediaobjectinterface.h #648661:648662
@@ -20,11 +20,10 @@
#ifndef PHONON_MEDIAOBJECTINTERFACE_H
#define PHONON_MEDIAOBJECTINTERFACE_H
-#include <kdelibs_export.h>
-
-#include <QtCore/QObject>
-#include <kurl.h>
+#include <phonon/phonon_export.h>
#include "mediaobject.h"
+#include <kurl.h>
+#include <QtCore/QObject>
namespace Phonon
{
--- trunk/KDE/kdelibs/phonon/mediaqueue.h #648661:648662
@@ -20,7 +20,7 @@
#ifndef PHONON_MEDIAQUEUE_H
#define PHONON_MEDIAQUEUE_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
#include "mediaobject.h"
namespace Phonon
--- trunk/KDE/kdelibs/phonon/objectdescription.h #648661:648662
@@ -20,8 +20,9 @@
#ifndef PHONON_OBJECTDESCRIPTION_H
#define PHONON_OBJECTDESCRIPTION_H
+#include <phonon/phonon_export.h>
+
#include <QtGlobal>
-#include <kdelibs_export.h>
#include <QSharedDataPointer>
#include <QVariant>
#include <QByteArray>
--- trunk/KDE/kdelibs/phonon/objectdescriptionmodel.h #648661:648662
@@ -20,9 +20,9 @@
#ifndef PHONON_OBJECTDESCRIPTIONMODEL_H
#define PHONON_OBJECTDESCRIPTIONMODEL_H
+#include <phonon/phonon_export.h>
+#include "objectdescription.h"
#include <QAbstractListModel>
-#include <kdelibs_export.h>
-#include "objectdescription.h"
template<class t> class QList;
--- trunk/KDE/kdelibs/phonon/phononnamespace.h #648661:648662
@@ -20,7 +20,7 @@
#ifndef PHONONNAMESPACE_H
#define PHONONNAMESPACE_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
/**
* \brief The %KDE Multimedia classes
--- trunk/KDE/kdelibs/phonon/tests/fakebackend/backend.h #648661:648662
@@ -20,12 +20,13 @@
#ifndef Phonon_FAKE_BACKEND_H
#define Phonon_FAKE_BACKEND_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
+#include <phonon/objectdescription.h>
+#include <phonon/backendinterface.h>
+
#include <QList>
#include <QPointer>
#include <QStringList>
-#include <phonon/objectdescription.h>
-#include <phonon/backendinterface.h>
class KUrl;
--- trunk/KDE/kdelibs/phonon/tests/fakebackend/ui/backend.h #648661:648662
@@ -20,8 +20,8 @@
#ifndef Phonon_FAKE_UI_BACKEND_H
#define Phonon_FAKE_UI_BACKEND_H
+#include <phonon/phonon_export.h>
#include <QObject>
-#include <kdelibs_export.h>
namespace Phonon
{
--- trunk/KDE/kdelibs/phonon/trackinterface.h #648661:648662
@@ -20,7 +20,7 @@
#ifndef PHONON_TRACKINTERFACE_H
#define PHONON_TRACKINTERFACE_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
#include <QObject>
namespace Phonon
--- trunk/KDE/kdelibs/phonon/ui/effectwidget.h #648661:648662
@@ -20,8 +20,8 @@
#ifndef PHONON_UI_EFFECTWIDGET_H
#define PHONON_UI_EFFECTWIDGET_H
+#include <phonon/phonon_export.h>
#include <QWidget>
-#include <kdelibs_export.h>
namespace Phonon
{
--- trunk/KDE/kdelibs/phonon/ui/factory.h #648661:648662
@@ -20,8 +20,8 @@
#ifndef Phonon_UiFACTORY_H
#define Phonon_UiFACTORY_H
+#include <phonon/phonon_export.h>
#include <QObject>
-#include <kdelibs_export.h>
class KUrl;
--- trunk/KDE/kdelibs/phonon/ui/mediacontrols.h #648661:648662
@@ -20,9 +20,9 @@
#ifndef PHONON_UI_MEDIACONTROLS_H
#define PHONON_UI_MEDIACONTROLS_H
+#include <phonon/phonon_export.h>
+#include "../phononnamespace.h"
#include <QWidget>
-#include <kdelibs_export.h>
-#include "../phononnamespace.h"
namespace Phonon
{
--- trunk/KDE/kdelibs/phonon/ui/seekslider.h #648661:648662
@@ -20,9 +20,9 @@
#ifndef PHONON_UI_SEEKSLIDER_H
#define PHONON_UI_SEEKSLIDER_H
+#include <phonon/phonon_export.h>
+#include "../phononnamespace.h"
#include <QWidget>
-#include <kdelibs_export.h>
-#include "../phononnamespace.h"
namespace Phonon
{
--- trunk/KDE/kdelibs/phonon/ui/videoplayer.h #648661:648662
@@ -20,9 +20,9 @@
#ifndef Phonon_AUDIOPLAYER_H
#define Phonon_AUDIOPLAYER_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
+#include "../phononnamespace.h"
#include <QWidget>
-#include "../phononnamespace.h"
class KUrl;
--- trunk/KDE/kdelibs/phonon/ui/videowidget.h #648661:648662
@@ -19,9 +19,9 @@
#ifndef Phonon_VIDEOWIDGET_H
#define Phonon_VIDEOWIDGET_H
+#include <phonon/phonon_export.h>
+#include "../abstractvideooutput.h"
#include <QWidget>
-#include <kdelibs_export.h>
-#include "../abstractvideooutput.h"
class QString;
--- trunk/KDE/kdelibs/phonon/ui/volumeslider.h #648661:648662
@@ -20,8 +20,8 @@
#ifndef PHONON_UI_VOLUMESLIDER_H
#define PHONON_UI_VOLUMESLIDER_H
+#include <phonon/phonon_export.h>
#include <QWidget>
-#include <kdelibs_export.h>
namespace Phonon
{
--- trunk/KDE/kdelibs/phonon/volumefadereffect.h #648661:648662
@@ -20,7 +20,7 @@
#ifndef PHONON_VOLUMEFADEREFFECT_H
#define PHONON_VOLUMEFADEREFFECT_H
-#include <kdelibs_export.h>
+#include <phonon/phonon_export.h>
#include "audioeffect.h"
namespace Phonon
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic