diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-13 13:15:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-13 13:15:14 -0600 |
| commit | 735d75d6ce19269dc5faa00abc8f88ff30ce2f23 (patch) | |
| tree | 4e85ad9cc0479892232125234c6b71c4f17ac611 /lib | |
| parent | b180811d9a814c638032f77aaf02e84a3126328c (diff) | |
| download | koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.tar.gz koffice-735d75d6ce19269dc5faa00abc8f88ff30ce2f23.zip | |
Fix inadvertent TQt string conversions
This closes Bug 782
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kformula/contextstyle.cc | 2 | ||||
| -rw-r--r-- | lib/kformula/kformulacompatibility.cc | 2 | ||||
| -rw-r--r-- | lib/kformula/kformuladefs.h | 2 | ||||
| -rw-r--r-- | lib/kformula/kformuladocument.cc | 2 | ||||
| -rw-r--r-- | lib/kformula/sequenceelement.cc | 2 | ||||
| -rw-r--r-- | lib/kformula/spaceelement.cc | 2 | ||||
| -rw-r--r-- | lib/kross/python/cxx/PyCXX.html | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/lib/kformula/contextstyle.cc b/lib/kformula/contextstyle.cc index f358b62c..b6067e10 100644 --- a/lib/kformula/contextstyle.cc +++ b/lib/kformula/contextstyle.cc @@ -235,7 +235,7 @@ luPixel ContextStyle::getSpace( TextStyle tstyle, SpaceWidth space, double facto case THIN: return getThinSpace( tstyle, factor ); case MEDIUM: return getMediumSpace( tstyle, factor ); case THICK: return getThickSpace( tstyle, factor ); - case TQUAD: return getQuadSpace( tstyle, factor ); + case QUAD: return getQuadSpace( tstyle, factor ); } return 0; } diff --git a/lib/kformula/kformulacompatibility.cc b/lib/kformula/kformulacompatibility.cc index 434bd28b..f64bf9de 100644 --- a/lib/kformula/kformulacompatibility.cc +++ b/lib/kformula/kformulacompatibility.cc @@ -45,7 +45,7 @@ const BoxType OF_SUB = '_' + UNUSED_OFFSET; const BoxType OF_LSUP = '6' + UNUSED_OFFSET; const BoxType OF_LSUB = '%' + UNUSED_OFFSET; //const BoxType PAREN = '('; -//const BoxType ETQUAL = '='; +//const BoxType EQUAL = '='; //const BoxType MORE = '>'; //const BoxType LESS = '<'; //const BoxType ABS = '|'; diff --git a/lib/kformula/kformuladefs.h b/lib/kformula/kformuladefs.h index 855121c7..930b8be6 100644 --- a/lib/kformula/kformuladefs.h +++ b/lib/kformula/kformuladefs.h @@ -180,7 +180,7 @@ enum Direction { beforeCursor, afterCursor }; /** * The types of space we know. */ -enum SpaceWidth { THIN, MEDIUM, THICK, TQUAD, NEGTHIN }; +enum SpaceWidth { THIN, MEDIUM, THICK, QUAD, NEGTHIN }; /** * The types of MathML horizontal or vertical sizes we know diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc index ecd621ee..540fe5ef 100644 --- a/lib/kformula/kformuladocument.cc +++ b/lib/kformula/kformuladocument.cc @@ -760,7 +760,7 @@ void DocumentWrapper::addThickSpace() void DocumentWrapper::addQuadSpace() { if (hasFormula()) { - SpaceRequest r( TQUAD ); + SpaceRequest r( QUAD ); formula()->performRequest( &r ); } } diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cc index e3573174..f01636e7 100644 --- a/lib/kformula/sequenceelement.cc +++ b/lib/kformula/sequenceelement.cc @@ -1761,7 +1761,7 @@ BasicElement* NameSequence::replaceElement( const SymbolTable& table ) if ( name == "," ) return new SpaceElement( THIN ); if ( name == ">" ) return new SpaceElement( MEDIUM ); if ( name == ";" ) return new SpaceElement( THICK ); - if ( name == "quad" ) return new SpaceElement( TQUAD ); + if ( name == "quad" ) return new SpaceElement( QUAD ); if ( name == "frac" ) return new FractionElement(); if ( name == "atop" ) { diff --git a/lib/kformula/spaceelement.cc b/lib/kformula/spaceelement.cc index 1fb4f553..7d372360 100644 --- a/lib/kformula/spaceelement.cc +++ b/lib/kformula/spaceelement.cc @@ -55,7 +55,7 @@ SpaceElement::SpaceElement( SpaceWidth space, bool tab, BasicElement* parent ) case THICK: m_widthType = ThickMathSpace; break; - case TQUAD: + case QUAD: m_widthType = VeryVeryThickMathSpace; break; } diff --git a/lib/kross/python/cxx/PyCXX.html b/lib/kross/python/cxx/PyCXX.html index 46d065bb..566974c1 100644 --- a/lib/kross/python/cxx/PyCXX.html +++ b/lib/kross/python/cxx/PyCXX.html @@ -1,7 +1,7 @@ <html> <head> -<meta HTTP-ETQUIV="Content-Type" CONTENT="text/html; charset=windows-1252"> +<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=windows-1252"> <title>Writing Python Extensions in C++</title> <style> H1, H2, H3, H4 {color: #000099; |