From 5b8ab149469c8e186ee8b05d90c0103ae722dd85 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:23:24 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- lib/kotext/KoParagDia.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/kotext/KoParagDia.cpp') diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 0e38c8b5..200b1f32 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -794,7 +794,7 @@ KoStylePreview::KoStylePreview( const TQString& title, const TQString& text, TQW setMinimumHeight(80); m_zoomHandler = new KoTextZoomHandler; TQFont font = KoGlobal::defaultFont(); - m_textdoc = new KoTextDocument( m_zoomHandler, new KoTextFormatCollection( font, TQColor(), KGlobal::locale()->language(), false ) ); + m_textdoc = new KoTextDocument( m_zoomHandler, new KoTextFormatCollection( font, TQColor(), TDEGlobal::locale()->language(), false ) ); m_textdoc->setFlow( new MyFlow(this, m_zoomHandler) ); //m_textdoc->setWidth( KoTextZoomHandler::ptToLayoutUnitPt( 1000 ) ); @@ -1827,7 +1827,7 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram sAlignChar = new TQLineEdit( bgAlign); sAlignChar->setMaximumSize( TQSize( 60, 32767 ) ); - sAlignChar->setText(TQString(KGlobal::locale()->decimalSymbol()[0])); + sAlignChar->setText(TQString(TDEGlobal::locale()->decimalSymbol()[0])); Layout8->addWidget( sAlignChar ); TQSpacerItem* spacer_2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); Layout8->addItem( spacer_2 ); -- cgit v1.2.1