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

List:       kde-commits
Subject:    kdeplayground-multimedia/daap
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2005-04-09 2:16:48
Message-ID: 20050409021648.CB6D7492 () office ! kde ! org
[Download RAW message or body]

CVS commit by bmeyer: 

Aaron J. Seigo's patch
Track should be an inner class, KDE_EXPORT


  M +2 -2      kioslave/daap.cpp   1.4
  M +4 -4      libdaapclient/daapclient.cpp   1.5
  M +36 -33    libdaapclient/daapclient.h   1.2


--- kdeplayground-multimedia/daap/kioslave/daap.cpp  #1.3:1.4
@@ -91,5 +91,5 @@ static void buildDirEntry(UDSEntry& entr
 }
 
-static void buildFileEntry(UDSEntry& entry, QString db, Track track, const KURL &url \
) { +static void buildFileEntry(UDSEntry& entry, QString db, DaapClient::Track track, \
const KURL &url ) {  UDSAtom atom;
         entry.clear();
@@ -182,5 +182,5 @@ void DaapProtocol::listDir(const KURL& u
         if(!url.hasHost()) {
                 // No host, use zeroconf
-                browser = new DNSSD::ServiceBrowser("_daap._tcp");
+                browser = new DNSSD::ServiceBrowser(QString("_daap._tcp"));
                 connect( browser, SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),
                                                         this, \
SLOT(newService(DNSSD::RemoteService::Ptr)));

--- kdeplayground-multimedia/daap/libdaapclient/daapclient.cpp  #1.4:1.5
@@ -112,5 +112,5 @@ DaapClient::Status DaapClient::currentSt
 
 void DaapClient::setHost(const QString &host,
-                                                                                \
const QString &password, int port ) { +                                               \
const QString & password, int port ) {  if( d->connected )
                 logout();
@@ -172,9 +172,9 @@ QStringList DaapClient::getDatabases(){
 }
 
-QValueList<Track> DaapClient::getTrackList( const QString &database ){
+DaapClient::TrackList DaapClient::getTrackList( const QString &database ){
         int id = d->databases[database];
         if(!d->connected){
                 kdDebug() << "Error in getSongList(), Not connected" << endl;
-                return QValueList<Track>();
+                return TrackList();
         }
         
@@ -186,5 +186,5 @@ QValueList<Track> DaapClient::getTrackLi
         DAAP_ClientHost_GetDatabaseItems(d->host, id, songs, &(count), size);
 
-        QValueList<Track> tracks;
+        TrackList tracks;
         
         for (int i = 0; i < count; i++)

--- kdeplayground-multimedia/daap/libdaapclient/daapclient.h  #1.1:1.2
@@ -24,10 +24,25 @@
 #include <qstringlist.h>
 
+#include <kdelibs_export.h>
+
 class PrivateDaapClient;
 class QFile;
 
-class Track
+class KDE_EXPORT DaapClient
 {
+friend class PrivateDaapClient;
 public:
+        enum Status {
+                Error        = -1,
+                Idle         =  0,
+                Connecting   =  1,
+                Negotiating  =  2,
+                Downloading  =  3
+        };
+        
+
+        class KDE_EXPORT Track
+        {
+        public:
         int id; // for internal use
         QString itemName;
@@ -53,20 +68,8 @@ public:
                 qDebug("id: %d", id);
         }
-};
-
-class DaapClient
-{
-
-friend class PrivateDaapClient; 
-                                
-public:
-        enum Status {
-                Error        = -1,
-                Idle         =  0,
-                Connecting   =  1,
-                Negotiating  =  2,
-                Downloading  =  3
         };
         
+        typedef QValueList<Track> TrackList;
+
         DaapClient( const QString &host,
                                                         const QString &password, int \
port=3689 ); @@ -107,5 +110,5 @@ public:
          * @param database to get tracks from
          */
-        QValueList<Track> getTrackList( const QString &database );
+        TrackList getTrackList( const QString &database );
 
         /**


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