Rename old tq methods that no longer need a unique name

10 files changed, 30 insertions, 30 deletions

diff --git a/khexedit/lib/codecs/kebcdic1047charcodec.cpp b/khexedit/lib/codecs/kebcdic1047charcodec.cpp
index 2e91035..48986b2 100644
--- a/khexedit/lib/codecs/kebcdic1047charcodec.cpp
+++ b/khexedit/lib/codecs/kebcdic1047charcodec.cpp
@@ -119,6 +119,6 @@ const TQString& KEBCDIC1047CharCodec::name() const
 
 const TQString& KEBCDIC1047CharCodec::codecName()
 {
-  static const TQString Name( TQString::tqfromLatin1(KEBCDIC1047CharCodecName) );
+  static const TQString Name( TQString::fromLatin1(KEBCDIC1047CharCodecName) );
   return Name;
 }
diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp
index f5bcc65..b45c76d 100644
--- a/khexedit/lib/codecs/ktextcharcodec.cpp
+++ b/khexedit/lib/codecs/ktextcharcodec.cpp
@@ -127,7 +127,7 @@ const TQStringList &KTextCharCodec::codecNames()
       bool Found = true;
       TQTextCodec* Codec = KGlobal::charsets()->codecForName( *it, Found );
       if( Found && is8Bit(Codec) )
-        CodecNames.append( TQString::tqfromLatin1(Codec->name()) );
+        CodecNames.append( TQString::fromLatin1(Codec->name()) );
 }
 }
 
@@ -150,7 +150,7 @@ TQString KTextCharCodec::nameOfEncoding( KEncoding C )
 
   if( N != 0 )
   {
-    TQString CodeName = TQString::tqfromLatin1( N );
+    TQString CodeName = TQString::fromLatin1( N );
   }
   return Codec;
 }
@@ -186,10 +186,10 @@ const TQStringList &KTextCharCodec::codecNames()
     for( unsigned int i=0; i<NoOfEncodings; ++i )
     {
       bool Found = true;
-      TQString Name = TQString::tqfromLatin1( EncodingNames[i].Name );
+      TQString Name = TQString::fromLatin1( EncodingNames[i].Name );
       TQTextCodec* Codec = KGlobal::charsets()->codecForName( Name, Found );
       if( Found )
-        CodecNames.append( TQString::tqfromLatin1(Codec->name()) );
+        CodecNames.append( TQString::fromLatin1(Codec->name()) );
     }
   }
 
@@ -231,6 +231,6 @@ KHEChar KTextCharCodec::decode( char Byte ) const
 const TQString& KTextCharCodec::name() const
 {
   if( Name.isNull() )
-    Name = TQString::tqfromLatin1( Codec->name() );
+    Name = TQString::fromLatin1( Codec->name() );
   return Name;
 }
diff --git a/khexedit/lib/kbordercolumn.cpp b/khexedit/lib/kbordercolumn.cpp
index 170f972..4a22919 100644
--- a/khexedit/lib/kbordercolumn.cpp
+++ b/khexedit/lib/kbordercolumn.cpp
@@ -49,8 +49,8 @@ void KBorderColumn::paintLine( TQPainter *P )
 
     if( Middle )
     {
-      int GridColor = View->tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, View );
-      P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->tqcolorGroup().mid() );
+      int GridColor = View->tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, View );
+      P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() );
       P->drawLine( LineX, 0, LineX, LineHeight-1 ) ;
     }
   }
@@ -75,8 +75,8 @@ void KBorderColumn::paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys )
   KPixelX LX = x() + LineX;
   if( Middle && Xs.includes(LX) )
   {
-    int GridColor = View->tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, View );
-    P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->tqcolorGroup().mid() );
+    int GridColor = View->tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, View );
+    P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() );
     P->drawLine( LX, Ys.start(), LX, Ys.end() ) ;
   }
 }
diff --git a/khexedit/lib/kbuffercolumn.cpp b/khexedit/lib/kbuffercolumn.cpp
index 1d26bf0..fb2cfb9 100644
--- a/khexedit/lib/kbuffercolumn.cpp
+++ b/khexedit/lib/kbuffercolumn.cpp
@@ -395,7 +395,7 @@ void KBufferColumn::paintLine( TQPainter *P, int Line ) // TODO: could be remove
 
 void KBufferColumn::paintPositions( TQPainter *P, int Line, KSection Pos )
 {
-  const TQColorGroup &CG = View->tqcolorGroup();
+  const TQColorGroup &CG = View->colorGroup();
 
   // clear background
   unsigned int BlankFlag = (Pos.start()!=0?StartsBefore:0) | (Pos.end()!=LastPos?EndsLater:0);
@@ -501,7 +501,7 @@ void KBufferColumn::paintPlain( TQPainter *P, KSection Positions, int Index )
 
 void KBufferColumn::paintSelection( TQPainter *P, KSection Positions, int Index, int Flag )
 {
-  const TQColorGroup &CG = View->tqcolorGroup();
+  const TQColorGroup &CG = View->colorGroup();
 
   paintRange( P, CG.highlight(), Positions, Flag );
 
@@ -524,7 +524,7 @@ void KBufferColumn::paintSelection( TQPainter *P, KSection Positions, int Index,
 
 void KBufferColumn::paintMarking( TQPainter *P, KSection Positions, int Index, int Flag )
 {
-  const TQColorGroup &CG = View->tqcolorGroup();
+  const TQColorGroup &CG = View->colorGroup();
 
   paintRange( P, CG.text(), Positions, Flag );
 
@@ -581,7 +581,7 @@ void KBufferColumn::paintByte( TQPainter *P, int Index )
   char Byte = ( Index > -1 ) ? Buffer->datum( Index ) : EmptyByte;
   KHEChar B = Codec->decode( Byte );
 
-  const TQColorGroup &CG = View->tqcolorGroup();
+  const TQColorGroup &CG = View->colorGroup();
   TQColor Color = CG.text();
   TQBrush Brush( CG.base(), TQt::SolidPattern );
 
diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp
index c9cc54a..3809b61 100644
--- a/khexedit/lib/kbufferdrag.cpp
+++ b/khexedit/lib/kbufferdrag.cpp
@@ -135,7 +135,7 @@ const char *KBufferDrag::format( int i ) const
 }
 
 
-TQByteArray KBufferDrag::tqencodedData( const char *Format ) const
+TQByteArray KBufferDrag::encodedData( const char *Format ) const
 {
   if( Format != 0 )
   {
@@ -224,12 +224,12 @@ bool KBufferDrag::canDecode( const TQMimeSource* Source )
 
 bool KBufferDrag::decode( const TQMimeSource* Source, TQByteArray &Dest )
 {
-//   Dest = Source->tqencodedData( MediaString );
+//   Dest = Source->encodedData( MediaString );
 //   return Dest.size() != 0;
 
   bool CanDecode = Source->provides( OctetStream );
   if( CanDecode )
-    Dest = Source->tqencodedData( OctetStream );
+    Dest = Source->encodedData( OctetStream );
 
   return CanDecode;
 }
diff --git a/khexedit/lib/kbufferdrag.h b/khexedit/lib/kbufferdrag.h
index effd9a2..3af0ebd 100644
--- a/khexedit/lib/kbufferdrag.h
+++ b/khexedit/lib/kbufferdrag.h
@@ -52,7 +52,7 @@ class KBufferDrag : public TQDragObject
 
   public: // TQDragObject API
     virtual const char *format( int i ) const;
-    virtual TQByteArray tqencodedData( const char* ) const;
+    virtual TQByteArray encodedData( const char* ) const;
 
   public:
     virtual void setData( const TQByteArray &);
diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp
index 01d7602..1e59d2f 100644
--- a/khexedit/lib/khexedit.cpp
+++ b/khexedit/lib/khexedit.cpp
@@ -548,17 +548,17 @@ void KHexEdit::toggleOffsetColumn( bool Visible )
 }
 
 
-TQSize KHexEdit::tqsizeHint() const
+TQSize KHexEdit::sizeHint() const
 {
   return TQSize( totalWidth(), totalHeight() );
 }
 
 
-TQSize KHexEdit::tqminimumSizeHint() const
+TQSize KHexEdit::minimumSizeHint() const
 {
   // TODO: better minimal width (visibility!)
   return TQSize( OffsetColumn->visibleWidth()+FirstBorderColumn->visibleWidth()+SecondBorderColumn->visibleWidth()+valueColumn().byteWidth()+charColumn().byteWidth(),
-                lineHeight() + noOfLines()>1? tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent):0 );
+                lineHeight() + noOfLines()>1? tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent):0 );
 }
 
 
@@ -598,7 +598,7 @@ int KHexEdit::fittingBytesPerLine( const TQSize &NewSize ) const
 
   // check influence of dis-/appearing of the vertical scrollbar
   bool VerticalScrollbarIsVisible = verticalScrollBar()->isVisible();
-  KPixelX ScrollbarExtent = tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width();
+  KPixelX ScrollbarExtent = tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width();
 
   KPixelX AvailableWidth = FullWidth;
   if( VerticalScrollbarIsVisible )
@@ -1192,11 +1192,11 @@ bool KHexEdit::eventFilter( TQObject *O, TQEvent *E )
 
 //   if( O == this && E->type() == TQEvent::PaletteChange )
 //   {
-//     TQColor old( viewport()->tqcolorGroup().color(TQColorGroup::Text) );
+//     TQColor old( viewport()->colorGroup().color(TQColorGroup::Text) );
 //
-//     if( old != tqcolorGroup().color(TQColorGroup::Text) )
+//     if( old != colorGroup().color(TQColorGroup::Text) )
 //     {
-//       TQColor c( tqcolorGroup().color(TQColorGroup::Text) );
+//       TQColor c( colorGroup().color(TQColorGroup::Text) );
 //       doc->setMinimumWidth( -1 );
 //       doc->setDefaultFormat( doc->formatCollection()->defaultFormat()->font(), c );
 //       lastFormatted = doc->firstParagraph();
diff --git a/khexedit/lib/khexedit.h b/khexedit/lib/khexedit.h
index 00a25d6..b974542 100644
--- a/khexedit/lib/khexedit.h
+++ b/khexedit/lib/khexedit.h
@@ -130,8 +130,8 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView
 //    void focusOutEvent( TQFocusEvent *FocusEvent );
     virtual bool eventFilter( TQObject *O, TQEvent *E );
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
 
   public: // value access
diff --git a/khexedit/lib/koffsetcolumn.cpp b/khexedit/lib/koffsetcolumn.cpp
index c2be15a..43897b1 100644
--- a/khexedit/lib/koffsetcolumn.cpp
+++ b/khexedit/lib/koffsetcolumn.cpp
@@ -42,7 +42,7 @@ KOffsetColumn::~KOffsetColumn()
 
 void KOffsetColumn::paintLine( TQPainter *P, int Line )
 {
-  const TQColor &ButtonColor = View->tqcolorGroup().button();
+  const TQColor &ButtonColor = View->colorGroup().button();
   P->fillRect( 0,0,width(),LineHeight, TQBrush(ButtonColor,TQt::SolidPattern) );
 
   printFunction()( CodedOffset,FirstLineOffset+Delta*Line );
@@ -68,7 +68,7 @@ void KOffsetColumn::paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys )
 {
   Xs.restrictTo( XSpan );
 
-  const TQColor &ButtonColor = View->tqcolorGroup().button();
+  const TQColor &ButtonColor = View->colorGroup().button();
   P->fillRect( Xs.start(), Ys.start(), Xs.width(), Ys.width(), TQBrush(ButtonColor,TQt::SolidPattern) );
 }
 
diff --git a/khexedit/lib/kvaluecolumn.cpp b/khexedit/lib/kvaluecolumn.cpp
index beb706a..645dc89 100644
--- a/khexedit/lib/kvaluecolumn.cpp
+++ b/khexedit/lib/kvaluecolumn.cpp
@@ -105,7 +105,7 @@ void KValueColumn::paintEditedByte( TQPainter *P, char Byte, const TQString &Edi
 {
   KHEChar B = Codec->decode( Byte );
 
-  const TQColorGroup &CG = View->tqcolorGroup();
+  const TQColorGroup &CG = View->colorGroup();
 
   P->fillRect( 0,0,ByteWidth,LineHeight, TQBrush(colorForChar(B),TQt::SolidPattern) );