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

List:       kde-commits
Subject:    branches/work/konvi-kde4/src/viewer
From:       Lorenzo Villani <lvillani () binaryhelix ! net>
Date:       2009-01-30 18:42:55
Message-ID: 1233340975.180989.17920.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 918777 by villani:

Merge branch 'drop-qt3support'

 M  +22 -23    viewcontainer.cpp  
 M  +4 -5      viewcontainer.h  
 M  +2 -2      viewtree.cpp  
 M  +1 -1      viewtree.h  


--- branches/work/konvi-kde4/src/viewer/viewcontainer.cpp #918776:918777
@@ -11,9 +11,6 @@
 
 #include "viewcontainer.h"
 #include "queuetuner.h"
-//Added by qt3to4:
-#include <Q3ValueList>
-#include <Q3PtrList>
 #include "viewtree.h"
 #include "application.h" ////// header renamed
 #include "notificationhandler.h"
@@ -37,21 +34,23 @@
 #include "joinchanneldialog.h"
 #include "servergroupsettings.h"
 
-#include <qsplitter.h>
-#include <q3popupmenu.h>
+#include <QList>
+#include <QSplitter>
+#include <Q3PopupMenu>
 
-#include <kdebug.h>
-#include <klocale.h>
-#include <ktabwidget.h>
-#include <kpushbutton.h>
-#include <kiconloader.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <KDebug>
+#include <KLocale>
+#include <KTabWidget>
+#include <KPushButton>
+#include <KPushButton>
+#include <KIconLoader>
+#include <KMessageBox>
+#include <KGlobalSettings>
 
-#include <kactioncollection.h>
-#include <ktoggleaction.h>
-#include <kselectaction.h>
-#include <kxmlguifactory.h>
+#include <KActionCollection>
+#include <KToggleAction>
+#include <KSelectAction>
+#include <KXMLGUIFactory>
 
 ViewContainer::ViewContainer(KonversationMainWindow* window):
         m_vbox(0), m_queueTuner(0)
@@ -320,18 +319,18 @@
 
 void ViewContainer::syncTabBarToTree()
 {
-    Q3PtrList<ChatWindow> viewList = m_viewTree->getSortedViewList();
+    QList<ChatWindow*> viewList = m_viewTree->getSortedViewList();
 
     if (m_tabWidget && !viewList.isEmpty())
     {
-        Q3PtrListIterator<ChatWindow> it(viewList);
+        QListIterator<ChatWindow*> it(viewList);
         ChatWindow* view;
         int index = 0;
         int oldIndex = 0;
 
-        while ((view = it.current()) != 0)
+        while (it.hasNext())
         {
-            ++it;
+            view = it.next();
 
             oldIndex = m_tabWidget->indexOf(view);
 
@@ -1123,7 +1122,7 @@
         //m_tabWidget->setTabColor(view, textColor);
     }
 
-    Q3ValueList<ChatWindow*>::iterator it = m_activeViewOrderList.find(view);
+     QList<ChatWindow*>::iterator it = m_activeViewOrderList.find(view);
 
     if (it != m_activeViewOrderList.end())
         m_activeViewOrderList.remove(it);
@@ -1576,7 +1575,7 @@
     }
 
     // Remove the view from the active view list if it's still on it
-    Q3ValueList<ChatWindow*>::iterator it = m_activeViewOrderList.find(view);
+    QList<ChatWindow*>::iterator it = m_activeViewOrderList.find(view);
 
     if (it != m_activeViewOrderList.end())
         m_activeViewOrderList.remove(it);
@@ -2454,7 +2453,7 @@
         ChatWindow* prev = m_activeViewOrderList.first();
         ChatWindow* view = prev;
 
-        Q3ValueList<ChatWindow*>::ConstIterator it;
+        QList<ChatWindow*>::ConstIterator it;
 
         for (it = m_activeViewOrderList.begin(); it != m_activeViewOrderList.end(); ++it)
         {
--- branches/work/konvi-kde4/src/viewer/viewcontainer.h #918776:918777
@@ -16,10 +16,9 @@
 #include "common.h"
 #include "server.h"
 
-#include <qobject.h>
-#include <qpointer.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+#include <QList>
+#include <QObject>
+#include <QPointer>
 
 
 class QSplitter;
@@ -225,7 +224,7 @@
         int m_popupViewIndex;
         int m_queryViewCount;
 
-        Q3ValueList<ChatWindow*> m_activeViewOrderList;
+        QList<ChatWindow*> m_activeViewOrderList;
 };
 
 #endif
--- branches/work/konvi-kde4/src/viewer/viewtree.cpp #918776:918777
@@ -877,9 +877,9 @@
     return new Q3StoredDrag("application/x-qlistviewitem", viewport());
 }
 
-Q3PtrList<ChatWindow> ViewTree::getSortedViewList()
+QList<ChatWindow*> ViewTree::getSortedViewList()
 {
-    Q3PtrList<ChatWindow> viewList;
+    QList<ChatWindow*> viewList;
 
     ViewTreeItem* item = static_cast<ViewTreeItem*>(firstChild());
 
--- branches/work/konvi-kde4/src/viewer/viewtree.h #918776:918777
@@ -44,7 +44,7 @@
         bool canMoveViewUp(ChatWindow* view);
         bool canMoveViewDown(ChatWindow* view);
 
-        Q3PtrList<ChatWindow> getSortedViewList();
+        QList<ChatWindow*> getSortedViewList();
 
     public slots:
         void updateAppearance();
[prev in list] [next in list] [prev in thread] [next in thread]