From f008adb5a77e094eaf6abf3fc0f36958e66896a5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 25 Jun 2011 05:28:35 +0000 Subject: TQt4 port koffice This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- lib/kofficecore/KoUnit.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'lib/kofficecore/KoUnit.h') diff --git a/lib/kofficecore/KoUnit.h b/lib/kofficecore/KoUnit.h index 07638215..8757ab09 100644 --- a/lib/kofficecore/KoUnit.h +++ b/lib/kofficecore/KoUnit.h @@ -20,13 +20,13 @@ #ifndef kounit_h #define kounit_h -#include -#include +#include +#include #include // for floor #include class KoXmlWriter; -class QDomElement; +class TQDomElement; // 1 inch ^= 72 pt // 1 inch ^= 25.399956 mm (-pedantic ;p) @@ -137,7 +137,7 @@ public: /// This method is the one to use to display a value in a dialog /// @return the value @p ptValue converted to @p unit and rounded, ready to be displayed /// Old name: userValue - static QString toUserStringValue( double ptValue, Unit unit ); + static TQString toUserStringValue( double ptValue, Unit unit ); /// This method is the one to use to read a value from a dialog /// @return the value in @p unit, converted to points for internal use @@ -150,20 +150,20 @@ public: /// @param ok if set, the pointed bool is set to true if the value could be /// converted to a double, and to false otherwise. /// @return the value in @p unit, converted to points for internal use - static double fromUserValue( const QString& value, Unit unit, bool* ok = 0 ); + static double fromUserValue( const TQString& value, Unit unit, bool* ok = 0 ); /// Convert a unit name into a Unit enum /// @param _unitName name to convert /// @param ok if set, it will be true if the unit was known, false if unknown - static Unit unit( const QString &_unitName, bool* ok = 0 ); + static Unit unit( const TQString &_unitName, bool* ok = 0 ); /// Get the name of a unit - static QString unitName( Unit _unit ); + static TQString unitName( Unit _unit ); /// Get the full (translated) description of a unit - static QString unitDescription( Unit _unit ); - static QStringList listOfUnitName(); + static TQString unitDescription( Unit _unit ); + static TQStringList listOfUnitName(); /// parse common %KOffice and OO values, like "10cm", "5mm" to pt - static double parseValue( QString value, double defaultVal = 0.0 ); + static double parseValue( TQString value, double defaultVal = 0.0 ); // Note: the above method doesn't take a const ref, since it modifies the arg. /// Save a unit in OASIS format -- cgit v1.2.1