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

List:       kde-commits
Subject:    playground/base/attica/lib
From:       Cornelius Schumacher <schumacher () kde ! org>
Date:       2008-09-12 9:16:02
Message-ID: 1221210962.206787.23078.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 860186 by cschumac:

Remove URL API knowledge from model classes.


 M  +4 -0      activity.cpp  
 M  +7 -4      activitylistjob.cpp  
 M  +3 -0      activitylistjob.h  
 M  +9 -1      person.cpp  
 M  +4 -12     personjob.cpp  
 M  +3 -2      personjob.h  


--- trunk/playground/base/attica/lib/activity.cpp #860185:860186
@@ -39,6 +39,10 @@
 ActivityListJob *Activity::request()
 {
   ActivityListJob *job = new ActivityListJob();
+
+  KUrl url( "http://api.opendesktop.org/v1/activity" );
+  job->setUrl( url );
+
   job->start();
   return job;
 }
--- trunk/playground/base/attica/lib/activitylistjob.cpp #860185:860186
@@ -35,6 +35,11 @@
 {
 }
 
+void ActivityListJob::setUrl( const KUrl &url )
+{
+  m_url = url;
+}
+
 void ActivityListJob::start()
 {
   QTimer::singleShot( 0, this, SLOT( doWork() ) );
@@ -47,11 +52,9 @@
 
 void ActivityListJob::doWork()
 {
-  KUrl url( "http://api.opendesktop.org/v1/activity" );
+  qDebug() << m_url;
 
-  qDebug() << url;
-
-  m_job = KIO::get( url, KIO::NoReload, KIO::HideProgressInfo );
+  m_job = KIO::get( m_url, KIO::NoReload, KIO::HideProgressInfo );
   connect( m_job, SIGNAL( result( KJob * ) ),
     SLOT( slotJobResult( KJob * ) ) );
   connect( m_job, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
--- trunk/playground/base/attica/lib/activitylistjob.h #860185:860186
@@ -37,6 +37,8 @@
   public:
     ActivityListJob();
 
+    void setUrl( const KUrl & );
+
     void start();
 
     Activity::List ActivityList() const;
@@ -48,6 +50,7 @@
     void slotJobData( KIO::Job *job, const QByteArray &data );
     
   private:
+    KUrl m_url;
     KIO::Job *m_job;
     QByteArray m_data;
   
--- trunk/playground/base/attica/lib/person.cpp #860185:860186
@@ -40,7 +40,11 @@
 
 PersonJob *Person::request( const QString &id )
 {
-  PersonJob *job = new PersonJob( id );
+  PersonJob *job = new PersonJob();
+
+  KUrl url( "http://api.opendesktop.org/v1/person/data/" + id );
+  job->setUrl( url );
+
   job->start();
   return job;
 }
@@ -48,6 +52,10 @@
 PersonJob *Person::requestSelf()
 {
   PersonJob *job = new PersonJob();
+
+  KUrl url( "http://api.opendesktop.org/v1/person/self" );
+  job->setUrl( url );
+
   job->start();
   return job;
 }
--- trunk/playground/base/attica/lib/personjob.cpp #860185:860186
@@ -35,9 +35,9 @@
 {
 }
 
-PersonJob::PersonJob( const QString &id )
-  : m_job( 0 ), m_id( id )
+void PersonJob::setUrl( const KUrl &url )
 {
+  m_url = url;
 }
 
 void PersonJob::start()
@@ -52,17 +52,9 @@
 
 void PersonJob::doWork()
 {
-  KUrl url( "http://api.opendesktop.org/v1/person/" );
-  
-  if ( m_id.isEmpty() ) {
-    url.addPath( "self" );
-  } else {
-    url.addPath( "data/" + m_id );
-  }
+  qDebug() << m_url;
 
-  qDebug() << url;
-
-  m_job = KIO::get( url, KIO::NoReload, KIO::HideProgressInfo );
+  m_job = KIO::get( m_url, KIO::NoReload, KIO::HideProgressInfo );
   connect( m_job, SIGNAL( result( KJob * ) ),
     SLOT( slotUserJobResult( KJob * ) ) );
   connect( m_job, SIGNAL( data( KIO::Job *, const QByteArray & ) ),
--- trunk/playground/base/attica/lib/personjob.h #860185:860186
@@ -36,8 +36,9 @@
     Q_OBJECT
   public:
     PersonJob();
-    PersonJob( const QString &id );
 
+    void setUrl( const KUrl & );
+
     void start();
 
     Person person() const;
@@ -52,11 +53,11 @@
     void slotAvatarJobData( KIO::Job *job, const QByteArray &data );
     
   private:
+    KUrl m_url;
     KIO::Job *m_job;
     QString m_userData;
     QByteArray m_avatarData;
   
-    QString m_id;
     Person m_person;
 };
 
[prev in list] [next in list] [prev in thread] [next in thread]