diff demos/browser/xbel.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/xbel.d	Fri May 22 10:59:00 2009 +0000
+++ b/demos/browser/xbel.d	Fri May 22 23:43:58 2009 +0000
@@ -52,10 +52,10 @@
 public:
 
 	enum Type {
-	Root,
-	Folder,
-	Bookmark,
-	Separator
+		Root,
+		Folder,
+		Bookmark,
+		Separator
 	};
 
 	this(Type type = Root, BookmarkNode parent = null)
@@ -89,7 +89,7 @@
 		return true;
 	}
 
-	Type type() const
+	Type type()
 	{
 		return m_type;
 	}
@@ -99,7 +99,7 @@
 		m_type = type;
 	}
 
-	QList<BookmarkNode > children() const
+	BookmarkNode[] children()
 	{
 		return m_children;
 	}
@@ -136,7 +136,7 @@
 
 	BookmarkNode m_parent;
 	Type m_type;
-	QList<BookmarkNode> m_children;
+	BookmarkNode[] m_children;
 }
 
 class XbelReader : public QXmlStreamReader
@@ -149,7 +149,7 @@
 
 	BookmarkNode read(QString fileName)
 	{
-		QFile file(fileName);
+		auto file = new QFile(fileName);
 		if (!file.exists()) {
 			return new BookmarkNode(BookmarkNode.Root);
 		}
@@ -176,6 +176,7 @@
 	}
 
 private:
+
 	void skipUnknownElement()
 	{
 		assert(isStartElement());
@@ -298,7 +299,7 @@
 		setAutoFormatting(true);
 	}
 	
-	bool write(QString fileName, BookmarkNode root);
+	bool write(QString fileName, BookmarkNode root)
 	{
 		QFile file(fileName);
 		if (!root || !file.open(QFile.WriteOnly))
@@ -306,7 +307,7 @@
 		return write(&file, root);
 	}
 
-	bool write(QIODevice device, BookmarkNode root);
+	bool write(QIODevice device, BookmarkNode root)
 	{
 		setDevice(device);