--- a/demos/browser/cookiejar.d	Wed May 20 22:44:31 2009 +0000
+++ b/demos/browser/cookiejar.d	Fri May 22 10:59:00 2009 +0000
@@ -40,45 +40,33 @@
 ****************************************************************************/
 module cookiejar;
 
-import QtNetwork.QNetworkCookieJar;
+import qt.network.QNetworkCookieJar;
+import qt.core.QDebug;
+
+import qt.core.QAbstractItemModel;
+import qt.core.QStringList;
+import qt.core.QDateTime;
+import qt.core.QDir;
+import qt.core.QFile;
+import qt.core.QMetaEnum;
+import qt.core.QSettings;
+import qt.core.QUrl;
 
-import QtCore.QAbstractItemModel;
-import QtCore.QStringList;
+import qt.gui.QDialog;
+import qt.gui.QTableView;
+import qt.gui.QCompleter;
+import qt.gui.QDesktopServices;
+import qt.gui.QFont;
+import qt.gui.QFontMetrics;
+import qt.gui.QHeaderView;
+import qt.gui.QKeyEvent;
+import qt.gui.QSortFilterProxyModel;
 
-import QtGui.QDialog;
-import QtGui.QTableView;
-
+import QtWebKit.QWebSettings;
 
 import cookiejar;
 import autosaver;
 
-import QtCore.QDateTime;
-import QtCore.QDir;
-import QtCore.QFile;
-import QtCore.QMetaEnum;
-import QtCore.QSettings;
-import QtCore.QUrl;
-
-import QtGui.QCompleter;
-import QtGui.QDesktopServices;
-import QtGui.QFont;
-import QtGui.QFontMetrics;
-import QtGui.QHeaderView;
-import QtGui.QKeyEvent;
-import QtGui.QSortFilterProxyModel;
-
-import QtWebKit.QWebSettings;
-
-import QtCore.QDebug;
-
-/*
-QT_BEGIN_NAMESPACE
-class QSortFilterProxyModel;
-class QKeyEvent;
-QT_END_NAMESPACE
-
-class AutoSaver;
-*/
 
 static const unsigned int JAR_VERSION = 23;
 
@@ -95,8 +83,8 @@
 {
 	list.clear();
 
-	quint32 version;
-	stream >> version;
+	quint32 version_;
+	stream >> version_;
 
 	if (version != JAR_VERSION)
 		return stream;
@@ -121,7 +109,6 @@
 	return stream;
 }
 
-
 class CookieJar : public QNetworkCookieJar
 {
 	mixin Signal!("cookiesChanged");
@@ -305,7 +292,7 @@
 		m_saveTimer.changeOccurred();
 	}
 
-public slots:
+public:
 
 	void clear()
 	{