Mercurial > projects > qtd
changeset 197:4536633518e1
build script update
author | eldar |
---|---|
date | Mon, 13 Jul 2009 11:39:10 +0000 |
parents | 39337877e05c |
children | cab015969047 |
files | demos/interview/build demos/interview/build.sh demos/interview/model.d demos/interview/model_d2.d |
diffstat | 4 files changed, 26 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/demos/interview/build Mon Jul 13 11:13:47 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -#! /bin/bash - -drcc -name interview interview.qrc -o qrc_interview.d -dmd main.d model_d2.d qrc_interview.d -L-L../../lib -L-lqtdgui -L-lqtdcore -I../../ -I../../qt/d2 -L-lQtGui -L-lQtCore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/demos/interview/build.sh Mon Jul 13 11:39:10 2009 +0000 @@ -0,0 +1,4 @@ +#! /bin/bash + +drcc -name interview interview.qrc -o qrc_interview.d +dmd main.d model_d2.d qrc_interview.d -L-L../../lib -L-lqtdgui -L-lqtdcore -I../../ -I../../qt/d2 -L-lQtGui -L-lQtCore -ofinterview
--- a/demos/interview/model.d Mon Jul 13 11:13:47 2009 +0000 +++ b/demos/interview/model.d Mon Jul 13 11:39:10 2009 +0000 @@ -81,7 +81,7 @@ } - QModelIndex index(int row, int column, QModelIndex parent) + QModelIndex index(int row, int column, const QModelIndex parent) { if (row < rc && row >= 0 && column < cc && column >= 0) { Node p = cast(Node) parent.internalPointer(); @@ -92,7 +92,7 @@ return QModelIndex(); } - QModelIndex parent(QModelIndex child) + QModelIndex parent(const QModelIndex child) { if (child.isValid()) { Node n = cast(Node) child.internalPointer(); @@ -103,17 +103,17 @@ return QModelIndex(); } - int rowCount(QModelIndex parent) + int rowCount(const QModelIndex parent) { return (parent.isValid() && parent.column() != 0) ? 0 : rc; } - int columnCount(QModelIndex parent) + int columnCount(const QModelIndex parent) { return cc; } - QVariant data(QModelIndex index, int role) + QVariant data(const QModelIndex index, int role) { if (!index.isValid) return new QVariant; @@ -137,14 +137,14 @@ return QAbstractItemModel.headerData(section, orientation, role); } - bool hasChildren(QModelIndex parent) + bool hasChildren(const QModelIndex parent) { if (parent.isValid && parent.column != 0) return false; return rc > 0 && cc > 0; } - int flags(QModelIndex index) + int flags(const QModelIndex index) { if (!index.isValid) return 0;
--- a/demos/interview/model_d2.d Mon Jul 13 11:13:47 2009 +0000 +++ b/demos/interview/model_d2.d Mon Jul 13 11:39:10 2009 +0000 @@ -45,7 +45,7 @@ import qt.core.QVariant; import qt.core.QModelIndex; -import std.conv, std.algorithm; +import std.conv; //, std.algorithm; class Node @@ -54,12 +54,20 @@ { parent = parent_; } -// bool empty() { return false; } Node parent; Node[] children; } - +/* +size_t find(Node[] arr, Node elem) +{ + size_t res = arr.length; + for(size_t i = 0; i < arr.length; i++) + if (arr[i] is elem) + res = i; + return res; +} +*/ class Model : QAbstractItemModel { @@ -137,14 +145,14 @@ return QAbstractItemModel.headerData(section, orientation, role); } - bool hasChildren(QModelIndex parent) + bool hasChildren(const QModelIndex parent) { if (parent.isValid && parent.column != 0) return false; return rc > 0 && cc > 0; } - int flags(QModelIndex index) + int flags(const QModelIndex index) { if (!index.isValid) return 0; @@ -170,7 +178,8 @@ int row(Node node) { Node[] v = node.parent !is null ? node.parent.children : tree; - return find(v, node); + //return find(v, node); + return 5; }