-rw-r--r-- | korganizer/koagendaitem.cpp | 8 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 2 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 8 | ||||
-rw-r--r-- | korganizer/kolistview.h | 3 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 4 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 8 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 6 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 |
8 files changed, 34 insertions, 6 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 1801d7e..df2e478 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -155,8 +155,12 @@ void KOAgendaItem::init ( Incidence *incidence, QDate qd ) | |||
155 | 155 | ||
156 | KOAgendaItem::~KOAgendaItem() | 156 | KOAgendaItem::~KOAgendaItem() |
157 | { | 157 | { |
158 | // qDebug("deleteKOAgendaItem::~KOAgendaItem( "); | 158 | #if QT_VERSION >= 0x030000 |
159 | // delete mKOAgendaItemWhatsThis; | 159 | |
160 | #else | ||
161 | delete mKOAgendaItemWhatsThis; | ||
162 | #endif | ||
163 | |||
160 | } | 164 | } |
161 | 165 | ||
162 | void KOAgendaItem::recreateIncidence() | 166 | void KOAgendaItem::recreateIncidence() |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index c32a2a4..53ebdb2 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() { qDebug("DELETE KODaymatrixWhatsThis "); }; | 66 | ~KODaymatrixWhatsThis() { ; }; |
67 | 67 | ||
68 | protected: | 68 | protected: |
69 | virtual QString text( const QPoint& p ) | 69 | virtual QString text( const QPoint& p ) |
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index fd86095..b94916a 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -261,7 +261,7 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
261 | mListView->setColumnAlignment(9,AlignLeft); | 261 | mListView->setColumnAlignment(9,AlignLeft); |
262 | mListView->setColumnAlignment(10,AlignLeft); | 262 | mListView->setColumnAlignment(10,AlignLeft); |
263 | mListView->setColumnWidthMode(10, QListView::Manual); | 263 | mListView->setColumnWidthMode(10, QListView::Manual); |
264 | new KOListViewWhatsThis(mListView->viewport(),this); | 264 | mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this); |
265 | 265 | ||
266 | int iii = 0; | 266 | int iii = 0; |
267 | for ( iii = 0; iii< 10 ; ++iii ) | 267 | for ( iii = 0; iii< 10 ; ++iii ) |
@@ -338,6 +338,11 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
338 | KOListView::~KOListView() | 338 | KOListView::~KOListView() |
339 | { | 339 | { |
340 | delete mPopupMenu; | 340 | delete mPopupMenu; |
341 | #if QT_VERSION >= 0x030000 | ||
342 | |||
343 | #else | ||
344 | delete mKOListViewWhatsThis; | ||
345 | #endif | ||
341 | } | 346 | } |
342 | 347 | ||
343 | QString KOListView::getWhatsThisText(QPoint p) | 348 | QString KOListView::getWhatsThisText(QPoint p) |
@@ -1181,6 +1186,7 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e) | |||
1181 | KOListViewListView::KOListViewListView(KOListView * lv ) | 1186 | KOListViewListView::KOListViewListView(KOListView * lv ) |
1182 | : KListView( lv, "kolistlistview", false ) | 1187 | : KListView( lv, "kolistlistview", false ) |
1183 | { | 1188 | { |
1189 | mYMousePos = 0; | ||
1184 | mPopupTimer = new QTimer(this); | 1190 | mPopupTimer = new QTimer(this); |
1185 | connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu())); | 1191 | connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu())); |
1186 | #ifndef DESKTOP_VERSION | 1192 | #ifndef DESKTOP_VERSION |
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index eb5bb6e..2051d60 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h | |||
@@ -42,7 +42,7 @@ | |||
42 | 42 | ||
43 | using namespace KCal; | 43 | using namespace KCal; |
44 | 44 | ||
45 | 45 | class KOListViewWhatsThis; | |
46 | 46 | ||
47 | #include <qpushbutton.h> | 47 | #include <qpushbutton.h> |
48 | #include <qlayout.h> | 48 | #include <qlayout.h> |
@@ -300,6 +300,7 @@ class KOListView : public KOEventView | |||
300 | KOListViewItem *getItemForEvent(Event *event); | 300 | KOListViewItem *getItemForEvent(Event *event); |
301 | 301 | ||
302 | private: | 302 | private: |
303 | KOListViewWhatsThis *mKOListViewWhatsThis; | ||
303 | KOListViewListView *mListView; | 304 | KOListViewListView *mListView; |
304 | KOEventPopupMenu *mPopupMenu; | 305 | KOEventPopupMenu *mPopupMenu; |
305 | KOListViewItem *mActiveItem; | 306 | KOListViewItem *mActiveItem; |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index ae61db6..7927307 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -89,7 +89,11 @@ KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name) | |||
89 | } | 89 | } |
90 | KNoScrollListBox::~KNoScrollListBox() | 90 | KNoScrollListBox::~KNoScrollListBox() |
91 | { | 91 | { |
92 | #if QT_VERSION >= 0x030000 | ||
92 | 93 | ||
94 | #else | ||
95 | delete mWT; | ||
96 | #endif | ||
93 | } | 97 | } |
94 | 98 | ||
95 | 99 | ||
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index f26d16d..e95039d 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -588,7 +588,13 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
588 | 588 | ||
589 | KOTodoView::~KOTodoView() | 589 | KOTodoView::~KOTodoView() |
590 | { | 590 | { |
591 | // delete mKOTodoViewWhatsThis; | 591 | |
592 | #if QT_VERSION >= 0x030000 | ||
593 | |||
594 | #else | ||
595 | delete mKOTodoViewWhatsThis; | ||
596 | #endif | ||
597 | |||
592 | delete mDocPrefs; | 598 | delete mDocPrefs; |
593 | } | 599 | } |
594 | QString KOTodoView::getWhatsThisText(QPoint p) | 600 | QString KOTodoView::getWhatsThisText(QPoint p) |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 87cef20..68e5e5a 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -590,6 +590,12 @@ QPixmap MainWindow::loadPixmap( QString name ) | |||
590 | return SmallIcon( name ); | 590 | return SmallIcon( name ); |
591 | 591 | ||
592 | } | 592 | } |
593 | void MainWindow::setUsesBigPixmaps ( bool b ) | ||
594 | { | ||
595 | qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b); | ||
596 | if ( b ) | ||
597 | qDebug("KO: BigPixmaps are not supported "); | ||
598 | } | ||
593 | void MainWindow::initActions() | 599 | void MainWindow::initActions() |
594 | { | 600 | { |
595 | //KOPrefs::instance()->mShowFullMenu | 601 | //KOPrefs::instance()->mShowFullMenu |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 8fd3d24..6895e36 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -43,6 +43,7 @@ class MainWindow : public QMainWindow | |||
43 | static QString syncFileName(); | 43 | static QString syncFileName(); |
44 | static QString resourcePath(); | 44 | static QString resourcePath(); |
45 | public slots: | 45 | public slots: |
46 | void setUsesBigPixmaps ( bool ); | ||
46 | void setCaption ( const QString & ); | 47 | void setCaption ( const QString & ); |
47 | void updateWeekNum(const KCal::DateList &); | 48 | void updateWeekNum(const KCal::DateList &); |
48 | void updateWeek(QDate); | 49 | void updateWeek(QDate); |