From kde-pim  Sun Sep 29 12:03:22 2002
From: Guenter Schwann <schwann () icg ! tu-graz ! ac ! at>
Date: Sun, 29 Sep 2002 12:03:22 +0000
To: kde-pim
Subject: Re: [Kde-pim] bug#25400
X-MARC-Message: https://marc.info/?l=kde-pim&m=103330105321682
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--------------Boundary-00=_M5871KO08OGGSI7UM7D4"


--------------Boundary-00=_M5871KO08OGGSI7UM7D4
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


Forget the last patch. This one is nicer...

- --=20
Guenter Schwann
Graz University of Technology - Computer Graphics and Vision
GPG-key: http://www.sbox.tugraz.at/home/v/vogel/gpg-schwann-public-key.tx=
t
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.0 (GNU/Linux)

iD8DBQE9luwK43e2O3Z+/CQRArL3AJ97f98mLPEEHBH+T1LBvTkT6rb+UQCfebQH
FY0CTVwmlyqtlYfLEJWXevo=3D
=3DSvaf
-----END PGP SIGNATURE-----

--------------Boundary-00=_M5871KO08OGGSI7UM7D4
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="korganizer38.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="korganizer38.patch"

? dummy.cpp
Index: koagenda.cpp
===================================================================
RCS file: /home/kde/kdepim/korganizer/koagenda.cpp,v
retrieving revision 1.54
diff -u -3 -p -b -r1.54 koagenda.cpp
--- koagenda.cpp	2002/09/22 22:49:19	1.54
+++ koagenda.cpp	2002/09/29 11:31:31
@@ -691,6 +691,12 @@ void KOAgenda::endItemAction()
       placeItem = mActionItem;      
     }
     emit itemModified( placeItem );
+    QPtrList<KOAgendaItem> oldconflictItems = placeItem->conflictItems();
+    KOAgendaItem *item;
+    for ( item=oldconflictItems.first(); item != 0;
+          item=oldconflictItems.next() ) {
+      placeSubCells(item);    
+    }
     while ( placeItem ) {
       placeSubCells( placeItem );
       placeItem = placeItem->nextMultiItem();
@@ -847,6 +853,7 @@ void KOAgenda::placeSubCells(KOAgendaIte
     gridToContents(placeItem->cellX(),placeItem->cellYTop(),x,y);
     moveChild(placeItem,x,y);
   }
+  placeItem->setConflictItems(conflictItems);
 }
 
 /*
Index: koagendaitem.cpp
===================================================================
RCS file: /home/kde/kdepim/korganizer/koagendaitem.cpp,v
retrieving revision 1.32
diff -u -3 -p -b -r1.32 koagendaitem.cpp
--- koagendaitem.cpp	2002/07/20 14:17:30	1.32
+++ koagendaitem.cpp	2002/09/29 11:31:32
@@ -390,3 +390,25 @@ void KOAgendaItem::dropEvent( QDropEvent
   }
 #endif
 }
+
+
+QPtrList<KOAgendaItem> KOAgendaItem::conflictItems()
+{
+  return mConflictItems;
+}
+
+void KOAgendaItem::setConflictItems(QPtrList<KOAgendaItem> ci)
+{
+  mConflictItems = ci;
+  KOAgendaItem *item;
+  for ( item=mConflictItems.first(); item != 0;
+        item=mConflictItems.next() ) {
+    item->addConflictItem(this);
+  }
+}
+
+void KOAgendaItem::addConflictItem(KOAgendaItem *ci)
+{
+  if (mConflictItems.find(ci)<0)
+    mConflictItems.append(ci);
+}
Index: koagendaitem.h
===================================================================
RCS file: /home/kde/kdepim/korganizer/koagendaitem.h,v
retrieving revision 1.16
diff -u -3 -p -b -r1.16 koagendaitem.h
--- koagendaitem.h	2002/07/20 14:17:30	1.16
+++ koagendaitem.h	2002/09/29 11:31:32
@@ -90,6 +90,10 @@ class KOAgendaItem : public QFrame
 
     static QToolTipGroup *toolTipGroup();
 
+    QPtrList<KOAgendaItem> conflictItems();
+    void setConflictItems(QPtrList<KOAgendaItem>);
+    void addConflictItem(KOAgendaItem *ci);
+
   public slots:
     void updateIcons();
     void select(bool=true);
@@ -125,6 +129,7 @@ class KOAgendaItem : public QFrame
     static QToolTipGroup *mToolTipGroup;
 
     bool mSelected;
+    QPtrList<KOAgendaItem> mConflictItems;
 };
 
 #endif // KOAGENDAITEM_H
Index: koagendaview.cpp
===================================================================
RCS file: /home/kde/kdepim/korganizer/koagendaview.cpp,v
retrieving revision 1.84
diff -u -3 -p -b -r1.84 koagendaview.cpp

--------------Boundary-00=_M5871KO08OGGSI7UM7D4--

_______________________________________________
kde-pim mailing list
kde-pim@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-pim
kde-pim home page at http://pim.kde.org/