diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 09:56:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 09:56:31 -0600 |
| commit | c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (patch) | |
| tree | 1ee1912ac4bb966475f0db0f2a78678661b4b4a5 /kexi/3rdparty/kolibs/koUnit.cc | |
| parent | 94844816550ad672ccfcdc25659c625546239998 (diff) | |
| download | koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.tar.gz koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 94844816550ad672ccfcdc25659c625546239998.
Diffstat (limited to 'kexi/3rdparty/kolibs/koUnit.cc')
| -rw-r--r-- | kexi/3rdparty/kolibs/koUnit.cc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc index e8dd16ff..506e24e1 100644 --- a/kexi/3rdparty/kolibs/koUnit.cc +++ b/kexi/3rdparty/kolibs/koUnit.cc @@ -185,15 +185,15 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok ) { if ( ok ) *ok = true; - if ( _unitName == TQString::fromLatin1( "mm" ) ) return U_MM; - if ( _unitName == TQString::fromLatin1( "cm" ) ) return U_CM; - if ( _unitName == TQString::fromLatin1( "dm" ) ) return U_DM; - if ( _unitName == TQString::fromLatin1( "in" ) - || _unitName == TQString::fromLatin1("inch") /*compat*/ ) return U_INCH; - if ( _unitName == TQString::fromLatin1( "pi" ) ) return U_PI; - if ( _unitName == TQString::fromLatin1( "dd" ) ) return U_DD; - if ( _unitName == TQString::fromLatin1( "cc" ) ) return U_CC; - if ( _unitName == TQString::fromLatin1( "pt" ) ) return U_PT; + if ( _unitName == TQString::tqfromLatin1( "mm" ) ) return U_MM; + if ( _unitName == TQString::tqfromLatin1( "cm" ) ) return U_CM; + if ( _unitName == TQString::tqfromLatin1( "dm" ) ) return U_DM; + if ( _unitName == TQString::tqfromLatin1( "in" ) + || _unitName == TQString::tqfromLatin1("inch") /*compat*/ ) return U_INCH; + if ( _unitName == TQString::tqfromLatin1( "pi" ) ) return U_PI; + if ( _unitName == TQString::tqfromLatin1( "dd" ) ) return U_DD; + if ( _unitName == TQString::tqfromLatin1( "cc" ) ) return U_CC; + if ( _unitName == TQString::tqfromLatin1( "pt" ) ) return U_PT; if ( ok ) *ok = false; return U_PT; @@ -201,14 +201,14 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok ) TQString KoUnit::unitName( Unit _unit ) { - if ( _unit == U_MM ) return TQString::fromLatin1( "mm" ); - if ( _unit == U_CM ) return TQString::fromLatin1( "cm" ); - if ( _unit == U_DM ) return TQString::fromLatin1( "dm" ); - if ( _unit == U_INCH ) return TQString::fromLatin1( "in" ); - if ( _unit == U_PI ) return TQString::fromLatin1( "pi" ); - if ( _unit == U_DD ) return TQString::fromLatin1( "dd" ); - if ( _unit == U_CC ) return TQString::fromLatin1( "cc" ); - return TQString::fromLatin1( "pt" ); + if ( _unit == U_MM ) return TQString::tqfromLatin1( "mm" ); + if ( _unit == U_CM ) return TQString::tqfromLatin1( "cm" ); + if ( _unit == U_DM ) return TQString::tqfromLatin1( "dm" ); + if ( _unit == U_INCH ) return TQString::tqfromLatin1( "in" ); + if ( _unit == U_PI ) return TQString::tqfromLatin1( "pi" ); + if ( _unit == U_DD ) return TQString::tqfromLatin1( "dd" ); + if ( _unit == U_CC ) return TQString::tqfromLatin1( "cc" ); + return TQString::tqfromLatin1( "pt" ); } #ifndef SIMPLE_KOLIBS |