[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kioslave/man
From:       Laurent Montel <montel () kde ! org>
Date:       2005-12-21 8:21:18
Message-ID: 1135153278.094550.17790.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 490232 by mlaurent:

Q3PtrList--


 M  +2 -2      kio_man.cpp  
 M  +6 -5      man2html.cpp  


--- trunk/KDE/kdebase/kioslave/man/kio_man.cpp #490231:490232
@@ -1132,8 +1132,8 @@
 #warning using heapsort
 // Set up my own man page list,
 // with a special compare function to sort itself
-typedef Q3PtrList<struct man_index_t> QManIndexListBase;
-typedef Q3PtrListIterator<struct man_index_t> QManIndexListIterator;
+typedef QList<struct man_index_t*> QManIndexListBase;
+typedef QList<struct man_index_t*>::Iterator QManIndexListIterator;
 
 class QManIndexList : public QManIndexListBase
 {
--- trunk/KDE/kdebase/kioslave/man/man2html.cpp #490231:490232
@@ -1878,10 +1878,11 @@
 public:
     TABLEROW() {
         test = new char;
-        items.setAutoDelete(true);
         prev = 0; next = 0;
     }
     ~TABLEROW() {
+		qDeleteAll(items);
+		items.clear();
         delete test;
 
     }
@@ -1901,7 +1902,7 @@
     TABLEROW *prev, *next;
 
 private:
-    Q3PtrList<TABLEITEM> items;
+    QList<TABLEITEM*> items;
 };
 
 TABLEITEM::TABLEITEM(TABLEROW *row) : contents(0), _parent(row) {
@@ -1912,10 +1913,10 @@
 TABLEROW *TABLEROW::copyLayout() const {
     TABLEROW *newrow = new TABLEROW();
 
-    Q3PtrListIterator<TABLEITEM> it(items);
-    for ( ; it.current(); ++it) {
+    QListIterator<TABLEITEM *> it(items);
+	while (it.hasNext()){
         TABLEITEM *newitem = new TABLEITEM(newrow);
-        newitem->copyLayout(it.current());
+        newitem->copyLayout(it.next());
     }
     return newrow;
 }
[prev in list] [next in list] [prev in thread] [next in thread]