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

List:       kde-commits
Subject:    extragear/base/konq-plugins/microformat
From:       Pino Toscano <pino () kde ! org>
Date:       2008-02-29 22:16:29
Message-ID: 1204323389.531874.16766.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780747 by pino:

convert the menu to QAction


 M  +0 -1      CMakeLists.txt  
 M  +15 -4     konqmficon.cpp  
 M  +2 -1      konqmficon.h  


--- trunk/extragear/base/konq-plugins/microformat/CMakeLists.txt #780746:780747
@@ -1,6 +1,5 @@
 
 
-add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
 
 
 ########### next target ###############
--- trunk/extragear/base/konq-plugins/microformat/konqmficon.cpp #780746:780747
@@ -265,18 +265,20 @@
 	delete m_menu;
 	m_menu = new KMenu(m_part->widget());
 	m_menu->addTitle(i18n("Microformats"));
-	connect(m_menu, SIGNAL(activated(int)), this, SLOT(addMF(int)));
 	int id = 0;
+	QAction *action = 0;
 	for (QList<QPair<QString, QString> >::ConstIterator it = _events.begin(); it != \
                _events.end(); ++it) {
-		m_menu->insertItem(SmallIcon("bookmark-new"), (*it).first, id);
+		action = m_menu->addAction(KIcon("bookmark-new"), (*it).first, this, \
SLOT(addMF())); +		action->setData(qVariantFromValue(id));
 		id++;
 	}
 	for (QList<QPair<QString, QString> >::ConstIterator it = _cards.begin(); it != \
                _cards.end(); ++it) {
-		m_menu->insertItem(SmallIcon("bookmark-new"), (*it).first, id);
+		action = m_menu->addAction(KIcon("bookmark-new"), (*it).first, this, \
SLOT(addMF())); +		action->setData(qVariantFromValue(id));
 		id++;
 	}
 	m_menu->addSeparator();
-	m_menu->insertItem(SmallIcon("bookmark-new"), i18n("Import All Microformats"), \
this, SLOT(addMFs()), 0, 50000 ); +	m_menu->addAction(KIcon("bookmark-new"), \
i18n("Import All Microformats"), this, SLOT(addMFs()));  \
m_menu->popup(QCursor::pos());  }
 
@@ -321,6 +323,15 @@
 }
 
 
+void KonqMFIcon::addMF() {
+	bool ok = false;
+	int id = sender() ? qobject_cast<QAction *>(sender())->data().toInt(&ok) : -1;
+	if (!ok || id < 0) {
+		return;
+	}
+	addMF(id);
+}
+
 void KonqMFIcon::addMF(int id) {
 	if (id < int(_events.count())) {
 	} else if (id < int(_cards.count())) {
--- trunk/extragear/base/konq-plugins/microformat/konqmficon.h #780746:780747
@@ -53,6 +53,7 @@
 		bool hasMicroFormat(DOM::NodeList nodes);
 		void extractCard(DOM::Node node);
 		void extractEvent(DOM::Node node);
+		void addMF(int id);
 
 		QPointer<KHTMLPart> m_part;
 		KUrlLabel *m_mfIcon;
@@ -66,7 +67,7 @@
 		void addMFIcon();
 		void removeMFIcon();
 		void addMFs();
-		void addMF(int id);
+		void addMF();
 };
 
 #endif // KONQ_PLUGIN_KONQMFICON_H


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