initial public commit of qt4 portp1

1 files changed, 34 insertions, 24 deletions

diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 0cbc087..a9e7f30 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -17,33 +17,43 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KOTODOVIEW_H
 #define KOTODOVIEW_H
 
 #include <qfont.h>
 #include <qfontmetrics.h>
 #include <qlineedit.h>
-#include <qptrlist.h>
-#include <qstrlist.h>
-#include <qlistbox.h>
-#include <qpopupmenu.h>
+#include <q3ptrlist.h>
+#include <q3strlist.h>
+#include <q3listbox.h>
+#include <q3popupmenu.h>
 #include <qlabel.h>
 #include <qmap.h>
 #include <qdialog.h>
 #include <qlabel.h>
-#include <qlistview.h>
+#include <q3listview.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QDragLeaveEvent>
+#include <QWheelEvent>
+#include <QPaintEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QDragEnterEvent>
 #include <klistview.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/todo.h>
 
 #include <korganizer/baseview.h>
 
 #include "kotodoviewitem.h"
 #include "koprefs.h"
 #include "koglobals.h"
 #include "datenavigator.h"
 
@@ -92,48 +102,48 @@ private:
 };
 
 class KOTodoListView : public KListView
 {
     Q_OBJECT
   public:
     KOTodoListView(Calendar *,QWidget *parent=0,const char *name=0);
     virtual ~KOTodoListView() {}
 
   signals:
     void paintNeeded();
     void todoDropped(Todo *, int);  
-    void double_Clicked(QListViewItem *item);
+    void double_Clicked(Q3ListViewItem *item);
     void reparentTodoSignal( Todo *,Todo * );
     void unparentTodoSignal(Todo *);
     void deleteTodo( Todo * );
   protected:
     void wheelEvent (QWheelEvent *e);
     void contentsDragEnterEvent(QDragEnterEvent *);
     void contentsDragMoveEvent(QDragMoveEvent *);
     void contentsDragLeaveEvent(QDragLeaveEvent *);
     void contentsDropEvent(QDropEvent *);
 
     void contentsMousePressEvent(QMouseEvent *);
     void contentsMouseMoveEvent(QMouseEvent *);
     void contentsMouseReleaseEvent(QMouseEvent *);
     void contentsMouseDoubleClickEvent(QMouseEvent *);
 
   private:
     void paintEvent(QPaintEvent * pevent);
     bool internalDrop;
     QString mName;
     Calendar *mCalendar;
     QPoint mPressPos;
     bool mMousePressed;
-    QListViewItem *mOldCurrent;
+    Q3ListViewItem *mOldCurrent;
     bool  mFlagKeyPressed;
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;
 };
 
 
 /**
   This is the line-edit on top of the todoview for fast addition of new todos
 */
 class KOQuickTodo : public QLineEdit
 {
   public:
@@ -148,26 +158,26 @@ class KOQuickTodo : public QLineEdit
   This class provides a multi-column list view of todo events.
 
   @short multi-column list view of todo events.
   @author Cornelius Schumacher <schumacher@kde.org>
 */
 class KOTodoView : public KOrg::BaseView
 {
     Q_OBJECT
   public:
     KOTodoView(Calendar *, QWidget* parent=0, const char* name=0 );
     ~KOTodoView();
 
-    QPtrList<Incidence> selectedIncidences();
-    QPtrList<Todo> selectedTodos();
+    Q3PtrList<Incidence> selectedIncidences();
+    Q3PtrList<Todo> selectedTodos();
 
     DateList selectedDates()
       {DateList q;
        return q;}
 
     /** Return number of shown dates. TodoView does not show dates, */
     int currentDateCount() { return 0; }
 
     void printPreview(CalPrinter *calPrinter, const QDate &fd, const QDate &td);
 
     void setDocumentId( const QString & );
 
@@ -175,32 +185,32 @@ class KOTodoView : public KOrg::BaseView
     void restoreLayout(KConfig *config, const QString &group);
     void setNavigator( DateNavigator* nav ) {mNavigator = nav;}
     QString getWhatsThisText(QPoint p);
     void clearList( bool saveCurrentItem = true );
 
   public slots:
     void updateView();
     void updateConfig();
 
     void changeEventDisplay(Event *, int);
 
     void showDates(const QDate &start, const QDate &end);
-    void showEvents(QPtrList<Event> eventList);
+    void showEvents(Q3PtrList<Event> eventList);
 
     void clearSelection();
     void jumpToDate ();
 
-    void editItem(QListViewItem *item);
-    void showItem(QListViewItem *item,const QPoint &,int);
-    void popupMenu(QListViewItem *item,const QPoint &,int);
+    void editItem(Q3ListViewItem *item);
+    void showItem(Q3ListViewItem *item,const QPoint &,int);
+    void popupMenu(Q3ListViewItem *item,const QPoint &,int);
     void newTodo();
     void newSubTodo();
     void unparentTodo();
     void reparentTodo();
     void showTodo();
     void editTodo();
     void cloneTodo();
     void cancelTodo();
     void moveTodo();
     void beamTodo();
     void deleteTodo();
 
@@ -210,28 +220,28 @@ class KOTodoView : public KOrg::BaseView
 
     void setAllOpen();
     void setAllClose();
     void setAllFlat();
     void displayAllFlat();
 
     void purgeCompleted();
     void toggleCompleted();
     void toggleRunning();
     void toggleQuickTodo();
     void updateTodo( Todo *, int );
 
-    void itemClicked(QListViewItem *);
-    void itemStateChanged(QListViewItem *);
+    void itemClicked(Q3ListViewItem *);
+    void itemStateChanged(Q3ListViewItem *);
     void modified(bool);
-    void itemDoubleClicked(QListViewItem *item);
+    void itemDoubleClicked(Q3ListViewItem *item);
     void resetFocusToList();
     void fillCategories ();
     void fillCal ();
     void changedCal (int);
 
   signals:
     void newTodoSignal();
     void newSubTodoSignal(Todo *);
     void unparentTodoSignal(Todo *);
     void reparentTodoSignal( Todo *,Todo * );
     void showTodoSignal(Todo *);
 
@@ -264,36 +274,36 @@ class KOTodoView : public KOrg::BaseView
      * Korganizer keeps it in memory and we need to update
      * 1. make KOTodoViewItem a QObject again?
      * 2. add a public method for setting one todo modified?
      * 3. add a private method for setting a todo modified + friend here?
      *  -- zecke 2002-07-08
      */
     KOTodoViewWhatsThis* mKOTodoViewWhatsThis;
     friend class KOTodoListView;
     void paintEvent(QPaintEvent * pevent);
     bool mPendingUpdateBeforeRepaint;
     friend class KOTodoViewItem;
     QMap<Todo *,KOTodoViewItem *>::ConstIterator insertTodoItem(Todo *todo);
-    void restoreItemState( QListViewItem * );
+    void restoreItemState( Q3ListViewItem * );
 
     bool checkTodo( Todo * );
     bool isFlatDisplay;
-    void  setOpen( QListViewItem*, bool setOpen);
+    void  setOpen( Q3ListViewItem*, bool setOpen);
     KOTodoListView *mTodoListView;
-    QPopupMenu *mItemPopupMenu;
-    QPopupMenu *mPopupMenu;
-    QPopupMenu *mPriorityPopupMenu;
-    QPopupMenu *mPercentageCompletedPopupMenu;
-    QPopupMenu *mCategoryPopupMenu;
-    QPopupMenu *mCalPopupMenu;
+    Q3PopupMenu *mItemPopupMenu;
+    Q3PopupMenu *mPopupMenu;
+    Q3PopupMenu *mPriorityPopupMenu;
+    Q3PopupMenu *mPercentageCompletedPopupMenu;
+    Q3PopupMenu *mCategoryPopupMenu;
+    Q3PopupMenu *mCalPopupMenu;
 
     QMap<int, int> mPercentage;
     QMap<int, int> mPriority;
     QMap<int, QString> mCategory;
     KOTodoViewItem *mActiveItem;
 
     QMap<Todo *,KOTodoViewItem *> mTodoMap;
     QString mName;
     QWidget* mQuickBar;
 
     DocPrefs *mDocPrefs;
     QString mCurrentDoc;