summaryrefslogtreecommitdiffstats
path: root/kitchensync/src/htmldiffalgodisplay.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:53:50 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:53:50 +0000
commit7be55ffa061c026e35e2d6a0effe1161ddb0d41f (patch)
tree8474f9b444b2756228600050f07a7ff25de532b2 /kitchensync/src/htmldiffalgodisplay.cpp
parentf587f20a6d09f1729dd0a8c1cd8ee0110aec7451 (diff)
downloadtdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.tar.gz
tdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kitchensync/src/htmldiffalgodisplay.cpp')
-rw-r--r--kitchensync/src/htmldiffalgodisplay.cpp34
1 files changed, 17 insertions, 17 deletions
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( "<html>" );
- mText.append( QString( "<body text=\"%1\" bgcolor=\"%2\">" )
+ mText.append( TQString( "<body text=\"%1\" bgcolor=\"%2\">" )
.arg( KGlobalSettings::textColor().name() )
.arg( KGlobalSettings::baseColor().name() ) );
mText.append( "<center><table>" );
- mText.append( QString( "<tr><th></th><th align=\"center\">%1</th><td> </td><th align=\"center\">%2</th></tr>" )
+ mText.append( TQString( "<tr><th></th><th align=\"center\">%1</th><td> </td><th align=\"center\">%2</th></tr>" )
.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( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#9cff83\">%2</td><td></td><td></td></tr>" )
+ mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#9cff83\">%2</td><td></td><td></td></tr>" )
.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( "<tr><td align=\"right\"><b>%1:</b></td><td></td><td></td><td bgcolor=\"#9cff83\">%2</td></tr>" )
+ mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td></td><td></td><td bgcolor=\"#9cff83\">%2</td></tr>" )
.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( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#ff8686\">%2</td><td></td><td bgcolor=\"#ff8686\">%3</td></tr>" )
+ mText.append( TQString( "<tr><td align=\"right\"><b>%1:</b></td><td bgcolor=\"#ff8686\">%2</td><td></td><td bgcolor=\"#ff8686\">%3</td></tr>" )
.arg( id )
.arg( textToHTML( leftValue ) )
.arg( textToHTML( rightValue ) ) );