diff options
Diffstat (limited to 'khexedit')
| -rw-r--r-- | khexedit/bitswapwidget.cpp | 8 | ||||
| -rw-r--r-- | khexedit/fileinfodialog.cpp | 2 | ||||
| -rw-r--r-- | khexedit/hexvalidator.cpp | 2 | ||||
| -rw-r--r-- | khexedit/parts/kpart/khepart.cpp | 6 | ||||
| -rw-r--r-- | khexedit/stringdialog.cpp | 4 | ||||
| -rw-r--r-- | khexedit/toplevel.cpp | 210 |
6 files changed, 116 insertions, 116 deletions
diff --git a/khexedit/bitswapwidget.cpp b/khexedit/bitswapwidget.cpp index bc6da80..dc17ea1 100644 --- a/khexedit/bitswapwidget.cpp +++ b/khexedit/bitswapwidget.cpp @@ -56,7 +56,7 @@ void CDigitLabel::setValue( uint digit, bool notify ) { if( notify == true ) { - emit valueChanged( TQT_TQOBJECT(this), digit, false ); + emit valueChanged( this, digit, false ); } mDigit = digit; @@ -64,7 +64,7 @@ void CDigitLabel::setValue( uint digit, bool notify ) if( notify == true ) { - emit valueChanged( TQT_TQOBJECT(this), mDigit, true ); + emit valueChanged( this, mDigit, true ); } } } @@ -145,12 +145,12 @@ void CDigitLabel::keyPressEvent( TQKeyEvent *e ) { case Key_Left: case Key_Up: - emit stepCell( TQT_TQOBJECT(this), false ); + emit stepCell( this, false ); break; case Key_Right: case Key_Down: - emit stepCell( TQT_TQOBJECT(this), true ); + emit stepCell( this, true ); break; case Key_Escape: diff --git a/khexedit/fileinfodialog.cpp b/khexedit/fileinfodialog.cpp index 96fb060..9d240e0 100644 --- a/khexedit/fileinfodialog.cpp +++ b/khexedit/fileinfodialog.cpp @@ -321,7 +321,7 @@ void CFileInfoDialog::showEvent( TQShowEvent *e ) void CFileInfoDialog::timerEvent( TQTimerEvent * ) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); slotUser1(); } diff --git a/khexedit/hexvalidator.cpp b/khexedit/hexvalidator.cpp index 74126e7..96cd982 100644 --- a/khexedit/hexvalidator.cpp +++ b/khexedit/hexvalidator.cpp @@ -25,7 +25,7 @@ CHexValidator::CHexValidator( TQWidget *parent, EState state, const char *name ) - :TQValidator( TQT_TQOBJECT(parent), name ) + :TQValidator( parent, name ) { setState( state ); } diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp index e23e26a..0acab5c 100644 --- a/khexedit/parts/kpart/khepart.cpp +++ b/khexedit/parts/kpart/khepart.cpp @@ -83,7 +83,7 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) { TDEActionCollection *AC = actionCollection(); // create our actions - CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( TQT_TQOBJECT(HexEdit), TQT_SLOT(copy()), AC ); + CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( HexEdit, TQT_SLOT(copy()), AC ); KStdAction::selectAll( this, TQT_SLOT(slotSelectAll()), AC ); KStdAction::deselect( this, TQT_SLOT(slotUnselect()), AC ); @@ -105,8 +105,8 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) ShowUnprintableAction = new TDEToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQT_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" ); - KStdAction::zoomIn( TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomIn()), actionCollection() ); - KStdAction::zoomOut( TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomOut()), actionCollection() ); + KStdAction::zoomIn( HexEdit, TQT_SLOT(zoomIn()), actionCollection() ); + KStdAction::zoomOut( HexEdit, TQT_SLOT(zoomOut()), actionCollection() ); // resize style ResizeStyleAction = new TDESelectAction( i18n("&Resize Style"), 0, AC, "resizestyle" ); diff --git a/khexedit/stringdialog.cpp b/khexedit/stringdialog.cpp index f1c79f4..5cab7eb 100644 --- a/khexedit/stringdialog.cpp +++ b/khexedit/stringdialog.cpp @@ -270,14 +270,14 @@ void CStringDialog::setClean( void ) void CStringDialog::selectionChanged() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); startTimer( 200 ); } void CStringDialog::timerEvent( TQTimerEvent * ) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); TQListViewItem *item = mStringList->currentItem(); if( item == 0 ) diff --git a/khexedit/toplevel.cpp b/khexedit/toplevel.cpp index c09bef8..b462b5a 100644 --- a/khexedit/toplevel.cpp +++ b/khexedit/toplevel.cpp @@ -65,43 +65,43 @@ KHexEdit::KHexEdit( void ) // // Prepare menus and status bar // - mAction.bookmarkMapper = new TQSignalMapper(TQT_TQOBJECT(this)); - connect(mAction.bookmarkMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(editor()), TQT_SLOT(gotoBookmark(int))); + mAction.bookmarkMapper = new TQSignalMapper(this); + connect(mAction.bookmarkMapper, TQT_SIGNAL(mapped(int)), editor(), TQT_SLOT(gotoBookmark(int))); setupActions(); setupStatusBar(); connect( hexView(), TQT_SIGNAL( cursorChanged( SCursorState & ) ), - TQT_TQOBJECT(this), TQT_SLOT( cursorChanged( SCursorState & ) ) ); + this, TQT_SLOT( cursorChanged( SCursorState & ) ) ); connect( hexView(), TQT_SIGNAL( editMode( CHexBuffer::EEditMode ) ), - TQT_TQOBJECT(this), TQT_SLOT( editMode( CHexBuffer::EEditMode ) ) ); + this, TQT_SLOT( editMode( CHexBuffer::EEditMode ) ) ); connect( hexView(), TQT_SIGNAL( encodingChanged( const SEncodeState &)), - TQT_TQOBJECT(this), TQT_SLOT( encodingChanged( const SEncodeState & )) ); + this, TQT_SLOT( encodingChanged( const SEncodeState & )) ); connect( hexView(), TQT_SIGNAL( textWidth( uint ) ), - TQT_TQOBJECT(this), TQT_SLOT( textWidth( uint ) ) ); + this, TQT_SLOT( textWidth( uint ) ) ); connect( hexView(), TQT_SIGNAL( fileState( SFileState & ) ), - TQT_TQOBJECT(this), TQT_SLOT( fileState( SFileState & ) ) ); + this, TQT_SLOT( fileState( SFileState & ) ) ); connect( hexView(), TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ), - TQT_TQOBJECT(this), TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) ); + this, TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) ); connect( hexView(), TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), - TQT_TQOBJECT(this), TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); + this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); connect( hexView(), TQT_SIGNAL( bookmarkChanged( TQPtrList<SCursorOffset> &)), - TQT_TQOBJECT(this), TQT_SLOT( bookmarkChanged( TQPtrList<SCursorOffset> & ) ) ); + this, TQT_SLOT( bookmarkChanged( TQPtrList<SCursorOffset> & ) ) ); connect( hexView(), TQT_SIGNAL( fileName( const TQString &, bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( fileActive( const TQString &, bool ) ) ); + this, TQT_SLOT( fileActive( const TQString &, bool ) ) ); connect( hexView(), TQT_SIGNAL( fileRename( const TQString &, const TQString & )), - TQT_TQOBJECT(this), TQT_SLOT( fileRename( const TQString &, const TQString & ) ) ); + this, TQT_SLOT( fileRename( const TQString &, const TQString & ) ) ); connect( hexView(), TQT_SIGNAL( fileClosed( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( fileClosed( const TQString & ) ) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( errorLoadFile( const TQString & ) ), - TQT_TQOBJECT(this), TQT_SLOT( removeRecentFile( const TQString & ) ) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( operationChanged( bool ) ), - TQT_TQOBJECT(this), TQT_SLOT( operationChanged( bool ) ) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( removeRecentFiles() ), - TQT_TQOBJECT(this), TQT_SLOT( removeRecentFiles() ) ); + this, TQT_SLOT( fileClosed( const TQString & ) ) ); + connect( editor(), TQT_SIGNAL( errorLoadFile( const TQString & ) ), + this, TQT_SLOT( removeRecentFile( const TQString & ) ) ); + connect( editor(), TQT_SIGNAL( operationChanged( bool ) ), + this, TQT_SLOT( operationChanged( bool ) ) ); + connect( editor(), TQT_SIGNAL( removeRecentFiles() ), + this, TQT_SLOT( removeRecentFiles() ) ); connect( mManager, TQT_SIGNAL( conversionClosed() ), - TQT_TQOBJECT(this), TQT_SLOT(conversionClosed()) ); + this, TQT_SLOT(conversionClosed()) ); connect( mManager, TQT_SIGNAL( searchBarClosed() ), - TQT_TQOBJECT(this), TQT_SLOT(searchBarClosed()) ); + this, TQT_SLOT(searchBarClosed()) ); // // Read configuration from file and set the default editor size. @@ -122,68 +122,68 @@ KHexEdit::~KHexEdit( void ) void KHexEdit::setupActions( void ) { - KStdAction::openNew( TQT_TQOBJECT(editor()), TQT_SLOT(newFile()), actionCollection() ); - KStdAction::open( TQT_TQOBJECT(editor()), TQT_SLOT(open()), actionCollection() ); + KStdAction::openNew( editor(), TQT_SLOT(newFile()), actionCollection() ); + KStdAction::open( editor(), TQT_SLOT(open()), actionCollection() ); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); mAction.insert = new TDEAction( i18n("&Insert..."), CTRL+Key_I, - TQT_TQOBJECT(editor()), TQT_SLOT(insertFile()), actionCollection(), "insert_file" ); - mAction.openRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); - mAction.save = KStdAction::save( TQT_TQOBJECT(editor()), TQT_SLOT(save()), actionCollection() ); - mAction.saveAs = KStdAction::saveAs( TQT_TQOBJECT(editor()), TQT_SLOT(saveAs()), actionCollection() ); - mAction.revert = KStdAction::revert( TQT_TQOBJECT(editor()), TQT_SLOT(reload()), actionCollection() ); - //mAction.revert = KStdAction::revert( TQT_TQOBJECT(this), TQT_SLOT(resizeTest()), actionCollection() ); - - mAction.close = KStdAction::close( TQT_TQOBJECT(editor()), TQT_SLOT(close()), actionCollection() ); - mAction.print = KStdAction::print( TQT_TQOBJECT(editor()), TQT_SLOT(print()), actionCollection() ); + editor(), TQT_SLOT(insertFile()), actionCollection(), "insert_file" ); + mAction.openRecent = KStdAction::openRecent( this, TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); + mAction.save = KStdAction::save( editor(), TQT_SLOT(save()), actionCollection() ); + mAction.saveAs = KStdAction::saveAs( editor(), TQT_SLOT(saveAs()), actionCollection() ); + mAction.revert = KStdAction::revert( editor(), TQT_SLOT(reload()), actionCollection() ); + //mAction.revert = KStdAction::revert( this, TQT_SLOT(resizeTest()), actionCollection() ); + + mAction.close = KStdAction::close( editor(), TQT_SLOT(close()), actionCollection() ); + mAction.print = KStdAction::print( editor(), TQT_SLOT(print()), actionCollection() ); mAction.exportData = new TDEAction( i18n("E&xport..."), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(exportDialog()), actionCollection(), "export" ); + editor(), TQT_SLOT(exportDialog()), actionCollection(), "export" ); mAction.cancel = new TDEAction( i18n("&Cancel Operation"), - "process-stop", 0, TQT_TQOBJECT(editor()), TQT_SLOT(stop()), actionCollection(), "cancel" ); + "process-stop", 0, editor(), TQT_SLOT(stop()), actionCollection(), "cancel" ); mAction.readOnly = new TDEToggleAction( i18n("&Read Only"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleWriteProtection()),actionCollection(), "read_only" ); + 0, editor(), TQT_SLOT(toggleWriteProtection()),actionCollection(), "read_only" ); mAction.resizeLock = new TDEToggleAction( i18n("&Allow Resize"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" ); + 0, editor(), TQT_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" ); mAction.newWindow = new TDEAction( i18n("N&ew Window"), - 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()),actionCollection(), "new_window" ); + 0, this, TQT_SLOT(newWindow()),actionCollection(), "new_window" ); mAction.closeWindow= new TDEAction( i18n("Close &Window"), - 0, TQT_TQOBJECT(this), TQT_SLOT(closeWindow()),actionCollection(), "close_window" ); - mAction.quit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(closeProgram()), actionCollection() ); - - mAction.undo = KStdAction::undo( TQT_TQOBJECT(editor()), TQT_SLOT(undo()), actionCollection() ); - mAction.redo = KStdAction::redo( TQT_TQOBJECT(editor()), TQT_SLOT(redo()), actionCollection() ); - mAction.cut = KStdAction::cut( TQT_TQOBJECT(editor()), TQT_SLOT(cut()), actionCollection() ); - mAction.copy = KStdAction::copy( TQT_TQOBJECT(editor()), TQT_SLOT(copy()), actionCollection() ); - mAction.paste = KStdAction::paste( TQT_TQOBJECT(editor()), TQT_SLOT(paste()), actionCollection() ); - mAction.selectAll = KStdAction::selectAll( TQT_TQOBJECT(editor()), TQT_SLOT(selectAll()),actionCollection() ); - mAction.unselect = KStdAction::deselect( TQT_TQOBJECT(editor()), TQT_SLOT(unselect()), actionCollection()); - mAction.find = KStdAction::find( TQT_TQOBJECT(editor()), TQT_SLOT(find()), actionCollection() ); - mAction.findNext = KStdAction::findNext( TQT_TQOBJECT(editor()), TQT_SLOT(findNext()), actionCollection() ); - mAction.findPrev = KStdAction::findPrev( TQT_TQOBJECT(editor()),TQT_SLOT(findPrevious()),actionCollection() ); - mAction.replace = KStdAction::replace( TQT_TQOBJECT(editor()), TQT_SLOT(replace()), actionCollection() ); + 0, this, TQT_SLOT(closeWindow()),actionCollection(), "close_window" ); + mAction.quit = KStdAction::quit( this, TQT_SLOT(closeProgram()), actionCollection() ); + + mAction.undo = KStdAction::undo( editor(), TQT_SLOT(undo()), actionCollection() ); + mAction.redo = KStdAction::redo( editor(), TQT_SLOT(redo()), actionCollection() ); + mAction.cut = KStdAction::cut( editor(), TQT_SLOT(cut()), actionCollection() ); + mAction.copy = KStdAction::copy( editor(), TQT_SLOT(copy()), actionCollection() ); + mAction.paste = KStdAction::paste( editor(), TQT_SLOT(paste()), actionCollection() ); + mAction.selectAll = KStdAction::selectAll( editor(), TQT_SLOT(selectAll()),actionCollection() ); + mAction.unselect = KStdAction::deselect( editor(), TQT_SLOT(unselect()), actionCollection()); + mAction.find = KStdAction::find( editor(), TQT_SLOT(find()), actionCollection() ); + mAction.findNext = KStdAction::findNext( editor(), TQT_SLOT(findNext()), actionCollection() ); + mAction.findPrev = KStdAction::findPrev( editor(),TQT_SLOT(findPrevious()),actionCollection() ); + mAction.replace = KStdAction::replace( editor(), TQT_SLOT(replace()), actionCollection() ); mAction.gotoOffset = new TDEAction( i18n("&Goto Offset..."), CTRL+Key_G, - TQT_TQOBJECT(editor()), TQT_SLOT(gotoOffset()),actionCollection(), "goto_offset" ); + editor(), TQT_SLOT(gotoOffset()),actionCollection(), "goto_offset" ); mAction.insertPattern = new TDEAction( i18n("&Insert Pattern..."), CTRL+Key_Insert, - TQT_TQOBJECT(editor()), TQT_SLOT(insertPattern()), actionCollection(), "insert_pattern" ); + editor(), TQT_SLOT(insertPattern()), actionCollection(), "insert_pattern" ); mAction.copyAsText = new TDEAction( i18n("Copy as &Text"), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(copyText()), actionCollection(), "copy_as_text" ); + editor(), TQT_SLOT(copyText()), actionCollection(), "copy_as_text" ); mAction.pasteToNewFile = new TDEAction( i18n("Paste into New &File"), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" ); + editor(), TQT_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" ); mAction.pasteToNewWindow = new TDEAction( i18n("Paste into New &Window"), 0, - TQT_TQOBJECT(this), TQT_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" ); + this, TQT_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" ); mAction.hexadecimal = new TDERadioAction( i18n("&Hexadecimal"), - 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_hex" ); + 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_hex" ); mAction.decimal = new TDERadioAction( i18n("&Decimal"), - 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_dec" ); + 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_dec" ); mAction.octal = new TDERadioAction( i18n("&Octal"), - 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_oct" ); + 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_oct" ); mAction.binary = new TDERadioAction( i18n("&Binary"), - 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_bin" ); + 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_bin" ); mAction.textOnly = new TDERadioAction( i18n("&Text"), - 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_text" ); + 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_text" ); mAction.hexadecimal->setExclusiveGroup( "displayMode" ); mAction.decimal->setExclusiveGroup( "displayMode" ); mAction.octal->setExclusiveGroup( "displayMode" ); @@ -191,104 +191,104 @@ actionCollection()); mAction.textOnly->setExclusiveGroup( "displayMode" ); mAction.showOffsetColumn = new TDEToggleAction( i18n("Show O&ffset Column"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" ); + 0, editor(), TQT_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" ); mAction.showTextColumn = new TDEToggleAction( i18n("Show Te&xt Field"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" ); + 0, editor(), TQT_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" ); mAction.offsetAsDecimal = new TDEToggleAction( i18n("Off&set as Decimal"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" ); + 0, editor(), TQT_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" ); mAction.dataUppercase = new TDEToggleAction( i18n("&Upper Case (Data)"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" ); + 0, editor(), TQT_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" ); mAction.offsetUppercase = new TDEToggleAction( i18n("Upper &Case (Offset)"), - 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" ); + 0, editor(), TQT_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" ); mAction.defaultEncoding = new TDERadioAction( i18n("&Default encoding", "&Default"), - 0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_default" ); + 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_default" ); mAction.usAsciiEncoding = new TDERadioAction( i18n("US-&ASCII (7 bit)"), - 0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_ascii"); + 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_ascii"); mAction.ebcdicEncoding = new TDERadioAction( i18n("&EBCDIC"), - 0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" ); + 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" ); // mAction.customEncoding = new TDEAction( i18n("&Custom..."), -// 0, TQT_TQOBJECT(editor()), TQT_SLOT( encoding()), actionCollection(), "enc_custom" ); +// 0, editor(), TQT_SLOT( encoding()), actionCollection(), "enc_custom" ); mAction.defaultEncoding->setExclusiveGroup( "encodingMode" ); mAction.usAsciiEncoding->setExclusiveGroup( "encodingMode" ); mAction.ebcdicEncoding->setExclusiveGroup( "encodingMode" ); mAction.strings = new TDEAction( i18n("&Extract Strings..."), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(strings()), actionCollection(), "extract_strings" ); + editor(), TQT_SLOT(strings()), actionCollection(), "extract_strings" ); // mAction.recordViewer = new TDEAction( i18n("&Record Viewer"), 0, -// TQT_TQOBJECT(editor()), TQT_SLOT(recordView()), actionCollection(), "record_viewer" ); +// editor(), TQT_SLOT(recordView()), actionCollection(), "record_viewer" ); mAction.filter = new TDEAction( i18n("&Binary Filter..."), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(filter()), actionCollection(), "binary_filter" ); + editor(), TQT_SLOT(filter()), actionCollection(), "binary_filter" ); mAction.characterTable = new TDEAction( i18n("&Character Table"), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(chart()), actionCollection(), "char_table" ); + editor(), TQT_SLOT(chart()), actionCollection(), "char_table" ); mAction.converter = new TDEAction( i18n("C&onverter"), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(converter()), actionCollection(), "converter" ); + editor(), TQT_SLOT(converter()), actionCollection(), "converter" ); mAction.statistics = new TDEAction( i18n("&Statistics"), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(statistics()), actionCollection(), "statistics" ); + editor(), TQT_SLOT(statistics()), actionCollection(), "statistics" ); - mAction.addBookmark = KStdAction::addBookmark( TQT_TQOBJECT(editor()), + mAction.addBookmark = KStdAction::addBookmark( editor(), TQT_SLOT(addBookmark()), actionCollection() ); mAction.replaceBookmark = new TDEAction( i18n("&Replace Bookmark"), CTRL+Key_E, - TQT_TQOBJECT(editor()), TQT_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark"); + editor(), TQT_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark"); mAction.removeBookmark = new TDEAction( i18n("R&emove Bookmark"), CTRL+Key_U, - TQT_TQOBJECT(editor()), TQT_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" ); + editor(), TQT_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" ); mAction.removeAllBookmark = new TDEAction( i18n("Re&move All"), 0, - TQT_TQOBJECT(editor()), TQT_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" ); + editor(), TQT_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" ); mAction.nextBookmark = new TDEAction( i18n("Goto &Next Bookmark"), - ALT+Key_Down, TQT_TQOBJECT(editor()), + ALT+Key_Down, editor(), TQT_SLOT(gotoNextBookmark()), actionCollection(), "next_bookmark" ); mAction.prevBookmark = new TDEAction( i18n("Goto &Previous Bookmark"), - ALT+Key_Up, TQT_TQOBJECT(editor()), + ALT+Key_Up, editor(), TQT_SLOT(gotoPrevBookmark()), actionCollection(), "prev_bookmark" ); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); mAction.showFullPath = new TDEToggleAction( i18n("Show F&ull Path"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showFullPath()), actionCollection(), "show_full_path" ); + 0, this, TQT_SLOT(showFullPath()), actionCollection(), "show_full_path" ); mAction.tabHide = new TDERadioAction( i18n("&Hide"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" ); + 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" ); mAction.tabShowAboveEditor = new TDERadioAction( i18n("&Above Editor"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" ); + 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" ); mAction.tabShowBelowEditor = new TDERadioAction( i18n("&Below Editor"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" ); + 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" ); mAction.tabHide->setExclusiveGroup( "editorTab" ); mAction.tabShowAboveEditor->setExclusiveGroup( "editorTab" ); mAction.tabShowBelowEditor->setExclusiveGroup( "editorTab" ); mAction.conversionHide = new TDERadioAction( i18n("&Hide"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_hide"); + 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_hide"); mAction.conversionFloat = new TDERadioAction( i18n("&Floating"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_float"); + 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_float"); mAction.conversionEmbed = new TDERadioAction( i18n("&Embed in Main Window"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_embed"); + 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_embed"); mAction.conversionHide->setExclusiveGroup( "conversionField" ); mAction.conversionFloat->setExclusiveGroup( "conversionField" ); mAction.conversionEmbed->setExclusiveGroup( "conversionField" ); mAction.searchHide = new TDERadioAction( i18n("&Hide"), - 0, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" ); + 0, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" ); mAction.searchShowAboveEditor = new TDERadioAction( i18n("&Above Editor"), - Key_F5, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_above" ); + Key_F5, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_above" ); mAction.searchShowBelowEditor = new TDERadioAction( i18n("&Below Editor"), - Key_F6, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_below" ); + Key_F6, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_below" ); mAction.searchHide->setExclusiveGroup( "searchBar" ); mAction.searchShowAboveEditor->setExclusiveGroup( "searchBar" ); mAction.searchShowBelowEditor->setExclusiveGroup( "searchBar" ); - KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(writeConfiguration()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(editor()) ,TQT_SLOT(options()),actionCollection() ); + KStdAction::saveOptions(this, TQT_SLOT(writeConfiguration()), actionCollection()); + KStdAction::preferences(editor() ,TQT_SLOT(options()),actionCollection() ); // mAction.favorites = new TDEAction( i18n("P&rofiles..."), 0, -// TQT_TQOBJECT(editor()), TQT_SLOT(favorites()), actionCollection(), "favorites" ); +// editor(), TQT_SLOT(favorites()), actionCollection(), "favorites" ); - KStdAction::help( TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection() ); + KStdAction::help( this, TQT_SLOT(appHelpActivated()), actionCollection() ); mDragLabel = new CDragLabel(this); mDragLabel->setPixmap( UserIcon( "hexdrag" ) ); mDragLabel->setDragMask( UserIcon( "hexmask" ) ); mDragLabel->setEnabled( false ); // Enabled once we open a document TQToolTip::add( mDragLabel, i18n("Drag document") ); - (void) new KWidgetAction(mDragLabel, i18n("Drag Document"), 0, TQT_TQOBJECT(editor()), TQT_SLOT(options()), actionCollection(), "drag_document"); + (void) new KWidgetAction(mDragLabel, i18n("Drag Document"), 0, editor(), TQT_SLOT(options()), actionCollection(), "drag_document"); createGUI("khexeditui.rc", false); @@ -297,7 +297,7 @@ actionCollection()); int id = 100; toolBar(0)->insertButton( MainBarIcon("system-lock-screen"), id, TQT_SIGNAL(clicked()), - TQT_TQOBJECT(editor()), TQT_SLOT(toggleWriteProtection()), true, + editor(), TQT_SLOT(toggleWriteProtection()), true, i18n("Toggle write protection") ); toolBar(0)->alignItemRight( id ); mWriteProtectButton = toolBar(0)->getButton(id); @@ -313,14 +313,14 @@ void KHexEdit::setupStatusBar( void ) { CStatusBarProgress *progess = new CStatusBarProgress( statusBar() ); statusBar()->addWidget( progess, 10 ); - connect( progess, TQT_SIGNAL(pressed()), TQT_TQOBJECT(editor()), TQT_SLOT(stop()) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( setProgress( int ) ), + connect( progess, TQT_SIGNAL(pressed()), editor(), TQT_SLOT(stop()) ); + connect( editor(), TQT_SIGNAL( setProgress( int ) ), progess, TQT_SLOT( setValue( int ) ) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( setProgress( int, int ) ), + connect( editor(), TQT_SIGNAL( setProgress( int, int ) ), progess, TQT_SLOT( setValue( int, int ) ) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( enableProgressText( bool ) ), + connect( editor(), TQT_SIGNAL( enableProgressText( bool ) ), progess, TQT_SLOT( setTextEnabled( bool ) ) ); - connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( setProgressText( const TQString & ) ), + connect( editor(), TQT_SIGNAL( setProgressText( const TQString & ) ), progess, TQT_SLOT( setText( const TQString & ) ) ); statusBar()->insertFixedItem( i18n("Selection: 0000:0000 0000:0000"), @@ -408,7 +408,7 @@ void KHexEdit::initialize( bool openFiles ) // is displayed, then the editor will not be visible until the error // is confirmed and the (modal) dialog is closed. // - TQTimer::singleShot( 100, TQT_TQOBJECT(this), TQT_SLOT(delayedStartupOpen()) ); + TQTimer::singleShot( 100, this, TQT_SLOT(delayedStartupOpen()) ); } @@ -920,7 +920,7 @@ void KHexEdit::bookmarkChanged( TQPtrList<SCursorOffset> &list ) { offset.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF ); text = i18n("Offset: %1").arg(offset); - TDEAction *action = new TDEAction(text, 0, mAction.bookmarkMapper, TQT_SLOT(map()), TQT_TQOBJECT(this), text.latin1()); + TDEAction *action = new TDEAction(text, 0, mAction.bookmarkMapper, TQT_SLOT(map()), this, text.latin1()); int key = acceleratorNumKey( i ); if( key > 0 ) { |