diff --git a/kx_utils/kx_coeffs.h b/kx_utils/kx_coeffs.h index 0304bf2..e6d31b7 100644 --- a/kx_utils/kx_coeffs.h +++ b/kx_utils/kx_coeffs.h @@ -24,7 +24,7 @@ public: #pragma pack (pop) __KPi(const PIString & config, const PIString & name, bool _pult = false): PIProtocol(config, name, &from_k, 2, &(from_k.count), sizeof(from_k) - 2, &to_k, sizeof(to_k)) { PIConfig conf(config, PIIODevice::ReadOnly); - PIConfig::Entry ce = conf.getValue(name);-- + PIConfig::Entry ce = conf.getValue(name); to_k.type = from_k.type = ce.getValue("type", 0xA); to_k.addr_to = ce.getValue("addr_k", 0x15); from_k.addr_to = ce.getValue("addr_pult", 0x75); diff --git a/qad_graphic/graphic.cpp b/qad_graphic/graphic.cpp index 47e3c88..244f6b0 100644 --- a/qad_graphic/graphic.cpp +++ b/qad_graphic/graphic.cpp @@ -853,7 +853,7 @@ void Graphic::drawGrid() { cy = 0; cx = gbx - 5; grid_pen.setWidth(qMax(qRound(thick / 1.4), 1)); - QFont nf = font(), sf = font(); + QFont nf = sf = font(); sf.setPointSizeF(qMax(sf.pointSizeF() / 1.6, 7.)); QFontMetrics fm(nf), sfm(sf); if (step > 0.) { diff --git a/qad_utils/qpiconfig.h b/qad_utils/qpiconfig.h index 32ac2eb..cfe0081 100644 --- a/qad_utils/qpiconfig.h +++ b/qad_utils/qpiconfig.h @@ -102,7 +102,7 @@ public: friend class QPIConfigWidget; friend class ConfigValueWidget; public: - Entry() {_parent = 0;} + Entry() {_parent = 0; _line = -1;} Entry * parent() const {return _parent;} int childCount() {return _children.size();} diff --git a/qad_utils/qpievaluator.cpp b/qad_utils/qpievaluator.cpp index 02e89c5..a71bfec 100644 --- a/qad_utils/qpievaluator.cpp +++ b/qad_utils/qpievaluator.cpp @@ -651,7 +651,6 @@ int QPIEvaluator::parse(const QString & string, int offset) { bcnt = farg = 1; ///qDebug() << "function: " + cfunc.identifier; //for (int k = 0; k < facnt; k++) { - bcnt = 1; carg = ""; k = i + 1; //if (string.size() <= k || k < 0) return -666; diff --git a/qad_widgets/shortcuts.h b/qad_widgets/shortcuts.h index 49d65cd..1bddb1a 100644 --- a/qad_widgets/shortcuts.h +++ b/qad_widgets/shortcuts.h @@ -24,7 +24,7 @@ class ShortcutEdit: public CLineEdit Q_OBJECT friend class Shortcuts; public: - explicit ShortcutEdit(QWidget * parent = 0): CLineEdit(parent) {ti = 0; connect(this, SIGNAL(textChanged(QString)), this, SLOT(textChanged_(QString)));} + explicit ShortcutEdit(QWidget * parent = 0): CLineEdit(parent) {ti = 0; ca = 0; connect(this, SIGNAL(textChanged(QString)), this, SLOT(textChanged_(QString)));} void assignAction(QAction * a) {clear(); ca = a; reset();} QAction * action() const {return ca;} diff --git a/qglview/loader_ase.cpp b/qglview/loader_ase.cpp index 92ac145..c50b7c8 100644 --- a/qglview/loader_ase.cpp +++ b/qglview/loader_ase.cpp @@ -290,7 +290,7 @@ GLObjectBase * loadFromASEFile(const QString & filepath, double scale) { mst = line.indexOf("MESH_NORMALS {"); } for (int i = 0; i < faces.size(); ++i) { - line = stream.readLine(); + line = stream.readLine(); line = stream.readLine().trimmed(); mst = line.indexOf(" "); line = line.right(line.length() - mst - 1); normals[i * 3] = Vector3d(line); line = stream.readLine().trimmed(); mst = line.indexOf(" ");