diff demos/browser/browsermainwindow.d @ 94:87bb4e622f9e

more porting
author mandel
date Thu, 28 May 2009 22:11:52 +0000
parents 85c59c4e5f19
children 8636c819ce4d
line wrap: on
line diff
--- a/demos/browser/browsermainwindow.d	Wed May 27 18:47:28 2009 +0000
+++ b/demos/browser/browsermainwindow.d	Thu May 28 22:11:52 2009 +0000
@@ -57,7 +57,7 @@
 import qt.gui.QToolBar;
 import qt.gui.QInputDialog;
 
-import qt.core.QDebug;
+//import qt.core.QDebug;
 
 import qt.webkit.QWebFrame;
 import qt.webkit.QWebHistory;
@@ -87,7 +87,7 @@
 
 public:
 
-	this(QWidget parent = null, Qt.WindowFlags flags = 0)
+	this(QWidget parent = null, int flags = 0) //Qt.WindowFlags flags
 	{
 		super(parent, flags);
 		m_tabWidget = new TabWidget(this);
@@ -97,7 +97,7 @@
 		m_stop = 0;
 		m_reload = 0;
 
-		setAttribute(Qt.WA_DeleteOnClose, true);
+		setAttribute(Qt_WidgetAttribute.WA_DeleteOnClose, true);
 		statusBar().setSizeGripEnabled(true);
 		setupMenu();
 		setupToolBar();
@@ -219,7 +219,7 @@
 	QByteArray saveState(bool withTabs)
 	{
 		int version_ = 2;
-		QByteArray data;
+		auto data = new QByteArray;
 		auto stream = new QDataStream(&data, QIODevice.WriteOnly);
 
 		stream << cast(int) BrowserMainWindowMagic;
@@ -291,7 +291,7 @@
 
 	void slotHome()
 	{
-		QSettings settings;
+		auto settings = new QSettings;
 		settings.beginGroup("MainWindow");
 		string home = settings.value("home", "http://qtsoftware.com/").toString();
 		loadPage(home);
@@ -322,7 +322,7 @@
 	{
 		BrowserApplication.instance().saveSession();
 
-		QSettings settings;
+		auto settings = new QSettings;
 		settings.beginGroup("BrowserMainWindow");
 		QByteArray data = saveState(false);
 		settings.setValue("defaultState", data);
@@ -447,7 +447,7 @@
 			for (int i = 0; i < windows.length; ++i) {
 				BrowserMainWindow window = windows[i];
 				window.m_lastSearch = null; //QString::null
-				window.tabWidget().clear();
+				window.tabWidget().clearTabs();
 			}
 		}
 	}
@@ -494,7 +494,7 @@
 	void slotAddBookmark()
 	{
 		WebView webView = currentTab();
-		string url = webView.url().toString();
+		string url = webView.getUrl().toString();
 		string title = webView.title();
 		AddBookmarkDialog dialog(url, title);
 		dialog.exec();