1 files changed, 66 insertions, 55 deletions

diff --git a/microkde/kdeui/klistview.h b/microkde/kdeui/klistview.h
index 9f0d9fd..2176525 100644
--- a/microkde/kdeui/klistview.h
+++ b/microkde/kdeui/klistview.h
@@ -22,5 +22,16 @@
 
-#include <qlistview.h>
-
-#include <qptrlist.h>
+#include <q3listview.h>
+
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QDragLeaveEvent>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QEvent>
+#include <QDragEnterEvent>
 
@@ -32,3 +43,3 @@ class QDragEnterEvent;
 
-class QDragObject;
+class Q3DragObject;
 class KConfig;
@@ -59,3 +70,3 @@ class KLineEdit;
  */
-class KListView : public QListView
+class KListView : public Q3ListView
 {
@@ -108,6 +119,6 @@ public:
   enum SelectionModeExt {
-        Single = QListView::Single,
-        Multi = QListView::Multi,
-        Extended = QListView::Extended,
-        NoSelection = QListView::NoSelection,
+        Single = Q3ListView::Single,
+        Multi = Q3ListView::Multi,
+        Extended = Q3ListView::Extended,
+        NoSelection = Q3ListView::NoSelection,
         FileManager
@@ -116,3 +127,3 @@ public:
         {
-            QScrollView::repaintContents( contentsX(), contentsY(),
+            Q3ScrollView::repaintContents( contentsX(), contentsY(),
                                           visibleWidth(), visibleHeight(), erase );
@@ -163,3 +174,3 @@ public:
    */
-  QPtrList<QListViewItem> selectedItems() const; // ### BIC: KDE 4: use an implicitly shared class! (QValueList?)
+  Q3PtrList<Q3ListViewItem> selectedItems() const; // ### BIC: KDE 4: use an implicitly shared class! (QValueList?)
 
@@ -168,3 +179,3 @@ public:
    */
-  void moveItem(QListViewItem *item, QListViewItem *parent, QListViewItem *after);
+  void moveItem(Q3ListViewItem *item, Q3ListViewItem *parent, Q3ListViewItem *after);
 
@@ -175,3 +186,3 @@ public:
    */
-  QListViewItem *lastItem() const;
+  Q3ListViewItem *lastItem() const;
 
@@ -182,3 +193,3 @@ public:
    */
-  QListViewItem* lastChild () const;
+  Q3ListViewItem* lastChild () const;
 
@@ -278,3 +289,3 @@ public:
    */
-  int itemIndex( const QListViewItem *item ) const;
+  int itemIndex( const Q3ListViewItem *item ) const;
 
@@ -285,3 +296,3 @@ public:
    */
-  QListViewItem* itemAtIndex(int index);
+  Q3ListViewItem* itemAtIndex(int index);
 
@@ -316,3 +327,3 @@ public:
    */
-  virtual int addColumn(const QIconSet& iconset, const QString& label, int width = -1);
+  virtual int addColumn(const QIcon& iconset, const QString& label, int width = -1);
   /**
@@ -390,3 +401,3 @@ signals:
    */
-  void executed( QListViewItem *item );
+  void executed( Q3ListViewItem *item );
 
@@ -403,3 +414,3 @@ signals:
    */
-  void executed( QListViewItem *item, const QPoint &pos, int c );
+  void executed( Q3ListViewItem *item, const QPoint &pos, int c );
 
@@ -419,4 +430,4 @@ signals:
    */
-  void doubleClicked( QListViewItem *item, const QPoint &pos, int c );
-  void contextRequest( QListViewItem *item, const QPoint &pos, int c );
+  void doubleClicked( Q3ListViewItem *item, const QPoint &pos, int c );
+  void contextRequest( Q3ListViewItem *item, const QPoint &pos, int c );
 
@@ -432,3 +443,3 @@ signals:
    */
-  void dropped (QDropEvent * e, QListViewItem *after);
+  void dropped (QDropEvent * e, Q3ListViewItem *after);
 
@@ -446,3 +457,3 @@ signals:
    */
-  void dropped (KListView* list, QDropEvent* e, QListViewItem* after);
+  void dropped (KListView* list, QDropEvent* e, Q3ListViewItem* after);
 
@@ -460,3 +471,3 @@ signals:
    */
-  void dropped (KListView* list, QDropEvent* e, QListViewItem* parent, QListViewItem* after);
+  void dropped (KListView* list, QDropEvent* e, Q3ListViewItem* parent, Q3ListViewItem* after);
 
@@ -473,3 +484,3 @@ signals:
    */
-  void dropped (QDropEvent* e, QListViewItem* parent, QListViewItem* after);
+  void dropped (QDropEvent* e, Q3ListViewItem* parent, Q3ListViewItem* after);
 
@@ -504,3 +515,3 @@ signals:
    */
-  void moved (QListViewItem *item, QListViewItem *afterFirst, QListViewItem *afterNow);
+  void moved (Q3ListViewItem *item, Q3ListViewItem *afterFirst, Q3ListViewItem *afterNow);
 
@@ -512,3 +523,3 @@ signals:
    */
-  void moved(QPtrList<QListViewItem> &items, QPtrList<QListViewItem> &afterFirst, QPtrList<QListViewItem> &afterNow);
+  void moved(Q3PtrList<Q3ListViewItem> &items, Q3PtrList<Q3ListViewItem> &afterFirst, Q3PtrList<Q3ListViewItem> &afterNow);
 
@@ -521,3 +532,3 @@ signals:
    */
-  void itemRenamed(QListViewItem* item, const QString &str, int col);
+  void itemRenamed(Q3ListViewItem* item, const QString &str, int col);
 
@@ -526,3 +537,3 @@ signals:
    */
-  void itemRenamed(QListViewItem* item);
+  void itemRenamed(Q3ListViewItem* item);
   void signalDelete();
@@ -539,3 +550,3 @@ signals:
    */
-  void menuShortCutPressed (KListView* list, QListViewItem* item);
+  void menuShortCutPressed (KListView* list, Q3ListViewItem* item);
 
@@ -549,3 +560,3 @@ signals:
    */
-  void contextMenu (KListView* l, QListViewItem* i, const QPoint& p);
+  void contextMenu (KListView* l, Q3ListViewItem* i, const QPoint& p);
 
@@ -555,3 +566,3 @@ public slots:
    */
-  virtual void rename(QListViewItem *item, int c);
+  virtual void rename(Q3ListViewItem *item, int c);
 
@@ -675,3 +686,3 @@ protected:
    */
-  inline bool below (QListViewItem* i, const QPoint& p)
+  inline bool below (Q3ListViewItem* i, const QPoint& p)
   {
@@ -691,3 +702,3 @@ protected:
   //US I added buttonstate to pass the current keyboard status 
-  void emitExecute( int buttonstate, QListViewItem *item, const QPoint &pos, int c);
+  void emitExecute( int buttonstate, Q3ListViewItem *item, const QPoint &pos, int c);
 
@@ -723,3 +734,3 @@ protected:
    */
-  virtual QString tooltip(QListViewItem* item, int column) const;
+  virtual QString tooltip(Q3ListViewItem* item, int column) const;
 
@@ -728,3 +739,3 @@ protected:
    */
-  virtual bool showTooltip(QListViewItem *item, const QPoint &pos, int column) const;
+  virtual bool showTooltip(Q3ListViewItem *item, const QPoint &pos, int column) const;
 
@@ -807,3 +818,3 @@ protected:
    */
-  virtual QDragObject *dragObject();
+  virtual Q3DragObject *dragObject();
 
@@ -823,3 +834,3 @@ protected:
    */
-  virtual QRect drawDropVisualizer (QPainter *p, QListViewItem *parent, QListViewItem *after);
+  virtual QRect drawDropVisualizer (QPainter *p, Q3ListViewItem *parent, Q3ListViewItem *after);
 
@@ -831,3 +842,3 @@ protected:
    */
-  virtual QRect drawItemHighlighter(QPainter *painter, QListViewItem *item);
+  virtual QRect drawItemHighlighter(QPainter *painter, Q3ListViewItem *item);
 
@@ -888,4 +899,4 @@ protected slots:
 
-  void slotMouseButtonClicked( int btn, QListViewItem *item, const QPoint &pos, int c );
-  void doneEditing(QListViewItem *item, int row);
+  void slotMouseButtonClicked( int btn, Q3ListViewItem *item, const QPoint &pos, int c );
+  void doneEditing(Q3ListViewItem *item, int row);
 
@@ -904,3 +915,3 @@ protected slots:
    */
-  void emitContextMenu (QListViewItem*, const QPoint&, int);
+  void emitContextMenu (Q3ListViewItem*, const QPoint&, int);
 
@@ -909,3 +920,3 @@ protected slots:
    */
-  void emitContextMenu (KListView*, QListViewItem*);
+  void emitContextMenu (KListView*, Q3ListViewItem*);
 
@@ -915,3 +926,3 @@ protected slots:
    */
-  void slotOnItem( QListViewItem *item );
+  void slotOnItem( Q3ListViewItem *item );
 
@@ -941,3 +952,3 @@ protected:
    */
-  virtual void movableDropEvent (QListViewItem* parent, QListViewItem* afterme);
+  virtual void movableDropEvent (Q3ListViewItem* parent, Q3ListViewItem* afterme);
 
@@ -949,3 +960,3 @@ protected:
    */
-  virtual void findDrop(const QPoint &pos, QListViewItem *&parent, QListViewItem *&after);
+  virtual void findDrop(const QPoint &pos, Q3ListViewItem *&parent, Q3ListViewItem *&after);
 
@@ -976,3 +987,3 @@ private:
  */
-class KListViewItem : public QListViewItem
+class KListViewItem : public Q3ListViewItem
 {
@@ -985,8 +996,8 @@ public:
    */
-  KListViewItem(QListView *parent);
-  KListViewItem(QListViewItem *parent);
-  KListViewItem(QListView *parent, QListViewItem *after);
-  KListViewItem(QListViewItem *parent, QListViewItem *after);
+  KListViewItem(Q3ListView *parent);
+  KListViewItem(Q3ListViewItem *parent);
+  KListViewItem(Q3ListView *parent, Q3ListViewItem *after);
+  KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after);
 
-  KListViewItem(QListView *parent,
+  KListViewItem(Q3ListView *parent,
     QString, QString = QString::null,
@@ -996,3 +1007,3 @@ public:
 
-  KListViewItem(QListViewItem *parent,
+  KListViewItem(Q3ListViewItem *parent,
     QString, QString = QString::null,
@@ -1002,3 +1013,3 @@ public:
 
-  KListViewItem(QListView *parent, QListViewItem *after,
+  KListViewItem(Q3ListView *parent, Q3ListViewItem *after,
     QString, QString = QString::null,
@@ -1008,3 +1019,3 @@ public:
 
-  KListViewItem(QListViewItem *parent, QListViewItem *after,
+  KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after,
     QString, QString = QString::null,