summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/datenavigatorcontainer.cpp10
-rw-r--r--korganizer/koagendaitem.cpp4
-rw-r--r--korganizer/koagendaitem.h2
-rw-r--r--korganizer/kodaymatrix.cpp6
-rw-r--r--korganizer/kodaymatrix.h2
-rw-r--r--korganizer/kotodoview.cpp3
-rw-r--r--korganizer/kotodoview.h2
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
@@ -206,9 +206,13 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
206 connectNavigatorView( n ); 206 connectNavigatorView( n );
207 n->show(); 207 n->show();
208 } 208 }
209 209 int iii = 0;
210 while ( count < ( mExtraViews.count() + 1 ) ) { 210 while ( iii < ( mExtraViews.count() ) ) {
211 mExtraViews.removeLast(); 211 if ( iii < count-1 )
212 mExtraViews.at( iii )->show();
213 else
214 mExtraViews.at( iii )->hide();
215 ++iii;
212 } 216 }
213 if ( fontchange ) { 217 if ( fontchange ) {
214 //mNavigatorView->changeFont( fo ); 218 //mNavigatorView->changeFont( fo );
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 0ea2860..19cc0e3 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -77,7 +77,7 @@ KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool
77#ifndef DESKTOP_VERSION 77#ifndef DESKTOP_VERSION
78 //QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); 78 //QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
79#endif 79#endif
80 new KOAgendaItemWhatsThis(this); 80 mKOAgendaItemWhatsThis = new KOAgendaItemWhatsThis(this);
81 int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase 81 int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase
82 setWFlags ( wflags); 82 setWFlags ( wflags);
83 mAllDay = allday; 83 mAllDay = allday;
@@ -155,7 +155,7 @@ void KOAgendaItem::init ( Incidence *incidence, QDate qd )
155KOAgendaItem::~KOAgendaItem() 155KOAgendaItem::~KOAgendaItem()
156{ 156{
157 // qDebug("deleteKOAgendaItem::~KOAgendaItem( "); 157 // qDebug("deleteKOAgendaItem::~KOAgendaItem( ");
158 158 delete mKOAgendaItemWhatsThis;
159} 159}
160 160
161void KOAgendaItem::recreateIncidence() 161void KOAgendaItem::recreateIncidence()
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index b4dba79..53658c0 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -27,6 +27,7 @@
27 27
28#include <libkcal/incidence.h> 28#include <libkcal/incidence.h>
29 29
30class KOAgendaItemWhatsThis;
30class QToolTipGroup; 31class QToolTipGroup;
31class QDragEnterEvent; 32class QDragEnterEvent;
32class QDropEvent; 33class QDropEvent;
@@ -119,6 +120,7 @@ class KOAgendaItem : public QWidget
119 void resizeEvent ( QResizeEvent *ev ); 120 void resizeEvent ( QResizeEvent *ev );
120 121
121 private: 122 private:
123 KOAgendaItemWhatsThis* mKOAgendaItemWhatsThis;
122 bool mAllDay; 124 bool mAllDay;
123 int mCellX; 125 int mCellX;
124 int mCellXWidth; 126 int mCellXWidth;
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index ae0a051..5133519 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -62,7 +62,8 @@ DynamicTip::DynamicTip( QWidget * parent )
62class KODaymatrixWhatsThis :public QWhatsThis 62class KODaymatrixWhatsThis :public QWhatsThis
63{ 63{
64public: 64public:
65 KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { }; 65 KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;};
66 ~KODaymatrixWhatsThis() { ; };
66 67
67protected: 68protected:
68 virtual QString text( const QPoint& p ) 69 virtual QString text( const QPoint& p )
@@ -109,7 +110,7 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const
109 QFrame(parent, name) 110 QFrame(parent, name)
110#endif 111#endif
111{ 112{
112 new KODaymatrixWhatsThis(this); 113 mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this);
113 mPendingUpdateBeforeRepaint = false; 114 mPendingUpdateBeforeRepaint = false;
114 mouseDown = false; 115 mouseDown = false;
115 // initialize dynamic arrays 116 // initialize dynamic arrays
@@ -222,6 +223,7 @@ QColor KODayMatrix::getShadedColor(QColor color)
222 223
223KODayMatrix::~KODayMatrix() 224KODayMatrix::~KODayMatrix()
224{ 225{
226 delete mKODaymatrixWhatsThis;
225 delete [] days; 227 delete [] days;
226 delete [] daylbls; 228 delete [] daylbls;
227 delete [] events; 229 delete [] events;
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index f4016b6..10f4b05 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -41,6 +41,7 @@ class QDragLeaveEvent;
41class QDropEvent; 41class QDropEvent;
42 42
43class KODayMatrix; 43class KODayMatrix;
44class KODaymatrixWhatsThis;
44 45
45using namespace KCal; 46using namespace KCal;
46 47
@@ -226,6 +227,7 @@ protected:
226 void resizeEvent(QResizeEvent *); 227 void resizeEvent(QResizeEvent *);
227 228
228private: 229private:
230 KODaymatrixWhatsThis* mKODaymatrixWhatsThis;
229 bool mouseDown; 231 bool mouseDown;
230 QBitArray bDays; 232 QBitArray bDays;
231 QPixmap myPix; 233 QPixmap myPix;
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 5e8ea27..2b01c23 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -413,7 +413,7 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
413 mTodoListView->setColumnWidthMode(8, QListView::Manual); 413 mTodoListView->setColumnWidthMode(8, QListView::Manual);
414 414
415 415
416 new KOTodoViewWhatsThis(mTodoListView->viewport(),this); 416 mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this);
417 417
418 mPriorityPopupMenu = new QPopupMenu(this); 418 mPriorityPopupMenu = new QPopupMenu(this);
419 for (int i = 1; i <= 5; i++) { 419 for (int i = 1; i <= 5; i++) {
@@ -550,6 +550,7 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
550 550
551KOTodoView::~KOTodoView() 551KOTodoView::~KOTodoView()
552{ 552{
553 delete mKOTodoViewWhatsThis;
553 delete mDocPrefs; 554 delete mDocPrefs;
554} 555}
555QString KOTodoView::getWhatsThisText(QPoint p) 556QString 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
@@ -49,6 +49,7 @@ class QDragEnterEvent;
49class QDragMoveEvent; 49class QDragMoveEvent;
50class QDragLeaveEvent; 50class QDragLeaveEvent;
51class QDropEvent; 51class QDropEvent;
52class KOTodoViewWhatsThis;
52 53
53class DocPrefs; 54class DocPrefs;
54 55
@@ -218,6 +219,7 @@ class KOTodoView : public KOrg::BaseView
218 * 3. add a private method for setting a todo modified + friend here? 219 * 3. add a private method for setting a todo modified + friend here?
219 * -- zecke 2002-07-08 220 * -- zecke 2002-07-08
220 */ 221 */
222 KOTodoViewWhatsThis* mKOTodoViewWhatsThis;
221 friend class KOTodoListView; 223 friend class KOTodoListView;
222 void paintEvent(QPaintEvent * pevent); 224 void paintEvent(QPaintEvent * pevent);
223 bool mPendingUpdateBeforeRepaint; 225 bool mPendingUpdateBeforeRepaint;