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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui
From:       Joseph Wenninger <kde () jowenn ! at>
Date:       2005-08-05 19:38:28
Message-ID: 1123270708.221729.17059.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 443320 by jowenn:

littlebit less Q3

 M  +11 -16    ktoolbarhandler.cpp  
 M  +2 -1      ktoolbarhandler.h  


--- trunk/KDE/kdelibs/kdeui/ktoolbarhandler.cpp #443319:443320
@@ -18,7 +18,7 @@
 
 #include "ktoolbarhandler.h"
 
-#include <q3popupmenu.h>
+#include <QMenu>
 #include <kapplication.h>
 #include <ktoolbar.h>
 #include <kmainwindow.h>
@@ -44,17 +44,13 @@
     class BarActionBuilder
     {
     public:
-        BarActionBuilder( KActionCollection *actionCollection, KMainWindow \
*mainWindow, Q3PtrList<KToolBar> &oldToolBarList ) +        BarActionBuilder( \
KActionCollection *actionCollection, KMainWindow *mainWindow, QLinkedList<KToolBar*> \
                &oldToolBarList )
             : m_actionCollection( actionCollection ), m_mainWindow( mainWindow ), \
m_needsRebuild( false )  {
-            QList<Q3DockWindow*> dockWindows = m_mainWindow->dockWindows();
-            foreach ( Q3DockWindow* dockWindowIt, dockWindows ) {
-
-                KToolBar *toolBar = dynamic_cast<KToolBar *>( dockWindowIt );
-                if ( !toolBar )
-                    continue;
-
-                if ( oldToolBarList.findRef( toolBar ) == -1 )
+            QList<KToolBar*>  toolBars = qFindChildren<KToolBar*>(m_mainWindow);
+            foreach( KToolBar * toolBar, toolBars) {
+		if (toolBar->mainWindow()!=m_mainWindow) continue;
+                if ( !oldToolBarList.contains( toolBar ) )
                     m_needsRebuild = true;
 
                 m_toolBars.append( toolBar );
@@ -71,9 +67,8 @@
             if ( !m_needsRebuild )
                 return Q3PtrList<KAction>();
 
-            Q3PtrListIterator<KToolBar> toolBarIt( m_toolBars );
-            for ( ; toolBarIt.current(); ++toolBarIt )
-                handleToolBar( toolBarIt.current() );
+            foreach(KToolBar* bar, m_toolBars)
+                handleToolBar( bar );
 
             Q3PtrList<KAction> actions;
 
@@ -97,7 +92,7 @@
             return actions;
         }
 
-        const Q3PtrList<KToolBar> &toolBars() const { return m_toolBars; }
+        const QLinkedList<KToolBar*> &toolBars() const { return m_toolBars; }
 
     private:
         void handleToolBar( KToolBar *toolBar )
@@ -114,7 +109,7 @@
         KActionCollection *m_actionCollection;
         KMainWindow *m_mainWindow;
 
-        Q3PtrList<KToolBar> m_toolBars;
+        QLinkedList<KToolBar*> m_toolBars;
         Q3PtrList<KAction> m_toolBarActions;
 
         bool m_needsRebuild : 1;
@@ -231,7 +226,7 @@
 
 void ToolBarHandler::connectToActionContainer( QWidget *container )
 {
-    Q3PopupMenu *popupMenu = dynamic_cast<Q3PopupMenu *>( container );
+    QMenu *popupMenu = dynamic_cast<QMenu *>( container );
     if ( !popupMenu )
         return;
 
--- trunk/KDE/kdelibs/kdeui/ktoolbarhandler.h #443319:443320
@@ -19,6 +19,7 @@
 #ifndef KBARHANDLER_H
 #define KBARHANDLER_H
 
+#include <QLinkedList>
 #include <qobject.h>
 #include <qpointer.h>
 #include <kxmlguiclient.h>
@@ -58,7 +59,7 @@
 
     QPointer<KMainWindow> m_mainWindow;
     Q3PtrList<KAction> m_actions;
-    Q3PtrList<KToolBar> m_toolBars;
+    QLinkedList<KToolBar*> m_toolBars;
 };
 
 } // namespace KDEPrivate


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