nf

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
@@ -205,11 +205,15 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
       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;
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 0ea2860..19cc0e3 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -76,9 +76,9 @@ KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool
 {
 #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 );
@@ -154,9 +154,9 @@ void KOAgendaItem::init ( Incidence *incidence, QDate qd )
 
 KOAgendaItem::~KOAgendaItem()
 {
     // qDebug("deleteKOAgendaItem::~KOAgendaItem(  ");
-
+    delete mKOAgendaItemWhatsThis;
 }
 
 void KOAgendaItem::recreateIncidence()
 {
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index b4dba79..53658c0 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -26,8 +26,9 @@
 #include <qpalette.h> 
 
 #include <libkcal/incidence.h>
 
+class KOAgendaItemWhatsThis;
 class QToolTipGroup;
 class QDragEnterEvent;
 class QDropEvent;
 
@@ -118,8 +119,9 @@ class KOAgendaItem : public QWidget
     void paintEvent ( QPaintEvent * );
     void resizeEvent ( QResizeEvent *ev );
 
   private:
+    KOAgendaItemWhatsThis* mKOAgendaItemWhatsThis;
     bool mAllDay;
     int mCellX;
     int mCellXWidth;
     int mCellYTop,mCellYBottom;
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index ae0a051..5133519 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -61,9 +61,10 @@ DynamicTip::DynamicTip( QWidget * 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 )
   {
@@ -108,9 +109,9 @@ KODayMatrix::KODayMatrix( QWidget *parent, const char *name )
 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 );
@@ -221,8 +222,9 @@ QColor KODayMatrix::getShadedColor(QColor color)
 }
 
 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
@@ -40,8 +40,9 @@ class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
 
 class KODayMatrix;
+class KODaymatrixWhatsThis;
 
 using namespace KCal;
 
 
@@ -225,8 +226,9 @@ protected:
 
     void resizeEvent(QResizeEvent *);
 
 private:
+    KODaymatrixWhatsThis* mKODaymatrixWhatsThis;
     bool mouseDown;
     QBitArray bDays;
     QPixmap myPix;
     QTimer* mUpdateTimer;
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 5e8ea27..2b01c23 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -412,9 +412,9 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   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);
@@ -549,8 +549,9 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 }
 
 KOTodoView::~KOTodoView()
 {
+    delete mKOTodoViewWhatsThis;
   delete mDocPrefs;
 }
 QString KOTodoView::getWhatsThisText(QPoint p)
 {
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 462f0a6..eab0754 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -48,8 +48,9 @@
 class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
+class KOTodoViewWhatsThis;
 
 class DocPrefs;
 
 class KOTodoListView : public KListView
@@ -217,8 +218,9 @@ class KOTodoView : public KOrg::BaseView
      * 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;