Skip to content

Commit 28b7894

Browse files
committed
Clean up many warnings
Mostly unused variables, but some more serious issues as well. A few warnings are still outstanding.
1 parent 3bcd5a8 commit 28b7894

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+205
-337
lines changed

include/cando/chem/atom.h

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -521,23 +521,22 @@ namespace chem {
521521
Atom_O() :
522522
_UniqueAtomOrder(nextUniqueAtomOrder()),
523523
_Alias(nil<core::Symbol_O>()),
524-
_Element(element_Undefined),
525-
_Hybridization(hybridization_undefined),
526-
_Type(nil<core::Symbol_O>()),
527-
_Flags(0),
528-
_StereochemistryType(undefinedCenter),
529-
_Configuration(undefinedConfiguration),
530-
_Ionization(0),
531-
_Charge(0.0),
532-
_VdwRadius(0.0),
533-
_CovalentRadius(0.0),
534-
_Mask(0),
535-
_CopyAtom(unbound<chem::Atom_O>()),
536-
_RingMembershipCount(0),
537-
_TempInt(0)
524+
_Flags(0),
525+
_Type(nil<core::Symbol_O>()),
526+
_Charge(0.0),
527+
_CopyAtom(unbound<chem::Atom_O>()),_TempInt(0),
528+
_VdwRadius(0.0),
529+
_CovalentRadius(0.0),
530+
_StereochemistryType(undefinedCenter),
531+
_Configuration(undefinedConfiguration),
532+
_Mask(0),
533+
_Element(element_Undefined),
534+
_Hybridization(hybridization_undefined),
535+
_RingMembershipCount(0),
536+
_Ionization(0)
538537
// moeIndex(0),
539538
// moeType(_Nil<core::Symbol_O>())
540-
{};
539+
{};
541540
virtual ~Atom_O() {};
542541
};
543542

include/cando/chem/chemInfo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ CL_DEFMETHOD chem::Atom_sp tag(core::T_sp tag) { return this->getAtomWithTag
114114
*/
115115
BoundFrame_sp boundFrame();
116116

117-
ChemInfoMatch_O(Root_sp root, size_t maxtagPlus1) : _Root(root), _Matches(false), _MaxTagPlus1(maxtagPlus1), _TagHistory(nil<core::T_O>()) {};
117+
ChemInfoMatch_O(Root_sp root, size_t maxtagPlus1) : _Matches(false), _MaxTagPlus1(maxtagPlus1), _Root(root), _TagHistory(nil<core::T_O>()) {};
118118
};
119119

120120

@@ -1074,9 +1074,9 @@ class Root_O : public AtomOrBondMatchNode_O
10741074
virtual ChemInfoType type() { return root; };
10751075
virtual bool matches_Atom( Root_sp root, chem::Atom_sp atom );
10761076
virtual bool matches_Bond( Root_sp root, chem::Atom_sp from, chem::Bond_sp bond );
1077-
Root_O(const std::string& code, ChemInfoNode_sp node, size_t maxtag) : _Code(code), _Node(node), _Tests(nil<core::T_O>()), _MaxTag(maxtag) {}
1077+
Root_O(const std::string& code, ChemInfoNode_sp node, size_t maxtag) : _Node(node), _Tests(nil<core::T_O>()), _MaxTag(maxtag), _Code(code) {}
10781078
Root_O(const std::string& code) : _Code(code) {};
1079-
Root_O() : _Code(""), _Node(nil<core::T_O>()), _Tests(nil<core::T_O>()), _MaxTag(0) {};
1079+
Root_O() : _Node(nil<core::T_O>()), _Tests(nil<core::T_O>()), _MaxTag(0), _Code("") {};
10801080
};
10811081

10821082

include/cando/chem/chemdraw.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ class CDNode_O : public core::CxxObject_O
118118

119119
CDNode_O( const CDNode_O& ss ); //!< Copy constructor
120120

121-
CDNode_O() : _Atom(nil<core::T_O>())
122-
, _BackSpan(nil<core::T_O>())
123-
, _NextSpan(nil<core::T_O>())
124-
, _AtomProperties(nil<core::T_O>())
125-
, _ResidueProperties(nil<core::T_O>())
126-
, _MoleculeProperties(nil<core::T_O>())
127-
{};
121+
CDNode_O() : _AtomProperties(nil<core::T_O>())
122+
, _ResidueProperties(nil<core::T_O>())
123+
, _MoleculeProperties(nil<core::T_O>())
124+
, _Atom(nil<core::T_O>())
125+
, _BackSpan(nil<core::T_O>())
126+
, _NextSpan(nil<core::T_O>())
127+
{};
128128
virtual ~CDNode_O() {};
129129
};
130130

include/cando/chem/constitutionAtoms.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ It stores the atom name, element, properties and a vector of bonds in the form o
104104
virtual bool isVirtualAtom() { return false;};
105105
/*! Append a ConstitutionBond_sp to our list of bonds */
106106
void addConstitutionBond(ConstitutionBond_sp cb) {this->_Bonds.push_back(cb);};
107-
ConstitutionAtom_O(MatterName atomName, Element element, core::T_sp atomType, size_t index, StereochemistryType stype, core::List_sp properties ) : _AtomName(atomName), _Element(element), _AtomType(atomType), _Index(index), _StereochemistryType(stype), _Properties(properties) {};
107+
ConstitutionAtom_O(MatterName atomName, Element element, core::T_sp atomType, size_t index, StereochemistryType stype, core::List_sp properties ) : _AtomName(atomName), _Index(index), _Element(element), _AtomType(atomType), _StereochemistryType(stype), _Properties(properties) {};
108108
ConstitutionAtom_O() : _AtomType(nil<core::T_O>()) {};
109109
virtual Atom_sp buildAtom() const;
110110
};

include/cando/chem/energyDihedral.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class EnergyDihedral : public EnergyTerm
116116
double getCalculatedDihedralDeviation() { return this->_CalculatedDihedralDeviation;};
117117

118118
public:
119-
EnergyDihedral(Atom_sp a1, Atom_sp a2, Atom_sp a3, Atom_sp a4, double phase, bool proper, size_t i1, size_t i2, size_t i3, size_t i4, double sinp, double cosp, double v, double dn, int in) : term(sinp,cosp,v,dn,in,i1,i2,i3,i4),_Atom1(a1),_Atom2(a2),_Atom3(a3),_Atom4(a4), _PhaseRad(phase), _Proper(proper) {};
119+
EnergyDihedral(Atom_sp a1, Atom_sp a2, Atom_sp a3, Atom_sp a4, double phase, bool proper, size_t i1, size_t i2, size_t i3, size_t i4, double sinp, double cosp, double v, double dn, int in) : _Proper(proper), _Atom1(a1),_Atom2(a2),_Atom3(a3),_Atom4(a4), _PhaseRad(phase), term(sinp,cosp,v,dn,in,i1,i2,i3,i4) {};
120120
EnergyDihedral() {};
121121
public:
122122
adapt::QDomNode_sp asXml();

include/cando/chem/energyNonbond.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ class EnergyNonbond_O : public EnergyComponent_O
284284
public:
285285
EnergyNonbond_O( const EnergyNonbond_O& ss ); //!< Copy constructor
286286

287-
EnergyNonbond_O() : _FFNonbondDb(unbound<core::T_O>()), _UsesExcludedAtoms(true) {};
287+
EnergyNonbond_O() : _UsesExcludedAtoms(true), _FFNonbondDb(unbound<core::T_O>()) {};
288288
};
289289

290290
};

include/cando/chem/energySketchNonbond.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class EnergySketchNonbond_O : public EnergyComponent_O
154154
void modifySketchNonbondTermConstant(size_t index, float constant);
155155

156156
public:
157-
EnergySketchNonbond_O() : _LongDistanceCutoff(80.0), _ScaleSketchNonbond(1.0), _IgnoreHydrogensAndLps(false), _FreezeFlags() {};
157+
EnergySketchNonbond_O() : _ScaleSketchNonbond(1.0), _LongDistanceCutoff(80.0), _IgnoreHydrogensAndLps(false), _FreezeFlags() {};
158158
void reset();
159159
};
160160

include/cando/chem/ffTypesDb.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ class FFTypesDb_O : public FFBaseDb_O
102102
size_t new_size = other_types_db->_TypeAssignmentRules.size() + this->_TypeAssignmentRules.size();
103103
gctools::Vec0<FFTypeRule_sp> newRules;
104104
newRules.reserve(new_size);
105-
size_t idx;
106105
for ( auto it : other_types_db->_TypeAssignmentRules ) {
107106
newRules.push_back(it);
108107
}

include/cando/chem/minimizer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ takes a single argument, the NVECTOR position of the atoms.)dx");
325325

326326
adapt::QDomNode_sp asXml();
327327

328-
Minimizer_O() : _PrintIntermediateResults(1), _StepCallback(nil<core::T_O>()), _Frozen(nil<core::T_O>()) {};
328+
Minimizer_O() : _PrintIntermediateResults(1), _Frozen(nil<core::T_O>()), _StepCallback(nil<core::T_O>()) {};
329329
};
330330

331331
extern core::Symbol_sp& _sym__PLUS_minimizerStatusConverter_PLUS_;

include/cando/chem/monomer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ namespace chem {
113113
CL_DEFMETHOD core::Symbol_sp name() const { return this->_Name; };
114114
CL_DEFMETHOD Fixnum isomer() const { return this->_Isomer; };
115115
CL_DEFMETHOD Topology_sp topology() const { return this->_Topology; };
116-
Isoname_O(core::Symbol_sp name, Topology_sp topology, Fixnum isomer ) : _Name(name), _Topology(topology), _Isomer(isomer) {};
116+
Isoname_O(core::Symbol_sp name, Topology_sp topology, Fixnum isomer ) : _Name(name), _Isomer(isomer), _Topology(topology) {};
117117
};
118118
};
119119

0 commit comments

Comments
 (0)