bug fix: segfault when load project with folio report linked but without the same potential text

(Assert QList(), in conductor.cpp)


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2815 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-02-06 21:35:13 +00:00
parent 0e46586892
commit 801a2d298f
7 changed files with 20 additions and 20 deletions

View File

@@ -96,10 +96,10 @@ void ConductorAutoNumerotation::checkPotential(Conductor *conductor) {
//check text list, isn't same in potential, ask user what to do
if (!eachIsEqual(strl)) {
ConductorAutoNumerotationWidget *canw = new ConductorAutoNumerotationWidget(conductor, c_list, conductor -> diagramEditor());
ConductorAutoNumerotationWidget canw(c_list, conductor -> diagramEditor());
ConductorAutoNumerotation can(conductor);
connect(canw, SIGNAL(textIsSelected(QString)), &can, SLOT(applyText(QString)));
canw -> exec();
connect(&canw, SIGNAL(textIsSelected(QString)), &can, SLOT(applyText(QString)));
canw.exec();
}
}
@@ -168,7 +168,7 @@ void ConductorAutoNumerotation::numeratePotential() {
}
//the texts isn't identicals
else {
ConductorAutoNumerotationWidget *canw = new ConductorAutoNumerotationWidget(conductor_, conductor_list, conductor_ -> diagramEditor());
ConductorAutoNumerotationWidget *canw = new ConductorAutoNumerotationWidget(conductor_list, conductor_ -> diagramEditor());
connect(canw, SIGNAL(textIsSelected(QString)),
this, SLOT(applyText(QString)));
canw -> exec();