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

List:       kde-commits
Subject:    extragear/network/kmldonkey
From:       Aleksey Markelov <markelovai () gmail ! com>
Date:       2009-06-25 16:58:03
Message-ID: 1245949083.076536.31358.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 987151 by amarkelov:

--qt3

 M  +0 -1      kmlplasma/CMakeLists.txt  
 M  +0 -1      libkmldonkey/donkeyhost.h  
 M  +5 -12     libkmldonkey/hostmanager.cpp  
 M  +0 -2      libkmldonkey/hostmanager.h  


--- trunk/extragear/network/kmldonkey/kmlplasma/CMakeLists.txt #987150:987151
@@ -14,7 +14,6 @@
     ${KDE4_KDEUI_LIBS}
     ${PLASMA_LIBS}
     ${QT_QTCORE_LIBRARY}
-    ${QT_QT3SUPPORT_LIBRARY}
     )
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 install(TARGETS plasma_engine_kmldonkey DESTINATION ${PLUGIN_INSTALL_DIR})
--- trunk/extragear/network/kmldonkey/libkmldonkey/donkeyhost.h #987150:987151
@@ -28,7 +28,6 @@
 
 #include <QString>
 #include <QStringList>
-#include <q3ptrlist.h>
 #include <qmap.h>
 #include <QObject>
 #include <kaction.h>
--- trunk/extragear/network/kmldonkey/libkmldonkey/hostmanager.cpp #987150:987151
@@ -27,6 +27,7 @@
 #include <kdirwatch.h>
 #include <kicon.h>
 #include <QSignalMapper>
+#include <KMenu>
 
 #include "donkeyhost.h"
 
@@ -154,7 +155,6 @@
     : KActionMenu(KIcon(icon), text, parent)
 {
     setObjectName("HostSelectAction");
-    m_connectActions.setAutoDelete(true);
     if (hostManager)
         m_hostManager = hostManager;
     else
@@ -168,19 +168,12 @@
 
 void HostSelectAction::populateMenu()
 {
-    Q3PtrListIterator<KAction> ait(m_connectActions);
-    for (; ait.current(); ++ait)
-        removeAction(ait.current());
-    m_connectActions.clear();
-
-    QStringList list(m_hostManager->hostList());
-    QStringList::iterator it;
-    for (it = list.begin(); it != list.end(); ++it) {
-        KAction* action = new KAction(*it, this);
+    qDeleteAll(menu()->actions());
+    foreach (const QString &host, m_hostManager->hostList()) {
+        KAction *action = new KAction(host, this);
         connect(action, SIGNAL(activated()), m_connectMapper, SLOT(map()));
-        m_connectMapper->setMapping(action, *it);
+        m_connectMapper->setMapping(action, host);
         addAction(action);
-        m_connectActions.append(action);
     }
 }
 
--- trunk/extragear/network/kmldonkey/libkmldonkey/hostmanager.h #987150:987151
@@ -26,7 +26,6 @@
 
 #include <QString>
 #include <QStringList>
-#include <q3ptrlist.h>
 #include <qmap.h>
 #include <QObject>
 #include <kaction.h>
@@ -125,7 +124,6 @@
 private:
 
     HostManager* m_hostManager;
-    Q3PtrList<KAction> m_connectActions;
     QSignalMapper* m_connectMapper;
 
 };

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