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

List:       kde-commits
Subject:    kdelibs
From:       Stephan Kulow <coolo () kde ! org>
Date:       2004-12-07 17:02:19
Message-ID: 20041207170219.8AFF51BB41 () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

ARTS_EXPORT is already defined in arts, so use something else in kdelibs


  M +1 -1      arts/kde/kartsserver.h   1.7
  M +2 -2      arts/kde/kaudiomanagerplay.h   1.7
  M +1 -1      arts/kde/kaudioplaystream.h   1.5
  M +2 -2      arts/kde/kaudiorecordstream.h   1.9
  M +2 -2      arts/kde/kvideowidget.h   1.10
  M +1 -1      kdecore/kdelibs_export.h   1.14


--- kdelibs/kdecore/kdelibs_export.h  #1.13:1.14
@@ -54,5 +54,5 @@
 #define KMID_EXPORT KDE_EXPORT
 #define KIMPROXY_EXPORT KDE_EXPORT
-#define ARTS_EXPORT KDE_EXPORT
+#define KDE_ARTS_EXPORT KDE_EXPORT
 
 #define KPATH_SEPARATOR ':'

--- kdelibs/arts/kde/kartsserver.h  #1.6:1.7
@@ -35,5 +35,5 @@
  * party PlayObjects that will crash.  So, this is necessary.
  */
-class ARTS_EXPORT KArtsServer : public QObject
+class KDE_ARTS_EXPORT KArtsServer : public QObject
 {
 Q_OBJECT

--- kdelibs/arts/kde/kaudiomanagerplay.h  #1.6:1.7
@@ -36,5 +36,5 @@ class QString;
  * @since 3.2
  */
-class ARTS_EXPORT KAudioManagerPlay
+class KDE_ARTS_EXPORT KAudioManagerPlay
 {
         public:

--- kdelibs/arts/kde/kaudioplaystream.h  #1.4:1.5
@@ -40,5 +40,5 @@ class KAudioPlayStreamPrivate;
 */
 
-class ARTS_EXPORT KAudioPlayStream : public QObject {
+class KDE_ARTS_EXPORT KAudioPlayStream : public QObject {
    Q_OBJECT
 public:

--- kdelibs/arts/kde/kaudiorecordstream.h  #1.8:1.9
@@ -39,5 +39,5 @@ namespace Arts { class StereoEffectStack
  * @since 3.2
 */
-class ARTS_EXPORT KAudioRecordStream : public QObject
+class KDE_ARTS_EXPORT KAudioRecordStream : public QObject
 {
         Q_OBJECT

--- kdelibs/arts/kde/kvideowidget.h  #1.9:1.10
@@ -19,5 +19,5 @@
 
 
-class ARTS_EXPORT KVideoWidget : public QWidget, virtual public KXMLGUIClient
+class KDE_ARTS_EXPORT KVideoWidget : public QWidget, virtual public KXMLGUIClient
 {
 Q_OBJECT


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