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

List:       kde-commits
Subject:    [Phonon/4.1] bc7e096: Add cctor and operator= to ObjectDescription so
From:       Matthias Kretz <kretz () kde ! org>
Date:       2011-01-02 21:59:12
Message-ID: 20110102215912.294D3A622E () git ! kde ! org
[Download RAW message or body]


	A	 bytestreaminterface.h	 [License: Trivialfile.]

commit bc7e09649820daab7a01f91d369db6aed243e0a9
Author: Matthias Kretz <kretz@kde.org>
Date:   Tue Jul 11 13:09:48 2006 +0000

    Add cctor and operator= to ObjectDescription so that the forward decl of
    ObjectDescriptionPrivate is enough.
    Also add ByteStreamInterface (to be used with a later commit. I'm too lazy to
    adjust the CMakeLists.txt file)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc8539f..c2217dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,6 @@ add_subdirectory( ui )
 add_subdirectory( tests )
 add_subdirectory( kcm )
 
-
 ########### next target ###############
 
 set(phononcore_LIB_SRCS
@@ -67,7 +66,6 @@ install(TARGETS phononcore  DESTINATION ${LIB_INSTALL_DIR} )
 
 install( FILES
 	objectdescription.h
-	objectdescription_p.h
 	objectdescriptionmodel.h
 	phononnamespace.h
 	base.h
@@ -95,6 +93,7 @@ install( FILES
 	audioplayer.h
 	backendcapabilities.h
 	phonondefs.h
+	bytestreaminterface.h
 	DESTINATION ${INCLUDE_INSTALL_DIR}/phonon)
 install( FILES  phononbackend.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
 
diff --git a/bytestreaminterface.h b/bytestreaminterface.h
new file mode 100644
index 0000000..52dff0b
--- /dev/null
+++ b/bytestreaminterface.h
@@ -0,0 +1,37 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2006 Matthias Kretz <kretz@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License version 2 as published by the Free Software Foundation.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+
+*/
+
+#ifndef PHONON_BYTESTREAMINTERFACE_H
+#define PHONON_BYTESTREAMINTERFACE_H
+
+namespace Phonon
+{
+class ByteStreamInterface
+{
+	public:
+		virtual ~ByteStreamInterface() {}
+		virtual void writeData( const QByteArray& ) = 0;
+		virtual void endOfData() = 0;
+};
+}
+
+Q_DECLARE_INTERFACE( Phonon::ByteStreamInterface, "org.kde.Phonon.ByteStreamInterface/0.1" )
+
+#endif // PHONON_BYTESTREAMINTERFACE_H
+// vim: sw=4 ts=4 noet tw=80
diff --git a/objectdescription.cpp b/objectdescription.cpp
index a965e1f..0124c09 100644
--- a/objectdescription.cpp
+++ b/objectdescription.cpp
@@ -18,6 +18,7 @@
 */
 
 #include "objectdescription.h"
+#include "objectdescription_p.h"
 #include <QString>
 #include <QObject>
 #include <QSet>
@@ -36,6 +37,17 @@ ObjectDescription::ObjectDescription( Type type, int index, const QString& name,
 {
 }
 
+ObjectDescription::ObjectDescription( const ObjectDescription& rhs )
+	: d( rhs.d )
+{
+}
+
+ObjectDescription& ObjectDescription::operator=( const ObjectDescription& rhs )
+{
+	d = rhs.d;
+	return *this;
+}
+
 bool ObjectDescription::operator==( const ObjectDescription& otherDescription ) const
 {
 	return *d == *otherDescription.d;
diff --git a/objectdescription.h b/objectdescription.h
index eb74786..8e22a76 100644
--- a/objectdescription.h
+++ b/objectdescription.h
@@ -58,6 +58,8 @@ class PHONONCORE_EXPORT ObjectDescription
 			Visualization
 		};
 
+		ObjectDescription( const ObjectDescription& rhs );
+		ObjectDescription& operator=( const ObjectDescription& rhs );
 		ObjectDescription();
 
 		/**
@@ -122,7 +124,6 @@ class PHONONCORE_EXPORT ObjectDescription
 		QSharedDataPointer<ObjectDescriptionPrivate> d;
 };
 } //namespace Phonon
-#include "objectdescription_p.h"
 
 #endif // PHONON_OBJECTDESCRIPTION_H
 // vim: sw=4 ts=4 noet tw=80
[prev in list] [next in list] [prev in thread] [next in thread]