From 7ea89afa119615e547323a7a482ea7fef8e67029 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:52 -0600 Subject: Remove additional unneeded tq method conversions --- khexedit/lib/codecs/kbinarybytecodec.cpp | 4 ++-- khexedit/lib/codecs/kbytecodec.cpp | 4 ++-- khexedit/lib/codecs/kdecimalbytecodec.cpp | 12 ++++++------ khexedit/lib/codecs/khexadecimalbytecodec.cpp | 8 ++++---- khexedit/lib/codecs/koctalbytecodec.cpp | 12 ++++++------ khexedit/lib/kbufferdrag.cpp | 2 +- khexedit/lib/kbufferranges.h | 2 +- khexedit/lib/kbytesedit.h | 4 ++-- khexedit/lib/kcolumnsview.cpp | 4 ++-- khexedit/lib/kcursor.h | 2 +- khexedit/lib/kfixedsizebuffer.cpp | 6 +++--- khexedit/lib/khexedit.cpp | 10 +++++----- khexedit/lib/kplainbuffer.cpp | 4 ++-- 13 files changed, 37 insertions(+), 37 deletions(-) (limited to 'khexedit/lib') diff --git a/khexedit/lib/codecs/kbinarybytecodec.cpp b/khexedit/lib/codecs/kbinarybytecodec.cpp index fc9fe8d..a49a460 100644 --- a/khexedit/lib/codecs/kbinarybytecodec.cpp +++ b/khexedit/lib/codecs/kbinarybytecodec.cpp @@ -24,7 +24,7 @@ using namespace KHE; void KBinaryByteCodec::encode( TQString &Digits, unsigned int Pos, const unsigned char Char ) const { for( unsigned char M=1<<7; M>0; M>>=1 ) - Digits.tqat(Pos++) = (Char & M) ? '1' : '0'; + Digits.at(Pos++) = (Char & M) ? '1' : '0'; } void KBinaryByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned char Char ) const @@ -36,7 +36,7 @@ void KBinaryByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned break; // now set the for( ; M>0; M>>=1 ) - Digits.tqat(Pos++) = (Char & M) ? '1' : '0'; + Digits.at(Pos++) = (Char & M) ? '1' : '0'; } diff --git a/khexedit/lib/codecs/kbytecodec.cpp b/khexedit/lib/codecs/kbytecodec.cpp index 900055e..f4847ba 100644 --- a/khexedit/lib/codecs/kbytecodec.cpp +++ b/khexedit/lib/codecs/kbytecodec.cpp @@ -40,7 +40,7 @@ KByteCodec *KByteCodec::createCodec( KCoding C ) unsigned int KByteCodec::decode( unsigned char *Char, const TQString &Digits, uint Pos ) const { - //kdDebug() << TQString("KByteCodec::decode(%1,%2)").tqarg(Digits).tqarg(Pos) << endl; + //kdDebug() << TQString("KByteCodec::decode(%1,%2)").arg(Digits).arg(Pos) << endl; const uint P = Pos; // remove leading 0s @@ -50,7 +50,7 @@ unsigned int KByteCodec::decode( unsigned char *Char, const TQString &Digits, ui unsigned int d = encodingWidth(); do { - if( !appendDigit(&C,Digits.tqat(Pos)) ) + if( !appendDigit(&C,Digits.at(Pos)) ) break; ++Pos; diff --git a/khexedit/lib/codecs/kdecimalbytecodec.cpp b/khexedit/lib/codecs/kdecimalbytecodec.cpp index 065eb81..c556875 100644 --- a/khexedit/lib/codecs/kdecimalbytecodec.cpp +++ b/khexedit/lib/codecs/kdecimalbytecodec.cpp @@ -24,12 +24,12 @@ using namespace KHE; void KDecimalByteCodec::encode( TQString &Digits, unsigned int Pos, unsigned char Char ) const { unsigned char C = Char / 100; - Digits.tqat(Pos++) = '0'+C; + Digits.at(Pos++) = '0'+C; Char -= C * 100; C = Char / 10; - Digits.tqat(Pos++) = '0'+C; + Digits.at(Pos++) = '0'+C; Char -= C * 10; - Digits.tqat(Pos) = '0'+Char; + Digits.at(Pos) = '0'+Char; } @@ -38,15 +38,15 @@ void KDecimalByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigne unsigned char C; if( (C = Char / 100) ) { - Digits.tqat(Pos++) = '0'+C; + Digits.at(Pos++) = '0'+C; Char -= C * 100; } if( (C = Char / 10) ) { - Digits.tqat(Pos++) = '0'+C; + Digits.at(Pos++) = '0'+C; Char -= C * 10; } - Digits.tqat(Pos) = '0'+Char; + Digits.at(Pos) = '0'+Char; } diff --git a/khexedit/lib/codecs/khexadecimalbytecodec.cpp b/khexedit/lib/codecs/khexadecimalbytecodec.cpp index 46abdad..596fd24 100644 --- a/khexedit/lib/codecs/khexadecimalbytecodec.cpp +++ b/khexedit/lib/codecs/khexadecimalbytecodec.cpp @@ -41,16 +41,16 @@ bool KHexadecimalByteCodec::smallDigits() const { return Digit != BigDigit; } void KHexadecimalByteCodec::encode( TQString &Digits, unsigned int Pos, unsigned char Char ) const { - Digits.tqat(Pos++) = Digit[Char>>4]; - Digits.tqat(Pos) = Digit[Char&0x0F]; + Digits.at(Pos++) = Digit[Char>>4]; + Digits.at(Pos) = Digit[Char&0x0F]; } void KHexadecimalByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned char Char ) const { unsigned char C; if( (C = (Char>>4)) ) - Digits.tqat(Pos++) = Digit[C]; - Digits.tqat(Pos) = Digit[Char&0x0F]; + Digits.at(Pos++) = Digit[C]; + Digits.at(Pos) = Digit[Char&0x0F]; } diff --git a/khexedit/lib/codecs/koctalbytecodec.cpp b/khexedit/lib/codecs/koctalbytecodec.cpp index 7aa156d..44c7952 100644 --- a/khexedit/lib/codecs/koctalbytecodec.cpp +++ b/khexedit/lib/codecs/koctalbytecodec.cpp @@ -23,9 +23,9 @@ using namespace KHE; void KOctalByteCodec::encode( TQString &Digits, unsigned int Pos, unsigned char Char ) const { - Digits.tqat(Pos++) = '0'+(Char>>6); - Digits.tqat(Pos++) = '0'+((Char>>3)&0x07); - Digits.tqat(Pos) = '0'+((Char) &0x07); + Digits.at(Pos++) = '0'+(Char>>6); + Digits.at(Pos++) = '0'+((Char>>3)&0x07); + Digits.at(Pos) = '0'+((Char) &0x07); } @@ -33,10 +33,10 @@ void KOctalByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned { unsigned char C; if( (C = (Char>>6)&0x07) ) - Digits.tqat(Pos++) = '0'+C; + Digits.at(Pos++) = '0'+C; if( (C = (Char>>3)&0x07) ) - Digits.tqat(Pos++) = '0'+C; - Digits.tqat(Pos) = '0'+((Char)&0x07); + Digits.at(Pos++) = '0'+C; + Digits.at(Pos) = '0'+((Char)&0x07); } diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp index 3809b61..35fbbca 100644 --- a/khexedit/lib/kbufferdrag.cpp +++ b/khexedit/lib/kbufferdrag.cpp @@ -166,7 +166,7 @@ TQByteArray KBufferDrag::encodedData( const char *Format ) const { KHEChar B = CharCodec->decode( Data[i] ); - Text.tqat(i) = B.isUndefined() ? KHEChar(UndefinedChar) : + Text.at(i) = B.isUndefined() ? KHEChar(UndefinedChar) : (!B.isPrint() && B != Tab && B != Return ) ? KHEChar(SubstituteChar) : B; } // clean up diff --git a/khexedit/lib/kbufferranges.h b/khexedit/lib/kbufferranges.h index 6b293b2..ed2cbce 100644 --- a/khexedit/lib/kbufferranges.h +++ b/khexedit/lib/kbufferranges.h @@ -28,7 +28,7 @@ namespace KHE { /** a class to control all the ranges like marking and selections - * holds also all modified ranges and merges them so a tqrepaint can take its info from here + * holds also all modified ranges and merges them so a repaint can take its info from here * * @author Friedrich W. H. Kossebau */ diff --git a/khexedit/lib/kbytesedit.h b/khexedit/lib/kbytesedit.h index 915276b..eedf025 100644 --- a/khexedit/lib/kbytesedit.h +++ b/khexedit/lib/kbytesedit.h @@ -39,7 +39,7 @@ class KBytesEditPrivate; * possible changes are told to the widget by repaintRange * b) changing data ranges -> data pointer and length might change * changes told by - * * resetData( char *, int size, bool tqrepaint ); + * * resetData( char *, int size, bool repaint ); * * * 2. used as editor * a) static data ranges @@ -137,7 +137,7 @@ class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit */ void setKeepsMemory( bool KM = true ); - /** tqrepaint the indizes from i1 to i2 */ + /** repaint the indizes from i1 to i2 */ void repaintRange( int i1, int i2 ); protected: diff --git a/khexedit/lib/kcolumnsview.cpp b/khexedit/lib/kcolumnsview.cpp index 2b0b157..4bb939a 100644 --- a/khexedit/lib/kcolumnsview.cpp +++ b/khexedit/lib/kcolumnsview.cpp @@ -167,7 +167,7 @@ void KColumnsView::drawContents( TQPainter *P, int cx, int cy, int cw, int ch ) if( AffectedLines.isValid() ) { TQPainter Paint; - Paint.tqbegin( const_cast(&LineBuffer), this ); + Paint.begin( const_cast(&LineBuffer), this ); // starting painting with the first line KColumn *C = RedrawColumns.first(); @@ -198,7 +198,7 @@ void KColumnsView::drawContents( TQPainter *P, int cx, int cy, int cw, int ch ) break; // to avoid flickers we first paint to the linebuffer - Paint.tqbegin( TQT_TQPAINTDEVICE(&LineBuffer), this ); + Paint.begin( TQT_TQPAINTDEVICE(&LineBuffer), this ); KColumn *C = RedrawColumns.first(); Paint.translate( C->x(), 0 ); diff --git a/khexedit/lib/kcursor.h b/khexedit/lib/kcursor.h index bb66003..17b4371 100644 --- a/khexedit/lib/kcursor.h +++ b/khexedit/lib/kcursor.h @@ -38,7 +38,7 @@ class KCursor public: /** sets size of the full cursor */ void setSize( KPixelX Width, KPixelY Height ); - /** sets the tqshape of the cursor to be drawn */ + /** sets the shape of the cursor to be drawn */ void setShape( KPixelX X, KPixelX W ); public: // access diff --git a/khexedit/lib/kfixedsizebuffer.cpp b/khexedit/lib/kfixedsizebuffer.cpp index 83fd134..784858c 100644 --- a/khexedit/lib/kfixedsizebuffer.cpp +++ b/khexedit/lib/kfixedsizebuffer.cpp @@ -214,7 +214,7 @@ int KFixedSizeBuffer::fill( const char FChar, int FillLength, unsigned int Pos ) int KFixedSizeBuffer::compare( const KDataBuffer &Other, KSection OtherRange, unsigned int Pos ) { - //kdDebug() << TQString("Pos: %1, OtherRange: (%3/%4)" ).tqarg(Pos).tqarg(OtherRange.start()).tqarg(OtherRange.end()) + //kdDebug() << TQString("Pos: %1, OtherRange: (%3/%4)" ).arg(Pos).arg(OtherRange.start()).arg(OtherRange.end()) // << endl; // test other values if( OtherRange.startsBehind(Other.size()-1) ) @@ -245,14 +245,14 @@ int KFixedSizeBuffer::compare( const KDataBuffer &Other, KSection OtherRange, un ValueByLength = -1; } //kdDebug() - // << TQString( "Range: (%1/%2), OtherRange: (%3/%4)" ).tqarg(Range.start()).tqarg(Range.end()).tqarg(OtherRange.start()).tqarg(OtherRange.end()) + // << TQString( "Range: (%1/%2), OtherRange: (%3/%4)" ).arg(Range.start()).arg(Range.end()).arg(OtherRange.start()).arg(OtherRange.end()) // << endl; int oi = OtherRange.start(); for( int i=Range.start(); i<=Range.end(); ++i,++oi ) { char OD = Other.datum(oi); char D = Data[i]; - //kdDebug() << TQString("%1==%2").tqarg((int)D).tqarg((int)OD) << endl; + //kdDebug() << TQString("%1==%2").arg((int)D).arg((int)OD) << endl; if( OD == D ) continue; return OD < D ? 1 : -1; diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp index 1e59d2f..f8fecc9 100644 --- a/khexedit/lib/khexedit.cpp +++ b/khexedit/lib/khexedit.cpp @@ -199,7 +199,7 @@ void KHexEdit::setOverwriteMode( bool OM ) OverWrite = OM; // affected: - // cursor tqshape + // cursor shape bool ChangeCursor = !( CursorPaused || ValueEditor->isInEditMode() ); if( ChangeCursor ) pauseCursor(); @@ -1275,15 +1275,15 @@ void KHexEdit::createCursorPixmaps() int Index = BufferCursor->validIndex(); TQPainter Paint; - Paint.tqbegin( const_cast(&CursorPixmaps->offPixmap()), this ); + Paint.begin( const_cast(&CursorPixmaps->offPixmap()), this ); activeColumn().paintByte( &Paint, Index ); Paint.end(); - Paint.tqbegin( const_cast(&CursorPixmaps->onPixmap()), this ); + Paint.begin( const_cast(&CursorPixmaps->onPixmap()), this ); activeColumn().paintCursor( &Paint, Index ); Paint.end(); - // calculat the tqshape + // calculat the shape KPixelX CursorX; KPixelX CursorW; if( BufferCursor->isBehind() ) @@ -1498,7 +1498,7 @@ void KHexEdit::paintLine( KBufferColumn *C, int Line, KSection Positions ) // to avoid flickers we first paint to the linebuffer TQPainter Paint; - Paint.tqbegin( &LineBuffer, this ); + Paint.begin( &LineBuffer, this ); Paint.translate( C->x(), 0 ); C->paintPositions( &Paint, Line, Positions ); diff --git a/khexedit/lib/kplainbuffer.cpp b/khexedit/lib/kplainbuffer.cpp index 08874ba..02b9d70 100644 --- a/khexedit/lib/kplainbuffer.cpp +++ b/khexedit/lib/kplainbuffer.cpp @@ -72,7 +72,7 @@ int KPlainBuffer::insert( int Pos, const char* D, int Length ) // check all parameters if( Length == 0 ) return 0; - //kdDebug() << TQString("before: Size: %1, RawSize: %2").tqarg(Size).tqarg(RawSize) << endl; + //kdDebug() << TQString("before: Size: %1, RawSize: %2").arg(Size).arg(RawSize) << endl; // correct for appending if( Pos > (int)Size ) Pos = Size; @@ -82,7 +82,7 @@ int KPlainBuffer::insert( int Pos, const char* D, int Length ) // copy new data to its place memcpy( &Data[Pos], D, Length ); - //kdDebug() << TQString("after: Size: %1, RawSize: %2").tqarg(Size).tqarg(RawSize) << endl; + //kdDebug() << TQString("after: Size: %1, RawSize: %2").arg(Size).arg(RawSize) << endl; Modified = true; return Length; -- cgit v1.2.1