Mercurial > projects > qtd
changeset 218:438877e90dbe
D2 windows fixes
author | eldar |
---|---|
date | Tue, 14 Jul 2009 17:07:32 +0000 |
parents | 3855c7a9a5a2 |
children | 1a98a547b4d5 |
files | generator/dgenerator.cpp qt/d2/qt/qtd/Str.d |
diffstat | 2 files changed, 3 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/generator/dgenerator.cpp Tue Jul 14 15:56:04 2009 +0000 +++ b/generator/dgenerator.cpp Tue Jul 14 17:07:32 2009 +0000 @@ -2592,7 +2592,7 @@ s << endl << INDENT << "void*[" << signal_funcs.size() << "] sign_arr;" << endl; for(int i = 0; i < signal_funcs.size(); i++) { AbstractMetaFunction *signal = signal_funcs.at(i); - s << INDENT << "sign_arr[" << i << "] = &" << signalExternName(d_class, signal) << "_handle_in_d;" << endl; + s << INDENT << "sign_arr[" << i << "] = &" << signalExternName(d_class, signal) << "_handle;" << endl; } if(signal_funcs.size() == 0) initArgs += ", null";
--- a/qt/d2/qt/qtd/Str.d Tue Jul 14 15:56:04 2009 +0000 +++ b/qt/d2/qt/qtd/Str.d Tue Jul 14 17:07:32 2009 +0000 @@ -11,18 +11,10 @@ module qt.qtd.Str; -version (Tango) -{ - public import tango.text.convert.Utf : toUTF8 = toString; - alias char[] string; -} -else -{ - import std.utf : toUTF8; -} +import std.utf : toUTF8; version(D_Version2) { - private import core.sys.posix.stdio; +// private import core.sys.posix.stdio; private import core.stdc.string; version = druntime; @@ -45,11 +37,6 @@ return argv; } -version(Tango) { - import tango.stdc.stringz : toStringz, fromStringz; -} - - public string fromStringz(const (char) *s) { return s ? s[0 .. strlen(s)].idup : cast(string)null;