diff demos/browser/modelmenu.d @ 74:37caa90ce503

more porting
author mandel
date Fri, 22 May 2009 23:43:58 +0000
parents 7bfd46c330dc
children 0654fc9bac95
line wrap: on
line diff
--- a/demos/browser/modelmenu.d	Fri May 22 10:59:00 2009 +0000
+++ b/demos/browser/modelmenu.d	Fri May 22 23:43:58 2009 +0000
@@ -52,8 +52,8 @@
 class ModelMenu : public QMenu
 {
 	
-mixin Signal!("activated", QModelIndex index);
-mixin Signal!("hovered", QString text);
+mixin Signal!("activated", QModelIndex /*index*/);
+mixin Signal!("hovered", QString /*text*/);
 
 public:
 
@@ -129,9 +129,9 @@
 		return m_separatorRole;
 	}
 
-	QAction makeAction(QIcon icon, QString text, QObject parent);
+	QAction makeAction(QIcon icon, QString text, QObject parent)
 	{
-		QFontMetrics fm(font());
+		auto fm = new QFontMetrics(font());
 		if (-1 == m_maxWidth)
 			m_maxWidth = fm.width(QLatin1Char('m')) * 30;
 		QString smallText = fm.elidedText(text, Qt.ElideMiddle, m_maxWidth);
@@ -235,9 +235,9 @@
 
 private:
 
-	QAction makeAction(QModelIndex index);
+	QAction makeAction(QModelIndex index)
 	{
-		QIcon icon = qvariant_cast<QIcon>(index.data(Qt.DecorationRole));
+		QIcon icon = cast(QIcon) index.data(Qt.DecorationRole);
 		QAction action = makeAction(icon, index.data().toString(), this);
 		QVariant v;
 		v.setValue(index);