Commit aae99306 authored by Victor Yacovlev's avatar Victor Yacovlev

Build fix

parent a6442965
...@@ -143,7 +143,7 @@ QVariant courseModel::data(const QModelIndex &index, int role) const ...@@ -143,7 +143,7 @@ QVariant courseModel::data(const QModelIndex &index, int role) const
QDomNode child_n=nodeById(child.internalId(),root); QDomNode child_n=nodeById(child.internalId(),root);
// if(child_n.isNull())return QModelIndex(); // if(child_n.isNull())return QModelIndex();
QDomNode par=child_n.parentNode(); QDomNode par=child_n.parentNode();
if(par.toElement().attribute("id").toInt()==0) return createIndex(0,0,0); if(par.toElement().attribute("id").toInt()==0) return createIndex(0,0,(void*)0);
return createIndex(domRow(par),0,idByNode(par)); return createIndex(domRow(par),0,idByNode(par));
}; };
int courseModel::columnCount(const QModelIndex &parent)const int courseModel::columnCount(const QModelIndex &parent)const
...@@ -207,7 +207,7 @@ QVariant courseModel::data(const QModelIndex &index, int role) const ...@@ -207,7 +207,7 @@ QVariant courseModel::data(const QModelIndex &index, int role) const
} }
QModelIndex courseModel::createMyIndex(int row,int column,QModelIndex parent) const QModelIndex courseModel::createMyIndex(int row,int column,QModelIndex parent) const
{ {
if(!parent.isValid())return createIndex(0,0,0); if(!parent.isValid())return createIndex(0,0,(void*)0);
int id=parent.internalId(); int id=parent.internalId();
if(id<0)return QModelIndex(); if(id<0)return QModelIndex();
QDomNode par=nodeById(id,root); QDomNode par=nodeById(id,root);
...@@ -446,7 +446,7 @@ QString courseModel::Script(int index,QString isp) ...@@ -446,7 +446,7 @@ QString courseModel::Script(int index,QString isp)
} }
csEl=csEl.nextSiblingElement("ISP"); csEl=csEl.nextSiblingElement("ISP");
}; };
return QDomElement();
}; };
void courseModel::removeEvn(QDomElement ispElement,QString fieldStr) void courseModel::removeEvn(QDomElement ispElement,QString fieldStr)
{ {
......
...@@ -722,7 +722,7 @@ void MainWindowTask::closeEvent(QCloseEvent *event) ...@@ -722,7 +722,7 @@ void MainWindowTask::closeEvent(QCloseEvent *event)
QMessageBox::StandardButton ans; QMessageBox::StandardButton ans;
ans = QMessageBox::question(this, trUtf8("Курсы"), trUtf8("Вы хотите сохранить работу?"), ans = QMessageBox::question(this, trUtf8("Курсы"), trUtf8("Вы хотите сохранить работу?"),
QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, QMessageBox::Yes); QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, QMessageBox::Yes);
if ((ans == QMessageBox::No)) if (ans == QMessageBox::No)
{ {
event->accept(); event->accept();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment