From 74b1270d0d06d17fa02d667343d07e69627c5a6b Mon Sep 17 00:00:00 2001 From: blacksun Date: Thu, 4 Dec 2014 23:25:49 +0000 Subject: [PATCH] Conductor auto numerotation : use function from QET namespace instead of function from this file. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3532 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/conductorautonumerotation.cpp | 23 +++++++---------------- sources/conductorautonumerotation.h | 2 -- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/sources/conductorautonumerotation.cpp b/sources/conductorautonumerotation.cpp index aba207d00..4aae6a0dc 100644 --- a/sources/conductorautonumerotation.cpp +++ b/sources/conductorautonumerotation.cpp @@ -22,6 +22,7 @@ #include "conductor.h" #include "diagram.h" #include "potentialtextsdialog.h" +#include "qet.h" /** *Constructor @@ -51,15 +52,15 @@ void ConductorAutoNumerotation::numerate() { * A conductor of the potential to check. */ void ConductorAutoNumerotation::checkPotential(Conductor *conductor) { - //fill list of potential + //fill list of potential QSet c_list = conductor->relatedPotentialConductors(); c_list << conductor; - //fill list of text + //fill list of text QStringList strl; foreach (const Conductor *c, c_list) strl<<(c->text()); - //check text list, isn't same in potential, ask user what to do - if (!eachIsEqual(strl)) { + //check text list, isn't same in potential, ask user what to do + if (!QET::eachStrIsEqual(strl)) { PotentialTextsDialog ptd(conductor, conductor->diagramEditor()); if ( ptd.exec() == QDialog::Accepted ) { ConductorAutoNumerotation can(conductor); @@ -110,8 +111,8 @@ void ConductorAutoNumerotation::applyText(QString t) { void ConductorAutoNumerotation::numeratePotential() { QStringList strl; foreach (const Conductor *cc, conductor_list) strl<<(cc->text()); - //the texts is identicals - if (eachIsEqual(strl)) { + //the texts is identicals + if (QET::eachStrIsEqual(strl)) { ConductorProperties cp = conductor_ -> properties(); cp.text = strl.at(0); conductor_ -> setProperties(cp); @@ -140,13 +141,3 @@ void ConductorAutoNumerotation::numerateNewConductor() { applyText(ncc.toRepresentedString()); m_diagram->project()->addConductorAutoNum(m_diagram -> conductorsAutonumName(), ncc.next()); } - -/** - * @return true if every text of qsl is identical, else false. - */ -bool eachIsEqual (const QStringList &qsl) { - foreach (const QString t, qsl) { - if (qsl.at(0) != t) return false; - } - return true; -} diff --git a/sources/conductorautonumerotation.h b/sources/conductorautonumerotation.h index 53aa3e968..6a711516b 100644 --- a/sources/conductorautonumerotation.h +++ b/sources/conductorautonumerotation.h @@ -44,6 +44,4 @@ class ConductorAutoNumerotation { QSet conductor_list; }; -bool eachIsEqual (const QStringList &); - #endif // CONDUCTORAUTONUMEROTATION_H