From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kitchensync/src/htmldiffalgodisplay.cpp | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'kitchensync/src/htmldiffalgodisplay.cpp') diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp index b3b1bf819..610f05a54 100644 --- a/kitchensync/src/htmldiffalgodisplay.cpp +++ b/kitchensync/src/htmldiffalgodisplay.cpp @@ -25,17 +25,17 @@ using namespace KSync; -static QString textToHTML( const QString &text ) +static TQString textToHTML( const TQString &text ) { - return QStyleSheet::convertFromPlainText( text ); + return TQStyleSheet::convertFromPlainText( text ); } -HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( QWidget *parent ) +HTMLDiffAlgoDisplay::HTMLDiffAlgoDisplay( TQWidget *parent ) : KTextBrowser( parent ) { - setWrapPolicy( QTextEdit::AtWordBoundary ); - setVScrollBarMode( QScrollView::AlwaysOff ); - setHScrollBarMode( QScrollView::AlwaysOff ); + setWrapPolicy( TQTextEdit::AtWordBoundary ); + setVScrollBarMode( TQScrollView::AlwaysOff ); + setHScrollBarMode( TQScrollView::AlwaysOff ); } void HTMLDiffAlgoDisplay::begin() @@ -44,12 +44,12 @@ void HTMLDiffAlgoDisplay::begin() mText = ""; mText.append( "" ); - mText.append( QString( "" ) + mText.append( TQString( "" ) .arg( KGlobalSettings::textColor().name() ) .arg( KGlobalSettings::baseColor().name() ) ); mText.append( "
" ); - mText.append( QString( "" ) + mText.append( TQString( "" ) .arg( mLeftTitle ) .arg( mRightTitle ) ); } @@ -63,34 +63,34 @@ void HTMLDiffAlgoDisplay::end() setText( mText ); } -void HTMLDiffAlgoDisplay::setLeftSourceTitle( const QString &title ) +void HTMLDiffAlgoDisplay::setLeftSourceTitle( const TQString &title ) { mLeftTitle = title; } -void HTMLDiffAlgoDisplay::setRightSourceTitle( const QString &title ) +void HTMLDiffAlgoDisplay::setRightSourceTitle( const TQString &title ) { mRightTitle = title; } -void HTMLDiffAlgoDisplay::additionalLeftField( const QString &id, const QString &value ) +void HTMLDiffAlgoDisplay::additionalLeftField( const TQString &id, const TQString &value ) { - mText.append( QString( "" ) + mText.append( TQString( "" ) .arg( id ) .arg( textToHTML( value ) ) ); } -void HTMLDiffAlgoDisplay::additionalRightField( const QString &id, const QString &value ) +void HTMLDiffAlgoDisplay::additionalRightField( const TQString &id, const TQString &value ) { - mText.append( QString( "" ) + mText.append( TQString( "" ) .arg( id ) .arg( textToHTML( value ) ) ); } -void HTMLDiffAlgoDisplay::conflictField( const QString &id, const QString &leftValue, - const QString &rightValue ) +void HTMLDiffAlgoDisplay::conflictField( const TQString &id, const TQString &leftValue, + const TQString &rightValue ) { - mText.append( QString( "" ) + mText.append( TQString( "" ) .arg( id ) .arg( textToHTML( leftValue ) ) .arg( textToHTML( rightValue ) ) ); -- cgit v1.2.1
%1 %2
%1 %2
%1:%2
%1:%2
%1:%2
%1:%2
%1:%2%3
%1:%2%3