Mercurial > projects > qtd
changeset 367:f69341b40588
Removed dependencies on qtd.Traits
| author | Max Samukha <maxter@spambox.com> |
|---|---|
| date | Thu, 24 Jun 2010 13:47:30 +0300 |
| parents | da4235301224 |
| children | 185df9220ea7 |
| files | d2/qt/core/QMetaObject.d d2/qtd/MOC.d d2/qtd/Signal.d d2/qtd/Traits.d generator/dgenerator.cpp |
| diffstat | 5 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/d2/qt/core/QMetaObject.d Wed Jun 23 21:34:43 2010 +0300 +++ b/d2/qt/core/QMetaObject.d Thu Jun 24 13:47:30 2010 +0300 @@ -10,6 +10,7 @@ qtd.MOC, qtd.String, std.typetuple, + std.traits, std.c.stdlib; import std.string : indexOf;
--- a/d2/qtd/MOC.d Wed Jun 23 21:34:43 2010 +0300 +++ b/d2/qtd/MOC.d Thu Jun 24 13:47:30 2010 +0300 @@ -490,10 +490,11 @@ mixin template Q_OBJECT() { - import std.typetuple; - import qtd.Marshal; - import std.stdio; - import qt.core.QString; // for QStringUtil.toNative + import + std.typetuple, + std.traits, + qtd.Marshal, + qt.core.QString; // for QStringUtil.toNative public: // required to override the outside scope protection.
--- a/d2/qtd/Signal.d Wed Jun 23 21:34:43 2010 +0300 +++ b/d2/qtd/Signal.d Thu Jun 24 13:47:30 2010 +0300 @@ -157,6 +157,8 @@ // BUG: parameter storage classes are not supported yet mixin template SignalEmitter(SignalKind signalKind, int localIndex) { + import std.traits; + alias signals[localIndex] signal; alias TypeTuple!(ReturnType!(signal), ParameterTypeTuple!(signal)) Args;
--- a/d2/qtd/Traits.d Wed Jun 23 21:34:43 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -module qtd.Traits; - -public import std.traits;
--- a/generator/dgenerator.cpp Wed Jun 23 21:34:43 2010 +0300 +++ b/generator/dgenerator.cpp Thu Jun 24 13:47:30 2010 +0300 @@ -1958,7 +1958,6 @@ if (d_class->isQObject()) { s << "public import qtd.Signal;" << endl << "public import qtd.MOC;" << endl - << "public import qtd.Traits;" << endl << "public import qt.core.QMetaObject;" << endl; if (d_class->name() != "QObject")