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

List:       kde-commits
Subject:    branches/work/kde4/kdeaddons/konq-plugins/microformat
From:       Laurent Montel <montel () kde ! org>
Date:       2005-07-19 15:48:45
Message-ID: 1121788125.886445.22225.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 436363 by mlaurent:

Compile


 M  +6 -3      konqmficon.cpp  
 M  +5 -3      konqmficon.h  


--- branches/work/kde4/kdeaddons/konq-plugins/microformat/konqmficon.cpp \
#436362:436363 @@ -33,9 +33,12 @@
 #include <kurllabel.h>
 
 #include <qcursor.h>
-#include <qstylesheet.h>
+#include <q3stylesheet.h>
 #include <qtimer.h>
 #include <qtooltip.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <Q3ValueList>
 
 typedef KGenericFactory<KonqMFIcon> KonqMFIconFactory;
 K_EXPORT_COMPONENT_FACTORY(libmfkonqmficon,
@@ -249,11 +252,11 @@
 	m_menu->insertTitle(i18n("Microformats"));
 	connect(m_menu, SIGNAL(activated(int)), this, SLOT(addMF(int)));
 	int id = 0;
-	for (QValueList<QPair<QString, QString> >::ConstIterator it = _events.begin(); it \
!= _events.end(); ++it) { +	for (Q3ValueList<QPair<QString, QString> >::ConstIterator \
it = _events.begin(); it != _events.end(); ++it) {  \
m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id);  id++;
 	}
-	for (QValueList<QPair<QString, QString> >::ConstIterator it = _cards.begin(); it != \
_cards.end(); ++it) { +	for (Q3ValueList<QPair<QString, QString> >::ConstIterator it \
= _cards.begin(); it != _cards.end(); ++it) {  \
m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id);  id++;
 	}
--- branches/work/kde4/kdeaddons/konq-plugins/microformat/konqmficon.h #436362:436363
@@ -28,6 +28,8 @@
 #include <kparts/plugin.h>
 #include <kpopupmenu.h>
 #include "pluginbase.h"
+//Added by qt3to4:
+#include <Q3ValueList>
 
 /**
 @author Teemu Rytilahti
@@ -52,11 +54,11 @@
 		void extractCard(DOM::Node node);
 		void extractEvent(DOM::Node node);
 
-		QGuardedPtr<KHTMLPart> m_part;
+		QPointer<KHTMLPart> m_part;
 		KURLLabel *m_mfIcon;
 		KParts::StatusBarExtension *m_statusBarEx;
-		QGuardedPtr<KPopupMenu> m_menu;
-		QValueList<QPair<QString, QString> > _events, _cards;
+		QPointer<KPopupMenu> m_menu;
+		Q3ValueList<QPair<QString, QString> > _events, _cards;
 
 	private slots:
 		void waitPartToLoad();


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