--HG--
branch : develop
This commit is contained in:
dismine 2014-06-16 20:18:36 +03:00
parent 3e363aea81
commit 507ccd686e
23 changed files with 203 additions and 206 deletions

View File

@ -31,7 +31,8 @@
#include "dialogtool.h" #include "dialogtool.h"
namespace Ui { namespace Ui
{
class DialogEditWrongFormula; class DialogEditWrongFormula;
} }

View File

@ -139,5 +139,3 @@ int SaveDetailOptions::id() const
{ {
return static_cast<int>(UndoCommand::SaveDetailOptions); return static_cast<int>(UndoCommand::SaveDetailOptions);
} }

View File

@ -38,7 +38,8 @@ class SaveToolOptions : public QObject, public QUndoCommand
{ {
Q_OBJECT Q_OBJECT
public: public:
SaveToolOptions(const QDomElement &oldXml, const QDomElement &newXml, VPattern *doc, const quint32 &id, QUndoCommand *parent = 0); SaveToolOptions(const QDomElement &oldXml, const QDomElement &newXml, VPattern *doc, const quint32 &id,
QUndoCommand *parent = 0);
virtual ~SaveToolOptions(); virtual ~SaveToolOptions();
virtual void undo(); virtual void undo();
virtual void redo(); virtual void redo();

View File

@ -247,6 +247,4 @@ inline QStringList VPattern::getPatternPieces() const
return patternPieces; return patternPieces;
} }
#endif // VPATTERN_H #endif // VPATTERN_H

View File

@ -48,8 +48,7 @@ class QmuParserCallback
public: public:
QmuParserCallback(fun_type0 a_pFun, bool a_bAllowOpti); QmuParserCallback(fun_type0 a_pFun, bool a_bAllowOpti);
QmuParserCallback(fun_type1 a_pFun, bool a_bAllowOpti, int a_iPrec = -1, ECmdCode a_iCode=cmFUNC); QmuParserCallback(fun_type1 a_pFun, bool a_bAllowOpti, int a_iPrec = -1, ECmdCode a_iCode=cmFUNC);
QmuParserCallback(fun_type2 a_pFun, bool a_bAllowOpti, int a_iPrec, EOprtAssociativity a_eAssociativity) QmuParserCallback(fun_type2 a_pFun, bool a_bAllowOpti, int a_iPrec, EOprtAssociativity a_eAssociativity);
;
QmuParserCallback(fun_type2 a_pFun, bool a_bAllowOpti); QmuParserCallback(fun_type2 a_pFun, bool a_bAllowOpti);
QmuParserCallback(fun_type3 a_pFun, bool a_bAllowOpti); QmuParserCallback(fun_type3 a_pFun, bool a_bAllowOpti);
QmuParserCallback(fun_type4 a_pFun, bool a_bAllowOpti); QmuParserCallback(fun_type4 a_pFun, bool a_bAllowOpti);