Branch: master

976500c8 2018-10-17 09:25:54 Michele Calgaro 
Removed obsolete Qt2's TQList/TQListIterator classes and replaced
with TQt3's TQPtrList/TQPtrListIterator ones.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M kbiff/kbiff.cpp
M kbiff/kbiff.h
M kbiff/kbiffmonitor.h
M kbiff/setupdlg.cpp
M kbiff/setupdlg.h
M kbiff/status.h

kbiff/kbiff.cpp

diff --git a/kbiff/kbiff.cpp b/kbiff/kbiff.cpp
index 185a8f0..2b4f421 100644
--- a/kbiff/kbiff.cpp
+++ b/kbiff/kbiff.cpp
@@ -152,9 +152,9 @@
     delete setup_;
 }
 
-void KBiff::setMailboxList(const TQList<KBiffMailbox>& mailbox_list, unsigned int poll)
+void KBiff::setMailboxList(const TQPtrList<KBiffMailbox>& mailbox_list, unsigned int poll)
 {
-    TQList<KBiffMailbox> tmp_list = mailbox_list;
+    TQPtrList<KBiffMailbox> tmp_list = mailbox_list;
 
     myMUTEX = true;
     if (isRunning())

kbiff/kbiff.h

diff --git a/kbiff/kbiff.h b/kbiff/kbiff.h
index d8c2524..dc8c9bb 100644
--- a/kbiff/kbiff.h
+++ b/kbiff/kbiff.h
@@ -14,7 +14,7 @@
 #include <config.h>
 #endif 
 
-#include <ntqlist.h>
+#include <ntqptrlist.h>
 
 #include <kbiffmonitor.h>
 #include <setupdlg.h>
@@ -45,7 +45,7 @@
     void processSetup(const KBiffSetup* setup, bool start);
     void readSessionConfig();
 
-    void setMailboxList(const TQList<KBiffMailbox>& mailbox_list, unsigned int poll = 60);
+    void setMailboxList(const TQPtrList<KBiffMailbox>& mailbox_list, unsigned int poll = 60);
 
     virtual bool process(const TQCString& obj, const TQCString& function,
                          const TQByteArray& data, TQCString& replyType,
@@ -96,8 +96,8 @@
 
 protected:
     bool myMUTEX;
-    TQList<KBiffMonitor> monitorList;
-    TQList<KBiffNotify>  notifyList;
+    TQPtrList<KBiffMonitor> monitorList;
+    TQPtrList<KBiffNotify>  notifyList;
     KBiffStatusList     statusList;
     TQStringList         proxyList;

kbiff/kbiffmonitor.h

diff --git a/kbiff/kbiffmonitor.h b/kbiff/kbiffmonitor.h
index 52cc1e7..71a9be4 100644
--- a/kbiff/kbiffmonitor.h
+++ b/kbiff/kbiffmonitor.h
@@ -18,7 +18,7 @@
 #include <sys/time.h>
 
 #include <ntqobject.h>
-#include <ntqlist.h>
+#include <ntqptrlist.h>
 #include <ntqfileinfo.h>
 
 #ifdef USE_SSL
@@ -32,7 +32,7 @@
  * @internal
  * Internal class to store UIDL list
  */
-class KBiffUidlList : public TQList<TQString>
+class KBiffUidlList : public TQPtrList<TQString>
 {
 protected:
     int compareItems(Item s1, Item s2)

kbiff/setupdlg.cpp

diff --git a/kbiff/setupdlg.cpp b/kbiff/setupdlg.cpp
index 6797513..4ff52db 100644
--- a/kbiff/setupdlg.cpp
+++ b/kbiff/setupdlg.cpp
@@ -24,7 +24,7 @@
 #include <ntqlayout.h>
 #include <ntqtooltip.h>
 #include <ntqdict.h>
-#include <ntqlist.h>
+#include <ntqptrlist.h>
 #include <ntqwhatsthis.h>
 #include <ntqstylesheet.h>
 
@@ -201,7 +201,7 @@
   return mailboxTab->getMailbox();
 }
 
-const TQList<KBiffMailbox> KBiffSetup::getMailboxList() const
+const TQPtrList<KBiffMailbox> KBiffSetup::getMailboxList() const
 {
   return mailboxTab->getMailboxList();
 }
@@ -1643,9 +1643,9 @@
     return url;
 }
 
-const TQList<KBiffMailbox> KBiffMailboxTab::getMailboxList() const
+const TQPtrList<KBiffMailbox> KBiffMailboxTab::getMailboxList() const
 {
-    TQList<KBiffMailbox> mbox_list;
+    TQPtrList<KBiffMailbox> mbox_list;
 
     for (TQListViewItem *item = mailboxes->firstChild();
          item;

kbiff/setupdlg.h

diff --git a/kbiff/setupdlg.h b/kbiff/setupdlg.h
index cf30e52..2964adf 100644
--- a/kbiff/setupdlg.h
+++ b/kbiff/setupdlg.h
@@ -52,7 +52,7 @@
 
 	const TQString getProfile() const;
 	const KBiffURL getCurrentMailbox() const;
-	const TQList<KBiffMailbox> getMailboxList() const;
+	const TQPtrList<KBiffMailbox> getMailboxList() const;
 
 	const TQString getMailClient() const;
 	const TQString getRunCommandPath() const;
@@ -235,7 +235,7 @@
 	void setMailbox(const KBiffURL& url);
 
 	const KBiffURL getMailbox() const;
-	const TQList<KBiffMailbox> getMailboxList() const;
+	const TQPtrList<KBiffMailbox> getMailboxList() const;
 
 public slots:
 	void readConfig(const TQString& profile);

kbiff/status.h

diff --git a/kbiff/status.h b/kbiff/status.h
index af33bc5..d749075 100644
--- a/kbiff/status.h
+++ b/kbiff/status.h
@@ -15,7 +15,7 @@
 #endif 
 
 #include <ntqframe.h>
-#include <ntqlist.h>
+#include <ntqptrlist.h>
 #include <ntqstring.h>
 
 class TQListView;
@@ -39,8 +39,8 @@
 	TQString _curMessages;
 };
 
-typedef TQList<KBiffStatusItem>         KBiffStatusList;
-typedef TQListIterator<KBiffStatusItem> KBiffStatusListIterator;
+typedef TQPtrList<KBiffStatusItem>         KBiffStatusList;
+typedef TQPtrListIterator<KBiffStatusItem> KBiffStatusListIterator;
 
 class KBiffStatus : public TQFrame
 {