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

List:       kde-commits
Subject:    osnabrueck_branch: kdepim/korganizer
From:       Cornelius Schumacher <schumacher () kde ! org>
Date:       2004-01-15 22:10:47
Message-ID: 20040115221047.098769061 () office ! kde ! org
[Download RAW message or body]

CVS commit by cschumac: 

Fix signal slot connection in free/busy view.


  M +11 -5     koeditorgantt.cpp   1.2.2.3
  M +5 -1      koeditorgantt.h   1.1.2.1
  M +1 -1      kogroupware.cpp   1.15.2.12
  M +1 -1      kogroupware.h   1.8.2.7


--- kdepim/korganizer/koeditorgantt.cpp  #1.2.2.2:1.2.2.3
@@ -215,6 +215,6 @@ KOEditorGantt::KOEditorGantt( int spacin
     mGanttView->setHourFormat( KDGanttView::Hour_24 );
 
-  connect( mGanttView, SIGNAL( lvItemDoubleClicked( KDGanttViewItem* ) ),
-           SLOT( updateFreeBusyData() ) );
+  connect( mGanttView, SIGNAL( lvItemDoubleClicked( KDGanttViewItem * ) ),
+           SLOT( updateFreeBusyData( KDGanttViewItem * ) ) );
 }
 
@@ -317,4 +317,9 @@ void KOEditorGantt::slotZoomToTime() 
 }
 
+void KOEditorGantt::updateFreeBusyData( KDGanttViewItem *item )
+{
+  GanttItem *g = static_cast<GanttItem *>( item );
+  updateFreeBusyData( g->data() );
+}
 
 /*!
@@ -332,6 +337,7 @@ void KOEditorGantt::updateFreeBusyData( 
                           KOGroupware::instance()->parseFreeBusy( fbText ) );
     } else
-      KOGroupware::instance()->downloadFreeBusyData( attendee->email(), this,
-                                                     SLOT( slotInsertFreeBusy( const \
QString&, FreeBusy* ) ) ); +      KOGroupware::instance()->downloadFreeBusyData(
+          attendee->email(), this,
+          SLOT( slotInsertFreeBusy( const QString &, KCal::FreeBusy * ) ) );
   }
 }
@@ -339,5 +345,5 @@ void KOEditorGantt::updateFreeBusyData( 
 // Set the Free Busy list for everyone having this email address
 // If fb == 0, this disabled the free busy list for them
-void KOEditorGantt::slotInsertFreeBusy( const QString& email, FreeBusy* fb )
+void KOEditorGantt::slotInsertFreeBusy( const QString& email, KCal::FreeBusy* fb )
 {
   if( fb )

--- kdepim/korganizer/koeditorgantt.h  #1.1:1.1.2.1
@@ -29,4 +29,5 @@
 class QLabel;
 class KDGanttView;
+class KDGanttViewItem;
 class GanttItem;
 namespace KCal {
@@ -68,6 +69,9 @@ class KOEditorGantt : public QWidget
     void slotPickDate();
 
+  private slots:
+    void updateFreeBusyData( KDGanttViewItem * );
+
   private:
-    void updateFreeBusyData( KCal::Attendee* );
+    void updateFreeBusyData( KCal::Attendee * );
 
     bool findFreeSlot( QDateTime& dtFrom, QDateTime& dtTo );

--- kdepim/korganizer/kogroupware.cpp  #1.15.2.11:1.15.2.12
@@ -885,5 +885,5 @@ bool KOGroupware::downloadFreeBusyData( 
 
   FBDownloadJob* job = new FBDownloadJob( email, sourceURL, this, "fb_download_job" \
                );
-  connect( job, SIGNAL( fbDownloaded( const QString&, FreeBusy*) ),
+  connect( job, SIGNAL( fbDownloaded( const QString&, KCal::FreeBusy * ) ),
            receiver, member );
 

--- kdepim/korganizer/kogroupware.h  #1.8.2.6:1.8.2.7
@@ -67,5 +67,5 @@ protected slots:
   void slotData(  KIO::Job*, const QByteArray &data );
 signals:
-  void fbDownloaded( const QString&, FreeBusy*);
+  void fbDownloaded( const QString&, KCal::FreeBusy * );
 
 private:


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