# HG changeset patch # User eldar # Date 1247432637 0 # Node ID a212c97edcd22836d6175205219c6541c400fd7e # Parent a1b48a630f736d4b9a3ccb00a12de9c8576751ea one more example diff -r a1b48a630f73 -r a212c97edcd2 examples/mainwindows/dockwidgets/build.sh --- a/examples/mainwindows/dockwidgets/build.sh Sun Jul 12 20:51:37 2009 +0000 +++ b/examples/mainwindows/dockwidgets/build.sh Sun Jul 12 21:03:57 2009 +0000 @@ -1,4 +1,4 @@ #! /bin/bash #rcc mainwindow.qrc -o mainwindow_rcc.cpp #g++ -c -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I/usr/X11R6/include mainwindow_rcc.cpp -dmd main.d mainwindow.d -I../../../ -I../../../qt/d1 -L-L../../../lib -L-lqtdgui -L-lqtdcore -L-lQtCore -L-lQtGui -ofdockwidgets +dmd main.d mainwindow.d -I../../../ -I../../../qt/d2 -L-L../../../lib -L-lqtdgui -L-lqtdcore -L-lQtCore -L-lQtGui -ofdockwidgets diff -r a1b48a630f73 -r a212c97edcd2 examples/mainwindows/dockwidgets/main.d --- a/examples/mainwindows/dockwidgets/main.d Sun Jul 12 20:51:37 2009 +0000 +++ b/examples/mainwindows/dockwidgets/main.d Sun Jul 12 21:03:57 2009 +0000 @@ -39,7 +39,7 @@ import mainwindow; -int main(char[][] args) +int main(string[] args) { scope app = new QApplication(args); scope mainWin = new MainWindow; diff -r a1b48a630f73 -r a212c97edcd2 examples/mainwindows/dockwidgets/mainwindow.d --- a/examples/mainwindows/dockwidgets/mainwindow.d Sun Jul 12 20:51:37 2009 +0000 +++ b/examples/mainwindows/dockwidgets/mainwindow.d Sun Jul 12 21:03:57 2009 +0000 @@ -63,8 +63,10 @@ import qt.gui. import qt.gui. */ -import tango.text.Util; -import tango.io.Stdout; +version(Tango) + import tango.text.Util; +else + import std.string; class MainWindow : public QMainWindow { @@ -162,11 +164,12 @@ document.undo(); } - void insertCustomer(char[] customer) + void insertCustomer(string customer) { if (customer == "") return; - char[][] customerList = customer.split(", "); + + string[] customerList = customer.split(", "); auto document = textEdit.document(); QTextCursor cursor = document.find("NAME"); if (!cursor.isNull) { @@ -186,7 +189,7 @@ } } - void addParagraph(char[] paragraph) + void addParagraph(string paragraph) { if (paragraph == "") return; diff -r a1b48a630f73 -r a212c97edcd2 qt/QGlobal.d --- a/qt/QGlobal.d Sun Jul 12 20:51:37 2009 +0000 +++ b/qt/QGlobal.d Sun Jul 12 21:03:57 2009 +0000 @@ -44,7 +44,7 @@ } } -char[] tr(char[] arg) { +string tr(string arg) { return arg; } diff -r a1b48a630f73 -r a212c97edcd2 qt/QGlobal.d.inc --- a/qt/QGlobal.d.inc Sun Jul 12 20:51:37 2009 +0000 +++ b/qt/QGlobal.d.inc Sun Jul 12 21:03:57 2009 +0000 @@ -44,7 +44,7 @@ } } -char[] tr(char[] arg) { +string tr(string arg) { return arg; }