author | zautrix <zautrix> | 2005-04-20 10:43:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-20 10:43:07 (UTC) |
commit | f23afbb9c09b4ee0f00af8f04ee4458181792cd0 (patch) (unidiff) | |
tree | 807bcaf329d257ec2a0c5c6e3a6afc7ab53a6078 /korganizer | |
parent | 03f7f26ad34f50dd86f335c7c5a25a292d642793 (diff) | |
download | kdepimpi-f23afbb9c09b4ee0f00af8f04ee4458181792cd0.zip kdepimpi-f23afbb9c09b4ee0f00af8f04ee4458181792cd0.tar.gz kdepimpi-f23afbb9c09b4ee0f00af8f04ee4458181792cd0.tar.bz2 |
fixes
-rw-r--r-- | korganizer/kodaymatrix.cpp | 14 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index df606d0..c32a2a4 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -63,7 +63,7 @@ class KODaymatrixWhatsThis :public QWhatsThis | |||
63 | { | 63 | { |
64 | public: | 64 | public: |
65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; | 65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; |
66 | ~KODaymatrixWhatsThis() { ; }; | 66 | ~KODaymatrixWhatsThis() { qDebug("DELETE KODaymatrixWhatsThis "); }; |
67 | 67 | ||
68 | protected: | 68 | protected: |
69 | virtual QString text( const QPoint& p ) | 69 | virtual QString text( const QPoint& p ) |
@@ -105,11 +105,9 @@ const int KODayMatrix::NUMDAYS = 42; | |||
105 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) | 105 | KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) |
106 | : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 ) | 106 | : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 ) |
107 | 107 | ||
108 | #if 0 | 108 | |
109 | KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) : | ||
110 | QFrame(parent, name) | ||
111 | #endif | ||
112 | { | 109 | { |
110 | mLastView = -1; | ||
113 | oldW = 0; | 111 | oldW = 0; |
114 | oldH = 0; | 112 | oldH = 0; |
115 | myPix.resize( 150, 120 ); | 113 | myPix.resize( 150, 120 ); |
@@ -244,6 +242,12 @@ QColor KODayMatrix::getShadedColor(QColor color) | |||
244 | 242 | ||
245 | KODayMatrix::~KODayMatrix() | 243 | KODayMatrix::~KODayMatrix() |
246 | { | 244 | { |
245 | #if QT_VERSION >= 0x030000 | ||
246 | |||
247 | #else | ||
248 | delete mKODaymatrixWhatsThis; | ||
249 | #endif | ||
250 | |||
247 | // delete mKODaymatrixWhatsThis; | 251 | // delete mKODaymatrixWhatsThis; |
248 | delete [] days; | 252 | delete [] days; |
249 | delete [] daylbls; | 253 | delete [] daylbls; |
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index d9d7924..e4bee63 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp | |||
@@ -1028,10 +1028,6 @@ dummy = | |||
1028 | 1028 | ||
1029 | 1029 | ||
1030 | 1030 | ||
1031 | |||
1032 | |||
1033 | |||
1034 | |||
1035 | QHBox* hbo = new QHBox ( topFrame ); | 1031 | QHBox* hbo = new QHBox ( topFrame ); |
1036 | mDefaultAlarmFile = new QLineEdit(hbo); | 1032 | mDefaultAlarmFile = new QLineEdit(hbo); |
1037 | QPushButton * loadTemplate = new QPushButton(hbo); | 1033 | QPushButton * loadTemplate = new QPushButton(hbo); |