SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

pvs fix

Browse Source 
git-svn-id: svn://db.shs.com.ru/libs@133 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
Бычков Андрей
2016-11-07 13:37:42 +00:00
parent 8bbb661966
commit fa98165775
6 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kx_utils/kx_coeffs.h
View File

@@ -24,7 +24,7 @@ public:
#pragma pack (pop) #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)) { __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 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.type = from_k.type = ce.getValue("type", 0xA);
to_k.addr_to = ce.getValue("addr_k", 0x15); to_k.addr_to = ce.getValue("addr_k", 0x15);
from_k.addr_to = ce.getValue("addr_pult", 0x75); from_k.addr_to = ce.getValue("addr_pult", 0x75);

2
qad_graphic/graphic.cpp
View File

@@ -853,7 +853,7 @@ void Graphic::drawGrid() {
cy = 0; cy = 0;
cx = gbx - 5; cx = gbx - 5;
grid_pen.setWidth(qMax<int>(qRound(thick / 1.4), 1)); grid_pen.setWidth(qMax<int>(qRound(thick / 1.4), 1));
QFont nf = font(), sf = font(); QFont nf = sf = font();
sf.setPointSizeF(qMax<qreal>(sf.pointSizeF() / 1.6, 7.)); sf.setPointSizeF(qMax<qreal>(sf.pointSizeF() / 1.6, 7.));
QFontMetrics fm(nf), sfm(sf); QFontMetrics fm(nf), sfm(sf);
if (step > 0.) { if (step > 0.) {

2
qad_utils/qpiconfig.h
View File

@@ -102,7 +102,7 @@ public:
friend class QPIConfigWidget; friend class QPIConfigWidget;
friend class ConfigValueWidget; friend class ConfigValueWidget;
public: public:
Entry() {_parent = 0;} Entry() {_parent = 0; _line = -1;}
Entry * parent() const {return _parent;} Entry * parent() const {return _parent;}
int childCount() {return _children.size();} int childCount() {return _children.size();}

1
qad_utils/qpievaluator.cpp
View File

@@ -651,7 +651,6 @@ int QPIEvaluator::parse(const QString & string, int offset) {
bcnt = farg = 1; bcnt = farg = 1;
///qDebug() << "function: " + cfunc.identifier; ///qDebug() << "function: " + cfunc.identifier;
//for (int k = 0; k < facnt; k++) { //for (int k = 0; k < facnt; k++) {
bcnt = 1;
carg = ""; carg = "";
k = i + 1; k = i + 1;
//if (string.size() <= k || k < 0) return -666; //if (string.size() <= k || k < 0) return -666;

2
qad_widgets/shortcuts.h
View File

@@ -24,7 +24,7 @@ class ShortcutEdit: public CLineEdit
Q_OBJECT Q_OBJECT
friend class Shortcuts; friend class Shortcuts;
public: 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();} void assignAction(QAction * a) {clear(); ca = a; reset();}
QAction * action() const {return ca;} QAction * action() const {return ca;}

2
qglview/loader_ase.cpp
View File

@@ -290,7 +290,7 @@ GLObjectBase * loadFromASEFile(const QString & filepath, double scale) {
mst = line.indexOf("MESH_NORMALS {"); mst = line.indexOf("MESH_NORMALS {");
} }
for (int i = 0; i < faces.size(); ++i) { for (int i = 0; i < faces.size(); ++i) {
line = stream.readLine(); line = stream.readLine();
line = stream.readLine().trimmed(); mst = line.indexOf(" "); line = stream.readLine().trimmed(); mst = line.indexOf(" ");
line = line.right(line.length() - mst - 1); normals[i * 3] = Vector3d(line); line = line.right(line.length() - mst - 1); normals[i * 3] = Vector3d(line);
line = stream.readLine().trimmed(); mst = line.indexOf(" "); line = stream.readLine().trimmed(); mst = line.indexOf(" ");