1 files changed, 24 insertions, 24 deletions

diff --git a/khexedit/hexviewwidget.cpp b/khexedit/hexviewwidget.cpp
index 6c15ae3..bcdca2f 100644
--- a/khexedit/hexviewwidget.cpp
+++ b/khexedit/hexviewwidget.cpp
@@ -139,7 +139,7 @@ void CDragManager::timerEvent( TQTimerEvent *e )
     if( mPending == true )
     {
       mPending = false;
-      emit startDrag( ( kapp->keyboardModifiers() & TDEApplication::ShiftModifier ) );
+      emit startDrag( ( tdeApp->keyboardModifiers() & TDEApplication::ShiftModifier ) );
     }
   }
 }
@@ -193,16 +193,16 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name,
   // signal whenever is receives a TQHideEvent.
   //
 
-  mVertScroll = new CScrollBar( Qt::Vertical, this );
+  mVertScroll = new CScrollBar( TQt::Vertical, this );
   if( mVertScroll == 0 ) { return; }
-  mHorzScroll = new CScrollBar( Qt::Horizontal, this );
+  mHorzScroll = new CScrollBar( TQt::Horizontal, this );
   if( mHorzScroll == 0 ) { return; }
   mCorner = new TQWidget( this );
   if( mCorner == 0 ) { return; }
-  connect( mHorzScroll, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changeXPos(int)) );
-  connect( mVertScroll, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changeYPos(int)) );
-  connect( mHorzScroll, TQT_SIGNAL(hidden()), TQT_SLOT(update()) );
-  connect( mVertScroll, TQT_SIGNAL(hidden()), TQT_SLOT(update()) );
+  connect( mHorzScroll, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changeXPos(int)) );
+  connect( mVertScroll, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changeYPos(int)) );
+  connect( mHorzScroll, TQ_SIGNAL(hidden()), TQ_SLOT(update()) );
+  connect( mVertScroll, TQ_SIGNAL(hidden()), TQ_SLOT(update()) );
   mHorzScroll->hide();
   mVertScroll->hide();
 
@@ -213,11 +213,11 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name,
   #else
   mDragManager->setActivateMode( CDragManager::Timer );
   #endif
-  connect( mDragManager, TQT_SIGNAL(startDrag(bool)), TQT_SLOT(startDrag(bool)) );
+  connect( mDragManager, TQ_SIGNAL(startDrag(bool)), TQ_SLOT(startDrag(bool)) );
 
   setFrameStyle( TQFrame::WinPanel|TQFrame::Sunken );
   setWFlags( WResizeNoErase );
-  setFocusPolicy( TQ_StrongFocus );
+  setFocusPolicy( TQWidget::StrongFocus );
 
   mHexBuffer = hexBuffer;
   mHexBuffer->cursorReset();
@@ -438,8 +438,8 @@ void CHexViewWidget::changeYPos( int p )
 
 void CHexViewWidget::clipboardChanged( void )
 {
-  disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
-	     this,TQT_SLOT(clipboardChanged()));
+  disconnect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()),
+	     this,TQ_SLOT(clipboardChanged()));
   unselect();
 }
 
@@ -451,7 +451,7 @@ void CHexViewWidget::paletteChanged( void )
 
 void CHexViewWidget::fontChanged( void )
 {
-  //setFont( kapp->fixedFont, true );
+  //setFont( tdeApp->fixedFont, true );
 }
 
 void CHexViewWidget::filter( SFilterControl &fc )
@@ -964,8 +964,8 @@ void CHexViewWidget::copy( void )
   {
     return;
   }
-  disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
-	     this,TQT_SLOT(clipboardChanged()));
+  disconnect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()),
+	     this,TQ_SLOT(clipboardChanged()));
   //
   // Note: Do no give the CHexDrag a parent != 0. The clipboard
   // owns the current dragdata and will destroy it on exit or
@@ -975,8 +975,8 @@ void CHexViewWidget::copy( void )
   // when the app. is closed (=> segfault).
   //
   TQApplication::clipboard()->setData(new CHexDrag( buf ));
-  connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
-	  this,TQT_SLOT(clipboardChanged()));
+  connect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()),
+	  this,TQ_SLOT(clipboardChanged()));
 }
 
 
@@ -988,11 +988,11 @@ void CHexViewWidget::copyText( int columnSegment )
     return;
   }
 
-  disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
-	     this,TQT_SLOT(clipboardChanged()));
+  disconnect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()),
+	     this,TQ_SLOT(clipboardChanged()));
   TQApplication::clipboard()->setText( buf.data() );
-  connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),
-	  this,TQT_SLOT(clipboardChanged()));
+  connect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()),
+	  this,TQ_SLOT(clipboardChanged()));
 }
 
 
@@ -1534,7 +1534,7 @@ void CHexViewWidget::mousePressEvent( TQMouseEvent *e )
   // The RMB popup menu is managed by the KContextMenuManager
   //
 
-  if( e->button() == Qt::LeftButton )
+  if( e->button() == TQt::LeftButton )
   {
     if( e->state() & ControlButton )
     {
@@ -1550,7 +1550,7 @@ void CHexViewWidget::mousePressEvent( TQMouseEvent *e )
       setCursorPosition( e->x(), e->y(), true, cellLevel );
     }
   }
-  else if( e->button() == Qt::MidButton )
+  else if( e->button() == TQt::MidButton )
   {
     paste();
   }
@@ -1559,7 +1559,7 @@ void CHexViewWidget::mousePressEvent( TQMouseEvent *e )
 
 void CHexViewWidget::mouseMoveEvent( TQMouseEvent *e )
 {
-  if( e->state() & Qt::LeftButton )
+  if( e->state() & TQt::LeftButton )
   {
     if( mDragManager->start( e ) == false )
     {
@@ -1575,7 +1575,7 @@ void CHexViewWidget::mouseReleaseEvent( TQMouseEvent *e )
   // The RMB popup menu is managed by the KContextMenuManager
   //
 
-  if( e->button() == Qt::LeftButton )
+  if( e->button() == TQt::LeftButton )
   {
     if( e->state() & ControlButton )
     {