diff options
Diffstat (limited to 'kig/objects')
39 files changed, 212 insertions, 212 deletions
diff --git a/kig/objects/angle_type.cc b/kig/objects/angle_type.cc index 89a17131..7b86411b 100644 --- a/kig/objects/angle_type.cc +++ b/kig/objects/angle_type.cc @@ -33,7 +33,7 @@ #include <algorithm> #include <cmath> -#include <qstringlist.h> +#include <tqstringlist.h> static const char* constructanglethroughpoint = I18N_NOOP( "Construct an angle through this point" ); @@ -97,9 +97,9 @@ const ObjectImpType* AngleType::resultId() const return AngleImp::stype(); } -QStringList AngleType::specialActions() const +TQStringList AngleType::specialActions() const { - QStringList ret; + TQStringList ret; ret << i18n( "Set Si&ze" ); return ret; } diff --git a/kig/objects/angle_type.h b/kig/objects/angle_type.h index 796143b4..e885bdbe 100644 --- a/kig/objects/angle_type.h +++ b/kig/objects/angle_type.h @@ -31,7 +31,7 @@ public: ObjectImp* calc( const Args& args, const KigDocument& ) const; const ObjectImpType* resultId() const; - QStringList specialActions() const; + TQStringList specialActions() const; void executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c, KigPart& d, KigWidget& w, NormalMode& m ) const; }; diff --git a/kig/objects/arc_type.cc b/kig/objects/arc_type.cc index f6c660f2..59d38054 100644 --- a/kig/objects/arc_type.cc +++ b/kig/objects/arc_type.cc @@ -36,7 +36,7 @@ using std::find; -#include <qstringlist.h> +#include <tqstringlist.h> static const char constructarcstartingstat[] = I18N_NOOP( "Construct an arc starting at this point" ); diff --git a/kig/objects/bogus_imp.cc b/kig/objects/bogus_imp.cc index c1ed6526..b7b8f41e 100644 --- a/kig/objects/bogus_imp.cc +++ b/kig/objects/bogus_imp.cc @@ -17,8 +17,8 @@ #include "bogus_imp.h" -#include <qcstring.h> -#include <qstringlist.h> +#include <tqcstring.h> +#include <tqstringlist.h> #include <klocale.h> #include "../misc/rect.h" @@ -52,7 +52,7 @@ IntImp::IntImp( const int d ) { } -StringImp::StringImp( const QString& d ) +StringImp::StringImp( const TQString& d ) : mdata( d ) { } @@ -86,22 +86,22 @@ InvalidImp::InvalidImp() { } -void InvalidImp::fillInNextEscape( QString& s, const KigDocument& ) const +void InvalidImp::fillInNextEscape( TQString& s, const KigDocument& ) const { s = s.arg( "[invalid]" ); } -void DoubleImp::fillInNextEscape( QString& s, const KigDocument& ) const +void DoubleImp::fillInNextEscape( TQString& s, const KigDocument& ) const { s = s.arg( mdata ); } -void IntImp::fillInNextEscape( QString& s, const KigDocument& ) const +void IntImp::fillInNextEscape( TQString& s, const KigDocument& ) const { s = s.arg( mdata ); } -void StringImp::fillInNextEscape( QString& s, const KigDocument& ) const +void StringImp::fillInNextEscape( TQString& s, const KigDocument& ) const { s = s.arg( mdata ); } @@ -300,7 +300,7 @@ const ObjectImpType* TestResultImp::stype() } -TestResultImp::TestResultImp( const QString& s ) +TestResultImp::TestResultImp( const TQString& s ) : mdata( s ) { } diff --git a/kig/objects/bogus_imp.h b/kig/objects/bogus_imp.h index 8e9386a8..c8f3ee2b 100644 --- a/kig/objects/bogus_imp.h +++ b/kig/objects/bogus_imp.h @@ -22,7 +22,7 @@ #include "../misc/object_hierarchy.h" #include "../misc/kigtransform.h" -#include <qstring.h> +#include <tqstring.h> /** * This is the base class for the so-called BogusImp's. These @@ -78,7 +78,7 @@ public: void visit( ObjectImpVisitor* vtor ) const; bool canFillInNextEscape() const; - void fillInNextEscape( QString& s, const KigDocument& ) const; + void fillInNextEscape( TQString& s, const KigDocument& ) const; bool equals( const ObjectImp& rhs ) const; }; @@ -117,7 +117,7 @@ public: void visit( ObjectImpVisitor* vtor ) const; bool canFillInNextEscape() const; - void fillInNextEscape( QString& s, const KigDocument& ) const; + void fillInNextEscape( TQString& s, const KigDocument& ) const; bool equals( const ObjectImp& rhs ) const; }; @@ -156,7 +156,7 @@ public: void visit( ObjectImpVisitor* vtor ) const; bool canFillInNextEscape() const; - void fillInNextEscape( QString& s, const KigDocument& ) const; + void fillInNextEscape( TQString& s, const KigDocument& ) const; bool equals( const ObjectImp& rhs ) const; }; @@ -167,7 +167,7 @@ public: class StringImp : public BogusImp { - QString mdata; + TQString mdata; public: /** * Returns the ObjectImpType representing the StringImp type.. @@ -178,16 +178,16 @@ public: /** * Construct a new StringImp containing the string d. */ - StringImp( const QString& d ); + StringImp( const TQString& d ); /** * Get hold of the contained data. */ - const QString& data() const { return mdata; } + const TQString& data() const { return mdata; } /** * Set the contained data. */ - void setData( const QString& s ) { mdata = s; } + void setData( const TQString& s ) { mdata = s; } StringImp* copy() const; @@ -195,7 +195,7 @@ public: void visit( ObjectImpVisitor* vtor ) const; bool canFillInNextEscape() const; - void fillInNextEscape( QString& s, const KigDocument& ) const; + void fillInNextEscape( TQString& s, const KigDocument& ) const; bool equals( const ObjectImp& rhs ) const; }; @@ -253,16 +253,16 @@ public: class TestResultImp : public BogusImp { - const QString mdata; + const TQString mdata; public: static const ObjectImpType* stype(); typedef BogusImp Parent; - TestResultImp( const QString& s ); + TestResultImp( const TQString& s ); TestResultImp* copy() const; - const QString& data() const { return mdata; } + const TQString& data() const { return mdata; } const ObjectImpType* type() const; void visit( ObjectImpVisitor* vtor ) const; diff --git a/kig/objects/circle_imp.cc b/kig/objects/circle_imp.cc index 13ceef93..38522c22 100644 --- a/kig/objects/circle_imp.cc +++ b/kig/objects/circle_imp.cc @@ -231,18 +231,18 @@ double CircleImp::circumference() const return 2 * M_PI * radius(); } -QString CircleImp::polarEquationString( const KigDocument& w ) const +TQString CircleImp::polarEquationString( const KigDocument& w ) const { - QString ret = i18n( "rho = %1 [centered at %2]" ); + TQString ret = i18n( "rho = %1 [centered at %2]" ); ConicPolarData data = polarData(); ret = ret.arg( data.pdimen, 0, 'g', 3 ); ret = ret.arg( w.coordinateSystem().fromScreen( data.focus1, w ) ); return ret; } -QString CircleImp::cartesianEquationString( const KigDocument& ) const +TQString CircleImp::cartesianEquationString( const KigDocument& ) const { - QString ret = i18n( "x² + y² + %1 x + %2 y + %3 = 0" ); + TQString ret = i18n( "x² + y² + %1 x + %2 y + %3 = 0" ); ConicCartesianData data = cartesianData(); ret = ret.arg( data.coeffs[3], 0, 'g', 3 ); ret = ret.arg( data.coeffs[4], 0, 'g', 3 ); @@ -250,9 +250,9 @@ QString CircleImp::cartesianEquationString( const KigDocument& ) const return ret; } -QString CircleImp::simplyCartesianEquationString( const KigDocument& ) const +TQString CircleImp::simplyCartesianEquationString( const KigDocument& ) const { - QString ret = i18n( "( x - %1 )² + ( y - %2 )² = %3" ); + TQString ret = i18n( "( x - %1 )² + ( y - %2 )² = %3" ); ret = ret.arg( mcenter.x, 0, 'g', 3 ); ret = ret.arg( mcenter.y, 0, 'g', 3 ); ret = ret.arg( mradius * mradius, 0, 'g', 3 ); diff --git a/kig/objects/circle_imp.h b/kig/objects/circle_imp.h index d38716a6..1ccede6a 100644 --- a/kig/objects/circle_imp.h +++ b/kig/objects/circle_imp.h @@ -107,17 +107,17 @@ public: * Return a string containing the cartesian equation of this circle. * This will be of the form "x^2 + y^2 + a x + b y + c = 0" */ - QString cartesianEquationString( const KigDocument& w ) const; + TQString cartesianEquationString( const KigDocument& w ) const; /** * Return a string containing the cartesian equation of this circle. * This will be of the form "( x - x0 )^2 + ( y - y0 )^2 = r^2" */ - QString simplyCartesianEquationString( const KigDocument& w ) const; + TQString simplyCartesianEquationString( const KigDocument& w ) const; /** * Return a string containing the polar equation of this circle. * This will be of the form "rho = r [centered at p]" */ - QString polarEquationString( const KigDocument& w ) const; + TQString polarEquationString( const KigDocument& w ) const; bool equals( const ObjectImp& rhs ) const; }; diff --git a/kig/objects/common.h b/kig/objects/common.h index a26a92cd..f876315f 100644 --- a/kig/objects/common.h +++ b/kig/objects/common.h @@ -20,9 +20,9 @@ #include <set> #include <vector> -#include <qcstring.h> -#include <qvaluelist.h> -#include <qstringlist.h> +#include <tqcstring.h> +#include <tqvaluelist.h> +#include <tqstringlist.h> #include <cassert> #include <klocale.h> @@ -47,7 +47,7 @@ class ScreenInfo; class Transformation; typedef std::vector<const ObjectImp*> Args; -typedef QValueList<QCString> QCStringList; +typedef TQValueList<TQCString> QCStringList; template<typename T> void delete_all( T begin, T end ) diff --git a/kig/objects/conic_imp.cc b/kig/objects/conic_imp.cc index a65d8511..81331522 100644 --- a/kig/objects/conic_imp.cc +++ b/kig/objects/conic_imp.cc @@ -184,7 +184,7 @@ int ConicImp::conicType() const return 0; } -QString ConicImp::conicTypeString() const +TQString ConicImp::conicTypeString() const { switch (conicType()) { @@ -200,9 +200,9 @@ QString ConicImp::conicTypeString() const } } -QString ConicImp::cartesianEquationString( const KigDocument& ) const +TQString ConicImp::cartesianEquationString( const KigDocument& ) const { - QString ret = i18n( "%1 x² + %2 y² + %3 xy + %4 x + %5 y + %6 = 0" ); + TQString ret = i18n( "%1 x² + %2 y² + %3 xy + %4 x + %5 y + %6 = 0" ); ConicCartesianData data = cartesianData(); ret = ret.arg( data.coeffs[0], 0, 'g', 3 ); ret = ret.arg( data.coeffs[1], 0, 'g', 3 ); @@ -213,9 +213,9 @@ QString ConicImp::cartesianEquationString( const KigDocument& ) const return ret; } -QString ConicImp::polarEquationString( const KigDocument& w ) const +TQString ConicImp::polarEquationString( const KigDocument& w ) const { - QString ret = i18n( "rho = %1/(1 + %2 cos theta + %3 sin theta)\n [centered at %4]" ); + TQString ret = i18n( "rho = %1/(1 + %2 cos theta + %3 sin theta)\n [centered at %4]" ); const ConicPolarData data = polarData(); ret = ret.arg( data.pdimen, 0, 'g', 3 ); diff --git a/kig/objects/conic_imp.h b/kig/objects/conic_imp.h index 55ba65ca..29068a7b 100644 --- a/kig/objects/conic_imp.h +++ b/kig/objects/conic_imp.h @@ -82,18 +82,18 @@ public: /** * A string containing "Hyperbola", "Parabola" or "Ellipse". */ - virtual QString conicTypeString() const; + virtual TQString conicTypeString() const; /** * A string containing the cartesian equation of the conic. This * will be of the form "a x^2 + b y^2 + c xy + d x + e y + f = 0". */ - virtual QString cartesianEquationString( const KigDocument& w ) const; + virtual TQString cartesianEquationString( const KigDocument& w ) const; /** * A string containing the polar equation of the conic. This will * be of the form "rho = pdimen/(1 + ect cos( theta ) + est sin( * theta ) )\n [centered at p]" */ - virtual QString polarEquationString( const KigDocument& w ) const; + virtual TQString polarEquationString( const KigDocument& w ) const; /** * Return the cartesian representation of this conic. */ diff --git a/kig/objects/conic_types.cc b/kig/objects/conic_types.cc index 6e32f844..34396369 100644 --- a/kig/objects/conic_types.cc +++ b/kig/objects/conic_types.cc @@ -663,9 +663,9 @@ const ObjectImpType* ConicRadicalType::resultId() const return LineImp::stype(); } -QStringList ConicRadicalType::specialActions() const +TQStringList ConicRadicalType::specialActions() const { - QStringList ret; + TQStringList ret; ret << i18n( "Switch Radical Lines" ); return ret; } diff --git a/kig/objects/conic_types.h b/kig/objects/conic_types.h index e2a1881d..858ca057 100644 --- a/kig/objects/conic_types.h +++ b/kig/objects/conic_types.h @@ -175,7 +175,7 @@ public: static const ConicRadicalType* instance(); ObjectImp* calc( const Args& parents, const KigDocument& ) const; const ObjectImpType* resultId() const; - QStringList specialActions() const; + TQStringList specialActions() const; void executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& t, KigPart& d, KigWidget& w, NormalMode& m ) const; }; diff --git a/kig/objects/cubic_imp.cc b/kig/objects/cubic_imp.cc index 51bb5d9f..3879c5d9 100644 --- a/kig/objects/cubic_imp.cc +++ b/kig/objects/cubic_imp.cc @@ -406,7 +406,7 @@ Rect CubicImp::surroundingRect() const return Rect::invalidRect(); } -QString CubicImp::cartesianEquationString( const KigDocument& ) const +TQString CubicImp::cartesianEquationString( const KigDocument& ) const { /* * unfortunately QStrings.arg method is limited to %1, %9, so we cannot @@ -416,7 +416,7 @@ QString CubicImp::cartesianEquationString( const KigDocument& ) const * the equation (removal of zeros, avoid " ... + -1234 x ", etc.) */ - QString ret = i18n( "%6 x³ + %9 y³ + %7 x²y + %8 xy² + %5 y² + %3 x² + %4 xy + %1 x + %2 y" ); + TQString ret = i18n( "%6 x³ + %9 y³ + %7 x²y + %8 xy² + %5 y² + %3 x² + %4 xy + %1 x + %2 y" ); ret = ret.arg( mdata.coeffs[1], 0, 'g', 3 ); ret = ret.arg( mdata.coeffs[2], 0, 'g', 3 ); ret = ret.arg( mdata.coeffs[3], 0, 'g', 3 ); diff --git a/kig/objects/cubic_imp.h b/kig/objects/cubic_imp.h index bb7d89c7..5e9e6a2c 100644 --- a/kig/objects/cubic_imp.h +++ b/kig/objects/cubic_imp.h @@ -43,7 +43,7 @@ public: bool contains( const Coordinate& p, int width, const KigWidget& ) const; bool inRect( const Rect& r, int width, const KigWidget& ) const; Rect surroundingRect() const; - QString cartesianEquationString( const KigDocument& ) const; + TQString cartesianEquationString( const KigDocument& ) const; const uint numberOfProperties() const; const QCStringList properties() const; diff --git a/kig/objects/line_imp.cc b/kig/objects/line_imp.cc index 6f3c6002..a49078a1 100644 --- a/kig/objects/line_imp.cc +++ b/kig/objects/line_imp.cc @@ -174,7 +174,7 @@ double AbstractLineImp::slope() const return diff.y / diff.x; } -const QString AbstractLineImp::equationString() const +const TQString AbstractLineImp::equationString() const { Coordinate p = mdata.a; Coordinate q = mdata.b; @@ -182,9 +182,9 @@ const QString AbstractLineImp::equationString() const double m = ( q.y - p.y ) / ( q.x - p.x ); double r = - ( q.y - p.y ) * p.x / ( q.x - p.x ) + p.y; - QString ret = QString::fromUtf8( "y = %1x " ) + - QString::fromUtf8( r > 0 ? "+" : "-" ) + - QString::fromUtf8( " %2" ); + TQString ret = TQString::fromUtf8( "y = %1x " ) + + TQString::fromUtf8( r > 0 ? "+" : "-" ) + + TQString::fromUtf8( " %2" ); ret = ret.arg( m, 0, 'g', 3 ); ret = ret.arg( abs( r ), 0, 'g', 3 ); diff --git a/kig/objects/line_imp.h b/kig/objects/line_imp.h index c9014613..b12c045d 100644 --- a/kig/objects/line_imp.h +++ b/kig/objects/line_imp.h @@ -66,7 +66,7 @@ public: * Get a string containing the equation of this line in the form "y * = a * x + b ". */ - const QString equationString() const; + const TQString equationString() const; /** * Get the LineData for this AbstractLineImp. */ diff --git a/kig/objects/line_type.cc b/kig/objects/line_type.cc index a2c0734b..a02cc80b 100644 --- a/kig/objects/line_type.cc +++ b/kig/objects/line_type.cc @@ -29,7 +29,7 @@ #include "../misc/common.h" #include "../misc/calcpaths.h" -#include <qstringlist.h> +#include <tqstringlist.h> #include <klocale.h> @@ -218,9 +218,9 @@ const ObjectImpType* LineParallelLPType::resultId() const return LineImp::stype(); } -QStringList SegmentABType::specialActions() const +TQStringList SegmentABType::specialActions() const { - QStringList ret; + TQStringList ret; ret << i18n( "Set &Length..." ); return ret; } diff --git a/kig/objects/line_type.h b/kig/objects/line_type.h index a3ded322..69a7b3a8 100644 --- a/kig/objects/line_type.h +++ b/kig/objects/line_type.h @@ -33,7 +33,7 @@ public: ObjectImp* calc( const Coordinate& a, const Coordinate& b ) const; const ObjectImpType* resultId() const; - QStringList specialActions() const; + TQStringList specialActions() const; /** * execute the \p i 'th action from the specialActions above.. */ diff --git a/kig/objects/object_drawer.cc b/kig/objects/object_drawer.cc index 0989d4f2..f92fabe7 100644 --- a/kig/objects/object_drawer.cc +++ b/kig/objects/object_drawer.cc @@ -20,8 +20,8 @@ #include "object_imp.h" #include "../misc/kigpainter.h" -#include <qpen.h> -#include <qnamespace.h> +#include <tqpen.h> +#include <tqnamespace.h> #include <cassert> #include <kdebug.h> @@ -33,7 +33,7 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const { p.setBrushStyle( Qt::NoBrush ); p.setBrushColor( sel ? Qt::red : ( mshown?mcolor:Qt::gray ) ); - p.setPen( QPen ( sel ? Qt::red : ( mshown?mcolor:Qt::gray ), 1) ); + p.setPen( TQPen ( sel ? Qt::red : ( mshown?mcolor:Qt::gray ), 1) ); p.setWidth( mwidth ); p.setStyle( mstyle ); p.setPointStyle( mpointstyle ); @@ -52,7 +52,7 @@ bool ObjectDrawer::shown( ) const return mshown; } -QColor ObjectDrawer::color() const +TQColor ObjectDrawer::color() const { return mcolor; } @@ -68,7 +68,7 @@ ObjectDrawer* ObjectDrawer::getCopyShown( bool s ) const return ret; } -ObjectDrawer* ObjectDrawer::getCopyColor( const QColor& c ) const +ObjectDrawer* ObjectDrawer::getCopyColor( const TQColor& c ) const { ObjectDrawer* ret = new ObjectDrawer; ret->mcolor = c; @@ -127,7 +127,7 @@ int ObjectDrawer::pointStyle() const return mpointstyle; } -ObjectDrawer::ObjectDrawer( const QColor& color, int width, bool shown, Qt::PenStyle style, int pointStyle ) +ObjectDrawer::ObjectDrawer( const TQColor& color, int width, bool shown, Qt::PenStyle style, int pointStyle ) : mcolor( color ), mshown( shown ), mwidth( width ), mstyle( style ), mpointstyle( pointStyle ) { } @@ -142,7 +142,7 @@ bool ObjectDrawer::inRect( const ObjectImp& imp, const Rect& r, const KigWidget& return mshown && imp.inRect( r, mwidth, w ); } -int ObjectDrawer::pointStyleFromString( const QString& style ) +int ObjectDrawer::pointStyleFromString( const TQString& style ) { if ( style == "Round" ) return 0; @@ -157,7 +157,7 @@ int ObjectDrawer::pointStyleFromString( const QString& style ) return 0; } -QString ObjectDrawer::pointStyleToString() const +TQString ObjectDrawer::pointStyleToString() const { if ( mpointstyle == 0 ) return "Round"; @@ -170,10 +170,10 @@ QString ObjectDrawer::pointStyleToString() const else if ( mpointstyle == 4 ) return "Cross"; assert( false ); - return QString::null; + return TQString::null; } -Qt::PenStyle ObjectDrawer::styleFromString( const QString& style ) +Qt::PenStyle ObjectDrawer::styleFromString( const TQString& style ) { if ( style == "SolidLine" ) return Qt::SolidLine; @@ -188,7 +188,7 @@ Qt::PenStyle ObjectDrawer::styleFromString( const QString& style ) else return Qt::SolidLine; } -QString ObjectDrawer::styleToString() const +TQString ObjectDrawer::styleToString() const { if ( mstyle == Qt::SolidLine ) return "SolidLine"; diff --git a/kig/objects/object_drawer.h b/kig/objects/object_drawer.h index 2781acdc..6206522e 100644 --- a/kig/objects/object_drawer.h +++ b/kig/objects/object_drawer.h @@ -18,8 +18,8 @@ #ifndef KIG_OBJECTS_OBJECT_DRAWER_H #define KIG_OBJECTS_OBJECT_DRAWER_H -#include <qcolor.h> -#include <qnamespace.h> +#include <tqcolor.h> +#include <tqnamespace.h> class ObjectImp; class KigPainter; @@ -45,7 +45,7 @@ class Rect; */ class ObjectDrawer { - QColor mcolor; + TQColor mcolor; bool mshown; int mwidth; Qt::PenStyle mstyle; @@ -57,7 +57,7 @@ public: * and pointstyle ( 0 ) */ ObjectDrawer(); - ObjectDrawer( const QColor& color, int width = -1, bool shown = true, Qt::PenStyle = Qt::SolidLine, int pointStyle = 0 ); + ObjectDrawer( const TQColor& color, int width = -1, bool shown = true, Qt::PenStyle = Qt::SolidLine, int pointStyle = 0 ); /** * Draw the object \p imp on kigpainter \p p . If \p selected is true, it is * drawn in red, otherwise in its normal color. @@ -83,7 +83,7 @@ public: /** * returns the color that the object will be drawn in */ - QColor color() const; + TQColor color() const; /** * return the width of the object */ @@ -99,11 +99,11 @@ public: /** * return pointStyle trasnformed in a string */ - QString pointStyleToString() const; + TQString pointStyleToString() const; /** * return style trasnformed in a string */ - QString styleToString() const; + TQString styleToString() const; /** * returns a new ObjectDrawer that is identical to this one.. except * that the shown state is set to \p s .. @@ -113,7 +113,7 @@ public: * returns a new ObjectDrawer that is identical to this one.. except * that the color is set to \p c .. */ - ObjectDrawer* getCopyColor( const QColor& c ) const; + ObjectDrawer* getCopyColor( const TQColor& c ) const; /** * returns a new ObjectDrawer that is identical to this one.. except * that the width is set to \p w .. @@ -134,13 +134,13 @@ public: * the given \p style string is unknown. In that case it returns a * default value. */ - static int pointStyleFromString( const QString& style ); + static int pointStyleFromString( const TQString& style ); /** * Note that this returns a valid style in every case, even if the * given \p style string is unknown. In that case it returns a default * value. */ - static Qt::PenStyle styleFromString( const QString& style ); + static Qt::PenStyle styleFromString( const TQString& style ); }; #endif diff --git a/kig/objects/object_factory.cc b/kig/objects/object_factory.cc index a54e01f0..f2957a7e 100644 --- a/kig/objects/object_factory.cc +++ b/kig/objects/object_factory.cc @@ -178,7 +178,7 @@ ObjectHolder* ObjectFactory::locus( ObjectCalcer* a, ObjectCalcer* b ) const } ObjectHolder* ObjectFactory::label( - const QString& s, const Coordinate& loc, + const TQString& s, const Coordinate& loc, bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const { @@ -186,7 +186,7 @@ ObjectHolder* ObjectFactory::label( } ObjectTypeCalcer* ObjectFactory::labelCalcer( - const QString& s, const Coordinate& loc, + const TQString& s, const Coordinate& loc, bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const { @@ -194,7 +194,7 @@ ObjectTypeCalcer* ObjectFactory::labelCalcer( } ObjectTypeCalcer* ObjectFactory::attachedLabelCalcer( - const QString& s, ObjectCalcer* p, + const TQString& s, ObjectCalcer* p, const Coordinate& loc, bool needframe, const std::vector<ObjectCalcer*>& nparents, const KigDocument& doc ) const @@ -266,7 +266,7 @@ ObjectCalcer* ObjectFactory::getAttachPoint( } ObjectHolder* ObjectFactory::attachedLabel( - const QString& s, ObjectCalcer* locationparent, + const TQString& s, ObjectCalcer* locationparent, const Coordinate& loc, bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const diff --git a/kig/objects/object_factory.h b/kig/objects/object_factory.h index 0ce6ce62..30f080d9 100644 --- a/kig/objects/object_factory.h +++ b/kig/objects/object_factory.h @@ -98,11 +98,11 @@ public: * is calced already... */ ObjectHolder* label( - const QString& s, const Coordinate& loc, + const TQString& s, const Coordinate& loc, bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const; ObjectTypeCalcer* labelCalcer( - const QString& s, const Coordinate& loc, + const TQString& s, const Coordinate& loc, bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const; @@ -111,7 +111,7 @@ public: * attached to locationparent if it is non-null.. */ ObjectTypeCalcer* attachedLabelCalcer( - const QString& s, ObjectCalcer* locationparent, + const TQString& s, ObjectCalcer* locationparent, const Coordinate& loc, bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const; @@ -125,7 +125,7 @@ public: const Coordinate& loc, const KigDocument& doc ) const; ObjectHolder* attachedLabel( - const QString& s, ObjectCalcer* locationparent, + const TQString& s, ObjectCalcer* locationparent, const Coordinate& loc, bool needframe, const std::vector<ObjectCalcer*>& parents, const KigDocument& doc ) const; diff --git a/kig/objects/object_holder.cc b/kig/objects/object_holder.cc index 5a2c0765..70e1100b 100644 --- a/kig/objects/object_holder.cc +++ b/kig/objects/object_holder.cc @@ -137,7 +137,7 @@ bool ObjectHolder::shown( ) const return mdrawer->shown( ); } -const QString ObjectHolder::name() const +const TQString ObjectHolder::name() const { if ( mnamecalcer ) { @@ -145,7 +145,7 @@ const QString ObjectHolder::name() const return static_cast<const StringImp*>( mnamecalcer->imp() )->data(); } else - return QString::null; + return TQString::null; } void ObjectHolder::setNameCalcer( ObjectConstCalcer* namecalcer ) @@ -154,9 +154,9 @@ void ObjectHolder::setNameCalcer( ObjectConstCalcer* namecalcer ) mnamecalcer = namecalcer; } -QString ObjectHolder::selectStatement() const +TQString ObjectHolder::selectStatement() const { - const QString n = name(); + const TQString n = name(); if ( n.isEmpty() ) return i18n( imp()->type()->selectStatement() ); else diff --git a/kig/objects/object_holder.h b/kig/objects/object_holder.h index 9b30453d..0afd3892 100644 --- a/kig/objects/object_holder.h +++ b/kig/objects/object_holder.h @@ -20,7 +20,7 @@ #include "object_calcer.h" -#include <qstring.h> +#include <tqstring.h> /** * An ObjectHolder represents an object as it is known to the @@ -77,9 +77,9 @@ public: void setNameCalcer( ObjectConstCalcer* namecalcer ); /** - * returns QString::null if no name is set. + * returns TQString::null if no name is set. */ - const QString name() const; + const TQString name() const; /** * Set the ObjectDrawer of this ObjectHolder to \p d , the old * ObjectDrawer is deleted. @@ -139,7 +139,7 @@ public: * "select segment ab" depending on whether this ObjectHolder has a * name. */ - QString selectStatement() const; + TQString selectStatement() const; }; #endif diff --git a/kig/objects/object_imp.cc b/kig/objects/object_imp.cc index 6cb6650f..9a3ee679 100644 --- a/kig/objects/object_imp.cc +++ b/kig/objects/object_imp.cc @@ -27,7 +27,7 @@ class ObjectImpType::StaticPrivate { public: - std::map<QCString, const ObjectImpType*> namemap; + std::map<TQCString, const ObjectImpType*> namemap; }; ObjectImp::ObjectImp() @@ -43,7 +43,7 @@ bool ObjectImp::valid() const return ! type()->inherits( InvalidImp::stype() ); } -void ObjectImp::fillInNextEscape( QString&, const KigDocument& ) const +void ObjectImp::fillInNextEscape( TQString&, const KigDocument& ) const { assert( false ); } @@ -215,7 +215,7 @@ const char* ObjectImpType::internalName() const return minternalname; } -QString ObjectImpType::translatedName() const +TQString ObjectImpType::translatedName() const { return i18n( mtranslatedname ); } @@ -230,25 +230,25 @@ const char* ObjectImpType::selectNameStatement() const return mselectnamestatement; } -QString ObjectImpType::removeAStatement() const +TQString ObjectImpType::removeAStatement() const { return i18n( mremoveastatement ); } -QString ObjectImpType::addAStatement() const +TQString ObjectImpType::addAStatement() const { return i18n( maddastatement ); } -QString ObjectImpType::moveAStatement() const +TQString ObjectImpType::moveAStatement() const { return i18n( mmoveastatement ); } const ObjectImpType* ObjectImpType::typeFromInternalName( const char* string ) { - QCString s( string ); - std::map<QCString, const ObjectImpType*>::iterator i = sd()->namemap.find( s ); + TQCString s( string ); + std::map<TQCString, const ObjectImpType*>::iterator i = sd()->namemap.find( s ); if ( i == sd()->namemap.end() ) return 0; else return i->second; @@ -286,17 +286,17 @@ bool ObjectImp::isCache() const return false; } -QString ObjectImpType::attachToThisStatement() const +TQString ObjectImpType::attachToThisStatement() const { return i18n( mattachtothisstatement ); } -QString ObjectImpType::showAStatement() const +TQString ObjectImpType::showAStatement() const { return i18n( mshowastatement ); } -QString ObjectImpType::hideAStatement() const +TQString ObjectImpType::hideAStatement() const { return i18n( mhideastatement ); } diff --git a/kig/objects/object_imp.h b/kig/objects/object_imp.h index 2c032f99..eaf29328 100644 --- a/kig/objects/object_imp.h +++ b/kig/objects/object_imp.h @@ -158,7 +158,7 @@ public: /** * The name of this type, translated to the currently used language. */ - QString translatedName() const; + TQString translatedName() const; /** * Returns a translatable string of the form "Select this %1". * E.g. "Select this segment". Note that users of this function @@ -178,35 +178,35 @@ public: * Returns a translated string of the form "Remove a xxx". * E.g. "Remove a Segment". */ - QString removeAStatement() const; + TQString removeAStatement() const; /** * Returns a translated string of the form "Add a xxx". * E.g. "Add a Segment". */ - QString addAStatement() const; + TQString addAStatement() const; /** * Returns a translated string of the form "Move a xxx". * E.g. "Move a Segment". */ - QString moveAStatement() const; + TQString moveAStatement() const; /** * Returns a translated string of the form "Attach to this xxx". * E.g. "Attach to this segment". * \internal This is used by the text label construction mode */ - QString attachToThisStatement() const; + TQString attachToThisStatement() const; /** * Returns a translated string of the form "Show a xxx". * E.g. "Show a Segment". */ - QString showAStatement() const; + TQString showAStatement() const; /** * Returns a translated string of the form "Hide a xxx". * E.g. "Hide a Segment". */ - QString hideAStatement() const; + TQString hideAStatement() const; }; /** @@ -328,7 +328,7 @@ public: // s is a string with at least one escape ( "%N" where N is a // number ) somewhere. This function replaces the first escape it - // sees with the "value" of this imp ( using the QString::arg + // sees with the "value" of this imp ( using the TQString::arg // functions ). This is e.g. used by TextType to turn its variable // args into strings.. // if you implement this, then you should return true in @@ -336,7 +336,7 @@ public: // override fillInNextEscape() ( standard implementation does an // assert( false ) ).. virtual bool canFillInNextEscape() const; - virtual void fillInNextEscape( QString& s, const KigDocument& ) const; + virtual void fillInNextEscape( TQString& s, const KigDocument& ) const; /** * Returns true if this ObjectImp is equal to rhs. diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc index bfeb1358..65cd9c94 100644 --- a/kig/objects/object_imp_factory.cc +++ b/kig/objects/object_imp_factory.cc @@ -30,7 +30,7 @@ #include "../misc/coordinate.h" -#include <qdom.h> +#include <tqdom.h> #include <klocale.h> @@ -48,94 +48,94 @@ ObjectImpFactory::~ObjectImpFactory() { } -static void addXYElements( const Coordinate& c, QDomElement& parent, QDomDocument& doc ) +static void addXYElements( const Coordinate& c, TQDomElement& parent, TQDomDocument& doc ) { - QDomElement xe = doc.createElement( "x" ); + TQDomElement xe = doc.createElement( "x" ); xe.appendChild( doc.createTextNode( - QString::number( c.x ) ) ); + TQString::number( c.x ) ) ); parent.appendChild( xe ); - QDomElement ye = doc.createElement( "y" ); + TQDomElement ye = doc.createElement( "y" ); ye.appendChild( doc.createTextNode( - QString::number( c.y ) ) ); + TQString::number( c.y ) ) ); parent.appendChild( ye ); } -static void addDoubleElement( const char* name, double d, QDomElement& parent, QDomDocument& doc ) +static void addDoubleElement( const char* name, double d, TQDomElement& parent, TQDomDocument& doc ) { - QDomElement e = doc.createElement( name ); - e.appendChild( doc.createTextNode( QString::number( d ) ) ); + TQDomElement e = doc.createElement( name ); + e.appendChild( doc.createTextNode( TQString::number( d ) ) ); parent.appendChild( e ); } -static void addCoordinateElement( const char* name, const Coordinate& d, QDomElement& p, QDomDocument& doc ) +static void addCoordinateElement( const char* name, const Coordinate& d, TQDomElement& p, TQDomDocument& doc ) { - QDomElement e = doc.createElement( name ); + TQDomElement e = doc.createElement( name ); addXYElements( d, e, doc ); p.appendChild( e ); } -QString ObjectImpFactory::serialize( const ObjectImp& d, QDomElement& parent, - QDomDocument& doc ) const +TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent, + TQDomDocument& doc ) const { if( d.inherits( IntImp::stype() ) ) { parent.appendChild( doc.createTextNode( - QString::number( static_cast<const IntImp&>( d ).data() ) ) ); - return QString::fromLatin1( "int" ); + TQString::number( static_cast<const IntImp&>( d ).data() ) ) ); + return TQString::fromLatin1( "int" ); } else if ( d.inherits( DoubleImp::stype() ) ) { parent.appendChild( doc.createTextNode( - QString::number( static_cast<const DoubleImp&>( d ).data() ) ) ); - return QString::fromLatin1( "double" ); + TQString::number( static_cast<const DoubleImp&>( d ).data() ) ) ); + return TQString::fromLatin1( "double" ); } else if( d.inherits( StringImp::stype() ) ) { parent.appendChild( doc.createTextNode( static_cast<const StringImp&>( d ).data() ) ); - return QString::fromLatin1( "string" ); + return TQString::fromLatin1( "string" ); } else if ( d.inherits( TestResultImp::stype() ) ) { parent.appendChild( doc.createTextNode( static_cast<const TestResultImp&>( d ).data() ) ); - return QString::fromLatin1( "testresult" ); + return TQString::fromLatin1( "testresult" ); } else if( d.inherits( HierarchyImp::stype() ) ) { static_cast<const HierarchyImp&>( d ).data().serialize( parent, doc ); - return QString::fromLatin1( "hierarchy" ); + return TQString::fromLatin1( "hierarchy" ); } else if ( d.inherits( TransformationImp::stype() ) ) { const Transformation& trans = static_cast<const TransformationImp&>( d ).data(); - QDomElement matrixe = doc.createElement( "matrix" ); + TQDomElement matrixe = doc.createElement( "matrix" ); for ( int i = 0; i < 3; ++i ) { for ( int j = 0; j < 3; ++j ) { - QDomElement elel = doc.createElement( "element" ); - elel.setAttribute( "row", QString::number( i ) ); - elel.setAttribute( "column", QString::number( j ) ); - elel.appendChild( doc.createTextNode( QString::number( trans.data( i, j ) ) ) ); + TQDomElement elel = doc.createElement( "element" ); + elel.setAttribute( "row", TQString::number( i ) ); + elel.setAttribute( "column", TQString::number( j ) ); + elel.appendChild( doc.createTextNode( TQString::number( trans.data( i, j ) ) ) ); matrixe.appendChild( elel ); }; } parent.appendChild( matrixe ); - QDomElement homothetye = doc.createElement( "homothetic" ); + TQDomElement homothetye = doc.createElement( "homothetic" ); const char* ishomothety = trans.isHomothetic() ? "true" : "false"; homothetye.appendChild( doc.createTextNode( ishomothety ) ); parent.appendChild( homothetye ); - return QString::fromLatin1( "transformation" ); + return TQString::fromLatin1( "transformation" ); } else if( d.inherits( AbstractLineImp::stype() ) ) { @@ -143,28 +143,28 @@ QString ObjectImpFactory::serialize( const ObjectImp& d, QDomElement& parent, addCoordinateElement( "a", l.a, parent, doc ); addCoordinateElement( "b", l.b, parent, doc ); if( d.inherits( SegmentImp::stype() ) ) - return QString::fromLatin1( "segment" ); + return TQString::fromLatin1( "segment" ); else if( d.inherits( RayImp::stype() ) ) - return QString::fromLatin1( "ray" ); - else return QString::fromLatin1( "line" ); + return TQString::fromLatin1( "ray" ); + else return TQString::fromLatin1( "line" ); } else if( d.inherits( PointImp::stype() ) ) { addXYElements( static_cast<const PointImp&>( d ).coordinate(), parent, doc ); - return QString::fromLatin1( "point" ); + return TQString::fromLatin1( "point" ); } else if( d.inherits( TextImp::stype() ) ) { - QString text = static_cast<const TextImp&>( d ).text(); + TQString text = static_cast<const TextImp&>( d ).text(); parent.appendChild( doc.createTextNode( text ) ); - return QString::fromLatin1( "text" ); + return TQString::fromLatin1( "text" ); } else if( d.inherits( AngleImp::stype() ) ) { addDoubleElement( "size", static_cast<const AngleImp&>( d ).size(), parent, doc ); - return QString::fromLatin1( "angle" ); + return TQString::fromLatin1( "angle" ); } else if ( d.inherits( ArcImp::stype() ) ) { @@ -173,38 +173,38 @@ QString ObjectImpFactory::serialize( const ObjectImp& d, QDomElement& parent, addDoubleElement( "radius", a.radius(), parent, doc ); addDoubleElement( "startangle", a.startAngle(), parent, doc ); addDoubleElement( "angle", a.angle(), parent, doc ); - return QString::fromLatin1( "arc" ); + return TQString::fromLatin1( "arc" ); } else if( d.inherits( VectorImp::stype() ) ) { Coordinate dir = static_cast<const VectorImp&>( d ).dir(); addXYElements( dir, parent, doc ); - return QString::fromLatin1( "vector" ); + return TQString::fromLatin1( "vector" ); } else if( d.inherits( LocusImp::stype() ) ) { const LocusImp& locus = static_cast<const LocusImp&>( d ); // serialize the curve.. - QDomElement curve = doc.createElement( "curve" ); + TQDomElement curve = doc.createElement( "curve" ); const CurveImp& curveimp = *locus.curve(); - QString type = serialize( curveimp, curve, doc ); + TQString type = serialize( curveimp, curve, doc ); curve.setAttribute( "type", type ); parent.appendChild( curve ); // serialize the hierarchy.. - QDomElement hier = doc.createElement( "calculation" ); + TQDomElement hier = doc.createElement( "calculation" ); locus.hierarchy().serialize( hier, doc ); parent.appendChild( hier ); - return QString::fromLatin1( "locus" ); + return TQString::fromLatin1( "locus" ); } else if( d.inherits( CircleImp::stype() ) ) { const CircleImp& c = static_cast<const CircleImp&>( d ); addCoordinateElement( "center", c.center(), parent, doc ); addDoubleElement( "radius", c.radius(), parent, doc ); - return QString::fromLatin1( "circle" ); + return TQString::fromLatin1( "circle" ); } else if( d.inherits( ConicImp::stype() ) ) { @@ -213,12 +213,12 @@ QString ObjectImpFactory::serialize( const ObjectImp& d, QDomElement& parent, addDoubleElement( "pdimen", data.pdimen, parent, doc ); addDoubleElement( "ecostheta0", data.ecostheta0, parent, doc ); addDoubleElement( "esintheta0", data.esintheta0, parent, doc ); - return QString::fromLatin1( "conic" ); + return TQString::fromLatin1( "conic" ); } else if( d.inherits( CubicImp::stype() ) ) { const CubicCartesianData data = static_cast<const CubicImp&>( d ).data(); - QDomElement coeffs = doc.createElement( "coefficients" ); + TQDomElement coeffs = doc.createElement( "coefficients" ); addDoubleElement( "a000", data.coeffs[0], coeffs, doc ); addDoubleElement( "a001", data.coeffs[1], coeffs, doc ); addDoubleElement( "a002", data.coeffs[2], coeffs, doc ); @@ -230,17 +230,17 @@ QString ObjectImpFactory::serialize( const ObjectImp& d, QDomElement& parent, addDoubleElement( "a122", data.coeffs[8], coeffs, doc ); addDoubleElement( "a222", data.coeffs[9], coeffs, doc ); parent.appendChild( coeffs ); - return QString::fromLatin1( "cubic" ); + return TQString::fromLatin1( "cubic" ); } assert( false ); - return QString::null; + return TQString::null; } -static Coordinate readXYElements( const QDomElement& e, bool& ok ) +static Coordinate readXYElements( const TQDomElement& e, bool& ok ) { double x, y; ok = true; - QDomElement xe = e.firstChild().toElement(); + TQDomElement xe = e.firstChild().toElement(); if ( xe.isNull() || xe.tagName() != "x" ) { ok = false; @@ -248,7 +248,7 @@ static Coordinate readXYElements( const QDomElement& e, bool& ok ) } else x = xe.text().toDouble( &ok ); - QDomElement ye = xe.nextSibling().toElement(); + TQDomElement ye = xe.nextSibling().toElement(); if ( ye.isNull() || ye.tagName() != "y" ) { ok = false; @@ -259,10 +259,10 @@ static Coordinate readXYElements( const QDomElement& e, bool& ok ) return Coordinate( x, y ); } -static Coordinate readCoordinateElement( QDomNode n, bool& ok, +static Coordinate readCoordinateElement( TQDomNode n, bool& ok, const char* tagname ) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if ( e.isNull() || e.tagName() != tagname ) { ok = false; @@ -272,10 +272,10 @@ static Coordinate readCoordinateElement( QDomNode n, bool& ok, return readXYElements( e, ok ); } -static double readDoubleElement( QDomNode n, bool& ok, +static double readDoubleElement( TQDomNode n, bool& ok, const char* tagname ) { - QDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if ( e.isNull() || e.tagName() != tagname ) { ok = false; @@ -284,9 +284,9 @@ static double readDoubleElement( QDomNode n, bool& ok, return e.text().toDouble( &ok ); } -ObjectImp* ObjectImpFactory::deserialize( const QString& type, - const QDomElement& parent, - QString& error ) const +ObjectImp* ObjectImpFactory::deserialize( const TQString& type, + const TQDomElement& parent, + TQString& error ) const { #define KIG_GENERIC_PARSE_ERROR \ { \ @@ -328,12 +328,12 @@ ObjectImp* ObjectImpFactory::deserialize( const QString& type, { double data[3][3]; bool homothetic = false; - for ( QDomElement childe = parent.firstChild().toElement(); + for ( TQDomElement childe = parent.firstChild().toElement(); ! childe.isNull(); childe = childe.nextSibling().toElement() ) { if ( childe.tagName() == "matrix" ) { - for ( QDomElement elel = childe.firstChild().toElement(); + for ( TQDomElement elel = childe.firstChild().toElement(); ! elel.isNull(); elel = elel.nextSibling().toElement() ) { if ( elel.tagName() != "element" ) KIG_GENERIC_PARSE_ERROR; @@ -363,7 +363,7 @@ ObjectImp* ObjectImpFactory::deserialize( const QString& type, } else if ( type == "line" || type == "segment" || type == "ray" ) { - QDomNode n = parent.firstChild(); + TQDomNode n = parent.firstChild(); Coordinate a = readCoordinateElement( n, ok, "a" ); if ( !ok ) KIG_GENERIC_PARSE_ERROR; n = n.nextSibling(); @@ -381,7 +381,7 @@ ObjectImp* ObjectImpFactory::deserialize( const QString& type, } else if ( type == "arc" ) { - QDomNode n = parent.firstChild(); + TQDomNode n = parent.firstChild(); Coordinate center = readCoordinateElement( n, ok, "center" ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; n = n.nextSibling(); @@ -403,21 +403,21 @@ ObjectImp* ObjectImpFactory::deserialize( const QString& type, } else if( type == "locus" ) { - QDomElement curvee = parent.firstChild().toElement(); + TQDomElement curvee = parent.firstChild().toElement(); if ( curvee.isNull() || curvee.tagName() != "curve" ) KIG_GENERIC_PARSE_ERROR; - QString type = curvee.attribute( "type" ); + TQString type = curvee.attribute( "type" ); ObjectImp* oi = deserialize( type, curvee, error ); if ( ! oi || ! oi->inherits( CurveImp::stype() ) ) KIG_GENERIC_PARSE_ERROR; //CurveImp* curvei = static_cast<CurveImp*>( oi ); - QDomElement hiere = curvee.nextSibling().toElement(); + TQDomElement hiere = curvee.nextSibling().toElement(); if ( hiere.isNull() || hiere.tagName() != "calculation" ) KIG_GENERIC_PARSE_ERROR; assert( false ); // TODO // return new LocusImp( curvei, hier ); } else if( type == "circle" ) { - QDomNode n = parent.firstChild(); + TQDomNode n = parent.firstChild(); Coordinate center = readCoordinateElement( n, ok, "center" ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; @@ -429,7 +429,7 @@ ObjectImp* ObjectImpFactory::deserialize( const QString& type, } else if( type == "conic" ) { - QDomNode n = parent.firstChild(); + TQDomNode n = parent.firstChild(); Coordinate focus1 = readCoordinateElement( n, ok, "focus1" ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; @@ -450,11 +450,11 @@ ObjectImp* ObjectImpFactory::deserialize( const QString& type, } else if( type == "cubic" ) { - QDomElement coeffse = parent.firstChild().toElement(); + TQDomElement coeffse = parent.firstChild().toElement(); if ( coeffse.isNull() || coeffse.tagName() != "coefficients" ) KIG_GENERIC_PARSE_ERROR; - QDomNode n = coeffse.firstChild(); + TQDomNode n = coeffse.firstChild(); double a000 = readDoubleElement( n, ok, "a000" ); if ( ! ok ) KIG_GENERIC_PARSE_ERROR; diff --git a/kig/objects/object_imp_factory.h b/kig/objects/object_imp_factory.h index 1ab82bb4..1ac08dde 100644 --- a/kig/objects/object_imp_factory.h +++ b/kig/objects/object_imp_factory.h @@ -30,11 +30,11 @@ public: * loads data from \p parent , and returns a new ObjectImp from the type * string \p type . */ - ObjectImp* deserialize( const QString& type, const QDomElement& parent, QString& error ) const; + ObjectImp* deserialize( const TQString& type, const TQDomElement& parent, TQString& error ) const; /** * adds data to \p parent , and returns a type string.. */ - QString serialize( const ObjectImp& d, QDomElement& parent, QDomDocument& doc ) const; + TQString serialize( const ObjectImp& d, TQDomElement& parent, TQDomDocument& doc ) const; }; #endif diff --git a/kig/objects/object_type.cc b/kig/objects/object_type.cc index 9ac2845b..ea85e4f8 100644 --- a/kig/objects/object_type.cc +++ b/kig/objects/object_type.cc @@ -22,7 +22,7 @@ #include "../misc/coordinate.h" -#include <qstringlist.h> +#include <tqstringlist.h> #include <klocale.h> @@ -86,9 +86,9 @@ bool ObjectType::isTransform() const return false; } -QStringList ObjectType::specialActions() const +TQStringList ObjectType::specialActions() const { - return QStringList(); + return TQStringList(); } void ObjectType::executeAction( int, ObjectHolder&, ObjectTypeCalcer&, KigPart&, KigWidget&, diff --git a/kig/objects/object_type.h b/kig/objects/object_type.h index f0ac49af..54471e46 100644 --- a/kig/objects/object_type.h +++ b/kig/objects/object_type.h @@ -98,7 +98,7 @@ public: /** * return i18n'd names for the special actions.. */ - virtual QStringList specialActions() const; + virtual TQStringList specialActions() const; /** * execute the \p i 'th action from the specialActions above.. */ diff --git a/kig/objects/object_type_factory.cc b/kig/objects/object_type_factory.cc index ee3024fd..a6d527ce 100644 --- a/kig/objects/object_type_factory.cc +++ b/kig/objects/object_type_factory.cc @@ -35,7 +35,7 @@ #include "../scripting/python_type.h" #endif -#include <qdom.h> +#include <tqdom.h> #include <string> ObjectTypeFactory::ObjectTypeFactory() diff --git a/kig/objects/point_imp.cc b/kig/objects/point_imp.cc index 02d4d360..539f98b3 100644 --- a/kig/objects/point_imp.cc +++ b/kig/objects/point_imp.cc @@ -135,7 +135,7 @@ void PointImp::setCoordinate( const Coordinate& c ) mc = c; } -void PointImp::fillInNextEscape( QString& s, const KigDocument& doc ) const +void PointImp::fillInNextEscape( TQString& s, const KigDocument& doc ) const { s = s.arg( doc.coordinateSystem().fromScreen( mc, doc ) ); } diff --git a/kig/objects/point_imp.h b/kig/objects/point_imp.h index a5e8eb98..dac0576c 100644 --- a/kig/objects/point_imp.h +++ b/kig/objects/point_imp.h @@ -72,7 +72,7 @@ public: const ObjectImpType* type() const; void visit( ObjectImpVisitor* vtor ) const; - void fillInNextEscape( QString& s, const KigDocument& ) const; + void fillInNextEscape( TQString& s, const KigDocument& ) const; bool canFillInNextEscape() const; bool equals( const ObjectImp& rhs ) const; diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cc index 04f8272c..2acd8479 100644 --- a/kig/objects/point_type.cc +++ b/kig/objects/point_type.cc @@ -360,17 +360,17 @@ const ObjectImpType* MidPointType::resultId() const return PointImp::stype(); } -QStringList FixedPointType::specialActions() const +TQStringList FixedPointType::specialActions() const { - QStringList ret; + TQStringList ret; ret << i18n( "Set &Coordinate..." ); ret << i18n( "Redefine" ); return ret; } -QStringList ConstrainedPointType::specialActions() const +TQStringList ConstrainedPointType::specialActions() const { - QStringList ret; + TQStringList ret; ret << i18n( "Set &Parameter..." ); ret << i18n( "Redefine" ); return ret; @@ -395,7 +395,7 @@ void FixedPointType::executeAction( Coordinate oldc = static_cast<const PointImp*>( o.imp() )->coordinate(); KigInputDialog::getCoordinate( i18n( "Set Coordinate" ), - i18n( "Enter the new coordinate." ) + QString::fromLatin1( "<br>" ) + + i18n( "Enter the new coordinate." ) + TQString::fromLatin1( "<br>" ) + d.document().coordinateSystem().coordinateFormatNoticeMarkup(), &w, &ok, d.document(), &oldc ); if ( ! ok ) break; diff --git a/kig/objects/point_type.h b/kig/objects/point_type.h index 231ad6c5..69a7e2e8 100644 --- a/kig/objects/point_type.h +++ b/kig/objects/point_type.h @@ -43,7 +43,7 @@ public: const KigDocument& ) const; const ObjectImpType* resultId() const; - QStringList specialActions() const; + TQStringList specialActions() const; void executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& t, KigPart& d, KigWidget& w, NormalMode& m ) const; }; @@ -67,7 +67,7 @@ public: const KigDocument& ) const; const ObjectImpType* resultId() const; -// QStringList specialActions() const; +// TQStringList specialActions() const; // void executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& t, // KigPart& d, KigWidget& w, NormalMode& m ) const; }; @@ -112,7 +112,7 @@ public: const KigDocument& ) const; const ObjectImpType* resultId() const; - QStringList specialActions() const; + TQStringList specialActions() const; void executeAction( int i, ObjectHolder&, ObjectTypeCalcer& o, KigPart& d, KigWidget& w, NormalMode& m ) const; }; diff --git a/kig/objects/text_imp.cc b/kig/objects/text_imp.cc index f7b2f1be..32591c16 100644 --- a/kig/objects/text_imp.cc +++ b/kig/objects/text_imp.cc @@ -20,7 +20,7 @@ #include "bogus_imp.h" #include "../misc/kigpainter.h" -TextImp::TextImp( const QString& text, const Coordinate& loc, bool frame ) +TextImp::TextImp( const TQString& text, const Coordinate& loc, bool frame ) : mtext( text), mloc( loc ), mframe( frame ), mboundrect( Rect::invalidRect() ) { } @@ -112,7 +112,7 @@ ObjectImp* TextImp::property( uint which, const KigDocument& w ) const return new InvalidImp; } -QString TextImp::text() const +TQString TextImp::text() const { return mtext; } diff --git a/kig/objects/text_imp.h b/kig/objects/text_imp.h index 8ad92b84..54e33f79 100644 --- a/kig/objects/text_imp.h +++ b/kig/objects/text_imp.h @@ -26,7 +26,7 @@ class TextImp : public ObjectImp { - QString mtext; + TQString mtext; Coordinate mloc; bool mframe; // with this var, we keep track of the place we drew in, for use in @@ -37,7 +37,7 @@ public: static const ObjectImpType* stype(); Coordinate attachPoint() const; - TextImp( const QString& text, const Coordinate& loc, bool frame = false ); + TextImp( const TQString& text, const Coordinate& loc, bool frame = false ); TextImp* copy() const; ~TextImp(); @@ -60,7 +60,7 @@ public: const ObjectImpType* type() const; void visit( ObjectImpVisitor* vtor ) const; - QString text() const; + TQString text() const; const Coordinate coordinate() const; bool hasFrame() const; diff --git a/kig/objects/text_type.cc b/kig/objects/text_type.cc index 6594c05a..214b35c2 100644 --- a/kig/objects/text_type.cc +++ b/kig/objects/text_type.cc @@ -30,8 +30,8 @@ #include <algorithm> -#include <qclipboard.h> -#include <qstringlist.h> +#include <tqclipboard.h> +#include <tqstringlist.h> #include <kapplication.h> @@ -87,7 +87,7 @@ ObjectImp* TextType::calc( const Args& parents, const KigDocument& doc ) const int frame = static_cast<const IntImp*>( firstthree[0] )->data(); bool needframe = frame != 0; const Coordinate t = static_cast<const PointImp*>( firstthree[1] )->coordinate(); - QString s = static_cast<const StringImp*>( firstthree[2] )->data(); + TQString s = static_cast<const StringImp*>( firstthree[2] )->data(); for ( Args::iterator i = varargs.begin(); i != varargs.end(); ++i ) (*i)->fillInNextEscape( s, doc ); @@ -120,9 +120,9 @@ void TextType::move( ObjectTypeCalcer& ourobj, const Coordinate& to, firstthree[1]->move( to, d ); } -QStringList TextType::specialActions() const +TQStringList TextType::specialActions() const { - QStringList ret; + TQStringList ret; ret << i18n( "&Copy Text" ); ret << i18n( "&Toggle Frame" ); ret << i18n( "&Redefine..." ); diff --git a/kig/objects/text_type.h b/kig/objects/text_type.h index 6368cafa..8f97d4ea 100644 --- a/kig/objects/text_type.h +++ b/kig/objects/text_type.h @@ -45,7 +45,7 @@ public: void move( ObjectTypeCalcer& ourobj, const Coordinate& to, const KigDocument& ) const; - QStringList specialActions() const; + TQStringList specialActions() const; void executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c, KigPart& d, KigWidget& w, NormalMode& m ) const; |