Remove additional unneeded tq method conversions

(cherry picked from commit 24d203b42a)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 4f2509ea5f
commit 586142a7b2

@ -123,7 +123,7 @@ KDStream& KDStream::operator<<( bool b )
*/ */
KDStream& KDStream::operator<<( char ch ) KDStream& KDStream::operator<<( char ch )
{ {
_output += TQString::fromLatin1("%1").tqarg( ch ); _output += TQString::fromLatin1("%1").arg( ch );
return *this; return *this;
} }
@ -340,7 +340,7 @@ KDStream& KDStream::operator<<( const TQCursor& cursor )
{ {
TQString type; TQString type;
switch ( cursor.tqshape() ) { switch ( cursor.shape() ) {
case TQt::ArrowCursor: type = TQString::fromLatin1("ArrowCursor"); break; case TQt::ArrowCursor: type = TQString::fromLatin1("ArrowCursor"); break;
case TQt::UpArrowCursor: type = TQString::fromLatin1("UpArrowCursor"); break; case TQt::UpArrowCursor: type = TQString::fromLatin1("UpArrowCursor"); break;
case TQt::CrossCursor: type = TQString::fromLatin1("CrossCursor"); break; case TQt::CrossCursor: type = TQString::fromLatin1("CrossCursor"); break;
@ -422,9 +422,9 @@ KDStream& KDStream::operator<<( const TQPen& pen )
} }
_output += TQString::fromLatin1("TQPen(%1,%2,%3)") _output += TQString::fromLatin1("TQPen(%1,%2,%3)")
.tqarg( pen.width() ) .arg( pen.width() )
.tqarg( TQColor2Str( pen.color() ) ) .arg( TQColor2Str( pen.color() ) )
.tqarg( style ); .arg( style );
return *this; return *this;
} }
@ -433,7 +433,7 @@ KDStream& KDStream::operator<<( const TQPen& pen )
*/ */
KDStream& KDStream::operator<<( const TQPoint& point ) KDStream& KDStream::operator<<( const TQPoint& point )
{ {
_output += TQString::fromLatin1("(%1,%2)").tqarg(point.x()).tqarg(point.y() ); _output += TQString::fromLatin1("(%1,%2)").arg(point.x()).arg(point.y() );
return *this; return *this;
} }
@ -442,7 +442,7 @@ KDStream& KDStream::operator<<( const TQPoint& point )
*/ */
KDStream& KDStream::operator<<( const TQSize& size ) KDStream& KDStream::operator<<( const TQSize& size )
{ {
_output += TQString::fromLatin1("%1x%2").tqarg(size.width()).tqarg(size.height()); _output += TQString::fromLatin1("%1x%2").arg(size.width()).arg(size.height());
return *this; return *this;
} }
@ -455,12 +455,12 @@ KDStream& KDStream::operator<<( const TQRect& rect )
TQString xplus = (rect.x() >= 0) ? TQString::fromLatin1("+") : TQString::fromLatin1(""); TQString xplus = (rect.x() >= 0) ? TQString::fromLatin1("+") : TQString::fromLatin1("");
TQString yplus = (rect.y() >= 0) ? TQString::fromLatin1("+") : TQString::fromLatin1(""); TQString yplus = (rect.y() >= 0) ? TQString::fromLatin1("+") : TQString::fromLatin1("");
_output += TQString::fromLatin1("%1x%2%3%4%5%6") _output += TQString::fromLatin1("%1x%2%3%4%5%6")
.tqarg( rect.width() ) .arg( rect.width() )
.tqarg( rect.height() ) .arg( rect.height() )
.tqarg( xplus ) .arg( xplus )
.tqarg( rect.x() ) .arg( rect.x() )
.tqarg( yplus ) .arg( yplus )
.tqarg( rect.y() ); .arg( rect.y() );
return *this; return *this;
} }
@ -609,7 +609,7 @@ KDStream& KDStream::operator<<( const TQBrush& brush)
case TQt::DiagCrossPattern: style = TQString::fromLatin1("DiagCrossPattern"); break; case TQt::DiagCrossPattern: style = TQString::fromLatin1("DiagCrossPattern"); break;
case TQt::CustomPattern: style = TQString::fromLatin1("CustomPattern"); break; case TQt::CustomPattern: style = TQString::fromLatin1("CustomPattern"); break;
} }
_output += TQString::fromLatin1("TQBrush(%1,%2)").tqarg(style).tqarg(TQColor2Str(brush.color())); _output += TQString::fromLatin1("TQBrush(%1,%2)").arg(style).arg(TQColor2Str(brush.color()));
return *this; return *this;
} }
@ -644,7 +644,7 @@ KDStream& KDStream::operator<<( const TQSizePolicy& policy)
} }
TQString hforw = policy.hasHeightForWidth() ? TQString::fromLatin1("true") : TQString::fromLatin1("false"); TQString hforw = policy.hasHeightForWidth() ? TQString::fromLatin1("true") : TQString::fromLatin1("false");
_output += TQString::fromLatin1("TQSizePolicy(hor=%1,ver=%2, hasHeightForWidth=%3)") _output += TQString::fromLatin1("TQSizePolicy(hor=%1,ver=%2, hasHeightForWidth=%3)")
.tqarg(hor).tqarg(ver).tqarg(hforw); .arg(hor).arg(ver).arg(hforw);
return *this; return *this;
} }
@ -672,8 +672,8 @@ KDStream& KDStream::operator<<( const TQStrList& list )
KDStream& KDStream::operator<<( const TQPixmap& pixmap ) KDStream& KDStream::operator<<( const TQPixmap& pixmap )
{ {
_output += TQString("TQPixmap[null=%1,width=%2,heigth=%3,depth=%4,hasMask=%5,hasAlpha=%6]") _output += TQString("TQPixmap[null=%1,width=%2,heigth=%3,depth=%4,hasMask=%5,hasAlpha=%6]")
.tqarg(pixmap.isNull()).tqarg(pixmap.width()).tqarg(pixmap.height()) .arg(pixmap.isNull()).arg(pixmap.width()).arg(pixmap.height())
.tqarg(pixmap.depth()).tqarg(pixmap.mask() != 0).tqarg(pixmap.hasAlpha() ); .arg(pixmap.depth()).arg(pixmap.mask() != 0).arg(pixmap.hasAlpha() );
return *this; return *this;
} }
@ -681,8 +681,8 @@ KDStream& KDStream::operator<<( const TQPixmap& pixmap )
KDStream& KDStream::operator<<( const TQImage& pixmap ) KDStream& KDStream::operator<<( const TQImage& pixmap )
{ {
_output += TQString("TQImage[null=%1,width=%2,heigth=%3,depth=%4,hasAlpha=%5]") _output += TQString("TQImage[null=%1,width=%2,heigth=%3,depth=%4,hasAlpha=%5]")
.tqarg(pixmap.isNull()).tqarg(pixmap.width()).tqarg(pixmap.height()) .arg(pixmap.isNull()).arg(pixmap.width()).arg(pixmap.height())
.tqarg(pixmap.depth()).tqarg(pixmap.hasAlphaBuffer() ); .arg(pixmap.depth()).arg(pixmap.hasAlphaBuffer() );
return *this; return *this;
} }

@ -106,25 +106,25 @@ public:
private: private:
int m_messagetype; int m_messagetype;
void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) void paintCell (TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
{ {
TQColorGroup _cg( cg ); TQColorGroup _cg( cg );
if ( m_messagetype == KIPI::ErrorMessage ) if ( m_messagetype == KIPI::ErrorMessage )
{ {
_cg.setColor( TQColorGroup::Text, TQt::red ); _cg.setColor( TQColorGroup::Text, TQt::red );
KListViewItem::paintCell( p, _cg, column, width, tqalignment ); KListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
if ( m_messagetype == KIPI::WarningMessage ) if ( m_messagetype == KIPI::WarningMessage )
{ {
_cg.setColor( TQColorGroup::Text, TQt::darkYellow ); _cg.setColor( TQColorGroup::Text, TQt::darkYellow );
KListViewItem::paintCell( p, _cg, column, width, tqalignment ); KListViewItem::paintCell( p, _cg, column, width, alignment );
return; return;
} }
KListViewItem::paintCell( p, cg, column, width, tqalignment ); KListViewItem::paintCell( p, cg, column, width, alignment );
} }
}; };

@ -83,7 +83,7 @@ void KIPI::Plugin::setup( TQWidget* widget )
{ {
d->m_defaultWidget = widget; d->m_defaultWidget = widget;
d->m_actions.insert( widget, KActionPtrList() ); d->m_actions.insert( widget, KActionPtrList() );
TQString name = TQString( "action collection for %1" ).tqarg( widget->name() ); TQString name = TQString( "action collection for %1" ).arg( widget->name() );
d->m_actionCollection.insert( widget, new KActionCollection( widget, TQT_TQOBJECT(widget), name.latin1(), d->m_instance ) ); d->m_actionCollection.insert( widget, new KActionCollection( widget, TQT_TQOBJECT(widget), name.latin1(), d->m_instance ) );
} }

@ -180,7 +180,7 @@ void KIPI::UploadWidget::mkdir()
bool ok; bool ok;
TQString dir = KInputDialog::getText( i18n("Create Directory"), TQString dir = KInputDialog::getText( i18n("Create Directory"),
i18n("<qt>Enter new directory name (to be created as subdir of %1):</qt>") i18n("<qt>Enter new directory name (to be created as subdir of %1):</qt>")
.tqarg(path().prettyURL()), "", &ok, this); .arg(path().prettyURL()), "", &ok, this);
if (!ok) return; if (!ok) return;

Loading…
Cancel
Save