From aae9930647b1fadd7d2b337bfc242d6dd15e2bd3 Mon Sep 17 00:00:00 2001 From: Victor Yacovlev Date: Wed, 3 Jun 2015 14:20:21 +0300 Subject: [PATCH] Build fix --- src/tools/courseeditor/course_model.cpp | 6 +++--- src/tools/courseeditor/mainwindow.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tools/courseeditor/course_model.cpp b/src/tools/courseeditor/course_model.cpp index 70f82438..22f4049b 100644 --- a/src/tools/courseeditor/course_model.cpp +++ b/src/tools/courseeditor/course_model.cpp @@ -143,7 +143,7 @@ QVariant courseModel::data(const QModelIndex &index, int role) const QDomNode child_n=nodeById(child.internalId(),root); // if(child_n.isNull())return QModelIndex(); 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)); }; int courseModel::columnCount(const QModelIndex &parent)const @@ -207,7 +207,7 @@ QVariant courseModel::data(const QModelIndex &index, int role) 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(); if(id<0)return QModelIndex(); QDomNode par=nodeById(id,root); @@ -446,7 +446,7 @@ QString courseModel::Script(int index,QString isp) } csEl=csEl.nextSiblingElement("ISP"); }; - + return QDomElement(); }; void courseModel::removeEvn(QDomElement ispElement,QString fieldStr) { diff --git a/src/tools/courseeditor/mainwindow.cpp b/src/tools/courseeditor/mainwindow.cpp index e85331f1..66fd2a1b 100644 --- a/src/tools/courseeditor/mainwindow.cpp +++ b/src/tools/courseeditor/mainwindow.cpp @@ -722,7 +722,7 @@ void MainWindowTask::closeEvent(QCloseEvent *event) QMessageBox::StandardButton ans; ans = QMessageBox::question(this, trUtf8("Курсы"), trUtf8("Вы хотите сохранить работу?"), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, QMessageBox::Yes); - if ((ans == QMessageBox::No)) + if (ans == QMessageBox::No) { event->accept(); -- GitLab