7 files changed, 21 insertions, 8 deletions

diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 5cdaa83..5941337 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -203,15 +203,19 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
       mExtraViews.append( n );
       n->setCalendar( mCalendar );
       setBaseDates();
       connectNavigatorView( n );
       n->show();
     }
-
-    while ( count < ( mExtraViews.count() + 1 ) ) {
-      mExtraViews.removeLast();
+    int iii = 0;
+    while ( iii < ( mExtraViews.count()  ) ) {
+        if ( iii < count-1 )
+            mExtraViews.at( iii )->show();
+        else
+            mExtraViews.at( iii )->hide();
+        ++iii;
     }
     if ( fontchange ) {
         //mNavigatorView->changeFont( fo );
         uint i;
         for( i = 0; i < mExtraViews.count(); ++i ) {
             KDateNavigator *view = mExtraViews.at( i );
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 0ea2860..19cc0e3 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -74,13 +74,13 @@ KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool
                            const char *name,WFlags) :
     QWidget(parent, name), mIncidence(incidence), mDate(qd)
 {
 #ifndef DESKTOP_VERSION
     //QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
 #endif
-    new KOAgendaItemWhatsThis(this);
+    mKOAgendaItemWhatsThis =  new KOAgendaItemWhatsThis(this);
     int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase
     setWFlags ( wflags);
     mAllDay = allday;
     init ( incidence, qd );
     //setMouseTracking(true);
     //setAcceptDrops(true);
@@ -152,13 +152,13 @@ void KOAgendaItem::init ( Incidence *incidence, QDate qd )
 }
 
 
 KOAgendaItem::~KOAgendaItem()
 {
     // qDebug("deleteKOAgendaItem::~KOAgendaItem(  ");
-
+    delete mKOAgendaItemWhatsThis;
 }
 
 void KOAgendaItem::recreateIncidence()
 {
 #if 0
     Incidence* newInc = mIncidence->clone();
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index b4dba79..53658c0 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -24,12 +24,13 @@
 #include <qpixmap.h>
 #include <qdatetime.h>
 #include <qpalette.h> 
 
 #include <libkcal/incidence.h>
 
+class KOAgendaItemWhatsThis;
 class QToolTipGroup;
 class QDragEnterEvent;
 class QDropEvent;
 
 using namespace KCal;
 
@@ -116,12 +117,13 @@ class KOAgendaItem : public QWidget
     void dragEnterEvent(QDragEnterEvent *e);
     void dropEvent(QDropEvent *e);
     void paintEvent ( QPaintEvent * );
     void resizeEvent ( QResizeEvent *ev );
 
   private:
+    KOAgendaItemWhatsThis* mKOAgendaItemWhatsThis;
     bool mAllDay;
     int mCellX;
     int mCellXWidth;
     int mCellYTop,mCellYBottom;
     int mSubCell;  // subcell number of this item
     int mSubCells;  // Total number of subcells in cell of this item
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index ae0a051..5133519 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -59,13 +59,14 @@ DynamicTip::DynamicTip( QWidget * parent )
     matrix = (KODayMatrix*)parent;
 }
 
 class KODaymatrixWhatsThis :public QWhatsThis
 {
 public:
-  KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { };
+    KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;};
+    ~KODaymatrixWhatsThis() { ;  };
 
 protected:
   virtual QString text( const QPoint& p )
   {
     return _view->getWhatsThisText( p ) ;
   }
@@ -106,13 +107,13 @@ KODayMatrix::KODayMatrix( QWidget *parent, const char *name )
 
 #if 0
 KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) :
   QFrame(parent, name)
 #endif
 {
-  new KODaymatrixWhatsThis(this);
+  mKODaymatrixWhatsThis =  new KODaymatrixWhatsThis(this);
   mPendingUpdateBeforeRepaint = false;
   mouseDown = false;
   // initialize dynamic arrays
   bDays.resize ( NUMDAYS );
   days = new QDate[NUMDAYS];
   daylbls = new QString[NUMDAYS];
@@ -219,12 +220,13 @@ QColor KODayMatrix::getShadedColor(QColor color)
 
   return shaded;
 }
 
 KODayMatrix::~KODayMatrix()
 {
+    delete mKODaymatrixWhatsThis;
   delete [] days;
   delete [] daylbls;
   delete [] events;
   delete mToolTip;
 }
 
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index f4016b6..10f4b05 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -38,12 +38,13 @@
 class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
 
 class KODayMatrix;
+class KODaymatrixWhatsThis;
 
 using namespace KCal;
 
 
 /**
  *  small helper class to dynamically show tooltips inside the day matrix.
@@ -223,12 +224,13 @@ protected:
 
     void dropEvent(QDropEvent *);
 
     void resizeEvent(QResizeEvent *);
 
 private:
+    KODaymatrixWhatsThis* mKODaymatrixWhatsThis;
     bool mouseDown;
     QBitArray bDays;
     QPixmap myPix;
     QTimer* mUpdateTimer;
     QTimer* mRepaintTimer;
     bool mDayChanged;
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 5e8ea27..2b01c23 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -410,13 +410,13 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mTodoListView->setColumnWidthMode(5, QListView::Manual);
   mTodoListView->setColumnWidthMode(6, QListView::Manual);
   mTodoListView->setColumnWidthMode(7, QListView::Manual);
   mTodoListView->setColumnWidthMode(8, QListView::Manual);
  
 
-  new KOTodoViewWhatsThis(mTodoListView->viewport(),this);
+  mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this);
 
   mPriorityPopupMenu = new QPopupMenu(this);
   for (int i = 1; i <= 5; i++) {
     QString label = QString ("%1").arg (i);
     mPriority[mPriorityPopupMenu->insertItem (label)] = i;
   }
@@ -547,12 +547,13 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
            SLOT( addQuickTodo() ) );
  
 }
 
 KOTodoView::~KOTodoView()
 {
+    delete mKOTodoViewWhatsThis;
   delete mDocPrefs;
 }
 QString KOTodoView::getWhatsThisText(QPoint p)
 {
     KOTodoViewItem* item = ( KOTodoViewItem* ) mTodoListView->itemAt( p );
     if ( item )
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 462f0a6..eab0754 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -46,12 +46,13 @@
 #include "datenavigator.h"
 
 class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
+class KOTodoViewWhatsThis;
 
 class DocPrefs;
 
 class KOTodoListView : public KListView
 {
     Q_OBJECT
@@ -215,12 +216,13 @@ class KOTodoView : public KOrg::BaseView
      * Korganizer keeps it in memory and we need to update
      * 1. make KOTodoViewItem a QObject again?
      * 2. add a public method for setting one todo modified?
      * 3. add a private method for setting a todo modified + friend here?
      *  -- zecke 2002-07-08
      */
+    KOTodoViewWhatsThis* mKOTodoViewWhatsThis;
     friend class KOTodoListView;
     void paintEvent(QPaintEvent * pevent);
     bool mPendingUpdateBeforeRepaint;
     friend class KOTodoViewItem;
     QMap<Todo *,KOTodoViewItem *>::ConstIterator insertTodoItem(Todo *todo);
     void restoreItemState( QListViewItem * );