[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kformula
From: Thomas Zander <zander () kde ! org>
Date: 2007-07-20 6:49:29
Message-ID: 1184914169.291978.24343.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 690153 by zander:
EBN Fixes
M +3 -3 flake/AttributeManager.cpp
M +1 -1 flake/FormulaToolOptions.h
M +2 -0 flake/fontstyle.cc
M +2 -1 flake/fontstyle.h
M +20 -20 fsparser.cc
--- trunk/koffice/kformula/flake/AttributeManager.cpp #690152:690153
@@ -181,7 +181,7 @@
if( unit == "in" || unit == "cm" || unit == "pc" || unit == "mm" || unit == "pt" \
) return KoUnit::parseValue( tmpValue );
- else if( tmpValue.endsWith( "%" ) )
+ else if( tmpValue.endsWith( '%' ) )
{
/* tmpValue.chop( 1 );
return defaultValueOf( m_attribute ) * (tmpValue.toDouble()/100); */
@@ -241,9 +241,9 @@
QString value = element->attribute( "scriptlevel" );
if( !value.isEmpty() )
{
- if( value.startsWith( "+" ) )
+ if( value.startsWith( '+' ) )
m_cachedScriptLevel += value.remove( 0, 1 ).toInt();
- else if( value.startsWith( "-" ) )
+ else if( value.startsWith( '-' ) )
m_cachedScriptLevel -= value.remove( 0, 1 ).toInt();
else
m_cachedScriptLevel = value.toInt();
--- trunk/koffice/kformula/flake/FormulaToolOptions.h #690152:690153
@@ -35,7 +35,7 @@
Q_OBJECT
public:
/// Standart constructor
- FormulaToolOptions( QWidget* parent = 0, Qt::WindowFlags f = 0 );
+ explicit FormulaToolOptions( QWidget* parent = 0, Qt::WindowFlags f = 0 );
~FormulaToolOptions();
--- trunk/koffice/kformula/flake/fontstyle.cc #690152:690153
@@ -352,7 +352,9 @@
{
}
+#ifdef __GNUC__
#warning "port port port"
+#endif
#if 0
void Artwork::calcSizes( const ContextStyle& style,
ContextStyle::TextStyle tstyle,
--- trunk/koffice/kformula/flake/fontstyle.h #690152:690153
@@ -105,8 +105,9 @@
Artwork(SymbolType type = EmptyBracket);
virtual ~Artwork() {}
-
+#ifdef __GNUC__
#warning "Port!"
+#endif
#if 0
virtual void calcSizes( const ContextStyle& style,
ContextStyle::TextStyle tstyle,
--- trunk/koffice/kformula/fsparser.cc #690152:690153
@@ -36,7 +36,7 @@
ParserNode() { debugCount++; }
virtual ~ParserNode() { debugCount--; }
//virtual void output( ostream& ) = 0;
- virtual void buildXML( QDomDocument& doc, QDomElement element ) = 0;
+ virtual void buildXML( QDomDocument& doc, QDomElement &element ) = 0;
virtual bool isSimple() { return false; }
static int debugCount;
@@ -48,7 +48,7 @@
public:
PrimaryNode( const QString& primary ) : m_primary( primary ), m_functionName( \
false ) {}
//virtual void output( ostream& stream ) { stream << "PrimaryNode {" << \
m_primary << "}" << endl; }
- virtual void buildXML( QDomDocument& doc, QDomElement element );
+ virtual void buildXML( QDomDocument& doc, QDomElement &element );
virtual bool isSimple() { return true; }
void setUnicode( QChar unicode ) { m_unicode = unicode; }
void setFunctionName( bool functionName ) { m_functionName = functionName; }
@@ -59,7 +59,7 @@
bool m_functionName;
};
-void PrimaryNode::buildXML( QDomDocument& doc, QDomElement element )
+void PrimaryNode::buildXML( QDomDocument& doc, QDomElement &element )
{
if ( m_unicode != QChar::Null ) {
QDomElement de = doc.createElement( "TEXT" );
@@ -85,12 +85,12 @@
public:
UnaryMinus( ParserNode* primary ) : m_primary( primary ) {}
~UnaryMinus() { delete m_primary; }
- virtual void buildXML( QDomDocument& doc, QDomElement element );
+ virtual void buildXML( QDomDocument& doc, QDomElement &element );
private:
ParserNode* m_primary;
};
-void UnaryMinus::buildXML( QDomDocument& doc, QDomElement element )
+void UnaryMinus::buildXML( QDomDocument& doc, QDomElement &element )
{
QDomElement de = doc.createElement( "TEXT" );
de.setAttribute( "CHAR", "-" );
@@ -116,10 +116,10 @@
class AssignNode : public OperatorNode {
public:
AssignNode( const QString& type, ParserNode* lhs, ParserNode* rhs ) : \
OperatorNode( type, lhs, rhs ) {}
- virtual void buildXML( QDomDocument& doc, QDomElement element );
+ virtual void buildXML( QDomDocument& doc, QDomElement &element );
};
-void AssignNode::buildXML( QDomDocument& doc, QDomElement element )
+void AssignNode::buildXML( QDomDocument& doc, QDomElement &element )
{
m_lhs->buildXML( doc, element );
QDomElement de = doc.createElement( "TEXT" );
@@ -131,10 +131,10 @@
class ExprNode : public OperatorNode {
public:
ExprNode( const QString& type, ParserNode* lhs, ParserNode* rhs ) : \
OperatorNode( type, lhs, rhs ) {}
- virtual void buildXML( QDomDocument& doc, QDomElement element );
+ virtual void buildXML( QDomDocument& doc, QDomElement &element );
};
-void ExprNode::buildXML( QDomDocument& doc, QDomElement element )
+void ExprNode::buildXML( QDomDocument& doc, QDomElement &element )
{
m_lhs->buildXML( doc, element );
QDomElement de = doc.createElement( "TEXT" );
@@ -146,10 +146,10 @@
class TermNode : public OperatorNode {
public:
TermNode( const QString& type, ParserNode* lhs, ParserNode* rhs ) : \
OperatorNode( type, lhs, rhs ) {}
- virtual void buildXML( QDomDocument& doc, QDomElement element );
+ virtual void buildXML( QDomDocument& doc, QDomElement &element );
};
-void TermNode::buildXML( QDomDocument& doc, QDomElement element )
+void TermNode::buildXML( QDomDocument& doc, QDomElement &element )
{
if ( m_type == "*" ) {
m_lhs->buildXML( doc, element );
@@ -178,10 +178,10 @@
class PowerNode : public OperatorNode {
public:
PowerNode( const QString& type, ParserNode* lhs, ParserNode* rhs ) : \
OperatorNode( type, lhs, rhs ) {}
- virtual void buildXML( QDomDocument& doc, QDomElement element );
+ virtual void buildXML( QDomDocument& doc, QDomElement &element );
};
-void PowerNode::buildXML( QDomDocument& doc, QDomElement element )
+void PowerNode::buildXML( QDomDocument& doc, QDomElement &element )
{
QDomElement index = doc.createElement( "INDEX" );
QDomElement content = doc.createElement( "CONTENT" );
@@ -227,14 +227,14 @@
}
~FunctionNode() { delete m_name; }
//virtual void output( ostream& stream );
- virtual void buildXML( QDomDocument& doc, QDomElement element );
+ virtual void buildXML( QDomDocument& doc, QDomElement &element );
private:
void buildSymbolXML( QDomDocument& doc, QDomElement element, \
KFormula::SymbolType type ); PrimaryNode* m_name;
Q3PtrList<ParserNode> m_args;
};
-void FunctionNode::buildSymbolXML( QDomDocument& doc, QDomElement element, \
KFormula::SymbolType type ) +void FunctionNode::buildSymbolXML( QDomDocument& doc, \
QDomElement &element, KFormula::SymbolType type ) {
QDomElement symbol = doc.createElement( "SYMBOL" );
symbol.setAttribute( "TYPE", type );
@@ -262,7 +262,7 @@
element.appendChild( symbol );
}
-void FunctionNode::buildXML( QDomDocument& doc, QDomElement element )
+void FunctionNode::buildXML( QDomDocument& doc, QDomElement &element )
{
if ( ( m_name->primary() == "sqrt" ) && ( m_args.count() == 1 ) ) {
QDomElement root = doc.createElement( "ROOT" );
@@ -334,7 +334,7 @@
public:
RowNode( Q3PtrList<ParserNode> row ) : m_row( row ) { m_row.setAutoDelete( true \
); } //virtual void output( ostream& stream );
- virtual void buildXML( QDomDocument& doc, QDomElement element );
+ virtual void buildXML( QDomDocument& doc, QDomElement &element );
uint columns() const { return m_row.count(); }
void setRequiredColumns( uint requiredColumns ) { m_requiredColumns = \
requiredColumns; } private:
@@ -342,7 +342,7 @@
uint m_requiredColumns;
};
-void RowNode::buildXML( QDomDocument& doc, QDomElement element )
+void RowNode::buildXML( QDomDocument& doc, QDomElement &element )
{
for ( int i = 0; i < m_requiredColumns; i++ ) {
QDomElement sequence = doc.createElement( "SEQUENCE" );
@@ -374,7 +374,7 @@
public:
MatrixNode( Q3PtrList<RowNode> rows ) : m_rows( rows ) { m_rows.setAutoDelete( \
true ); } //virtual void output( ostream& stream );
- virtual void buildXML( QDomDocument& doc, QDomElement element );
+ virtual void buildXML( QDomDocument& doc, QDomElement &element );
virtual bool isSimple() { return true; }
uint columns();
uint rows() { return m_rows.count(); }
@@ -391,7 +391,7 @@
return columns;
}
-void MatrixNode::buildXML( QDomDocument& doc, QDomElement element )
+void MatrixNode::buildXML( QDomDocument& doc, QDomElement &element )
{
QDomElement bracket = doc.createElement( "BRACKET" );
bracket.setAttribute( "LEFT", '(' );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic