From 489c8e07281dc55c384c88859642b778db9ba26e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 17 Oct 2018 23:25:58 +0900 Subject: [PATCH] Removed obsolete Qt2's TQList/TQListIterator classes and replaced with TQt3's TQPtrList/TQPtrListIterator ones. Signed-off-by: Michele Calgaro --- src/kvilib/core/kvi_pointerlist.h | 4 ++-- src/kvirc/ui/kvi_channel.cpp | 4 ++-- src/kvirc/ui/kvi_console.h | 2 +- src/kvirc/ui/kvi_customtoolbar.cpp | 8 ++++---- src/kvirc/ui/kvi_window.cpp | 16 ++++++++-------- src/kvirc/ui/kvi_window.h | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/kvilib/core/kvi_pointerlist.h b/src/kvilib/core/kvi_pointerlist.h index 5097000..c9746c2 100644 --- a/src/kvilib/core/kvi_pointerlist.h +++ b/src/kvilib/core/kvi_pointerlist.h @@ -297,11 +297,11 @@ public: /// since the list provides the autoDelete() method /// which vould implicitly violate constness. /// If you have to deal with const objects then -/// you need to use a TQList instead. +/// you need to use a TQPtrList instead. /// /// Your objects also do not need to support copy constructors /// or >= operators. This class will work fine without them -/// as opposed to a plain TQList. +/// as opposed to a plain TQPtrList. /// /// This class also supports automatic deletion of the inseted items. /// See the setAutoDelete() and autoDelete() members for the diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index 03ab82e..1716a03 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -302,9 +302,9 @@ void KviChannel::saveProperties(KviConfig *cfg) cfg->writeEntry("TopSplitter",m_pTopSplitter->sizes()); cfg->writeEntry("Splitter",m_pSplitter->sizes()); #ifdef COMPILE_USE_QT4 - TQList tmp = m_pVertSplitter->sizes(); + TQPtrList tmp = m_pVertSplitter->sizes(); KviValueList tmp2; - for(TQList::Iterator it = tmp.begin();it != tmp.end();++it) + for(TQPtrList::Iterator it = tmp.begin();it != tmp.end();++it) tmp2.append(*it); cfg->writeEntry("VertSplitter",m_pMessageView ? tmp2 : m_VertSplitterSizesList); #else diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h index a531492..9332f40 100644 --- a/src/kvirc/ui/kvi_console.h +++ b/src/kvirc/ui/kvi_console.h @@ -51,7 +51,7 @@ class KviProxy; class KviChannel; class KviQuery; #else - // windoze wants it to compile TQList and TQList + // windoze wants it to compile TQPtrList and TQPtrList #include "kvi_channel.h" #include "kvi_query.h" #endif diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index c7bca49..0e7bcad 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -171,8 +171,8 @@ void KviCustomToolBar::beginCustomize() m_pFilteredChildren->setAutoDelete(true); // filter the events for all the children #ifdef COMPILE_USE_QT4 - TQList l = children(); - for(TQList::Iterator it = l.begin();it != l.end();++it) + TQPtrList l = children(); + for(TQPtrList::Iterator it = l.begin();it != l.end();++it) { if((*it)->isWidgetType()) filterChild(*it); @@ -193,8 +193,8 @@ void KviCustomToolBar::endCustomize() { // stop filtering events #ifdef COMPILE_USE_QT4 - TQList l = children(); - for(TQList::Iterator it = l.begin();it != l.end();++it) + TQPtrList l = children(); + for(TQPtrList::Iterator it = l.begin();it != l.end();++it) { if((*it)->isWidgetType()) unfilterChild(*it); diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index e031a9b..1a82409 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -1006,8 +1006,8 @@ void KviWindow::focusInEvent(TQFocusEvent *) if(m_pIrcView)m_pFocusHandler = m_pIrcView; else { #ifdef COMPILE_USE_QT4 - TQList list = children(); - for(TQList::Iterator it = list.begin();it != list.end();++it) + TQPtrList list = children(); + for(TQPtrList::Iterator it = list.begin();it != list.end();++it) { TQObject * c = *it; if(c->isWidgetType()) @@ -1124,8 +1124,8 @@ void KviWindow::childInserted(TQWidget * o) } #ifdef COMPILE_USE_QT4 - TQList list = o->children(); - for(TQList::Iterator it = list.begin();it != list.end();++it) + TQPtrList list = o->children(); + for(TQPtrList::Iterator it = list.begin();it != list.end();++it) { TQObject * c = *it; if(c->isWidgetType()) @@ -1162,8 +1162,8 @@ void KviWindow::childRemoved(TQWidget * o) m_pLastFocusedChild = 0; #ifdef COMPILE_USE_QT4 - TQList list = o->children(); - for(TQList::Iterator it = list.begin();it != list.end();++it) + TQPtrList list = o->children(); + for(TQPtrList::Iterator it = list.begin();it != list.end();++it) { TQObject * c = *it; if(c->isWidgetType()) @@ -1217,11 +1217,11 @@ void KviWindow::updateBackgrounds(TQObject * obj) if(!obj) obj = TQT_TQOBJECT(this); #ifdef COMPILE_USE_QT4 - TQList list = obj->children(); + TQPtrList list = obj->children(); if (list.count()) { - for(TQList::Iterator it = list.begin();it != list.end();++it) + for(TQPtrList::Iterator it = list.begin();it != list.end();++it) { TQObject * child = *it; if(child->metaObject()->indexOfProperty("TransparencyCapable") != -1){ diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h index a52afd0..dce8a13 100644 --- a/src/kvirc/ui/kvi_window.h +++ b/src/kvirc/ui/kvi_window.h @@ -30,7 +30,7 @@ #include "kvi_settings.h" #ifdef COMPILE_ON_WINDOWS - // The brain-damaged MSVC compiler can't instantiate TQList templates without a destructor definition + // The brain-damaged MSVC compiler can't instantiate TQPtrList templates without a destructor definition #include "kvi_mdichild.h" #else class KviMdiChild;