From ca4b0c6d6aef469eede468b405ea89e119da3626 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 13 Apr 2012 00:25:47 -0500 Subject: Fix inadvertent "TQ" changes. --- kpovmodeler/pmpovrayparser.cpp | 30 +++++++++++++++--------------- kpovmodeler/pmquickcolor.h | 4 ++-- kpovmodeler/pmquickcoloredit.h | 4 ++-- kpovmodeler/pmscanner.cpp | 14 +++++++------- kpovmodeler/pmtokens.h | 14 +++++++------- 5 files changed, 33 insertions(+), 33 deletions(-) (limited to 'kpovmodeler') diff --git a/kpovmodeler/pmpovrayparser.cpp b/kpovmodeler/pmpovrayparser.cpp index 7f041b3e..c8cdd84f 100644 --- a/kpovmodeler/pmpovrayparser.cpp +++ b/kpovmodeler/pmpovrayparser.cpp @@ -289,9 +289,9 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* parent, child = new PMPlane( m_pPart ); error = !parsePlane( ( PMPlane* ) child ); break; - case TQUADRIC_TOK: + case QUADRIC_TOK: case CUBIC_TOK: - case TQUARTIC_TOK: + case QUARTIC_TOK: case POLY_TOK: child = new PMPolynom( m_pPart ); error = !parsePolynom( ( PMPolynom* ) child ); @@ -364,7 +364,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* parent, case MARBLE_TOK: case ONION_TOK: case PLANAR_TOK: - case TQUILTED_TOK: + case QUILTED_TOK: case RADIAL_TOK: case RIPPLES_TOK: case SLOPE_TOK: @@ -733,9 +733,9 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* parent, case SMOOTH_TRIANGLE_TOK: // infinite solid case PLANE_TOK: - case TQUADRIC_TOK: + case QUADRIC_TOK: case CUBIC_TOK: - case TQUARTIC_TOK: + case QUARTIC_TOK: case POLY_TOK: // csg case UNION_TOK: @@ -2331,7 +2331,7 @@ bool PMPovrayParser::parseJuliaFractal( PMJuliaFractal* pNewFractal ) switch( m_token ) { - case TQUATERNION_TOK: + case QUATERNION_TOK: pNewFractal->setAlgebraType( PMJuliaFractal::Quaternion ); nextToken( ); break; @@ -2515,8 +2515,8 @@ bool PMPovrayParser::parsePolynom( PMPolynom* pNewPoly ) pNewPoly->setSturm( false ); - if( ( m_token == TQUADRIC_TOK ) || ( m_token == CUBIC_TOK ) || - ( m_token == TQUARTIC_TOK ) || ( m_token == POLY_TOK ) ) + if( ( m_token == QUADRIC_TOK ) || ( m_token == CUBIC_TOK ) || + ( m_token == QUARTIC_TOK ) || ( m_token == POLY_TOK ) ) { nextToken( ); if( !parseToken( '{' ) ) @@ -2525,7 +2525,7 @@ bool PMPovrayParser::parsePolynom( PMPolynom* pNewPoly ) else printExpected( "poly", m_pScanner->sValue( ) ); - if( type == TQUADRIC_TOK ) + if( type == QUADRIC_TOK ) { c = PMVector( 10 ); pNewPoly->setPolynomOrder( 2 ); @@ -2565,7 +2565,7 @@ bool PMPovrayParser::parsePolynom( PMPolynom* pNewPoly ) { if( type == CUBIC_TOK ) order = 3; - else if( type == TQUARTIC_TOK ) + else if( type == QUARTIC_TOK ) order = 4; else { @@ -2846,7 +2846,7 @@ bool PMPovrayParser::parseLathe( PMLathe* pNewLathe ) nextToken( ); minp = 2; break; - case TQUADRATIC_SPLINE_TOK: + case QUADRATIC_SPLINE_TOK: pNewLathe->setSplineType( PMLathe::QuadraticSpline ); nextToken( ); minp = 3; @@ -2934,7 +2934,7 @@ bool PMPovrayParser::parsePrism( PMPrism* pNewPrism ) nextToken( ); minp = 3; break; - case TQUADRATIC_SPLINE_TOK: + case QUADRATIC_SPLINE_TOK: pNewPrism->setSplineType( PMPrism::QuadraticSpline ); nextToken( ); minp = 4; @@ -3911,7 +3911,7 @@ bool PMPovrayParser::parsePattern( PMPattern* pattern, bool normal ) pattern->setPatternType( PMPattern::PatternPlanar ); type = true; break; - case TQUILTED_TOK: + case QUILTED_TOK: nextToken( ); pattern->setPatternType( PMPattern::PatternQuilted ); type = true; @@ -6436,9 +6436,9 @@ bool PMPovrayParser::parseDeclare( PMDeclare* decl ) child = new PMPlane( m_pPart ); error = !parsePlane( ( PMPlane* ) child ); break; - case TQUADRIC_TOK: + case QUADRIC_TOK: case CUBIC_TOK: - case TQUARTIC_TOK: + case QUARTIC_TOK: case POLY_TOK: child = new PMPolynom( m_pPart ); error = !parsePolynom( ( PMPolynom* ) child ); diff --git a/kpovmodeler/pmquickcolor.h b/kpovmodeler/pmquickcolor.h index c64d363f..84a3afb5 100644 --- a/kpovmodeler/pmquickcolor.h +++ b/kpovmodeler/pmquickcolor.h @@ -19,8 +19,8 @@ **************************************************************************/ -#ifndef PMTQUICKCOLOR_H -#define PMTQUICKCOLOR_H +#ifndef PMQUICKCOLOR_H +#define PMQUICKCOLOR_H #ifdef HAVE_CONFIG_H #include diff --git a/kpovmodeler/pmquickcoloredit.h b/kpovmodeler/pmquickcoloredit.h index 3577916a..2dca5a5f 100644 --- a/kpovmodeler/pmquickcoloredit.h +++ b/kpovmodeler/pmquickcoloredit.h @@ -17,8 +17,8 @@ **************************************************************************/ -#ifndef PMTQUICKCOLOREDIT_H -#define PMTQUICKCOLOREDIT_H +#ifndef PMQUICKCOLOREDIT_H +#define PMQUICKCOLOREDIT_H #ifdef HAVE_CONFIG_H #include diff --git a/kpovmodeler/pmscanner.cpp b/kpovmodeler/pmscanner.cpp index d85fa3fb..c90c9728 100644 --- a/kpovmodeler/pmscanner.cpp +++ b/kpovmodeler/pmscanner.cpp @@ -304,13 +304,13 @@ PMReservedWordDict::PMReservedWordDict( PMDictMode mode ) insert( "prism", new int( PRISM_TOK ) ); insert( "projected_through", new int( PROJECTED_THROUGH_TOK ) ); insert( "pwr", new int( PWR_TOK ) ); - insert( "quadratic_spline", new int( TQUADRATIC_SPLINE_TOK ) ); - insert( "quadric", new int( TQUADRIC_TOK ) ); - insert( "quartic", new int( TQUARTIC_TOK ) ); - insert( "quaternion", new int( TQUATERNION_TOK ) ); - insert( "quick_color", new int( TQUICK_COLOR_TOK ) ); - insert( "quick_colour", new int( TQUICK_COLOUR_TOK ) ); - insert( "quilted", new int( TQUILTED_TOK ) ); + insert( "quadratic_spline", new int( QUADRATIC_SPLINE_TOK ) ); + insert( "quadric", new int( QUADRIC_TOK ) ); + insert( "quartic", new int( QUARTIC_TOK ) ); + insert( "quaternion", new int( QUATERNION_TOK ) ); + insert( "quick_color", new int( QUICK_COLOR_TOK ) ); + insert( "quick_colour", new int( QUICK_COLOUR_TOK ) ); + insert( "quilted", new int( QUILTED_TOK ) ); insert( "radial", new int( RADIAL_TOK ) ); insert( "radians", new int( RADIANS_TOK ) ); insert( "radiosity", new int( RADIOSITY_TOK ) ); diff --git a/kpovmodeler/pmtokens.h b/kpovmodeler/pmtokens.h index 785bb1db..21b4b34b 100644 --- a/kpovmodeler/pmtokens.h +++ b/kpovmodeler/pmtokens.h @@ -308,13 +308,13 @@ enum PMToken { PRISM_TOK, PROJECTED_THROUGH_TOK, PWR_TOK, - TQUADRATIC_SPLINE_TOK, - TQUADRIC_TOK, - TQUARTIC_TOK, - TQUATERNION_TOK, - TQUICK_COLOR_TOK, - TQUICK_COLOUR_TOK, - TQUILTED_TOK, + QUADRATIC_SPLINE_TOK, + QUADRIC_TOK, + QUARTIC_TOK, + QUATERNION_TOK, + QUICK_COLOR_TOK, + QUICK_COLOUR_TOK, + QUILTED_TOK, RADIAL_TOK, RADIANS_TOK, RADIOSITY_TOK, -- cgit v1.2.3