diff options
Diffstat (limited to 'khexedit')
-rw-r--r-- | khexedit/bitswapwidget.cpp | 8 | ||||
-rw-r--r-- | khexedit/chartabledialog.cpp | 4 | ||||
-rw-r--r-- | khexedit/converterdialog.cpp | 24 | ||||
-rw-r--r-- | khexedit/dialog.cpp | 46 | ||||
-rw-r--r-- | khexedit/exportdialog.cpp | 10 | ||||
-rw-r--r-- | khexedit/hexeditorwidget.cpp | 122 | ||||
-rw-r--r-- | khexedit/hexmanagerwidget.cpp | 36 | ||||
-rw-r--r-- | khexedit/hextoolwidget.cpp | 10 | ||||
-rw-r--r-- | khexedit/hexviewwidget.cpp | 30 | ||||
-rw-r--r-- | khexedit/lib/khexedit.cpp | 16 | ||||
-rw-r--r-- | khexedit/optiondialog.cpp | 204 | ||||
-rw-r--r-- | khexedit/parts/kbytesedit/kbyteseditwidget.cpp | 4 | ||||
-rw-r--r-- | khexedit/parts/kpart/khebrowserextension.cpp | 2 | ||||
-rw-r--r-- | khexedit/parts/kpart/khepart.cpp | 26 | ||||
-rw-r--r-- | khexedit/printdialogpage.cpp | 8 | ||||
-rw-r--r-- | khexedit/searchbar.cpp | 12 | ||||
-rw-r--r-- | khexedit/stringdialog.cpp | 6 | ||||
-rw-r--r-- | khexedit/toplevel.cpp | 250 |
18 files changed, 409 insertions, 409 deletions
diff --git a/khexedit/bitswapwidget.cpp b/khexedit/bitswapwidget.cpp index dc17ea1..098fc9d 100644 --- a/khexedit/bitswapwidget.cpp +++ b/khexedit/bitswapwidget.cpp @@ -186,10 +186,10 @@ CByteWidget::CByteWidget( TQWidget *parent, const char *name ) mDigit[i]->setFixedSize( mDigit[i]->sizeHint()*2 ); mDigit[i]->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); mDigit[i]->setAlignment( AlignCenter ); - connect( mDigit[i], TQT_SIGNAL(stepCell(const TQObject *, bool )), - this, TQT_SLOT(stepCell(const TQObject *, bool ))); - connect( mDigit[i], TQT_SIGNAL(valueChanged(const TQObject *, uint, bool )), - this, TQT_SLOT(valueChanged(const TQObject *, uint, bool ))); + connect( mDigit[i], TQ_SIGNAL(stepCell(const TQObject *, bool )), + this, TQ_SLOT(stepCell(const TQObject *, bool ))); + connect( mDigit[i], TQ_SIGNAL(valueChanged(const TQObject *, uint, bool )), + this, TQ_SLOT(valueChanged(const TQObject *, uint, bool ))); mHBox->addWidget( mDigit[i] ); } diff --git a/khexedit/chartabledialog.cpp b/khexedit/chartabledialog.cpp index a46bee0..be77c2b 100644 --- a/khexedit/chartabledialog.cpp +++ b/khexedit/chartabledialog.cpp @@ -58,8 +58,8 @@ CCharTableDialog::CCharTableDialog( TQWidget *parent, const char *name, // // I am setting the min. size below // - //connect( mCharacterList, TQT_SIGNAL(doubleClicked(TQListViewItem *) ), - //TQT_SLOT(startAssign(TQListViewItem *))); + //connect( mCharacterList, TQ_SIGNAL(doubleClicked(TQListViewItem *) ), + //TQ_SLOT(startAssign(TQListViewItem *))); topLayout->addWidget( mCharacterList, 10 ); diff --git a/khexedit/converterdialog.cpp b/khexedit/converterdialog.cpp index e742e73..1f54df7 100644 --- a/khexedit/converterdialog.cpp +++ b/khexedit/converterdialog.cpp @@ -34,8 +34,8 @@ CValidateLineEdit::CValidateLineEdit( TQWidget *parent, int validateType, { mValidator = new CHexValidator( this, (CHexValidator::EState)validateType ); setValidator( mValidator ); - connect( this, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(convertText(const TQString &)) ); + connect( this, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(convertText(const TQString &)) ); } @@ -101,16 +101,16 @@ CConverterDialog::CConverterDialog( TQWidget *parent, const char *name, mTxtInput = new CValidateLineEdit( page, CHexValidator::regularText ); topLayout->addWidget( mTxtInput, 4, 1 ); - connect( mHexInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); - connect( mDecInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); - connect( mOctInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); - connect( mBinInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); - connect( mTxtInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); + connect( mHexInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); + connect( mDecInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); + connect( mOctInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); + connect( mBinInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); + connect( mTxtInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); } diff --git a/khexedit/dialog.cpp b/khexedit/dialog.cpp index 588a715..76f48bc 100644 --- a/khexedit/dialog.cpp +++ b/khexedit/dialog.cpp @@ -189,7 +189,7 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal ) if( mSelector == 0 ) { return; } mSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mSelector->insertStringList( formatStrings() ); - connect( mSelector, TQT_SIGNAL(activated(int)), TQT_SLOT(selectorChanged(int)) ); + connect( mSelector, TQ_SIGNAL(activated(int)), TQ_SLOT(selectorChanged(int)) ); TQLabel *label = new TQLabel( mSelector, i18n("Fo&rmat:"), plainPage() ); if( label == 0 ) { return; } @@ -200,8 +200,8 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal ) mInput = new TQLineEdit( plainPage() ); if( mInput == 0 ) { return; } mInput->setMinimumWidth( fontMetrics().maxWidth()*17 ); - connect( mInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(inputChanged(const TQString&)) ); + connect( mInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(inputChanged(const TQString&)) ); mFindValidator = new CHexValidator( this, CHexValidator::regularText ); if( mFindValidator == 0 ) { return; } mInput->setValidator( mFindValidator ); @@ -498,8 +498,8 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) if( mFindSelector == 0 ) { return; } mFindSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mFindSelector->insertStringList( formatStrings() ); - connect( mFindSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(findSelectorChanged(int)) ); + connect( mFindSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(findSelectorChanged(int)) ); text = i18n("Fo&rmat (find):"); TQLabel *label = new TQLabel( mFindSelector, text, plainPage() ); @@ -514,8 +514,8 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) mFindValidator = new CHexValidator( this, CHexValidator::regularText ); if( mFindValidator == 0 ) { return; } mFindInput->setValidator( mFindValidator ); - connect( mFindInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(findInputChanged(const TQString&)) ); + connect( mFindInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(findInputChanged(const TQString&)) ); label = new TQLabel( mFindInput, i18n("F&ind:"), plainPage() ); if( label == 0 ) { return; } @@ -527,8 +527,8 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) if( mReplaceSelector == 0 ) { return; } mReplaceSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mReplaceSelector->insertStringList( formatStrings() ); - connect( mReplaceSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(replaceSelectorChanged(int)) ); + connect( mReplaceSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(replaceSelectorChanged(int)) ); text = i18n("For&mat (replace):"); label = new TQLabel( mReplaceSelector, text, plainPage() ); @@ -544,8 +544,8 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) mReplaceValidator = new CHexValidator( this, CHexValidator::regularText ); if( mReplaceValidator == 0 ) { return; } mReplaceInput->setValidator( mReplaceValidator ); - connect( mReplaceInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(replaceInputChanged(const TQString&)) ); + connect( mReplaceInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(replaceInputChanged(const TQString&)) ); label = new TQLabel( mReplaceInput, i18n("Rep&lace:"), plainPage() ); if( label == 0 ) { return; } @@ -774,8 +774,8 @@ CFilterDialog::CFilterDialog( TQWidget *parent, const char *name, bool modal ) if( mOperationSelector == 0 ) { return; } mOperationSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mOperationSelector->insertStringList( operationStrings() ); - connect( mOperationSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(operationSelectorChanged(int)) ); + connect( mOperationSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(operationSelectorChanged(int)) ); text = i18n("O&peration:"); TQLabel *label = new TQLabel( mOperationSelector, text, plainPage() ); @@ -849,8 +849,8 @@ void CFilterDialog::makeOperandLayout( void ) mOperandSelector->setFixedHeight( mOperandSelector->sizeHint().height()); mOperandSelector->setMinimumWidth( fontMetrics().width("M")*20 ); mOperandSelector->insertStringList( formatStrings() ); - connect( mOperandSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(operandSelectorChanged(int)) ); + connect( mOperandSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(operandSelectorChanged(int)) ); text = i18n("Fo&rmat (operand):"); mOperandFormatLabel = new TQLabel( mOperandSelector, text, page ); @@ -865,8 +865,8 @@ void CFilterDialog::makeOperandLayout( void ) mOperandValidator = new CHexValidator( this, CHexValidator::regularText ); if( mOperandValidator == 0 ) { return; } mOperandInput->setValidator( mOperandValidator ); - connect( mOperandInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(operandInputChanged(const TQString&)) ); + connect( mOperandInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(operandInputChanged(const TQString&)) ); mOperandInputLabel = new TQLabel( mOperandInput, i18n("O&perand:"), page ); if( mOperandInputLabel == 0 ) { return; } @@ -903,7 +903,7 @@ void CFilterDialog::makeBitSwapLayout( void ) text = i18n("&Reset"); TQPushButton *resetButton = new TQPushButton( text, page ); resetButton->setFixedHeight( resetButton->sizeHint().height() ); - connect( resetButton, TQT_SIGNAL(clicked()), mByteWidget, TQT_SLOT(reset()) ); + connect( resetButton, TQ_SIGNAL(clicked()), mByteWidget, TQ_SLOT(reset()) ); hbox->addWidget( resetButton ); hbox->addStretch( 10 ); @@ -1096,8 +1096,8 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) if( mPatternSelector == 0 ) { return; } mPatternSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mPatternSelector->insertStringList( formatStrings() ); - connect( mPatternSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(patternSelectorChanged(int)) ); + connect( mPatternSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(patternSelectorChanged(int)) ); text = i18n("Fo&rmat (pattern):"); label = new TQLabel( mPatternSelector, text, plainPage() ); @@ -1112,8 +1112,8 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) mPatternValidator = new CHexValidator( this, CHexValidator::regularText ); if( mPatternValidator == 0 ) { return; } mPatternInput->setValidator( mPatternValidator ); - connect( mPatternInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(patternInputChanged(const TQString&)) ); + connect( mPatternInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(patternInputChanged(const TQString&)) ); label = new TQLabel( mPatternInput, i18n("&Pattern:"), plainPage() ); if( label == 0 ) { return; } @@ -1143,7 +1143,7 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) gbox->addWidget( mCheckPattern, 1, 0 ); mCheckOnCursor = new TQCheckBox( i18n("&Insert on cursor position"), group ); gbox->addWidget( mCheckOnCursor, 2, 0 ); - connect( mCheckOnCursor, TQT_SIGNAL(clicked()), TQT_SLOT(cursorCheck()) ); + connect( mCheckOnCursor, TQ_SIGNAL(clicked()), TQ_SLOT(cursorCheck()) ); gbox->setRowStretch( 3, 10 ); TDEConfig &config = *kapp->config(); diff --git a/khexedit/exportdialog.cpp b/khexedit/exportdialog.cpp index 2cdfae7..b2ac808 100644 --- a/khexedit/exportdialog.cpp +++ b/khexedit/exportdialog.cpp @@ -163,8 +163,8 @@ void CExportDialog::setupDestinationPage( void ) mDestination.formatCombo = new TQComboBox( false, page ); mDestination.formatCombo->insertStringList( formatList ); mDestination.formatCombo->setMinimumWidth( fontMetrics().maxWidth()*10 ); - connect( mDestination.formatCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(formatChanged(int)) ); + connect( mDestination.formatCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(formatChanged(int)) ); text = i18n("&Format:"); TQLabel *label = new TQLabel( mDestination.formatCombo, text, page ); @@ -187,11 +187,11 @@ void CExportDialog::setupDestinationPage( void ) mDestination.fileInput = new TQLineEdit( page ); hbox->addWidget( mDestination.fileInput ); - connect(mDestination.fileInput, TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(destinationChanged(const TQString &))); + connect(mDestination.fileInput, TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(destinationChanged(const TQString &))); text = i18n("Choose..."); TQPushButton *browseButton = new TQPushButton( text, page, "browse" ); hbox->addWidget( browseButton ); - connect( browseButton, TQT_SIGNAL(clicked()), TQT_SLOT(browserClicked()) ); + connect( browseButton, TQ_SIGNAL(clicked()), TQ_SLOT(browserClicked()) ); mDestination.fileInput->setMinimumWidth( fontMetrics().maxWidth()*15 ); label->setBuddy(mDestination.fileInput); @@ -237,7 +237,7 @@ void CExportDialog::setupDestinationPage( void ) gbox->addWidget( mDestination.toLabel, 1, 0 ); gbox->addWidget( mDestination.toInput, 1, 1 ); - connect( group, TQT_SIGNAL(clicked(int)), TQT_SLOT(rangeChanged(int)) ); + connect( group, TQ_SIGNAL(clicked(int)), TQ_SLOT(rangeChanged(int)) ); group->setButton(0); rangeChanged(0); enableButtonOK( !mDestination.fileInput->text().isEmpty() ); diff --git a/khexedit/hexeditorwidget.cpp b/khexedit/hexeditorwidget.cpp index 09a9407..5638576 100644 --- a/khexedit/hexeditorwidget.cpp +++ b/khexedit/hexeditorwidget.cpp @@ -60,16 +60,16 @@ CHexEditorWidget::CHexEditorWidget( TQWidget *parent, const char *name ) mHexView = new CHexViewWidget( this, "hexview", hexBuffer ); if( mHexView == 0 || mHexView->widgetValid() == false ) { return; } - connect( mHexView, TQT_SIGNAL(pleaseOpenNewFile()), TQT_SLOT( newFile()) ); - connect( mHexView, TQT_SIGNAL(pleaseOpenFile( const TQString&, bool, uint )), - TQT_SLOT( open(const TQString&, bool, uint)) ); - connect( mHexView, TQT_SIGNAL(pleaseStepFile(bool)), TQT_SLOT( stepFile(bool)) ); - connect( kapp, TQT_SIGNAL( tdedisplayFontChanged() ), TQT_SLOT( fontChanged() ) ); - connect( kapp, TQT_SIGNAL( tdedisplayPaletteChanged() ),TQT_SLOT( paletteChanged()) ); - connect( mHexView, TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ), - TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) ); - connect( mHexView, TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), - this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); + connect( mHexView, TQ_SIGNAL(pleaseOpenNewFile()), TQ_SLOT( newFile()) ); + connect( mHexView, TQ_SIGNAL(pleaseOpenFile( const TQString&, bool, uint )), + TQ_SLOT( open(const TQString&, bool, uint)) ); + connect( mHexView, TQ_SIGNAL(pleaseStepFile(bool)), TQ_SLOT( stepFile(bool)) ); + connect( kapp, TQ_SIGNAL( tdedisplayFontChanged() ), TQ_SLOT( fontChanged() ) ); + connect( kapp, TQ_SIGNAL( tdedisplayPaletteChanged() ),TQ_SLOT( paletteChanged()) ); + connect( mHexView, TQ_SIGNAL( layoutChanged( const SDisplayLayout & ) ), + TQ_SLOT( layoutChanged( const SDisplayLayout & ) ) ); + connect( mHexView, TQ_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), + this, TQ_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); mHexView->setFocus(); setBackgroundColor( palette().active().base() ); @@ -1167,12 +1167,12 @@ void CHexEditorWidget::exportDialog( void ) { mExportDialog = new CExportDialog( topLevelWidget(), 0, false ); if( mExportDialog == 0 ) { return; } - connect( mExportDialog, TQT_SIGNAL( exportText(const SExportText &)), - this, TQT_SLOT( exportText( const SExportText &)) ); - connect( mExportDialog, TQT_SIGNAL( exportHtml(const SExportHtml &)), - this, TQT_SLOT( exportHtml( const SExportHtml &)) ); - connect( mExportDialog, TQT_SIGNAL( exportCArray(const SExportCArray &)), - this, TQT_SLOT( exportCArray( const SExportCArray &)) ); + connect( mExportDialog, TQ_SIGNAL( exportText(const SExportText &)), + this, TQ_SLOT( exportText( const SExportText &)) ); + connect( mExportDialog, TQ_SIGNAL( exportHtml(const SExportHtml &)), + this, TQ_SLOT( exportHtml( const SExportHtml &)) ); + connect( mExportDialog, TQ_SIGNAL( exportCArray(const SExportCArray &)), + this, TQ_SLOT( exportCArray( const SExportCArray &)) ); } mExportDialog->show(); } @@ -1449,8 +1449,8 @@ void CHexEditorWidget::gotoOffset( void ) { mGotoDialog = new CGotoDialog( topLevelWidget(), 0, false ); if( mGotoDialog == 0 ) { return; } - connect( mGotoDialog, TQT_SIGNAL(gotoOffset( uint, uint, bool, bool )), - mHexView, TQT_SLOT(gotoOffset( uint, uint, bool, bool )) ); + connect( mGotoDialog, TQ_SIGNAL(gotoOffset( uint, uint, bool, bool )), + mHexView, TQ_SLOT(gotoOffset( uint, uint, bool, bool )) ); } mGotoDialog->show(); } @@ -1468,8 +1468,8 @@ void CHexEditorWidget::find( void ) mFindDialog = new CFindDialog( topLevelWidget(), 0, false ); if( mFindDialog == 0 ) { return; } connect( mFindDialog, - TQT_SIGNAL(findData(SSearchControl &, uint, bool)), - TQT_SLOT(findData(SSearchControl &, uint, bool)) ); + TQ_SIGNAL(findData(SSearchControl &, uint, bool)), + TQ_SLOT(findData(SSearchControl &, uint, bool)) ); } mFindDialog->show(); } @@ -1616,10 +1616,10 @@ void CHexEditorWidget::findNavigator( SSearchControl &sc ) mFindNavigatorDialog = new CFindNavigatorDialog(topLevelWidget(),0,false); if( mFindNavigatorDialog == 0 ) { return; } connect( mFindNavigatorDialog, - TQT_SIGNAL(findData(SSearchControl &, uint, bool)), - TQT_SLOT(findData(SSearchControl &, uint, bool)) ); - connect( mFindNavigatorDialog, TQT_SIGNAL(makeKey(void)), - TQT_SLOT(find()) ); + TQ_SIGNAL(findData(SSearchControl &, uint, bool)), + TQ_SLOT(findData(SSearchControl &, uint, bool)) ); + connect( mFindNavigatorDialog, TQ_SIGNAL(makeKey(void)), + TQ_SLOT(find()) ); } if( mFindNavigatorDialog->isVisible() == false ) { @@ -1639,8 +1639,8 @@ void CHexEditorWidget::replace( void ) mReplaceDialog = new CReplaceDialog( topLevelWidget(), 0, false ); if( mReplaceDialog == 0 ) { return; } connect( mReplaceDialog, - TQT_SIGNAL( replaceData( SSearchControl &, uint)), - TQT_SLOT( replaceData( SSearchControl &, uint))); + TQ_SIGNAL( replaceData( SSearchControl &, uint)), + TQ_SLOT( replaceData( SSearchControl &, uint))); } mReplaceDialog->show(); } @@ -1729,8 +1729,8 @@ void CHexEditorWidget::replacePrompt( SSearchControl &sc ) mReplacePromptDialog = new CReplacePromptDialog(topLevelWidget(), 0,false); if( mReplacePromptDialog == 0 ) { return; } connect( mReplacePromptDialog, - TQT_SIGNAL( replaceData( SSearchControl &, uint)), - TQT_SLOT( replaceData( SSearchControl &, uint))); + TQ_SIGNAL( replaceData( SSearchControl &, uint)), + TQ_SLOT( replaceData( SSearchControl &, uint))); } if( mReplacePromptDialog->isVisible() == false ) { @@ -1783,8 +1783,8 @@ void CHexEditorWidget::insertPattern( void ) { mInsertDialog = new CInsertDialog( topLevelWidget(), 0, false ); if( mInsertDialog == 0 ) { return; } - connect( mInsertDialog, TQT_SIGNAL(execute( SInsertData & )), - mHexView, TQT_SLOT(insert( SInsertData & )) ); + connect( mInsertDialog, TQ_SIGNAL(execute( SInsertData & )), + mHexView, TQ_SLOT(insert( SInsertData & )) ); } mInsertDialog->show(); } @@ -1805,13 +1805,13 @@ void CHexEditorWidget::strings( void ) { mStringDialog = new CStringDialog( topLevelWidget(), 0, false ); if( mStringDialog == 0 ) { return; } - connect( mStringDialog, TQT_SIGNAL(markText( uint, uint, bool )), - mHexView, TQT_SLOT(setMark( uint, uint, bool )) ); - connect( mStringDialog, TQT_SIGNAL(collect()), TQT_SLOT(collectStrings()) ); - connect( mHexView, TQT_SIGNAL(fileName( const TQString &, bool ) ), - mStringDialog, TQT_SLOT( removeList() ) ); - connect( mHexView, TQT_SIGNAL(dataChanged()), - mStringDialog, TQT_SLOT(setDirty()) ); + connect( mStringDialog, TQ_SIGNAL(markText( uint, uint, bool )), + mHexView, TQ_SLOT(setMark( uint, uint, bool )) ); + connect( mStringDialog, TQ_SIGNAL(collect()), TQ_SLOT(collectStrings()) ); + connect( mHexView, TQ_SIGNAL(fileName( const TQString &, bool ) ), + mStringDialog, TQ_SLOT( removeList() ) ); + connect( mHexView, TQ_SIGNAL(dataChanged()), + mStringDialog, TQ_SLOT(setDirty()) ); } mStringDialog->show(); } @@ -1851,8 +1851,8 @@ void CHexEditorWidget::filter( void ) { mFilterDialog = new CFilterDialog( topLevelWidget(), 0, false ); if( mFilterDialog == 0 ) { return; } - connect( mFilterDialog, TQT_SIGNAL(filterData( SFilterControl & )), - mHexView, TQT_SLOT(filter( SFilterControl & )) ); + connect( mFilterDialog, TQ_SIGNAL(filterData( SFilterControl & )), + mHexView, TQ_SLOT(filter( SFilterControl & )) ); } mFilterDialog->show(); } @@ -1864,8 +1864,8 @@ void CHexEditorWidget::chart( void ) { mCharTableDialog = new CCharTableDialog( topLevelWidget(), 0, false ); if( mCharTableDialog == 0 ) { return; } - connect( mCharTableDialog, TQT_SIGNAL(assign( const TQByteArray & )), - mHexView, TQT_SLOT(insert( const TQByteArray & )) ); + connect( mCharTableDialog, TQ_SIGNAL(assign( const TQByteArray & )), + mHexView, TQ_SLOT(insert( const TQByteArray & )) ); } mCharTableDialog->show(); } @@ -1876,8 +1876,8 @@ void CHexEditorWidget::converter( void ) if( mConverterDialog == 0 ) { mConverterDialog = new CConverterDialog( this, "converter", false ); - connect( mConverterDialog, TQT_SIGNAL(probeCursorValue(TQByteArray &, uint)), - mHexView, TQT_SLOT(valueOnCursor(TQByteArray &, uint)) ); + connect( mConverterDialog, TQ_SIGNAL(probeCursorValue(TQByteArray &, uint)), + mHexView, TQ_SLOT(valueOnCursor(TQByteArray &, uint)) ); } mConverterDialog->show(); } @@ -1889,10 +1889,10 @@ void CHexEditorWidget::statistics( void ) { mFileInfoDialog = new CFileInfoDialog( topLevelWidget(), 0, false ); if( mFileInfoDialog == 0 ) { return; } - connect( mFileInfoDialog, TQT_SIGNAL(collectStatistic(SStatisticControl &)), - TQT_SLOT(collectStatistics(SStatisticControl &))); - connect( mHexView, TQT_SIGNAL(dataChanged()), - mFileInfoDialog, TQT_SLOT(setDirty()) ); + connect( mFileInfoDialog, TQ_SIGNAL(collectStatistic(SStatisticControl &)), + TQ_SLOT(collectStatistics(SStatisticControl &))); + connect( mHexView, TQ_SIGNAL(dataChanged()), + mFileInfoDialog, TQ_SLOT(setDirty()) ); } mFileInfoDialog->show(); } @@ -1930,20 +1930,20 @@ void CHexEditorWidget::options( void ) mOptionDialog = new COptionDialog( topLevelWidget(), 0, false ); if( mOptionDialog == 0 ) { return; } - connect( mOptionDialog, TQT_SIGNAL(lineSizeChoice(const SDisplayLine &)), - TQT_SLOT(setLineSize(const SDisplayLine &)) ); - connect( mOptionDialog, TQT_SIGNAL(layoutChoice(const SDisplayLayout &)), - TQT_SLOT(setLayout(const SDisplayLayout &)) ); - connect( mOptionDialog, TQT_SIGNAL(fontChoice(const SDisplayFont &)), - TQT_SLOT(setFont(const SDisplayFont &)) ); - connect( mOptionDialog, TQT_SIGNAL(colorChoice(const SDisplayColor &)), - TQT_SLOT(setColor(const SDisplayColor &)) ); - connect( mOptionDialog, TQT_SIGNAL(cursorChoice(const SDisplayCursor &)), - TQT_SLOT(setCursor(const SDisplayCursor &)) ); - connect( mOptionDialog, TQT_SIGNAL(miscChoice(const SDisplayMisc &)), - TQT_SLOT(setMisc(const SDisplayMisc &)) ); - connect( mOptionDialog, TQT_SIGNAL(removeRecentFiles()), - TQT_SIGNAL(removeRecentFiles()) ); + connect( mOptionDialog, TQ_SIGNAL(lineSizeChoice(const SDisplayLine &)), + TQ_SLOT(setLineSize(const SDisplayLine &)) ); + connect( mOptionDialog, TQ_SIGNAL(layoutChoice(const SDisplayLayout &)), + TQ_SLOT(setLayout(const SDisplayLayout &)) ); + connect( mOptionDialog, TQ_SIGNAL(fontChoice(const SDisplayFont &)), + TQ_SLOT(setFont(const SDisplayFont &)) ); + connect( mOptionDialog, TQ_SIGNAL(colorChoice(const SDisplayColor &)), + TQ_SLOT(setColor(const SDisplayColor &)) ); + connect( mOptionDialog, TQ_SIGNAL(cursorChoice(const SDisplayCursor &)), + TQ_SLOT(setCursor(const SDisplayCursor &)) ); + connect( mOptionDialog, TQ_SIGNAL(miscChoice(const SDisplayMisc &)), + TQ_SLOT(setMisc(const SDisplayMisc &)) ); + connect( mOptionDialog, TQ_SIGNAL(removeRecentFiles()), + TQ_SIGNAL(removeRecentFiles()) ); } if( mOptionDialog->isVisible() == false ) { diff --git a/khexedit/hexmanagerwidget.cpp b/khexedit/hexmanagerwidget.cpp index a8d4bed..a9a018f 100644 --- a/khexedit/hexmanagerwidget.cpp +++ b/khexedit/hexmanagerwidget.cpp @@ -38,18 +38,18 @@ CHexManagerWidget::CHexManagerWidget( TQWidget *parent, const char *name, mConverter = new CHexToolWidget( this ); - connect( mEditor->view(), TQT_SIGNAL(fileName(const TQString &, bool)), - this, TQT_SLOT( addName(const TQString &))); - connect( mEditor->view(), TQT_SIGNAL( fileClosed(const TQString &)), - this, TQT_SLOT( removeName(const TQString &))); - connect( mEditor->view(),TQT_SIGNAL(fileRename(const TQString &,const TQString &)), - this, TQT_SLOT(changeName(const TQString &,const TQString &))); - connect( mEditor->view(), TQT_SIGNAL( cursorChanged( SCursorState & ) ), - mConverter, TQT_SLOT( cursorChanged( SCursorState & ) ) ); - connect( mConverter, TQT_SIGNAL( closed(void) ), - this, TQT_SIGNAL( conversionClosed(void) ) ); - connect( mTabBar, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT(open(const TQString &))); + connect( mEditor->view(), TQ_SIGNAL(fileName(const TQString &, bool)), + this, TQ_SLOT( addName(const TQString &))); + connect( mEditor->view(), TQ_SIGNAL( fileClosed(const TQString &)), + this, TQ_SLOT( removeName(const TQString &))); + connect( mEditor->view(),TQ_SIGNAL(fileRename(const TQString &,const TQString &)), + this, TQ_SLOT(changeName(const TQString &,const TQString &))); + connect( mEditor->view(), TQ_SIGNAL( cursorChanged( SCursorState & ) ), + mConverter, TQ_SLOT( cursorChanged( SCursorState & ) ) ); + connect( mConverter, TQ_SIGNAL( closed(void) ), + this, TQ_SIGNAL( conversionClosed(void) ) ); + connect( mTabBar, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT(open(const TQString &))); mValid = true; setConversionVisibility( conversionPosition ); @@ -179,11 +179,11 @@ void CHexManagerWidget::setSearchBarPosition( EPosition position ) if( mSearchBar == 0 ) { mSearchBar = new CSearchBar( this ); - connect( mSearchBar, TQT_SIGNAL(hidden()), this, TQT_SLOT(searchBarHidden()) ); - connect( mSearchBar, TQT_SIGNAL(findData(SSearchControl &, uint, bool)), - mEditor, TQT_SLOT(findData(SSearchControl &, uint, bool)) ); - connect( editor()->view(), TQT_SIGNAL( cursorChanged( SCursorState & ) ), - mSearchBar, TQT_SLOT( cursorMoved() ) ); + connect( mSearchBar, TQ_SIGNAL(hidden()), this, TQ_SLOT(searchBarHidden()) ); + connect( mSearchBar, TQ_SIGNAL(findData(SSearchControl &, uint, bool)), + mEditor, TQ_SLOT(findData(SSearchControl &, uint, bool)) ); + connect( editor()->view(), TQ_SIGNAL( cursorChanged( SCursorState & ) ), + mSearchBar, TQ_SLOT( cursorMoved() ) ); } mSearchBar->show(); } @@ -261,7 +261,7 @@ int CHexManagerWidget::preferredWidth( void ) CTabBar::CTabBar( TQWidget *parent, char *name ) :TQTabBar( parent, name ) { - connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotSelected(int)) ); + connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotSelected(int)) ); } diff --git a/khexedit/hextoolwidget.cpp b/khexedit/hextoolwidget.cpp index ef66db2..d6f51ed 100644 --- a/khexedit/hextoolwidget.cpp +++ b/khexedit/hextoolwidget.cpp @@ -96,7 +96,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) text = i18n("Show little endian decoding"); mCheckIntelFormat = new TQCheckBox( text, this ); mCheckIntelFormat->setMinimumSize( mCheckIntelFormat->sizeHint() ); - connect( mCheckIntelFormat, TQT_SIGNAL(clicked()), this, TQT_SLOT(intelFormat()) ); + connect( mCheckIntelFormat, TQ_SIGNAL(clicked()), this, TQ_SLOT(intelFormat()) ); SettingsBox->addWidget( mCheckIntelFormat, 0, AlignVCenter ); mCheckIntelFormat->setChecked( // default value to please endian system users #ifdef WORDS_BIGENDIAN @@ -110,7 +110,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) text = i18n("Show unsigned as hexadecimal"); mCheckHexadecimal = new TQCheckBox( text, this ); mCheckHexadecimal->setMinimumSize( mCheckHexadecimal->sizeHint() ); - connect( mCheckHexadecimal, TQT_SIGNAL(clicked()), this, TQT_SLOT(unsignedFormat()) ); + connect( mCheckHexadecimal, TQ_SIGNAL(clicked()), this, TQ_SLOT(unsignedFormat()) ); SettingsBox->addWidget( mCheckHexadecimal, 0, AlignVCenter ); mUtilBox->addMultiCellLayout( ValuesBox, 0, 3, 0, 0, AlignLeft|AlignVCenter ); @@ -133,7 +133,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) mBitCombo->insertItem( text ); } mBitCombo->setMinimumSize( mBitCombo->sizeHint() ); - connect( mBitCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(bitWidthChanged(int))); + connect( mBitCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(bitWidthChanged(int))); mUtilBox->addWidget( mBitCombo, 4, 2 ); /* load font metrics */ @@ -141,8 +141,8 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) mUtilBox->activate(); - connect( kapp, TQT_SIGNAL( tdedisplayFontChanged() ), - TQT_SLOT( fontChanged() ) ); + connect( kapp, TQ_SIGNAL( tdedisplayFontChanged() ), + TQ_SLOT( fontChanged() ) ); mCursorState.valid = false; mViewHexCaps = true; diff --git a/khexedit/hexviewwidget.cpp b/khexedit/hexviewwidget.cpp index 16a3ffd..19a1d54 100644 --- a/khexedit/hexviewwidget.cpp +++ b/khexedit/hexviewwidget.cpp @@ -199,10 +199,10 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name, 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,7 +213,7 @@ 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 ); @@ -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(); } @@ -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())); } diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp index b60ad7e..7564890 100644 --- a/khexedit/lib/khexedit.cpp +++ b/khexedit/lib/khexedit.cpp @@ -138,9 +138,9 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl 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 ); } @@ -1674,11 +1674,11 @@ 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; } } @@ -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/optiondialog.cpp b/khexedit/optiondialog.cpp index 49a33b7..6db0334 100644 --- a/khexedit/optiondialog.cpp +++ b/khexedit/optiondialog.cpp @@ -116,10 +116,10 @@ void COptionDialog::setupLayoutPage( void ) modeList.append( i18n("Binary Mode") ); modeList.append( i18n("Text Only Mode") ); mLayout.formatCombo->insertStringList( modeList ); - connect( mLayout.formatCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotModeSelectorChanged(int)) ); - connect( mLayout.formatCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.formatCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotModeSelectorChanged(int)) ); + connect( mLayout.formatCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChanged()) ); gbox->addWidget( mLayout.formatCombo, 0, 1 ); // @@ -129,18 +129,18 @@ void COptionDialog::setupLayoutPage( void ) mLayout.lineSizeSpin = new TQSpinBox( page ); mLayout.lineSizeSpin->setMinimumWidth( fontMetrics().width("M") * 10 ); mLayout.lineSizeSpin->setRange( 1, 10000 ); - connect( mLayout.lineSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotLineSizeChanged(int) ) ); - connect( mLayout.lineSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.lineSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotLineSizeChanged(int) ) ); + connect( mLayout.lineSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); gbox->addWidget( mLayout.lineSizeSpin, 1, 1 ); mLayout.columnSizeSpin = new TQSpinBox( page ); mLayout.columnSizeSpin->setRange( 1, 10000 ); - connect( mLayout.columnSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotColumnSizeChanged(int) ) ); - connect( mLayout.columnSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged() ) ); + connect( mLayout.columnSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotColumnSizeChanged(int) ) ); + connect( mLayout.columnSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged() ) ); gbox->addWidget( mLayout.columnSizeSpin, 2, 1 ); text = i18n("Default l&ine size [bytes]:"); @@ -158,14 +158,14 @@ void COptionDialog::setupLayoutPage( void ) text = i18n("Line size is &fixed (use scrollbar when required)"); mLayout.lockLineCheck = new TQCheckBox( text, page ); gbox->addMultiCellWidget( mLayout.lockLineCheck, 4, 4, 0, 1, AlignLeft ); - connect( mLayout.lockLineCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.lockLineCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotChanged()) ); text = i18n("Loc&k column at end of line (when column size>1)"); mLayout.lockColumnCheck = new TQCheckBox( text, page ); gbox->addMultiCellWidget( mLayout.lockColumnCheck, 5, 5, 0, 1 ); - connect( mLayout.lockColumnCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.lockColumnCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotChanged()) ); hline = new TQFrame( page ); hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); @@ -179,8 +179,8 @@ void COptionDialog::setupLayoutPage( void ) mLayout.gridCombo = new TQComboBox( false, page ); mLayout.gridCombo->insertStringList( gridList ); - connect( mLayout.gridCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.gridCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChanged()) ); text = i18n("&Gridlines between text:"); label = new TQLabel( mLayout.gridCombo, text, page ); @@ -191,14 +191,14 @@ void COptionDialog::setupLayoutPage( void ) mLayout.leftSepWidthSpin = new TQSpinBox( page ); mLayout.leftSepWidthSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.leftSepWidthSpin, 8, 1 ); - connect( mLayout.leftSepWidthSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.leftSepWidthSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); mLayout.rightSepWidthSpin = new TQSpinBox( page ); mLayout.rightSepWidthSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.rightSepWidthSpin, 9, 1 ); - connect( mLayout.rightSepWidthSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.rightSepWidthSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); text = i18n("&Left separator width [pixels]:"); mLayout.leftSepLabel = new TQLabel( mLayout.leftSepWidthSpin, text, page ); @@ -211,14 +211,14 @@ void COptionDialog::setupLayoutPage( void ) mLayout.separatorSpin = new TQSpinBox( page ); mLayout.separatorSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.separatorSpin, 10, 1 ); - connect( mLayout.separatorSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.separatorSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); mLayout.edgeSpin = new TQSpinBox( page ); mLayout.edgeSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.edgeSpin, 11, 1 ); - connect( mLayout.edgeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.edgeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); text = i18n("&Separator margin width [pixels]:"); label = new TQLabel( mLayout.separatorSpin, text, page ); @@ -231,15 +231,15 @@ void COptionDialog::setupLayoutPage( void ) text = i18n("Column separation is e&qual to one character"); mLayout.columnCheck = new TQCheckBox( text, page ); gbox->addMultiCellWidget( mLayout.columnCheck, 12, 12, 0, 1, AlignLeft ); - connect( mLayout.columnCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotColumnSepCheck(bool))); - connect( mLayout.columnCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mLayout.columnCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotColumnSepCheck(bool))); + connect( mLayout.columnCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); mLayout.columnSepSpin = new TQSpinBox( page ); mLayout.columnSepSpin->setRange( 1, 100 ); - connect( mLayout.columnSepSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.columnSepSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); text = i18n("Column separa&tion [pixels]:"); mLayout.columnSepLabel = new TQLabel( mLayout.columnSepSpin, text, page ); @@ -265,10 +265,10 @@ void COptionDialog::setupCursorPage( void ) text = i18n("Do not b&link"); mCursor.blinkCheck = new TQCheckBox( i18n("Do not b&link"), group ); - connect( mCursor.blinkCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotBlinkIntervalCheck(bool))); - connect( mCursor.blinkCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mCursor.blinkCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotBlinkIntervalCheck(bool))); + connect( mCursor.blinkCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); TQHBox *hbox = new TQHBox( group ); mCursor.blinkLabel = new TQLabel( i18n("&Blink interval [ms]:" ), hbox ); @@ -278,8 +278,8 @@ void COptionDialog::setupCursorPage( void ) mCursor.blinkSpin->setSteps( 100, 100 ); mCursor.blinkSpin->setValue( 500 ); mCursor.blinkLabel->setBuddy(mCursor.blinkSpin); - connect( mCursor.blinkSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT( slotChanged())); + connect( mCursor.blinkSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT( slotChanged())); group = new TQVButtonGroup( i18n("Shape"), page ); group->layout()->setMargin( spacingHint() ); @@ -287,14 +287,14 @@ void COptionDialog::setupCursorPage( void ) text = i18n("Always &use block (rectangular) cursor"); mCursor.blockCheck = new TQCheckBox( text, group ); - connect( mCursor.blockCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotBlockCursorCheck(bool))); - connect( mCursor.blockCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mCursor.blockCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotBlockCursorCheck(bool))); + connect( mCursor.blockCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); text = i18n("Use &thick cursor in insert mode"); mCursor.thickCheck = new TQCheckBox( text, group ); - connect( mCursor.thickCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mCursor.thickCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); text = i18n("Cursor Behavior When Editor Loses Focus"); group = new TQVButtonGroup( text, page ); @@ -306,12 +306,12 @@ void COptionDialog::setupCursorPage( void ) mCursor.hideRadio = new TQRadioButton( i18n("H&ide"), group, "radio2" ); text = i18n("Do ¬hing"); mCursor.nothingRadio = new TQRadioButton( text, group, "radio3" ); - connect( mCursor.stopRadio, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); - connect( mCursor.hideRadio, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); - connect( mCursor.nothingRadio, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mCursor.stopRadio, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); + connect( mCursor.hideRadio, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); + connect( mCursor.nothingRadio, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); topLayout->addStretch(10); } @@ -328,10 +328,10 @@ void COptionDialog::setupColorPage( void ) text = i18n("&Use system colors (as chosen in Control Center)"); mColor.checkSystem = new TQCheckBox( text, page ); - connect( mColor.checkSystem, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotColorSystem(bool))); - connect( mColor.checkSystem, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mColor.checkSystem, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotColorSystem(bool))); + connect( mColor.checkSystem, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); topLayout->addWidget( mColor.checkSystem ); TQFrame *hline = new TQFrame( page ); @@ -365,7 +365,7 @@ void COptionDialog::setupColorPage( void ) mColor.colorList->insertItem( listItem ); } mColor.colorList->setCurrentItem(0); - connect( mColor.colorList, TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mColor.colorList, TQ_SIGNAL( dataChanged() ), this, TQ_SLOT( slotChanged() ) ); } @@ -380,10 +380,10 @@ void COptionDialog::setupFontPage( void ) text = i18n("&Use system font (as chosen in Control Center)"); mFont.checkSystem = new TQCheckBox( text, page ); - connect( mFont.checkSystem, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotFontSystem(bool))); - connect( mFont.checkSystem, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFont.checkSystem, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotFontSystem(bool))); + connect( mFont.checkSystem, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); topLayout->addWidget( mFont.checkSystem ); TQFrame *hline = new TQFrame( page ); @@ -396,8 +396,8 @@ void COptionDialog::setupFontPage( void ) fixFont.setBold(true); mFont.chooser->setFont( fixFont, true ); mFont.chooser->setSampleText( i18n("KHexEdit editor font") ); - connect( mFont.chooser, TQT_SIGNAL(fontSelected(const TQFont &)), - this, TQT_SLOT( slotChanged())); + connect( mFont.chooser, TQ_SIGNAL(fontSelected(const TQFont &)), + this, TQ_SLOT( slotChanged())); hline = new TQFrame( page ); hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); @@ -408,8 +408,8 @@ void COptionDialog::setupFontPage( void ) mFont.nonPrintInput = new TQLineEdit( page ); mFont.nonPrintInput->setMaxLength( 1 ); - connect( mFont.nonPrintInput, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT( slotChanged())); + connect( mFont.nonPrintInput, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT( slotChanged())); text = i18n("&Map non printable characters to:"); TQLabel *nonPrintLabel = new TQLabel( mFont.nonPrintInput, text, page ); @@ -440,8 +440,8 @@ void COptionDialog::setupFilePage( void ) modeList.append( i18n("All Recent Documents") ); mFile.openCombo->insertStringList( modeList ); mFile.openCombo->setMinimumWidth( mFile.openCombo->sizeHint().width() ); - connect( mFile.openCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT( slotChanged())); + connect( mFile.openCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT( slotChanged())); text = i18n("Open doc&uments on startup:"); TQLabel *label = new TQLabel( mFile.openCombo, text, page ); @@ -456,8 +456,8 @@ void COptionDialog::setupFilePage( void ) mFile.gotoOffsetCheck->setEnabled( false ); // ### END topLayout->addWidget( mFile.gotoOffsetCheck, 0, AlignLeft ); - connect( mFile.gotoOffsetCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.gotoOffsetCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); TQFrame *hline = new TQFrame( page ); hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); @@ -466,20 +466,20 @@ void COptionDialog::setupFilePage( void ) text = i18n("Open document with &write protection enabled"); mFile.writeProtectCheck = new TQCheckBox( text, page ); topLayout->addWidget( mFile.writeProtectCheck, 0, AlignLeft ); - connect( mFile.writeProtectCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.writeProtectCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("&Keep cursor position after reloading document"); mFile.reloadOffsetCheck = new TQCheckBox( text, page ); topLayout->addWidget( mFile.reloadOffsetCheck, 0, AlignLeft ); - connect( mFile.reloadOffsetCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.reloadOffsetCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("&Make a backup when saving document"); mFile.backupCheck = new TQCheckBox( text, page ); topLayout->addWidget( mFile.backupCheck, 0, AlignLeft ); - connect( mFile.backupCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.backupCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); hline = new TQFrame( page ); hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); @@ -493,8 +493,8 @@ void COptionDialog::setupFilePage( void ) "when the program is closed.\n" "Note: it will not erase any document of the recent document list " "created by TDE." ) ); - connect( mFile.discardRecentCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.discardRecentCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Cl&ear \"Recent\" Document List"); TQPushButton *discardRecentButton = new TQPushButton( page ); @@ -504,8 +504,8 @@ void COptionDialog::setupFilePage( void ) "Note: it will not erase any document of the recent document list " "created by TDE." ) ); topLayout->addWidget( discardRecentButton, 0, AlignCenter ); - connect( discardRecentButton, TQT_SIGNAL(clicked()), - TQT_SIGNAL(removeRecentFiles()) ); + connect( discardRecentButton, TQ_SIGNAL(clicked()), + TQ_SIGNAL(removeRecentFiles()) ); topLayout->addStretch(10); } @@ -526,57 +526,57 @@ void COptionDialog::setupMiscPage( void ) text = i18n("Auto&matic copy to clipboard when selection is ready"); mMisc.autoCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.autoCheck, 0, AlignLeft ); - connect( mMisc.autoCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.autoCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("&Editor starts in \"insert\" mode" ); mMisc.insertCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.insertCheck, 0, AlignLeft ); - connect( mMisc.insertCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.insertCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Confirm &wrapping (to beginning or end) during search"); mMisc.confirmWrapCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.confirmWrapCheck, 0, AlignLeft ); - connect( mMisc.confirmWrapCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.confirmWrapCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Cursor jumps to &nearest byte when moved"); mMisc.cursorJumpCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.cursorJumpCheck, 0, AlignLeft ); - connect( mMisc.cursorJumpCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.cursorJumpCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); TQVButtonGroup *group = new TQVButtonGroup( i18n("Sounds"), page ); group->layout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("Make sound on data &input (eg. typing) failure"); mMisc.inputCheck = new TQCheckBox( text, group ); - connect( mMisc.inputCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.inputCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Make sound on &fatal failure"); mMisc.fatalCheck = new TQCheckBox( text, group ); - connect( mMisc.fatalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.fatalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); group = new TQVButtonGroup( i18n("Bookmark Visibility"), page ); group->layout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("Use visible bookmarks in the offset column"); mMisc.bookmarkColumnCheck = new TQCheckBox( text, group ); - connect( mMisc.bookmarkColumnCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.bookmarkColumnCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Use visible bookmarks in the editor fields"); mMisc.bookmarkEditorCheck = new TQCheckBox( text, group ); - connect( mMisc.bookmarkEditorCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.bookmarkEditorCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Confirm when number of printed pages will e&xceed limit"); mMisc.thresholdCheck = new TQCheckBox( text, page ); - connect( mMisc.thresholdCheck, TQT_SIGNAL(clicked()), - TQT_SLOT( slotThresholdConfirm())); - connect( mMisc.thresholdCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.thresholdCheck, TQ_SIGNAL(clicked()), + TQ_SLOT( slotThresholdConfirm())); + connect( mMisc.thresholdCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); topLayout->addWidget( mMisc.thresholdCheck, 0, AlignLeft ); TQGridLayout *glay = new TQGridLayout( 3, 3 ); @@ -588,8 +588,8 @@ void COptionDialog::setupMiscPage( void ) mMisc.thresholdSpin->setRange( 5, INT_MAX ); mMisc.thresholdSpin->setSteps( 5, 5 ); mMisc.thresholdSpin->setValue( 5 ); - connect( mMisc.thresholdSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.thresholdSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT( slotChanged())); text = i18n("&Threshold [pages]:" ); mMisc.thresholdLabel = new TQLabel( mMisc.thresholdSpin, text, page ); @@ -605,8 +605,8 @@ void COptionDialog::setupMiscPage( void ) mMisc.undoSpin->setRange( 10, 10000 ); mMisc.undoSpin->setSteps( 5, 5 ); mMisc.undoSpin->setValue( 50 ); - connect( mMisc.undoSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.undoSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT( slotChanged())); label = new TQLabel( mMisc.undoSpin, i18n("&Undo limit:"), page ); glay->addWidget( label, 2, 0 ); @@ -1053,7 +1053,7 @@ SDisplayCursor::EFocusMode COptionDialog::cursorFocusMode( void ) CColorListBox::CColorListBox( TQWidget *parent, const char *name, WFlags f ) :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1) { - connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); + connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(newColor(int)) ); setAcceptDrops( true); } diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp index 7c1d6c4..25e7c48 100644 --- a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp +++ b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp @@ -32,8 +32,8 @@ KBytesEditWidget::KBytesEditWidget( TQWidget *parent, const char *name, const TQ TQHBoxLayout* Layout = new TQHBoxLayout( this ); BytesEdit = new KHE::KBytesEdit( this, "BytesEdit" ); Layout->addWidget( BytesEdit ); -// connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); - connect( BytesEdit, TQT_SIGNAL(copyAvailable( bool )), this, TQT_SIGNAL(copyAvailable( bool )) ); +// connect( _editor, TQ_SIGNAL( canUndo(bool) ), this, TQ_SIGNAL( canUndo(bool) ) ); + connect( BytesEdit, TQ_SIGNAL(copyAvailable( bool )), this, TQ_SIGNAL(copyAvailable( bool )) ); } diff --git a/khexedit/parts/kpart/khebrowserextension.cpp b/khexedit/parts/kpart/khebrowserextension.cpp index 6adebaa..ec509c7 100644 --- a/khexedit/parts/kpart/khebrowserextension.cpp +++ b/khexedit/parts/kpart/khebrowserextension.cpp @@ -29,7 +29,7 @@ KHexEditBrowserExtension::KHexEditBrowserExtension( KHexEditPart *P ) : KParts::BrowserExtension( P, "khexeditpartbrowserextension" ), HexEditPart( P ) { - connect( HexEditPart->HexEdit, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotSelectionChanged() ) ); + connect( HexEditPart->HexEdit, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotSelectionChanged() ) ); } void KHexEditBrowserExtension::copy() diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp index 0acab5c..41c7110 100644 --- a/khexedit/parts/kpart/khepart.cpp +++ b/khexedit/parts/kpart/khepart.cpp @@ -51,8 +51,8 @@ KHexEditPart::KHexEditPart( TQWidget *ParentWidget, const char *WidgetName, if( CopyAction ) { - connect( HexEdit, TQT_SIGNAL(copyAvailable(bool)), CopyAction,TQT_SLOT(setEnabled(bool)) ); - connect( HexEdit, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( HexEdit, TQ_SIGNAL(copyAvailable(bool)), CopyAction,TQ_SLOT(setEnabled(bool)) ); + connect( HexEdit, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); CopyAction->setEnabled( false ); } @@ -83,10 +83,10 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) { TDEActionCollection *AC = actionCollection(); // create our actions - CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( HexEdit, TQT_SLOT(copy()), AC ); + CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( HexEdit, TQ_SLOT(copy()), AC ); - KStdAction::selectAll( this, TQT_SLOT(slotSelectAll()), AC ); - KStdAction::deselect( this, TQT_SLOT(slotUnselect()), AC ); + KStdAction::selectAll( this, TQ_SLOT(slotSelectAll()), AC ); + KStdAction::deselect( this, TQ_SLOT(slotUnselect()), AC ); // value encoding CodingAction = new TDESelectAction( i18n("&Value Coding"), 0, AC, "view_valuecoding" ); @@ -96,17 +96,17 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) List.append( i18n("&Octal") ); List.append( i18n("&Binary") ); CodingAction->setItems( List ); - connect( CodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetCoding(int)) ); + connect( CodingAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetCoding(int)) ); // document encoding EncodingAction = new TDESelectAction( i18n("&Char Encoding"), 0, AC, "view_charencoding" ); EncodingAction->setItems( KCharCodec::codecNames() ); - connect( EncodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetEncoding(int)) ); + connect( EncodingAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetEncoding(int)) ); - ShowUnprintableAction = new TDEToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQT_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" ); + ShowUnprintableAction = new TDEToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQ_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" ); - KStdAction::zoomIn( HexEdit, TQT_SLOT(zoomIn()), actionCollection() ); - KStdAction::zoomOut( HexEdit, TQT_SLOT(zoomOut()), actionCollection() ); + KStdAction::zoomIn( HexEdit, TQ_SLOT(zoomIn()), actionCollection() ); + KStdAction::zoomOut( HexEdit, TQ_SLOT(zoomOut()), actionCollection() ); // resize style ResizeStyleAction = new TDESelectAction( i18n("&Resize Style"), 0, AC, "resizestyle" ); @@ -115,9 +115,9 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) List.append( i18n("&Lock Groups") ); List.append( i18n("&Full Size Usage") ); ResizeStyleAction->setItems( List ); - connect( ResizeStyleAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetResizeStyle(int)) ); + connect( ResizeStyleAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetResizeStyle(int)) ); - ShowOffsetColumnAction = new TDEToggleAction( i18n("&Line Offset"), Key_F11, this, TQT_SLOT(slotToggleOffsetColumn()), AC, "view_lineoffset" ); + ShowOffsetColumnAction = new TDEToggleAction( i18n("&Line Offset"), Key_F11, this, TQ_SLOT(slotToggleOffsetColumn()), AC, "view_lineoffset" ); // show buffer columns ToggleColumnsAction = new TDESelectAction( i18n("&Columns"), 0, AC, "togglecolumns" ); @@ -126,7 +126,7 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) List.append( i18n("&Chars Column") ); List.append( i18n("&Both Columns") ); ToggleColumnsAction->setItems( List ); - connect( ToggleColumnsAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleValueCharColumns(int)) ); + connect( ToggleColumnsAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotToggleValueCharColumns(int)) ); fitActionSettings(); diff --git a/khexedit/printdialogpage.cpp b/khexedit/printdialogpage.cpp index d421880..73efb45 100644 --- a/khexedit/printdialogpage.cpp +++ b/khexedit/printdialogpage.cpp @@ -102,8 +102,8 @@ void LayoutDialogPage::setupLayoutPage( void ) text = i18n("Draw h&eader above text"); mLayout.headerCheck = new TQCheckBox( text, this ); mLayout.headerCheck->setFixedSize( mLayout.headerCheck->sizeHint() ); - connect( mLayout.headerCheck, TQT_SIGNAL( toggled(bool)), - TQT_SLOT( slotDrawHeader(bool))); + connect( mLayout.headerCheck, TQ_SIGNAL( toggled(bool)), + TQ_SLOT( slotDrawHeader(bool))); topLayout->addWidget( mLayout.headerCheck, 0, AlignLeft ); gbox = new TQGridLayout( 5, 6, 0 ); @@ -164,8 +164,8 @@ void LayoutDialogPage::setupLayoutPage( void ) text = i18n("Draw &footer below text"); mLayout.footerCheck = new TQCheckBox( text, this ); mLayout.footerCheck->setFixedSize( mLayout.footerCheck->sizeHint() ); - connect( mLayout.footerCheck, TQT_SIGNAL( toggled(bool)), - TQT_SLOT( slotDrawFooter(bool))); + connect( mLayout.footerCheck, TQ_SIGNAL( toggled(bool)), + TQ_SLOT( slotDrawFooter(bool))); topLayout->addWidget( mLayout.footerCheck, 0, AlignLeft ); gbox = new TQGridLayout( 5, 6, 0 ); diff --git a/khexedit/searchbar.cpp b/khexedit/searchbar.cpp index aeb4b77..395c950 100644 --- a/khexedit/searchbar.cpp +++ b/khexedit/searchbar.cpp @@ -58,22 +58,22 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f ) setLineWidth( 1 ); mTypeCombo = new TQComboBox( this ); - connect( mTypeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(selectorChanged(int)) ); + connect( mTypeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(selectorChanged(int)) ); TQStringList list; list << i18n("Hex") << i18n("Dec") << i18n("Oct") << i18n("Bin") << i18n("Txt"); mTypeCombo->insertStringList( list ); mInputEdit = new TQLineEdit( this ); - connect( mInputEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(textChanged(const TQString&)) ); + connect( mInputEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(textChanged(const TQString&)) ); mValidator = new CHexValidator( this, CHexValidator::regularText ); mInputEdit->setValidator( mValidator ); mFindButton = new TQPushButton( i18n("Find"), this ); mFindButton->setAutoDefault(false); - connect( mFindButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(start()) ); - connect(mInputEdit,TQT_SIGNAL(returnPressed()),mFindButton,TQT_SLOT(animateClick())); + connect( mFindButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(start()) ); + connect(mInputEdit,TQ_SIGNAL(returnPressed()),mFindButton,TQ_SLOT(animateClick())); mFindButton->setFixedHeight( mTypeCombo->sizeHint().height() ); mBackwards = new TQCheckBox( i18n("Backwards"), this ); @@ -82,7 +82,7 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f ) mCloseButton = new TQPushButton( this ); mCloseButton->setAutoDefault(false); mCloseButton->setPixmap( TQPixmap( close_xpm ) ); - connect( mCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideWidget()) ); + connect( mCloseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideWidget()) ); // // Make layout diff --git a/khexedit/stringdialog.cpp b/khexedit/stringdialog.cpp index 5cab7eb..4d4c9dd 100644 --- a/khexedit/stringdialog.cpp +++ b/khexedit/stringdialog.cpp @@ -70,7 +70,7 @@ CStringDialog::CStringDialog( TQWidget *parent, const char *name, bool modal ) TQPushButton *useButton = new TQPushButton( plainPage(), "use" ); useButton->setText( i18n("&Use") ); useButton->setAutoDefault( false ); - connect( useButton, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotUser1()) ); + connect( useButton, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotUser1()) ); glay->addWidget( useButton, 1, 2 ); TQWidget *helper = new TQWidget( plainPage() ); @@ -97,8 +97,8 @@ CStringDialog::CStringDialog( TQWidget *parent, const char *name, bool modal ) mStringList->setAllColumnsShowFocus( true ); mStringList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken ); - connect( mStringList, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(selectionChanged())); + connect( mStringList, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(selectionChanged())); topLayout->addWidget( mStringList, 10 ); hlay = new TQHBoxLayout( topLayout ); diff --git a/khexedit/toplevel.cpp b/khexedit/toplevel.cpp index b462b5a..474faa3 100644 --- a/khexedit/toplevel.cpp +++ b/khexedit/toplevel.cpp @@ -66,42 +66,42 @@ KHexEdit::KHexEdit( void ) // Prepare menus and status bar // mAction.bookmarkMapper = new TQSignalMapper(this); - connect(mAction.bookmarkMapper, TQT_SIGNAL(mapped(int)), editor(), TQT_SLOT(gotoBookmark(int))); + connect(mAction.bookmarkMapper, TQ_SIGNAL(mapped(int)), editor(), TQ_SLOT(gotoBookmark(int))); setupActions(); setupStatusBar(); - connect( hexView(), TQT_SIGNAL( cursorChanged( SCursorState & ) ), - this, TQT_SLOT( cursorChanged( SCursorState & ) ) ); - connect( hexView(), TQT_SIGNAL( editMode( CHexBuffer::EEditMode ) ), - this, TQT_SLOT( editMode( CHexBuffer::EEditMode ) ) ); - connect( hexView(), TQT_SIGNAL( encodingChanged( const SEncodeState &)), - this, TQT_SLOT( encodingChanged( const SEncodeState & )) ); - connect( hexView(), TQT_SIGNAL( textWidth( uint ) ), - this, TQT_SLOT( textWidth( uint ) ) ); - connect( hexView(), TQT_SIGNAL( fileState( SFileState & ) ), - this, TQT_SLOT( fileState( SFileState & ) ) ); - connect( hexView(), TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ), - this, TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) ); - connect( hexView(), TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), - this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); - connect( hexView(), TQT_SIGNAL( bookmarkChanged( TQPtrList<SCursorOffset> &)), - this, TQT_SLOT( bookmarkChanged( TQPtrList<SCursorOffset> & ) ) ); - connect( hexView(), TQT_SIGNAL( fileName( const TQString &, bool ) ), - this, TQT_SLOT( fileActive( const TQString &, bool ) ) ); - connect( hexView(), TQT_SIGNAL( fileRename( const TQString &, const TQString & )), - this, TQT_SLOT( fileRename( const TQString &, const TQString & ) ) ); - connect( hexView(), TQT_SIGNAL( fileClosed( const TQString & ) ), - 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() ), - this, TQT_SLOT(conversionClosed()) ); - connect( mManager, TQT_SIGNAL( searchBarClosed() ), - this, TQT_SLOT(searchBarClosed()) ); + connect( hexView(), TQ_SIGNAL( cursorChanged( SCursorState & ) ), + this, TQ_SLOT( cursorChanged( SCursorState & ) ) ); + connect( hexView(), TQ_SIGNAL( editMode( CHexBuffer::EEditMode ) ), + this, TQ_SLOT( editMode( CHexBuffer::EEditMode ) ) ); + connect( hexView(), TQ_SIGNAL( encodingChanged( const SEncodeState &)), + this, TQ_SLOT( encodingChanged( const SEncodeState & )) ); + connect( hexView(), TQ_SIGNAL( textWidth( uint ) ), + this, TQ_SLOT( textWidth( uint ) ) ); + connect( hexView(), TQ_SIGNAL( fileState( SFileState & ) ), + this, TQ_SLOT( fileState( SFileState & ) ) ); + connect( hexView(), TQ_SIGNAL( layoutChanged( const SDisplayLayout & ) ), + this, TQ_SLOT( layoutChanged( const SDisplayLayout & ) ) ); + connect( hexView(), TQ_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), + this, TQ_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); + connect( hexView(), TQ_SIGNAL( bookmarkChanged( TQPtrList<SCursorOffset> &)), + this, TQ_SLOT( bookmarkChanged( TQPtrList<SCursorOffset> & ) ) ); + connect( hexView(), TQ_SIGNAL( fileName( const TQString &, bool ) ), + this, TQ_SLOT( fileActive( const TQString &, bool ) ) ); + connect( hexView(), TQ_SIGNAL( fileRename( const TQString &, const TQString & )), + this, TQ_SLOT( fileRename( const TQString &, const TQString & ) ) ); + connect( hexView(), TQ_SIGNAL( fileClosed( const TQString & ) ), + this, TQ_SLOT( fileClosed( const TQString & ) ) ); + connect( editor(), TQ_SIGNAL( errorLoadFile( const TQString & ) ), + this, TQ_SLOT( removeRecentFile( const TQString & ) ) ); + connect( editor(), TQ_SIGNAL( operationChanged( bool ) ), + this, TQ_SLOT( operationChanged( bool ) ) ); + connect( editor(), TQ_SIGNAL( removeRecentFiles() ), + this, TQ_SLOT( removeRecentFiles() ) ); + connect( mManager, TQ_SIGNAL( conversionClosed() ), + this, TQ_SLOT(conversionClosed()) ); + connect( mManager, TQ_SIGNAL( searchBarClosed() ), + this, TQ_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( editor(), TQT_SLOT(newFile()), actionCollection() ); - KStdAction::open( editor(), TQT_SLOT(open()), actionCollection() ); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::openNew( editor(), TQ_SLOT(newFile()), actionCollection() ); + KStdAction::open( editor(), TQ_SLOT(open()), actionCollection() ); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); mAction.insert = new TDEAction( i18n("&Insert..."), CTRL+Key_I, - 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() ); + editor(), TQ_SLOT(insertFile()), actionCollection(), "insert_file" ); + mAction.openRecent = KStdAction::openRecent( this, TQ_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); + mAction.save = KStdAction::save( editor(), TQ_SLOT(save()), actionCollection() ); + mAction.saveAs = KStdAction::saveAs( editor(), TQ_SLOT(saveAs()), actionCollection() ); + mAction.revert = KStdAction::revert( editor(), TQ_SLOT(reload()), actionCollection() ); + //mAction.revert = KStdAction::revert( this, TQ_SLOT(resizeTest()), actionCollection() ); + + mAction.close = KStdAction::close( editor(), TQ_SLOT(close()), actionCollection() ); + mAction.print = KStdAction::print( editor(), TQ_SLOT(print()), actionCollection() ); mAction.exportData = new TDEAction( i18n("E&xport..."), 0, - editor(), TQT_SLOT(exportDialog()), actionCollection(), "export" ); + editor(), TQ_SLOT(exportDialog()), actionCollection(), "export" ); mAction.cancel = new TDEAction( i18n("&Cancel Operation"), - "process-stop", 0, editor(), TQT_SLOT(stop()), actionCollection(), "cancel" ); + "process-stop", 0, editor(), TQ_SLOT(stop()), actionCollection(), "cancel" ); mAction.readOnly = new TDEToggleAction( i18n("&Read Only"), - 0, editor(), TQT_SLOT(toggleWriteProtection()),actionCollection(), "read_only" ); + 0, editor(), TQ_SLOT(toggleWriteProtection()),actionCollection(), "read_only" ); mAction.resizeLock = new TDEToggleAction( i18n("&Allow Resize"), - 0, editor(), TQT_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" ); + 0, editor(), TQ_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" ); mAction.newWindow = new TDEAction( i18n("N&ew Window"), - 0, this, TQT_SLOT(newWindow()),actionCollection(), "new_window" ); + 0, this, TQ_SLOT(newWindow()),actionCollection(), "new_window" ); mAction.closeWindow= new TDEAction( i18n("Close &Window"), - 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() ); + 0, this, TQ_SLOT(closeWindow()),actionCollection(), "close_window" ); + mAction.quit = KStdAction::quit( this, TQ_SLOT(closeProgram()), actionCollection() ); + + mAction.undo = KStdAction::undo( editor(), TQ_SLOT(undo()), actionCollection() ); + mAction.redo = KStdAction::redo( editor(), TQ_SLOT(redo()), actionCollection() ); + mAction.cut = KStdAction::cut( editor(), TQ_SLOT(cut()), actionCollection() ); + mAction.copy = KStdAction::copy( editor(), TQ_SLOT(copy()), actionCollection() ); + mAction.paste = KStdAction::paste( editor(), TQ_SLOT(paste()), actionCollection() ); + mAction.selectAll = KStdAction::selectAll( editor(), TQ_SLOT(selectAll()),actionCollection() ); + mAction.unselect = KStdAction::deselect( editor(), TQ_SLOT(unselect()), actionCollection()); + mAction.find = KStdAction::find( editor(), TQ_SLOT(find()), actionCollection() ); + mAction.findNext = KStdAction::findNext( editor(), TQ_SLOT(findNext()), actionCollection() ); + mAction.findPrev = KStdAction::findPrev( editor(),TQ_SLOT(findPrevious()),actionCollection() ); + mAction.replace = KStdAction::replace( editor(), TQ_SLOT(replace()), actionCollection() ); mAction.gotoOffset = new TDEAction( i18n("&Goto Offset..."), CTRL+Key_G, - editor(), TQT_SLOT(gotoOffset()),actionCollection(), "goto_offset" ); + editor(), TQ_SLOT(gotoOffset()),actionCollection(), "goto_offset" ); mAction.insertPattern = new TDEAction( i18n("&Insert Pattern..."), CTRL+Key_Insert, - editor(), TQT_SLOT(insertPattern()), actionCollection(), "insert_pattern" ); + editor(), TQ_SLOT(insertPattern()), actionCollection(), "insert_pattern" ); mAction.copyAsText = new TDEAction( i18n("Copy as &Text"), 0, - editor(), TQT_SLOT(copyText()), actionCollection(), "copy_as_text" ); + editor(), TQ_SLOT(copyText()), actionCollection(), "copy_as_text" ); mAction.pasteToNewFile = new TDEAction( i18n("Paste into New &File"), 0, - editor(), TQT_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" ); + editor(), TQ_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" ); mAction.pasteToNewWindow = new TDEAction( i18n("Paste into New &Window"), 0, - this, TQT_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" ); + this, TQ_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" ); mAction.hexadecimal = new TDERadioAction( i18n("&Hexadecimal"), - 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_hex" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_hex" ); mAction.decimal = new TDERadioAction( i18n("&Decimal"), - 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_dec" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_dec" ); mAction.octal = new TDERadioAction( i18n("&Octal"), - 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_oct" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_oct" ); mAction.binary = new TDERadioAction( i18n("&Binary"), - 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_bin" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_bin" ); mAction.textOnly = new TDERadioAction( i18n("&Text"), - 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_text" ); + 0, this, TQ_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, editor(), TQT_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" ); + 0, editor(), TQ_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" ); mAction.showTextColumn = new TDEToggleAction( i18n("Show Te&xt Field"), - 0, editor(), TQT_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" ); + 0, editor(), TQ_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" ); mAction.offsetAsDecimal = new TDEToggleAction( i18n("Off&set as Decimal"), - 0, editor(), TQT_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" ); + 0, editor(), TQ_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" ); mAction.dataUppercase = new TDEToggleAction( i18n("&Upper Case (Data)"), - 0, editor(), TQT_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" ); + 0, editor(), TQ_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" ); mAction.offsetUppercase = new TDEToggleAction( i18n("Upper &Case (Offset)"), - 0, editor(), TQT_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" ); + 0, editor(), TQ_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" ); mAction.defaultEncoding = new TDERadioAction( i18n("&Default encoding", "&Default"), - 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_default" ); + 0, this, TQ_SLOT( setEncoding()), actionCollection(), "enc_default" ); mAction.usAsciiEncoding = new TDERadioAction( i18n("US-&ASCII (7 bit)"), - 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_ascii"); + 0, this, TQ_SLOT( setEncoding()), actionCollection(), "enc_ascii"); mAction.ebcdicEncoding = new TDERadioAction( i18n("&EBCDIC"), - 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" ); + 0, this, TQ_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" ); // mAction.customEncoding = new TDEAction( i18n("&Custom..."), -// 0, editor(), TQT_SLOT( encoding()), actionCollection(), "enc_custom" ); +// 0, editor(), TQ_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, - editor(), TQT_SLOT(strings()), actionCollection(), "extract_strings" ); + editor(), TQ_SLOT(strings()), actionCollection(), "extract_strings" ); // mAction.recordViewer = new TDEAction( i18n("&Record Viewer"), 0, -// editor(), TQT_SLOT(recordView()), actionCollection(), "record_viewer" ); +// editor(), TQ_SLOT(recordView()), actionCollection(), "record_viewer" ); mAction.filter = new TDEAction( i18n("&Binary Filter..."), 0, - editor(), TQT_SLOT(filter()), actionCollection(), "binary_filter" ); + editor(), TQ_SLOT(filter()), actionCollection(), "binary_filter" ); mAction.characterTable = new TDEAction( i18n("&Character Table"), 0, - editor(), TQT_SLOT(chart()), actionCollection(), "char_table" ); + editor(), TQ_SLOT(chart()), actionCollection(), "char_table" ); mAction.converter = new TDEAction( i18n("C&onverter"), 0, - editor(), TQT_SLOT(converter()), actionCollection(), "converter" ); + editor(), TQ_SLOT(converter()), actionCollection(), "converter" ); mAction.statistics = new TDEAction( i18n("&Statistics"), 0, - editor(), TQT_SLOT(statistics()), actionCollection(), "statistics" ); + editor(), TQ_SLOT(statistics()), actionCollection(), "statistics" ); mAction.addBookmark = KStdAction::addBookmark( editor(), - TQT_SLOT(addBookmark()), actionCollection() ); + TQ_SLOT(addBookmark()), actionCollection() ); mAction.replaceBookmark = new TDEAction( i18n("&Replace Bookmark"), CTRL+Key_E, - editor(), TQT_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark"); + editor(), TQ_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark"); mAction.removeBookmark = new TDEAction( i18n("R&emove Bookmark"), CTRL+Key_U, - editor(), TQT_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" ); + editor(), TQ_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" ); mAction.removeAllBookmark = new TDEAction( i18n("Re&move All"), 0, - editor(), TQT_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" ); + editor(), TQ_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" ); mAction.nextBookmark = new TDEAction( i18n("Goto &Next Bookmark"), ALT+Key_Down, editor(), - TQT_SLOT(gotoNextBookmark()), actionCollection(), "next_bookmark" ); + TQ_SLOT(gotoNextBookmark()), actionCollection(), "next_bookmark" ); mAction.prevBookmark = new TDEAction( i18n("Goto &Previous Bookmark"), ALT+Key_Up, editor(), - TQT_SLOT(gotoPrevBookmark()), actionCollection(), "prev_bookmark" ); + TQ_SLOT(gotoPrevBookmark()), actionCollection(), "prev_bookmark" ); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); mAction.showFullPath = new TDEToggleAction( i18n("Show F&ull Path"), - 0, this, TQT_SLOT(showFullPath()), actionCollection(), "show_full_path" ); + 0, this, TQ_SLOT(showFullPath()), actionCollection(), "show_full_path" ); mAction.tabHide = new TDERadioAction( i18n("&Hide"), - 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" ); + 0, this, TQ_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" ); mAction.tabShowAboveEditor = new TDERadioAction( i18n("&Above Editor"), - 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" ); + 0, this, TQ_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" ); mAction.tabShowBelowEditor = new TDERadioAction( i18n("&Below Editor"), - 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" ); + 0, this, TQ_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" ); mAction.tabHide->setExclusiveGroup( "editorTab" ); mAction.tabShowAboveEditor->setExclusiveGroup( "editorTab" ); mAction.tabShowBelowEditor->setExclusiveGroup( "editorTab" ); mAction.conversionHide = new TDERadioAction( i18n("&Hide"), - 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_hide"); + 0, this, TQ_SLOT(showConversionField()), actionCollection(), "conversion_field_hide"); mAction.conversionFloat = new TDERadioAction( i18n("&Floating"), - 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_float"); + 0, this, TQ_SLOT(showConversionField()), actionCollection(), "conversion_field_float"); mAction.conversionEmbed = new TDERadioAction( i18n("&Embed in Main Window"), - 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_embed"); + 0, this, TQ_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, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" ); + 0, this, TQ_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" ); mAction.searchShowAboveEditor = new TDERadioAction( i18n("&Above Editor"), - Key_F5, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_above" ); + Key_F5, this, TQ_SLOT(showSearchBar()), actionCollection(), "searchbar_above" ); mAction.searchShowBelowEditor = new TDERadioAction( i18n("&Below Editor"), - Key_F6, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_below" ); + Key_F6, this, TQ_SLOT(showSearchBar()), actionCollection(), "searchbar_below" ); mAction.searchHide->setExclusiveGroup( "searchBar" ); mAction.searchShowAboveEditor->setExclusiveGroup( "searchBar" ); mAction.searchShowBelowEditor->setExclusiveGroup( "searchBar" ); - KStdAction::saveOptions(this, TQT_SLOT(writeConfiguration()), actionCollection()); - KStdAction::preferences(editor() ,TQT_SLOT(options()),actionCollection() ); + KStdAction::saveOptions(this, TQ_SLOT(writeConfiguration()), actionCollection()); + KStdAction::preferences(editor() ,TQ_SLOT(options()),actionCollection() ); // mAction.favorites = new TDEAction( i18n("P&rofiles..."), 0, -// editor(), TQT_SLOT(favorites()), actionCollection(), "favorites" ); +// editor(), TQ_SLOT(favorites()), actionCollection(), "favorites" ); - KStdAction::help( this, TQT_SLOT(appHelpActivated()), actionCollection() ); + KStdAction::help( this, TQ_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, editor(), TQT_SLOT(options()), actionCollection(), "drag_document"); + (void) new KWidgetAction(mDragLabel, i18n("Drag Document"), 0, editor(), TQ_SLOT(options()), actionCollection(), "drag_document"); createGUI("khexeditui.rc", false); @@ -296,15 +296,15 @@ actionCollection()); hexView()->setPopupMenu( popup ); int id = 100; - toolBar(0)->insertButton( MainBarIcon("system-lock-screen"), id, TQT_SIGNAL(clicked()), - editor(), TQT_SLOT(toggleWriteProtection()), true, + toolBar(0)->insertButton( MainBarIcon("system-lock-screen"), id, TQ_SIGNAL(clicked()), + editor(), TQ_SLOT(toggleWriteProtection()), true, i18n("Toggle write protection") ); toolBar(0)->alignItemRight( id ); mWriteProtectButton = toolBar(0)->getButton(id); TQPopupMenu *documentMenu = (TQPopupMenu *)factory()->container("documents", this); hexView()->setDocumentMenu(documentMenu); - connect(documentMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(documentMenuCB(int))); + connect(documentMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(documentMenuCB(int))); } @@ -313,15 +313,15 @@ void KHexEdit::setupStatusBar( void ) { CStatusBarProgress *progess = new CStatusBarProgress( statusBar() ); statusBar()->addWidget( progess, 10 ); - connect( progess, TQT_SIGNAL(pressed()), editor(), TQT_SLOT(stop()) ); - connect( editor(), TQT_SIGNAL( setProgress( int ) ), - progess, TQT_SLOT( setValue( int ) ) ); - connect( editor(), TQT_SIGNAL( setProgress( int, int ) ), - progess, TQT_SLOT( setValue( int, int ) ) ); - connect( editor(), TQT_SIGNAL( enableProgressText( bool ) ), - progess, TQT_SLOT( setTextEnabled( bool ) ) ); - connect( editor(), TQT_SIGNAL( setProgressText( const TQString & ) ), - progess, TQT_SLOT( setText( const TQString & ) ) ); + connect( progess, TQ_SIGNAL(pressed()), editor(), TQ_SLOT(stop()) ); + connect( editor(), TQ_SIGNAL( setProgress( int ) ), + progess, TQ_SLOT( setValue( int ) ) ); + connect( editor(), TQ_SIGNAL( setProgress( int, int ) ), + progess, TQ_SLOT( setValue( int, int ) ) ); + connect( editor(), TQ_SIGNAL( enableProgressText( bool ) ), + progess, TQ_SLOT( setTextEnabled( bool ) ) ); + connect( editor(), TQ_SIGNAL( setProgressText( const TQString & ) ), + progess, TQ_SLOT( setText( const TQString & ) ) ); statusBar()->insertFixedItem( i18n("Selection: 0000:0000 0000:0000"), status_Selection ); @@ -344,7 +344,7 @@ void KHexEdit::setupStatusBar( void ) statusBar()->changeItem( i18n("Size:"), status_Size ); statusBar()->changeItem( "", status_Modified ); statusBar()->changeItem( "", status_Selection ); - connect( statusBar(),TQT_SIGNAL(pressed(int)),this,TQT_SLOT(statusBarPressed(int)) ); + connect( statusBar(),TQ_SIGNAL(pressed(int)),this,TQ_SLOT(statusBarPressed(int)) ); } @@ -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, this, TQT_SLOT(delayedStartupOpen()) ); + TQTimer::singleShot( 100, this, TQ_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()), this, text.latin1()); + TDEAction *action = new TDEAction(text, 0, mAction.bookmarkMapper, TQ_SLOT(map()), this, text.latin1()); int key = acceleratorNumKey( i ); if( key > 0 ) { |