--- a/tools/duic/tests/ui_mainwindow.d	Sun May 17 21:57:30 2009 +0000
+++ b/tools/duic/tests/ui_mainwindow.d	Mon May 18 00:22:14 2009 +0000
@@ -1,13 +1,13 @@
 /********************************************************************************
 ** Form generated from reading ui file 'mainwindow.ui'
 **
-** Created: Wed Dec 17 23:30:55 2008
-**      by: QtD User Interface Compiler version 4.4.3
+** Created: Mon May 18 06:21:12 2009
+**      by: QtD User Interface Compiler version 4.5.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
 ********************************************************************************/
 
-module ui.MainWindow
+module ui.MainWindow;
 
 import qt.core.QVariant;
 import qt.gui.QAction;
@@ -32,71 +32,71 @@
 
 mixin QT_BEGIN_NAMESPACE;
 
-class Ui_MainWindow
+template Ui_MainWindow
 {
 public:
-    QAction *actionOpen;
-    QAction *actionClose;
-    QAction *actionQuit;
-    QAction *actionCopy;
-    QAction *actionPaste;
-    QAction *actionCut;
-    QWidget *centralwidget;
-    QVBoxLayout *verticalLayout_3;
-    QWidget *widget;
-    QHBoxLayout *horizontalLayout_2;
-    QFontComboBox *fontComboBox;
-    QDoubleSpinBox *doubleSpinBox;
-    QFrame *frame;
-    QVBoxLayout *verticalLayout_2;
-    QListView *listView;
-    QTreeView *treeView;
-    QMenuBar *menubar;
-    QMenu *menuFile;
-    QMenu *menuEdit;
-    QStatusBar *statusbar;
-    QToolBar *toolBar;
-    QDockWidget *dockWidget;
-    QWidget *dockWidgetContents;
-    QHBoxLayout *horizontalLayout;
-    QGroupBox *groupBox;
-    QVBoxLayout *verticalLayout;
-    QRadioButton *radioButton;
-    QRadioButton *radioButton_2;
-    QRadioButton *radioButton_3;
+    QAction actionOpen;
+    QAction actionClose;
+    QAction actionQuit;
+    QAction actionCopy;
+    QAction actionPaste;
+    QAction actionCut;
+    QWidget centralwidget;
+    QVBoxLayout verticalLayout_3;
+    QWidget widget;
+    QHBoxLayout horizontalLayout_2;
+    QFontComboBox fontComboBox;
+    QDoubleSpinBox doubleSpinBox;
+    QFrame frame;
+    QVBoxLayout verticalLayout_2;
+    QListView listView;
+    QTreeView treeView;
+    QMenuBar menubar;
+    QMenu menuFile;
+    QMenu menuEdit;
+    QStatusBar statusbar;
+    QToolBar toolBar;
+    QDockWidget dockWidget;
+    QWidget dockWidgetContents;
+    QHBoxLayout horizontalLayout;
+    QGroupBox groupBox;
+    QVBoxLayout verticalLayout;
+    QRadioButton radioButton;
+    QRadioButton radioButton_2;
+    QRadioButton radioButton_3;
 
     void setupUi(QMainWindow *MainWindow)
     {
     if (MainWindow.objectName().isEmpty())
-        MainWindow.setObjectName(qt.core.QString.fromUtf8("MainWindow"));
+        MainWindow.setObjectName(QString.fromUtf8("MainWindow"));
     MainWindow.resize(800, 600);
     actionOpen = new QAction(MainWindow);
-    actionOpen.setObjectName(qt.core.QString.fromUtf8("actionOpen"));
+    actionOpen.setObjectName(QString.fromUtf8("actionOpen"));
     actionClose = new QAction(MainWindow);
-    actionClose.setObjectName(qt.core.QString.fromUtf8("actionClose"));
+    actionClose.setObjectName(QString.fromUtf8("actionClose"));
     actionQuit = new QAction(MainWindow);
-    actionQuit.setObjectName(qt.core.QString.fromUtf8("actionQuit"));
+    actionQuit.setObjectName(QString.fromUtf8("actionQuit"));
     actionCopy = new QAction(MainWindow);
-    actionCopy.setObjectName(qt.core.QString.fromUtf8("actionCopy"));
+    actionCopy.setObjectName(QString.fromUtf8("actionCopy"));
     actionPaste = new QAction(MainWindow);
-    actionPaste.setObjectName(qt.core.QString.fromUtf8("actionPaste"));
+    actionPaste.setObjectName(QString.fromUtf8("actionPaste"));
     actionCut = new QAction(MainWindow);
-    actionCut.setObjectName(qt.core.QString.fromUtf8("actionCut"));
+    actionCut.setObjectName(QString.fromUtf8("actionCut"));
     centralwidget = new QWidget(MainWindow);
-    centralwidget.setObjectName(qt.core.QString.fromUtf8("centralwidget"));
+    centralwidget.setObjectName(QString.fromUtf8("centralwidget"));
     verticalLayout_3 = new QVBoxLayout(centralwidget);
-    verticalLayout_3.setObjectName(qt.core.QString.fromUtf8("verticalLayout_3"));
+    verticalLayout_3.setObjectName(QString.fromUtf8("verticalLayout_3"));
     widget = new QWidget(centralwidget);
-    widget.setObjectName(qt.core.QString.fromUtf8("widget"));
+    widget.setObjectName(QString.fromUtf8("widget"));
     horizontalLayout_2 = new QHBoxLayout(widget);
-    horizontalLayout_2.setObjectName(qt.core.QString.fromUtf8("horizontalLayout_2"));
+    horizontalLayout_2.setObjectName(QString.fromUtf8("horizontalLayout_2"));
     fontComboBox = new QFontComboBox(widget);
-    fontComboBox.setObjectName(qt.core.QString.fromUtf8("fontComboBox"));
+    fontComboBox.setObjectName(QString.fromUtf8("fontComboBox"));
 
     horizontalLayout_2.addWidget(fontComboBox);
 
     doubleSpinBox = new QDoubleSpinBox(widget);
-    doubleSpinBox.setObjectName(qt.core.QString.fromUtf8("doubleSpinBox"));
+    doubleSpinBox.setObjectName(QString.fromUtf8("doubleSpinBox"));
 
     horizontalLayout_2.addWidget(doubleSpinBox);
 
@@ -104,18 +104,18 @@
     verticalLayout_3.addWidget(widget);
 
     frame = new QFrame(centralwidget);
-    frame.setObjectName(qt.core.QString.fromUtf8("frame"));
+    frame.setObjectName(QString.fromUtf8("frame"));
     frame.setFrameShape(QFrame.QFrame::StyledPanel);
     frame.setFrameShadow(QFrame.QFrame::Raised);
     verticalLayout_2 = new QVBoxLayout(frame);
-    verticalLayout_2.setObjectName(qt.core.QString.fromUtf8("verticalLayout_2"));
+    verticalLayout_2.setObjectName(QString.fromUtf8("verticalLayout_2"));
     listView = new QListView(frame);
-    listView.setObjectName(qt.core.QString.fromUtf8("listView"));
+    listView.setObjectName(QString.fromUtf8("listView"));
 
     verticalLayout_2.addWidget(listView);
 
     treeView = new QTreeView(frame);
-    treeView.setObjectName(qt.core.QString.fromUtf8("treeView"));
+    treeView.setObjectName(QString.fromUtf8("treeView"));
 
     verticalLayout_2.addWidget(treeView);
 
@@ -124,41 +124,41 @@
 
     MainWindow.setCentralWidget(centralwidget);
     menubar = new QMenuBar(MainWindow);
-    menubar.setObjectName(qt.core.QString.fromUtf8("menubar"));
-    menubar.setGeometry(qt.core.QRect(0, 0, 800, 27));
+    menubar.setObjectName(QString.fromUtf8("menubar"));
+    menubar.setGeometry(QRect(0, 0, 800, 27));
     menuFile = new QMenu(menubar);
-    menuFile.setObjectName(qt.core.QString.fromUtf8("menuFile"));
+    menuFile.setObjectName(QString.fromUtf8("menuFile"));
     menuEdit = new QMenu(menubar);
-    menuEdit.setObjectName(qt.core.QString.fromUtf8("menuEdit"));
+    menuEdit.setObjectName(QString.fromUtf8("menuEdit"));
     MainWindow.setMenuBar(menubar);
     statusbar = new QStatusBar(MainWindow);
-    statusbar.setObjectName(qt.core.QString.fromUtf8("statusbar"));
+    statusbar.setObjectName(QString.fromUtf8("statusbar"));
     MainWindow.setStatusBar(statusbar);
     toolBar = new QToolBar(MainWindow);
-    toolBar.setObjectName(qt.core.QString.fromUtf8("toolBar"));
-    MainWindow.addToolBar(qt.core.Qt.TopToolBarArea, toolBar);
+    toolBar.setObjectName(QString.fromUtf8("toolBar"));
+    MainWindow.addToolBar(Qt.TopToolBarArea, toolBar);
     dockWidget = new QDockWidget(MainWindow);
-    dockWidget.setObjectName(qt.core.QString.fromUtf8("dockWidget"));
+    dockWidget.setObjectName(QString.fromUtf8("dockWidget"));
     dockWidgetContents = new QWidget();
-    dockWidgetContents.setObjectName(qt.core.QString.fromUtf8("dockWidgetContents"));
+    dockWidgetContents.setObjectName(QString.fromUtf8("dockWidgetContents"));
     horizontalLayout = new QHBoxLayout(dockWidgetContents);
-    horizontalLayout.setObjectName(qt.core.QString.fromUtf8("horizontalLayout"));
+    horizontalLayout.setObjectName(QString.fromUtf8("horizontalLayout"));
     groupBox = new QGroupBox(dockWidgetContents);
-    groupBox.setObjectName(qt.core.QString.fromUtf8("groupBox"));
+    groupBox.setObjectName(QString.fromUtf8("groupBox"));
     verticalLayout = new QVBoxLayout(groupBox);
-    verticalLayout.setObjectName(qt.core.QString.fromUtf8("verticalLayout"));
+    verticalLayout.setObjectName(QString.fromUtf8("verticalLayout"));
     radioButton = new QRadioButton(groupBox);
-    radioButton.setObjectName(qt.core.QString.fromUtf8("radioButton"));
+    radioButton.setObjectName(QString.fromUtf8("radioButton"));
 
     verticalLayout.addWidget(radioButton);
 
     radioButton_2 = new QRadioButton(groupBox);
-    radioButton_2.setObjectName(qt.core.QString.fromUtf8("radioButton_2"));
+    radioButton_2.setObjectName(QString.fromUtf8("radioButton_2"));
 
     verticalLayout.addWidget(radioButton_2);
 
     radioButton_3 = new QRadioButton(groupBox);
-    radioButton_3.setObjectName(qt.core.QString.fromUtf8("radioButton_3"));
+    radioButton_3.setObjectName(QString.fromUtf8("radioButton_3"));
 
     verticalLayout.addWidget(radioButton_3);
 
@@ -166,7 +166,7 @@
     horizontalLayout.addWidget(groupBox);
 
     dockWidget.setWidget(dockWidgetContents);
-    MainWindow.addDockWidget((cast(qt.core.Qt.DockWidgetArea)(2)), dockWidget);
+    MainWindow.addDockWidget((cast(Qt.DockWidgetArea)(2)), dockWidget);
 
     menubar.addAction(menuFile.menuAction());
     menubar.addAction(menuEdit.menuAction());
@@ -187,23 +187,26 @@
 
     void retranslateUi(QMainWindow *MainWindow)
     {
-    MainWindow.setWindowTitle(qt.gui.QApplication.translate("MainWindow", "MainWindow", 0, qt.gui.QApplication.UnicodeUTF8));
-    actionOpen.setText(qt.gui.QApplication.translate("MainWindow", "Open", 0, qt.gui.QApplication.UnicodeUTF8));
-    actionClose.setText(qt.gui.QApplication.translate("MainWindow", "Close", 0, qt.gui.QApplication.UnicodeUTF8));
-    actionQuit.setText(qt.gui.QApplication.translate("MainWindow", "Quit", 0, qt.gui.QApplication.UnicodeUTF8));
-    actionCopy.setText(qt.gui.QApplication.translate("MainWindow", "Copy", 0, qt.gui.QApplication.UnicodeUTF8));
-    actionPaste.setText(qt.gui.QApplication.translate("MainWindow", "Paste", 0, qt.gui.QApplication.UnicodeUTF8));
-    actionCut.setText(qt.gui.QApplication.translate("MainWindow", "Cut", 0, qt.gui.QApplication.UnicodeUTF8));
-    menuFile.setTitle(qt.gui.QApplication.translate("MainWindow", "File", 0, qt.gui.QApplication.UnicodeUTF8));
-    menuEdit.setTitle(qt.gui.QApplication.translate("MainWindow", "Edit", 0, qt.gui.QApplication.UnicodeUTF8));
-    toolBar.setWindowTitle(qt.gui.QApplication.translate("MainWindow", "toolBar", 0, qt.gui.QApplication.UnicodeUTF8));
-    groupBox.setTitle(qt.gui.QApplication.translate("MainWindow", "Some options", 0, qt.gui.QApplication.UnicodeUTF8));
-    radioButton.setText(qt.gui.QApplication.translate("MainWindow", "Option 1", 0, qt.gui.QApplication.UnicodeUTF8));
-    radioButton_2.setText(qt.gui.QApplication.translate("MainWindow", "Option 2", 0, qt.gui.QApplication.UnicodeUTF8));
-    radioButton_3.setText(qt.gui.QApplication.translate("MainWindow", "Option 3", 0, qt.gui.QApplication.UnicodeUTF8));
+    MainWindow.setWindowTitle(QApplication.translate("MainWindow", "MainWindow", 0, QApplication.UnicodeUTF8));
+    actionOpen.setText(QApplication.translate("MainWindow", "Open", 0, QApplication.UnicodeUTF8));
+    actionClose.setText(QApplication.translate("MainWindow", "Close", 0, QApplication.UnicodeUTF8));
+    actionQuit.setText(QApplication.translate("MainWindow", "Quit", 0, QApplication.UnicodeUTF8));
+    actionCopy.setText(QApplication.translate("MainWindow", "Copy", 0, QApplication.UnicodeUTF8));
+    actionPaste.setText(QApplication.translate("MainWindow", "Paste", 0, QApplication.UnicodeUTF8));
+    actionCut.setText(QApplication.translate("MainWindow", "Cut", 0, QApplication.UnicodeUTF8));
+    menuFile.setTitle(QApplication.translate("MainWindow", "File", 0, QApplication.UnicodeUTF8));
+    menuEdit.setTitle(QApplication.translate("MainWindow", "Edit", 0, QApplication.UnicodeUTF8));
+    toolBar.setWindowTitle(QApplication.translate("MainWindow", "toolBar", 0, QApplication.UnicodeUTF8));
+    groupBox.setTitle(QApplication.translate("MainWindow", "Some options", 0, QApplication.UnicodeUTF8));
+    radioButton.setText(QApplication.translate("MainWindow", "Option 1", 0, QApplication.UnicodeUTF8));
+    radioButton_2.setText(QApplication.translate("MainWindow", "Option 2", 0, QApplication.UnicodeUTF8));
+    radioButton_3.setText(QApplication.translate("MainWindow", "Option 3", 0, QApplication.UnicodeUTF8));
     } // retranslateUi
 
-};
+}
 
+struct MainWindow {
+    mixin Ui_MainWindow;
+}
 mixin QT_END_NAMESPACE;