diff options
Diffstat (limited to 'khexedit/lib')
-rw-r--r-- | khexedit/lib/kbufferdrag.h | 2 | ||||
-rw-r--r-- | khexedit/lib/kbytesedit.h | 2 | ||||
-rw-r--r-- | khexedit/lib/kcolumnsview.cpp | 2 | ||||
-rw-r--r-- | khexedit/lib/kcolumnsview.h | 2 | ||||
-rw-r--r-- | khexedit/lib/khexedit.cpp | 28 | ||||
-rw-r--r-- | khexedit/lib/khexedit.h | 2 | ||||
-rw-r--r-- | khexedit/lib/khexedit_export.h | 2 |
7 files changed, 20 insertions, 20 deletions
diff --git a/khexedit/lib/kbufferdrag.h b/khexedit/lib/kbufferdrag.h index e20fb43..8aea022 100644 --- a/khexedit/lib/kbufferdrag.h +++ b/khexedit/lib/kbufferdrag.h @@ -39,7 +39,7 @@ typedef KColTextExport* KColTextExportPtr; */ class TDEBufferDrag : public TQDragObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/khexedit/lib/kbytesedit.h b/khexedit/lib/kbytesedit.h index a94fff6..de9cd7d 100644 --- a/khexedit/lib/kbytesedit.h +++ b/khexedit/lib/kbytesedit.h @@ -56,7 +56,7 @@ class KBytesEditPrivate; //TODO: give the bytes edit widget an empty buffer as default class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit { - Q_OBJECT + TQ_OBJECT //_PROPERTY( char * Data READ data ) TQ_PROPERTY( int DataSize READ dataSize ) diff --git a/khexedit/lib/kcolumnsview.cpp b/khexedit/lib/kcolumnsview.cpp index 4bb939a..c50385b 100644 --- a/khexedit/lib/kcolumnsview.cpp +++ b/khexedit/lib/kcolumnsview.cpp @@ -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.begin( TQT_TQPAINTDEVICE(&LineBuffer), this ); + Paint.begin( &LineBuffer, this ); KColumn *C = RedrawColumns.first(); Paint.translate( C->x(), 0 ); diff --git a/khexedit/lib/kcolumnsview.h b/khexedit/lib/kcolumnsview.h index d51e54c..f728d44 100644 --- a/khexedit/lib/kcolumnsview.h +++ b/khexedit/lib/kcolumnsview.h @@ -41,7 +41,7 @@ class KColumnsViewPrivate; class KColumnsView : public TQScrollView { - Q_OBJECT + TQ_OBJECT friend class KColumn; diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp index 4873fa3..7564890 100644 --- a/khexedit/lib/khexedit.cpp +++ b/khexedit/lib/khexedit.cpp @@ -133,14 +133,14 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl // get the full control viewport()->setFocusProxy( this ); - viewport()->setFocusPolicy( TQ_WheelFocus ); + viewport()->setFocusPolicy( TQWidget::WheelFocus ); viewport()->installEventFilter( this ); installEventFilter( this ); - connect( CursorBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkCursor()) ); - connect( ScrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoScrollTimerDone()) ); - connect( DragStartTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(startDrag()) ); + connect( CursorBlinkTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkCursor()) ); + connect( ScrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoScrollTimerDone()) ); + connect( DragStartTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(startDrag()) ); viewport()->setAcceptDrops( true ); } @@ -1042,7 +1042,7 @@ void KHexEdit::updateLength() void KHexEdit::clipboardChanged() { // don't listen to selection changes - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0 ); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0 ); selectAll( false ); } @@ -1178,7 +1178,7 @@ void KHexEdit::showEvent( TQShowEvent *e ) bool KHexEdit::eventFilter( TQObject *O, TQEvent *E ) { - if( TQT_BASE_OBJECT(O) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(O) == TQT_BASE_OBJECT(viewport()) ) + if( O == this || O == viewport() ) { if( E->type() == TQEvent::FocusIn ) { @@ -1548,7 +1548,7 @@ void KHexEdit::contentsMousePressEvent( TQMouseEvent *e ) pauseCursor( true ); // care about a left button press? - if( e->button() == Qt::LeftButton ) + if( e->button() == TQt::LeftButton ) { MousePressed = true; @@ -1601,7 +1601,7 @@ void KHexEdit::contentsMousePressEvent( TQMouseEvent *e ) BufferRanges->removeFurtherSelections(); } - else if( e->button() == Qt::MidButton ) + else if( e->button() == TQt::MidButton ) BufferRanges->removeSelection(); if( BufferRanges->isModified() ) @@ -1674,17 +1674,17 @@ void KHexEdit::contentsMouseReleaseEvent( TQMouseEvent *e ) if( TQApplication::clipboard()->supportsSelection() ) { ClipboardMode = TQClipboard::Selection; - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); copy(); - connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(clipboardChanged()) ); ClipboardMode = TQClipboard::Clipboard; } } } // middle mouse button paste? - else if( e->button() == Qt::MidButton && !isReadOnly() ) + else if( e->button() == TQt::MidButton && !isReadOnly() ) { pauseCursor(); @@ -1723,7 +1723,7 @@ void KHexEdit::contentsMouseReleaseEvent( TQMouseEvent *e ) void KHexEdit::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { // we are only interested in LMB doubleclicks - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) { e->ignore(); return; @@ -2008,11 +2008,11 @@ void KHexEdit::contentsContextMenuEvent( TQContextMenuEvent *e ) if( TQApplication::clipboard()->supportsSelection() ) { ClipboardMode = TQClipboard::Selection; - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); copy(); - connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(clipboardChanged()) ); ClipboardMode = TQClipboard::Clipboard; } } diff --git a/khexedit/lib/khexedit.h b/khexedit/lib/khexedit.h index c44fb89..7b25536 100644 --- a/khexedit/lib/khexedit.h +++ b/khexedit/lib/khexedit.h @@ -80,7 +80,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView friend class KValueEditor; friend class KCharEditor; - Q_OBJECT + TQ_OBJECT TQ_ENUMS( KResizeStyle KCoding ) TQ_PROPERTY( bool OverwriteMode READ isOverwriteMode WRITE setOverwriteMode ) diff --git a/khexedit/lib/khexedit_export.h b/khexedit/lib/khexedit_export.h index f922516..8d10660 100644 --- a/khexedit/lib/khexedit_export.h +++ b/khexedit/lib/khexedit_export.h @@ -20,6 +20,6 @@ #include <kdemacros.h> -#define KHEXEDIT_EXPORT KDE_EXPORT +#define KHEXEDIT_EXPORT TDE_EXPORT #endif |