Porting to Qt4 : some corrections to make LightApp compilable.

diff --git a/src/Qtx/QtxListResourceEdit.h b/src/Qtx/QtxListResourceEdit.h
index fc538004aa9d0eb22264f725c13c68694e8fac37..ac009d7c832a31571b60125cd231dc7d3b59612c 100644 (file)
--- a/src/Qtx/QtxListResourceEdit.h
+++ b/src/Qtx/QtxListResourceEdit.h
@@ -25,7 +25,8 @@
 #include "QtxResourceEdit.h"
 
 #include <qmap.h>
-#include <qhbox.h>
+//#include <qhbox.h>
+#include <QWidget>
 #include <qframe.h>
 #include <qgroupbox.h>
 #include <qvalidator.h>
@@ -189,7 +190,7 @@ protected:
   Base class for preferences items.
 */
 
-class QtxListResourceEdit::PrefItem : public QHBox, public Item
+class QtxListResourceEdit::PrefItem : public QWidget/*QHBox*/, public Item
 {
 public:
   PrefItem( const int, QtxResourceEdit*, Item* = 0, QWidget* = 0 );
@@ -241,7 +242,7 @@ private:
   void             setIndexes( const QVariant& );
 
   void             setStrings( const QStringList& );
-  void             setIndexes( const QValueList<int>& );
+  void             setIndexes( const QList<int>& );
 
 private:
   QComboBox*       myList;

diff --git a/src/Qtx/QtxResourceEdit.h b/src/Qtx/QtxResourceEdit.h
index d6da330ac8fee1ed4745041d392c48a6a6098b17..14b9205918b025dca4e6496a02e2aa62da3ed171 100644 (file)
--- a/src/Qtx/QtxResourceEdit.h
+++ b/src/Qtx/QtxResourceEdit.h
@@ -90,7 +90,7 @@ protected:
   virtual void         itemAdded( Item* );
   virtual void         itemRemoved( Item* );
 
-  void                 childItems( QPtrList<Item>& ) const;
+  void                 childItems( QList<Item*>& ) const;
 
 private:
   void                 removeItem( Item* );
@@ -103,7 +103,7 @@ private:
   ItemMap              myItems;
   QtxResourceMgr*      myResMgr;
   QMap<Item*, QString> myBackup;
-  QPtrList<Item>       myChildren;
+  QList<Item*>         myChildren;
 
   friend class QtxResourceEdit::Item;
 };
@@ -123,7 +123,7 @@ public:
   virtual int          type() const = 0;
 
   Item*                parentItem() const;
-  void                 childItems( QPtrList<Item>& ) const;
+  void                 childItems( QList<Item*>& ) const;
 
   virtual bool         isEmpty() const;
 
@@ -172,8 +172,8 @@ protected:
   Item*                item( const QString&, const int ) const;
 
 protected:
-  typedef QPtrList<Item>         ItemList;
-  typedef QPtrListIterator<Item> ItemListIterator;
+  typedef QList<Item*>         ItemList;
+  typedef QListIterator<Item*> ItemListIterator;
 
 private:
   static int           generateId();