summaryrefslogtreecommitdiffstats
path: root/kexi/3rdparty/kolibs/koPageLayout.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-16 09:56:31 -0600
committerTimothy Pearson <[email protected]>2011-12-16 09:56:31 -0600
commitc9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (patch)
tree1ee1912ac4bb966475f0db0f2a78678661b4b4a5 /kexi/3rdparty/kolibs/koPageLayout.cpp
parent94844816550ad672ccfcdc25659c625546239998 (diff)
downloadkoffice-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/koPageLayout.cpp')
-rw-r--r--kexi/3rdparty/kolibs/koPageLayout.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp
index 316eba19..7888ba7d 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.cpp
+++ b/kexi/3rdparty/kolibs/koPageLayout.cpp
@@ -62,7 +62,7 @@ KoGenStyle KoPageLayout::saveOasis() const
void KoPageLayout::loadOasis(const TQDomElement &style)
{
- TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-layout-properties" ) );
+ TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-properties" ) );
if ( !properties.isNull() )
{
ptWidth = KoUnit::parseValue(properties.attributeNS( KoXmlNS::fo, "page-width", TQString() ) );
@@ -86,16 +86,16 @@ void KoPageLayout::loadOasis(const TQDomElement &style)
KoPageLayout KoPageLayout::standardLayout()
{
- KoPageLayout layout;
- layout.format = KoPageFormat::defaultFormat();
- layout.orientation = PG_PORTRAIT;
- layout.ptWidth = MM_TO_POINT( KoPageFormat::width( layout.format, layout.orientation ) );
- layout.ptHeight = MM_TO_POINT( KoPageFormat::height( layout.format, layout.orientation ) );
- layout.ptLeft = MM_TO_POINT( 20.0 );
- layout.ptRight = MM_TO_POINT( 20.0 );
- layout.ptTop = MM_TO_POINT( 20.0 );
- layout.ptBottom = MM_TO_POINT( 20.0 );
- return layout;
+ KoPageLayout tqlayout;
+ tqlayout.format = KoPageFormat::defaultFormat();
+ tqlayout.orientation = PG_PORTRAIT;
+ tqlayout.ptWidth = MM_TO_POINT( KoPageFormat::width( tqlayout.format, tqlayout.orientation ) );
+ tqlayout.ptHeight = MM_TO_POINT( KoPageFormat::height( tqlayout.format, tqlayout.orientation ) );
+ tqlayout.ptLeft = MM_TO_POINT( 20.0 );
+ tqlayout.ptRight = MM_TO_POINT( 20.0 );
+ tqlayout.ptTop = MM_TO_POINT( 20.0 );
+ tqlayout.ptBottom = MM_TO_POINT( 20.0 );
+ return tqlayout;
}
struct PageFormatInfo
@@ -151,12 +151,12 @@ int KoPageFormat::printerPageSize( KoFormat format )
{
if ( format == PG_SCREEN )
{
- kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
+ kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
return KPrinter::A4;
}
else if ( format == PG_CUSTOM )
{
- kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
+ kdWarning() << "The used page tqlayout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
return KPrinter::A4;
}
else if ( format <= PG_LAST_FORMAT )
@@ -200,15 +200,15 @@ KoFormat KoPageFormat::guessFormat( double width, double height )
TQString KoPageFormat::formatString( KoFormat format )
{
if ( format <= PG_LAST_FORMAT )
- return TQString::fromLatin1( pageFormatInfo[ format ].shortName );
- return TQString::fromLatin1( "A4" );
+ return TQString::tqfromLatin1( pageFormatInfo[ format ].shortName );
+ return TQString::tqfromLatin1( "A4" );
}
KoFormat KoPageFormat::formatFromString( const TQString & string )
{
for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i )
{
- if (string == TQString::fromLatin1( pageFormatInfo[ i ].shortName ))
+ if (string == TQString::tqfromLatin1( pageFormatInfo[ i ].shortName ))
return pageFormatInfo[ i ].format;
}
// We do not know the format name, so we have a custom format