summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaitem.cpp8
-rw-r--r--korganizer/kodaymatrix.cpp2
-rw-r--r--korganizer/kolistview.cpp8
-rw-r--r--korganizer/kolistview.h3
-rw-r--r--korganizer/komonthview.cpp6
-rw-r--r--korganizer/kotodoview.cpp8
-rw-r--r--korganizer/mainwindow.cpp6
-rw-r--r--korganizer/mainwindow.h1
8 files changed, 35 insertions, 7 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 )
KOAgendaItem::~KOAgendaItem()
{
- // qDebug("deleteKOAgendaItem::~KOAgendaItem( ");
- // delete mKOAgendaItemWhatsThis;
+#if QT_VERSION >= 0x030000
+
+#else
+ delete mKOAgendaItemWhatsThis;
+#endif
+
}
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
{
public:
KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;};
- ~KODaymatrixWhatsThis() { qDebug("DELETE KODaymatrixWhatsThis "); };
+ ~KODaymatrixWhatsThis() { ; };
protected:
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,
mListView->setColumnAlignment(9,AlignLeft);
mListView->setColumnAlignment(10,AlignLeft);
mListView->setColumnWidthMode(10, QListView::Manual);
- new KOListViewWhatsThis(mListView->viewport(),this);
+ mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this);
int iii = 0;
for ( iii = 0; iii< 10 ; ++iii )
@@ -338,6 +338,11 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
KOListView::~KOListView()
{
delete mPopupMenu;
+#if QT_VERSION >= 0x030000
+
+#else
+ delete mKOListViewWhatsThis;
+#endif
}
QString KOListView::getWhatsThisText(QPoint p)
@@ -1181,6 +1186,7 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
KOListViewListView::KOListViewListView(KOListView * lv )
: KListView( lv, "kolistlistview", false )
{
+ mYMousePos = 0;
mPopupTimer = new QTimer(this);
connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu()));
#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 @@
using namespace KCal;
-
+class KOListViewWhatsThis;
#include <qpushbutton.h>
#include <qlayout.h>
@@ -300,6 +300,7 @@ class KOListView : public KOEventView
KOListViewItem *getItemForEvent(Event *event);
private:
+ KOListViewWhatsThis *mKOListViewWhatsThis;
KOListViewListView *mListView;
KOEventPopupMenu *mPopupMenu;
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)
}
KNoScrollListBox::~KNoScrollListBox()
{
-
+#if QT_VERSION >= 0x030000
+
+#else
+ delete mWT;
+#endif
}
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) :
KOTodoView::~KOTodoView()
{
- // delete mKOTodoViewWhatsThis;
+
+#if QT_VERSION >= 0x030000
+
+#else
+ delete mKOTodoViewWhatsThis;
+#endif
+
delete mDocPrefs;
}
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 )
return SmallIcon( name );
}
+void MainWindow::setUsesBigPixmaps ( bool b )
+{
+ qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b);
+ if ( b )
+ qDebug("KO: BigPixmaps are not supported ");
+}
void MainWindow::initActions()
{
//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
static QString syncFileName();
static QString resourcePath();
public slots:
+ void setUsesBigPixmaps ( bool );
void setCaption ( const QString & );
void updateWeekNum(const KCal::DateList &);
void updateWeek(QDate);