initial public commit of qt4 portp1

1 files changed, 28 insertions, 19 deletions

diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 52fd1e8..4f681b3 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -26,5 +26,14 @@
 #include <qpainter.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qtimer.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <QDragLeaveEvent>
+#include <Q3Frame>
+#include <QDragEnterEvent>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QPaintEvent>
 
@@ -56,3 +65,3 @@
 DynamicTip::DynamicTip( QWidget * parent )
-    : QToolTip( parent )
+    /* TODO:hacker: : QToolTip( parent ) */
 {
@@ -61,6 +70,6 @@ DynamicTip::DynamicTip( QWidget * parent )
 
-class KODaymatrixWhatsThis :public QWhatsThis
+class KODaymatrixWhatsThis :public Q3WhatsThis
 {
 public:
-    KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;};
+    KODaymatrixWhatsThis( KODayMatrix* view ) : Q3WhatsThis( view ),_view (view) { ;};
     ~KODaymatrixWhatsThis() { ;  };
@@ -93,3 +102,3 @@ void DynamicTip::maybeTip( const QPoint &pos )
   if (str.isEmpty()) return;
-  tip(rct, str);
+  /* TODO:hacker: tip(rct, str);*/
 }
@@ -105,3 +114,3 @@ const int KODayMatrix::NUMDAYS = 42;
 KODayMatrix::KODayMatrix( QWidget *parent, const char *name )
-    : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 )
+    : Q3Frame( parent, name , Qt::WNoAutoErase ), mCalendar( 0 )
 
@@ -153,3 +162,3 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
     QDate mDate = days[tmp];
-    QPtrList<Event> eventlist = mCalendar->events(mDate);
+    Q3PtrList<Event> eventlist = mCalendar->events(mDate);
     Event *event;
@@ -207,3 +216,3 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
-        QPtrList<Todo> todolist = mCalendar->todos(mDate);
+        Q3PtrList<Todo> todolist = mCalendar->todos(mDate);
         Todo  *todo;
@@ -222,3 +231,3 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
     if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
-        QPtrList<Journal> j_list = mCalendar->journals4Date( mDate );
+        Q3PtrList<Journal> j_list = mCalendar->journals4Date( mDate );
         Journal *j = j_list.first();
@@ -443,3 +452,3 @@ void KODayMatrix::updateViewTimed()
     int timeSpan = NUMDAYS-1;
-    QPtrList<Event> events = mCalendar->events();
+    Q3PtrList<Event> events = mCalendar->events();
     Event *event;
@@ -528,3 +537,3 @@ void KODayMatrix::updateViewTimed()
         // insert due todos
-        QPtrList<Todo> todos = mCalendar->todos( );
+        Q3PtrList<Todo> todos = mCalendar->todos( );
         Todo *todo;
@@ -553,3 +562,3 @@ void KODayMatrix::updateViewTimed()
         // insert due todos
-        QPtrList<Journal> todos = mCalendar->journals( );
+        Q3PtrList<Journal> todos = mCalendar->journals( );
         Journal *todo;
@@ -577,3 +586,3 @@ void KODayMatrix::updateViewTimed()
         // if events are set for the day then remember to draw it bold
-        QPtrList<Event> eventlist = mCalendar->events(days[i]);
+        Q3PtrList<Event> eventlist = mCalendar->events(days[i]);
         Event *event;
@@ -677,3 +686,3 @@ void KODayMatrix::updateEvents()
     // if events are set for the day then remember to draw it bold
-    QPtrList<Event>  eventlist = mCalendar->events( days[ i ] );
+    Q3PtrList<Event>  eventlist = mCalendar->events( days[ i ] );
     int numEvents = eventlist.count();
@@ -741,3 +750,3 @@ void KODayMatrix::mousePressEvent (QMouseEvent* e)
   
-    if ( e->button() == LeftButton )
+    if ( e->button() == Qt::LeftButton )
         mouseDown = true; 
@@ -754,3 +763,3 @@ void KODayMatrix::mouseReleaseEvent (QMouseEvent* e)
   mRedrawNeeded = true;
-  if ( e->button() == LeftButton )
+  if ( e->button() == Qt::LeftButton )
       if ( ! mouseDown ) {
@@ -1197,3 +1206,3 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
     
-    bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,CopyROP);
+    bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,QPainter::CompositionMode_Source);
     mRedrawNeeded = false;
@@ -1210,3 +1219,3 @@ void KODayMatrix::resizeEvent(QResizeEvent * e)
   daysize.setWidth(sz.width() / 7);
-  QFrame::resizeEvent( e );
+  Q3Frame::resizeEvent( e );
 }