From bcc684e28ad6f9ebeeae5d334a4dc297cef3e816 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:35:27 -0600 Subject: Rename old tq methods that no longer need a unique name --- khexedit/bitswapwidget.cc | 6 +- khexedit/bitswapwidget.h | 2 +- khexedit/chartabledialog.cc | 2 +- khexedit/dialog.cc | 10 +-- khexedit/exportdialog.cc | 12 +-- khexedit/hexbuffer.cc | 18 ++--- khexedit/hexbuffer.h | 2 +- khexedit/hexdrag.cc | 6 +- khexedit/hexdrag.h | 2 +- khexedit/hexeditorwidget.cc | 106 +++++++++++++-------------- khexedit/hexmanagerwidget.cc | 10 +-- khexedit/hextoolwidget.cc | 22 +++--- khexedit/hexviewwidget.cc | 4 +- khexedit/lib/codecs/kebcdic1047charcodec.cpp | 2 +- khexedit/lib/codecs/ktextcharcodec.cpp | 10 +-- khexedit/lib/kbordercolumn.cpp | 8 +- khexedit/lib/kbuffercolumn.cpp | 8 +- khexedit/lib/kbufferdrag.cpp | 6 +- khexedit/lib/kbufferdrag.h | 2 +- khexedit/lib/khexedit.cpp | 14 ++-- khexedit/lib/khexedit.h | 4 +- khexedit/lib/koffsetcolumn.cpp | 4 +- khexedit/lib/kvaluecolumn.cpp | 2 +- khexedit/listview.cc | 10 +-- khexedit/listview.h | 2 +- khexedit/optiondialog.cc | 2 +- khexedit/printdialogpage.cc | 22 +++--- khexedit/searchbar.cc | 2 +- khexedit/statusbarprogress.cc | 2 +- khexedit/statusbarprogress.h | 2 +- khexedit/toplevel.cc | 4 +- 31 files changed, 154 insertions(+), 154 deletions(-) (limited to 'khexedit') diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cc index 7e7f14c..6f79cad 100644 --- a/khexedit/bitswapwidget.cc +++ b/khexedit/bitswapwidget.cc @@ -81,7 +81,7 @@ void CDigitLabel::setDotPosition( uint dotPosition ) -TQSize CDigitLabel::tqsizeHint( void ) const +TQSize CDigitLabel::sizeHint( void ) const { int h = fontMetrics().height(); TQSize s( h, h ); // Retangular @@ -183,9 +183,9 @@ CByteWidget::CByteWidget( TQWidget *parent, const char *name ) { mDigit[i] = new CDigitLabel( this, 7-i ); mDigit[i]->setLineWidth( 1 ); - mDigit[i]->setFixedSize( mDigit[i]->tqsizeHint()*2 ); + mDigit[i]->setFixedSize( mDigit[i]->sizeHint()*2 ); mDigit[i]->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - mDigit[i]->tqsetAlignment( AlignCenter ); + 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 )), diff --git a/khexedit/bitswapwidget.h b/khexedit/bitswapwidget.h index 0dfccbf..d2ec6de 100644 --- a/khexedit/bitswapwidget.h +++ b/khexedit/bitswapwidget.h @@ -35,7 +35,7 @@ class CDigitLabel : public TQLabel CDigitLabel( TQWidget *parent, uint digit = 0, const char *name=0 ); ~CDigitLabel( void ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; inline uint value( void ); signals: diff --git a/khexedit/chartabledialog.cc b/khexedit/chartabledialog.cc index 4475604..a560ea8 100644 --- a/khexedit/chartabledialog.cc +++ b/khexedit/chartabledialog.cc @@ -69,7 +69,7 @@ CCharTableDialog::CCharTableDialog( TQWidget *parent, const char *name, text = i18n("Insert this number of characters:"); TQLabel *label = new TQLabel( text, plainPage() ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); hbox->addWidget( label ); mInputCountSpin = new TQSpinBox( plainPage(), "spin" ); diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc index e04bb30..404e402 100644 --- a/khexedit/dialog.cc +++ b/khexedit/dialog.cc @@ -533,7 +533,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) text = i18n("For&mat (replace):"); label = new TQLabel( mReplaceSelector, text, plainPage() ); if( label == 0 ) { return; } - label->setFixedHeight( label->tqsizeHint().height() ); + label->setFixedHeight( label->sizeHint().height() ); vbox->addWidget( label ); vbox->addWidget( mReplaceSelector ); @@ -549,7 +549,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) label = new TQLabel( mReplaceInput, i18n("Rep&lace:"), plainPage() ); if( label == 0 ) { return; } - label->setFixedHeight( label->tqsizeHint().height() ); + label->setFixedHeight( label->sizeHint().height() ); vbox->addWidget( label ); vbox->addWidget( mReplaceInput ); @@ -846,7 +846,7 @@ void CFilterDialog::makeOperandLayout( void ) mOperandSelector = new TQComboBox( false, page ); if( mOperandSelector == 0 ) { return; } - mOperandSelector->setFixedHeight( mOperandSelector->tqsizeHint().height()); + mOperandSelector->setFixedHeight( mOperandSelector->sizeHint().height()); mOperandSelector->setMinimumWidth( fontMetrics().width("M")*20 ); mOperandSelector->insertStringList( formatStrings() ); connect( mOperandSelector, TQT_SIGNAL(activated(int)), @@ -891,7 +891,7 @@ void CFilterDialog::makeBitSwapLayout( void ) text = i18n("Swap rule"); TQLabel *label = new TQLabel( text, page ); if( label == 0 ) { return; } - label->setFixedHeight( label->tqsizeHint().height() ); + label->setFixedHeight( label->sizeHint().height() ); vbox->addWidget( label ); mByteWidget = new CByteWidget( page ); @@ -902,7 +902,7 @@ void CFilterDialog::makeBitSwapLayout( void ) text = i18n("&Reset"); TQPushButton *resetButton = new TQPushButton( text, page ); - resetButton->setFixedHeight( resetButton->tqsizeHint().height() ); + resetButton->setFixedHeight( resetButton->sizeHint().height() ); connect( resetButton, TQT_SIGNAL(clicked()), mByteWidget, TQT_SLOT(reset()) ); hbox->addWidget( resetButton ); diff --git a/khexedit/exportdialog.cc b/khexedit/exportdialog.cc index d5b90e1..63b74c8 100644 --- a/khexedit/exportdialog.cc +++ b/khexedit/exportdialog.cc @@ -208,17 +208,17 @@ void CExportDialog::setupDestinationPage( void ) vbox->addSpacing( fontMetrics().lineSpacing() ); TQRadioButton *radio1 = new TQRadioButton( i18n("&Everything"), group ); - radio1->setFixedSize( radio1->tqsizeHint() ); + radio1->setFixedSize( radio1->sizeHint() ); mDestination.rangeBox->insert( radio1, 0 ); vbox->addWidget( radio1, 0, AlignLeft ); TQRadioButton *radio2 = new TQRadioButton( i18n("&Selection"), group ); - radio2->setFixedSize( radio2->tqsizeHint() ); + radio2->setFixedSize( radio2->sizeHint() ); mDestination.rangeBox->insert( radio2, 1 ); vbox->addWidget( radio2, 0, AlignLeft ); TQRadioButton *radio3 = new TQRadioButton( i18n("&Range"), group ); - radio3->setFixedSize( radio3->tqsizeHint() ); + radio3->setFixedSize( radio3->sizeHint() ); mDestination.rangeBox->insert( radio3, 2 ); vbox->addWidget( radio3, 0, AlignLeft ); @@ -264,7 +264,7 @@ void CExportDialog::setupOptionPage( void ) makeCArrayOption(); mOptionStack->raiseWidget( (int)option_text ); - TQSize size = mOptionStack->tqsizeHint(); + TQSize size = mOptionStack->sizeHint(); size += TQSize(spacingHint()*2, spacingHint()*2); page->setMinimumSize( size ); } @@ -462,11 +462,11 @@ void CExportDialog::browserClicked( void ) TQString url; if( mDestination.formatCombo->currentItem() == option_html ) { - url = KFileDialog::getExistingDirectory( mWorkDir, tqtopLevelWidget() ); + url = KFileDialog::getExistingDirectory( mWorkDir, topLevelWidget() ); } else { - url = KFileDialog::getSaveFileName( mWorkDir, "*", tqtopLevelWidget() ); + url = KFileDialog::getSaveFileName( mWorkDir, "*", topLevelWidget() ); } if( url.isEmpty() ) diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc index dcfdd91..dc3f167 100644 --- a/khexedit/hexbuffer.cc +++ b/khexedit/hexbuffer.cc @@ -766,7 +766,7 @@ void CHexBuffer::setDisableCursor( bool disableCursor ) } -void CHexBuffer::settqCursorShapeModifier( bool alwaysBlock, bool thickInsert ) +void CHexBuffer::setCursorShapeModifier( bool alwaysBlock, bool thickInsert ) { mCursor.setShapeModifier( alwaysBlock, thickInsert ); setEditMode( mEditMode ); @@ -813,12 +813,12 @@ void CHexBuffer::setEditMode( EEditMode editMode ) -void CHexBuffer::setMaximumSize( uint tqmaximumSize ) +void CHexBuffer::setMaximumSize( uint maximumSize ) { - if( tqmaximumSize == 0 ) { tqmaximumSize = ~0; } + if( maximumSize == 0 ) { maximumSize = ~0; } - mMaximumSize = tqmaximumSize; - mFixedSizeMode = tqmaximumSize == (uint)~0 ? false : true; + mMaximumSize = maximumSize; + mFixedSizeMode = maximumSize == (uint)~0 ? false : true; mCursor.setFixedSizeMode( mFixedSizeMode ); if( mLayout.offsetVisible == false ) @@ -832,9 +832,9 @@ void CHexBuffer::setMaximumSize( uint tqmaximumSize ) if( mLayout.offsetMode == SDisplayLayout::decimal ) { printOffset = &CHexBuffer::printDecimalOffset; - for( mOffsetSize=0; tqmaximumSize > 0; mOffsetSize += 1 ) + for( mOffsetSize=0; maximumSize > 0; mOffsetSize += 1 ) { - tqmaximumSize = tqmaximumSize / 10; + maximumSize = maximumSize / 10; } mOffsetIndex = 10 - mOffsetSize; } @@ -848,9 +848,9 @@ void CHexBuffer::setMaximumSize( uint tqmaximumSize ) { printOffset = &CHexBuffer::printHexadecimalSmallOffset; } - for( mOffsetSize=0; tqmaximumSize > 0; mOffsetSize += 1 ) + for( mOffsetSize=0; maximumSize > 0; mOffsetSize += 1 ) { - tqmaximumSize = tqmaximumSize / 16; + maximumSize = maximumSize / 16; } if( mOffsetSize > 4 ) { mOffsetSize += 1; } // Space for the ':' sign mOffsetIndex = 9 - mOffsetSize; diff --git a/khexedit/hexbuffer.h b/khexedit/hexbuffer.h index 2955af0..862935b 100644 --- a/khexedit/hexbuffer.h +++ b/khexedit/hexbuffer.h @@ -1082,7 +1082,7 @@ class CHexBuffer : public TQByteArray void setNonPrintChar( TQChar nonPrintChar ); void setShowCursor( bool showCursor ); void setDisableCursor( bool disableCursor ); - void settqCursorShapeModifier( bool alwaysBlock, bool thickInsert ); + void setCursorShapeModifier( bool alwaysBlock, bool thickInsert ); void setEditMode( EEditMode editMode ); void setEditMode( EEditMode editMode, bool alwaysBlock, bool thickInsert ); void setMaximumSize( uint size ); diff --git a/khexedit/hexdrag.cc b/khexedit/hexdrag.cc index 0347129..1c9e234 100644 --- a/khexedit/hexdrag.cc +++ b/khexedit/hexdrag.cc @@ -75,7 +75,7 @@ const char *CHexDrag::format( int i ) const } -TQByteArray CHexDrag::tqencodedData( const char *fmt ) const +TQByteArray CHexDrag::encodedData( const char *fmt ) const { if( fmt != 0 ) { @@ -98,7 +98,7 @@ bool CHexDrag::canDecode( const TQMimeSource *e ) bool CHexDrag::decode( const TQMimeSource *e, TQByteArray &dest ) { - dest = e->tqencodedData(mediaString); + dest = e->encodedData(mediaString); return( dest.size() == 0 ? false : true ); // @@ -116,7 +116,7 @@ bool CHexDrag::decode( const TQMimeSource *e, TQByteArray &dest ) #if 0 if( e->provides(mediaString) == true ) { - dest = e->tqencodedData(mediaString); + dest = e->encodedData(mediaString); return( true ); } else diff --git a/khexedit/hexdrag.h b/khexedit/hexdrag.h index aef2e01..7d4fd26 100644 --- a/khexedit/hexdrag.h +++ b/khexedit/hexdrag.h @@ -37,7 +37,7 @@ class CHexDrag : public TQDragObject void setData( const TQByteArray &data ); const char* format ( int i ) const; - TQByteArray tqencodedData( const char *fmt ) const; + TQByteArray encodedData( const char *fmt ) const; static bool canDecode( const TQMimeSource *e ); diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc index 6235e09..5b255d8 100644 --- a/khexedit/hexeditorwidget.cc +++ b/khexedit/hexeditorwidget.cc @@ -605,7 +605,7 @@ void CHexEditorWidget::newFile( void ) if( errCode != Err_Success ) { TQString msg = i18n("Unable to create new document."); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Operation Failed") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Operation Failed") ); return; } @@ -626,7 +626,7 @@ void CHexEditorWidget::newFile( const TQByteArray &data ) void CHexEditorWidget::open() { - KURL file = KFileDialog::getOpenURL( mWorkDir, "*" ,tqtopLevelWidget() ); + KURL file = KFileDialog::getOpenURL( mWorkDir, "*" ,topLevelWidget() ); if( file.isEmpty() ) return; @@ -764,7 +764,7 @@ bool CHexEditorWidget::selectDocument( const TQString &url, void CHexEditorWidget::insertFile( void ) { - KFileDialog fdlg(mWorkDir, TQString(), tqtopLevelWidget(), 0, TRUE); + KFileDialog fdlg(mWorkDir, TQString(), topLevelWidget(), 0, TRUE); fdlg.setOperationMode( KFileDialog::Opening ); fdlg.okButton()->setGuiItem( KStdGuiItem::insert() ); fdlg.setCaption(i18n("Insert File")); @@ -868,7 +868,7 @@ bool CHexEditorWidget::querySave( void ) TQString msg = i18n("" "The current document has been modified.\n" "Do you want to save it?" ); - int reply = KMessageBox::warningYesNoCancel( tqtopLevelWidget(), msg, TQString(), KStdGuiItem::save(), KStdGuiItem::discard() ); + int reply = KMessageBox::warningYesNoCancel( topLevelWidget(), msg, TQString(), KStdGuiItem::save(), KStdGuiItem::discard() ); if( reply == KMessageBox::Yes ) { return( save() ); @@ -934,7 +934,7 @@ bool CHexEditorWidget::save( void ) "Current document has been changed on disk.\n" "If you save now, those changes will be lost.\n" "Proceed?" ); - int reply = KMessageBox::warningYesNoCancel( tqtopLevelWidget(), msg, + int reply = KMessageBox::warningYesNoCancel( topLevelWidget(), msg, i18n("Save"), KStdGuiItem::save(), KStdGuiItem::discard() ); if( reply == KMessageBox::No || reply == KMessageBox::Cancel ) { @@ -986,7 +986,7 @@ bool CHexEditorWidget::saveAs( void ) TQString msg = i18n("" "A document with this name already exists.\n" "Do you want to overwrite it?" ); - int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg, + int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg, i18n("Save As"), i18n("Overwrite") ); if( reply == KMessageBox::Continue ) break; @@ -1021,7 +1021,7 @@ void CHexEditorWidget::reload( void ) if( mHexView->urlValid() == false ) { TQString msg = i18n( "The current document does not exist on the disk." ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Reload") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Reload") ); return; } @@ -1040,7 +1040,7 @@ void CHexEditorWidget::reload( void ) "If you reload now, the modifications will be lost." ); } - int reply = KMessageBox::warningContinueCancel(tqtopLevelWidget(),msg,i18n("Reload"), i18n("&Reload")); + int reply = KMessageBox::warningContinueCancel(topLevelWidget(),msg,i18n("Reload"), i18n("&Reload")); if( reply != KMessageBox::Continue ) { return; @@ -1070,7 +1070,7 @@ void CHexEditorWidget::print( void ) prt.setFullPage( true ); // I use my own marings // FIXME: Make a better header for the printingdialog - if (prt.setup(tqtopLevelWidget(), i18n("Print Hex-Document"))) + if (prt.setup(topLevelWidget(), i18n("Print Hex-Document"))) { prt.setTopMarginMM( prt.option("kde-khexedit-topmarginmm").toInt() ); prt.setBottomMarginMM( prt.option("kde-khexedit-bottommarginmm").toInt() ); @@ -1125,7 +1125,7 @@ void CHexEditorWidget::printPostscript( CHexPrinter &printer ) if( errCode != Err_Success ) { - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Print") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Print") ); } } @@ -1148,7 +1148,7 @@ bool CHexEditorWidget::confirmPrintPageNumber( CHexPrinter &printer ) "You are about to print %n pages.
" "Proceed?", numPageSelected ); - int reply = KMessageBox::warningYesNo( tqtopLevelWidget(), msg, + int reply = KMessageBox::warningYesNo( topLevelWidget(), msg, i18n("Print"), KStdGuiItem::print(), KStdGuiItem::cancel() ); if( reply != KMessageBox::Continue ) { @@ -1165,7 +1165,7 @@ void CHexEditorWidget::exportDialog( void ) { if( mExportDialog == 0 ) { - mExportDialog = new CExportDialog( tqtopLevelWidget(), 0, false ); + mExportDialog = new CExportDialog( topLevelWidget(), 0, false ); if( mExportDialog == 0 ) { return; } connect( mExportDialog, TQT_SIGNAL( exportText(const SExportText &)), this, TQT_SLOT( exportText( const SExportText &)) ); @@ -1191,7 +1191,7 @@ void CHexEditorWidget::exportText( const SExportText &ex ) { TQString msg = i18n("Unable to export data.\n"); msg += hexError( errCode ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Export") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Export") ); } } @@ -1208,7 +1208,7 @@ void CHexEditorWidget::exportHtml( const SExportHtml &ex ) { TQString msg = i18n("Unable to export data.\n"); msg += hexError( errCode ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Export") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Export") ); } } @@ -1225,7 +1225,7 @@ void CHexEditorWidget::exportCArray( const SExportCArray &ex ) { TQString msg = i18n("Unable to export data.\n"); msg += hexError( errCode ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Export") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Export") ); } } @@ -1238,7 +1238,7 @@ void CHexEditorWidget::encode( CConversion::EMode mode ) "The encoding you have selected is not reversible.\n" "If you revert to the original encoding later, there is no " "guarantee that the data can be restored to the original state."); - int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg, + int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg, i18n("Encode"), i18n("&Encode")); if( reply != KMessageBox::Continue ) { @@ -1258,7 +1258,7 @@ void CHexEditorWidget::encode( CConversion::EMode mode ) { TQString msg = i18n("Could not encode data.\n"); msg += hexError( errCode ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Encode") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Encode") ); } } @@ -1412,7 +1412,7 @@ void CHexEditorWidget::removeAllBookmark( void ) TQString msg = i18n("" "Deleted bookmarks can not be restored.\n" "Proceed?" ); - int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg ); + int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg ); if( reply != KMessageBox::Continue ) { return; @@ -1447,7 +1447,7 @@ void CHexEditorWidget::gotoOffset( void ) { if( mGotoDialog == 0 ) { - mGotoDialog = new CGotoDialog( tqtopLevelWidget(), 0, false ); + 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 )) ); @@ -1465,7 +1465,7 @@ void CHexEditorWidget::find( void ) if( mFindDialog == 0 ) { - mFindDialog = new CFindDialog( tqtopLevelWidget(), 0, false ); + mFindDialog = new CFindDialog( topLevelWidget(), 0, false ); if( mFindDialog == 0 ) { return; } connect( mFindDialog, TQT_SIGNAL(findData(SSearchControl &, uint, bool)), @@ -1526,7 +1526,7 @@ void CHexEditorWidget::findData( SSearchControl &sc, uint mode, bool navigator) if( mode == Find_First ) { TQString msg = i18n( "Search key not found in document." ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Find") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Find") ); } } @@ -1580,7 +1580,7 @@ bool CHexEditorWidget::askWrap( bool fwd, const TQString &header ) "Continue from the end?" ); } - int reply = KMessageBox::questionYesNo( tqtopLevelWidget(), msg, header, KStdGuiItem::cont(), KStdGuiItem::cancel() ); + int reply = KMessageBox::questionYesNo( topLevelWidget(), msg, header, KStdGuiItem::cont(), KStdGuiItem::cancel() ); return( reply == KMessageBox::Yes ? true : false ); } @@ -1594,7 +1594,7 @@ bool CHexEditorWidget::canFind( bool showError ) TQString msg = i18n("" "Your request can not be processed.\n" "No search pattern defined." ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Find") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Find") ); } return( false ); } @@ -1613,7 +1613,7 @@ void CHexEditorWidget::findNavigator( SSearchControl &sc ) if( mFindNavigatorDialog == 0 ) { - mFindNavigatorDialog = new CFindNavigatorDialog(tqtopLevelWidget(),0,false); + mFindNavigatorDialog = new CFindNavigatorDialog(topLevelWidget(),0,false); if( mFindNavigatorDialog == 0 ) { return; } connect( mFindNavigatorDialog, TQT_SIGNAL(findData(SSearchControl &, uint, bool)), @@ -1636,7 +1636,7 @@ void CHexEditorWidget::replace( void ) if( mReplaceDialog == 0 ) { - mReplaceDialog = new CReplaceDialog( tqtopLevelWidget(), 0, false ); + mReplaceDialog = new CReplaceDialog( topLevelWidget(), 0, false ); if( mReplaceDialog == 0 ) { return; } connect( mReplaceDialog, TQT_SIGNAL( replaceData( SSearchControl &, uint)), @@ -1726,7 +1726,7 @@ void CHexEditorWidget::replacePrompt( SSearchControl &sc ) { if( mReplacePromptDialog == 0 ) { - mReplacePromptDialog = new CReplacePromptDialog(tqtopLevelWidget(), 0,false); + mReplacePromptDialog = new CReplacePromptDialog(topLevelWidget(), 0,false); if( mReplacePromptDialog == 0 ) { return; } connect( mReplacePromptDialog, TQT_SIGNAL( replaceData( SSearchControl &, uint)), @@ -1765,14 +1765,14 @@ void CHexEditorWidget::replaceResult( SSearchControl &sc ) { msg += i18n( "Search key not found in document." ); } - KMessageBox::information( tqtopLevelWidget(), msg, i18n("Find & Replace")); + KMessageBox::information( topLevelWidget(), msg, i18n("Find & Replace")); } else { const TQString msg = i18n( "Operation complete.

One replacement was made.", "Operation complete.

%n replacements were made.", sc.numReplace ); - KMessageBox::information( tqtopLevelWidget(), msg, i18n("Find & Replace")); + KMessageBox::information( topLevelWidget(), msg, i18n("Find & Replace")); } } @@ -1781,7 +1781,7 @@ void CHexEditorWidget::insertPattern( void ) { if( mInsertDialog == 0 ) { - mInsertDialog = new CInsertDialog( tqtopLevelWidget(), 0, false ); + mInsertDialog = new CInsertDialog( topLevelWidget(), 0, false ); if( mInsertDialog == 0 ) { return; } connect( mInsertDialog, TQT_SIGNAL(execute( SInsertData & )), mHexView, TQT_SLOT(insert( SInsertData & )) ); @@ -1795,7 +1795,7 @@ void CHexEditorWidget::encoding( void ) TQString msg = i18n("" "Not available yet!\n" "Define your own encoding" ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Encoding") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Encoding") ); } @@ -1803,7 +1803,7 @@ void CHexEditorWidget::strings( void ) { if( mStringDialog == 0 ) { - mStringDialog = new CStringDialog( tqtopLevelWidget(), 0, false ); + 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 )) ); @@ -1830,7 +1830,7 @@ void CHexEditorWidget::collectStrings( void ) { TQString msg = i18n("Could not collect strings.\n"); msg += hexError( errCode ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Collect Strings") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Collect Strings") ); } } @@ -1842,14 +1842,14 @@ void CHexEditorWidget::recordView( void ) TQString msg = i18n("" "Not available yet!\n" "Define a record (structure) and fill it with data from the document." ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Record Viewer") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Record Viewer") ); } void CHexEditorWidget::filter( void ) { if( mFilterDialog == 0 ) { - mFilterDialog = new CFilterDialog( tqtopLevelWidget(), 0, false ); + mFilterDialog = new CFilterDialog( topLevelWidget(), 0, false ); if( mFilterDialog == 0 ) { return; } connect( mFilterDialog, TQT_SIGNAL(filterData( SFilterControl & )), mHexView, TQT_SLOT(filter( SFilterControl & )) ); @@ -1862,7 +1862,7 @@ void CHexEditorWidget::chart( void ) { if( mCharTableDialog == 0 ) { - mCharTableDialog = new CCharTableDialog( tqtopLevelWidget(), 0, false ); + mCharTableDialog = new CCharTableDialog( topLevelWidget(), 0, false ); if( mCharTableDialog == 0 ) { return; } connect( mCharTableDialog, TQT_SIGNAL(assign( const TQByteArray & )), mHexView, TQT_SLOT(insert( const TQByteArray & )) ); @@ -1887,7 +1887,7 @@ void CHexEditorWidget::statistics( void ) { if( mFileInfoDialog == 0 ) { - mFileInfoDialog = new CFileInfoDialog( tqtopLevelWidget(), 0, false ); + mFileInfoDialog = new CFileInfoDialog( topLevelWidget(), 0, false ); if( mFileInfoDialog == 0 ) { return; } connect( mFileInfoDialog, TQT_SIGNAL(collectStatistic(SStatisticControl &)), TQT_SLOT(collectStatistics(SStatisticControl &))); @@ -1916,7 +1916,7 @@ void CHexEditorWidget::collectStatistics( SStatisticControl &sc ) TQString msg = i18n("Could not collect document statistics.\n"); msg += hexError( errCode ); - KMessageBox::sorry( tqtopLevelWidget(), msg, + KMessageBox::sorry( topLevelWidget(), msg, i18n("Collect Document Statistics") ); } @@ -1927,7 +1927,7 @@ void CHexEditorWidget::options( void ) { if( mOptionDialog == 0 ) { - mOptionDialog = new COptionDialog( tqtopLevelWidget(), 0, false ); + mOptionDialog = new COptionDialog( topLevelWidget(), 0, false ); if( mOptionDialog == 0 ) { return; } connect( mOptionDialog, TQT_SIGNAL(lineSizeChoice(const SDisplayLine &)), @@ -1959,7 +1959,7 @@ void CHexEditorWidget::favorites( void ) TQString msg = i18n("" "Not available yet!\n" "Save or retrive your favorite tqlayout" ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Profiles") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Profiles") ); } @@ -1979,7 +1979,7 @@ int CHexEditorWidget::readURL( const KURL &url, bool insert ) if( !url.isValid() ) { TQString msg = i18n("Malformed URL\n%1").tqarg( url.url() ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read URL") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Read URL") ); return( Err_IllegalArgument ); } @@ -2013,7 +2013,7 @@ void CHexEditorWidget::writeURL( TQString &url ) { mHexView->setModified( modified ); TQString msg = i18n("Could not save remote file."); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") ); } } } @@ -2050,21 +2050,21 @@ bool CHexEditorWidget::readFile( const TQString &diskPath, const TQString &url, if( info.exists() == false ) { const TQString msg = i18n("The specified file does not exist.\n%1").tqarg( diskPath ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") ); return( false ); } if( info.isDir() == true ) { const TQString msg = i18n("You have specified a folder.\n%1").tqarg( diskPath ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") ); return( false ); } if( info.isReadable() == false ) { const TQString msg = i18n("You do not have read permission to this file.\n%1").tqarg( diskPath ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") ); return( false ); } @@ -2072,7 +2072,7 @@ bool CHexEditorWidget::readFile( const TQString &diskPath, const TQString &url, if( file.open( IO_ReadOnly | IO_Raw ) == false ) { const TQString msg = i18n("An error occurred while trying to open the file.\n%1").tqarg( diskPath ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") ); return( false ); } @@ -2102,7 +2102,7 @@ bool CHexEditorWidget::readFile( const TQString &diskPath, const TQString &url, TQString header = insert == true ? i18n("Insert") : i18n("Read"); TQString msg = i18n("Could not read file.\n"); msg += hexError( errCode ); - KMessageBox::sorry( tqtopLevelWidget(), msg, header ); + KMessageBox::sorry( topLevelWidget(), msg, header ); } file.close(); @@ -2120,14 +2120,14 @@ bool CHexEditorWidget::writeFile( const TQString &diskPath ) if( info.isDir() == true ) { TQString msg = i18n("You have specified a folder."); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") ); return( false ); } if( info.isWritable() == false ) { TQString msg = i18n("You do not have write permission."); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") ); return( false ); } } @@ -2136,7 +2136,7 @@ bool CHexEditorWidget::writeFile( const TQString &diskPath ) if( file.open( IO_WriteOnly | IO_Raw | IO_Truncate ) == false ) { TQString msg = i18n("An error occurred while trying to open the file."); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") ); return( false ); } @@ -2149,7 +2149,7 @@ bool CHexEditorWidget::writeFile( const TQString &diskPath ) { TQString msg = i18n("Could not write data to disk.\n"); msg += hexError( errCode ); - KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") ); + KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") ); } file.close(); @@ -2231,7 +2231,7 @@ bool CHexEditorWidget::createBuffer( void ) { TQString msg = i18n( "Can not create text buffer.\n" ); msg += hexError( Err_NoMemory ); - KMessageBox::error( tqtopLevelWidget(), msg, i18n("Loading Failed" ) ); + KMessageBox::error( topLevelWidget(), msg, i18n("Loading Failed" ) ); return( false ); } @@ -2418,7 +2418,7 @@ int CHexEditorWidget::progressParse( const SProgressData &pd ) } - int reply = KMessageBox::warningYesNo( tqtopLevelWidget(), msg, header, KStdGuiItem::cancel(), KStdGuiItem::cont() ); + int reply = KMessageBox::warningYesNo( topLevelWidget(), msg, header, KStdGuiItem::cancel(), KStdGuiItem::cont() ); mProgressStop = false; return( reply == KMessageBox::Yes ? Err_Stop : Err_Success ); } @@ -2431,7 +2431,7 @@ bool CHexEditorWidget::busy( bool showWarning ) { TQString msg = i18n("Could not finish operation.\n"); msg += hexError( Err_Busy ); - KMessageBox::sorry( tqtopLevelWidget(), msg ); + KMessageBox::sorry( topLevelWidget(), msg ); } return( mProgressBusy ); diff --git a/khexedit/hexmanagerwidget.cc b/khexedit/hexmanagerwidget.cc index 0059c0a..e5c5da6 100644 --- a/khexedit/hexmanagerwidget.cc +++ b/khexedit/hexmanagerwidget.cc @@ -129,16 +129,16 @@ void CHexManagerWidget::setConversionVisibility( EConversionPosition position ) TQRect rect = tqgeometry(); TQPoint p; - p.setX(point.x() + rect.width()/2 - mConverter->tqminimumSize().width()/2); - p.setY(point.y() + rect.height()/2 - mConverter->tqminimumSize().height()/2); - mConverter->resize( mConverter->tqminimumSize() ); + p.setX(point.x() + rect.width()/2 - mConverter->minimumSize().width()/2); + p.setY(point.y() + rect.height()/2 - mConverter->minimumSize().height()/2); + mConverter->resize( mConverter->minimumSize() ); mConverter->reparent( 0, WStyle_Customize | WStyle_DialogBorder, p, true ); mConverter->setCaption(kapp->makeStdCaption(i18n("Conversion"))); } else { mConversionPosition = Embed; - uint utilHeight = mConverter->tqminimumSize().height(); + uint utilHeight = mConverter->minimumSize().height(); TQPoint p( 0, height() - utilHeight ); mConverter->reparent( this, 0, p, true ); } @@ -250,7 +250,7 @@ int CHexManagerWidget::preferredWidth( void ) int w = mEditor->defaultTextWidth(); if( mConversionPosition == Embed ) { - int converterWidth = mConverter->tqsizeHint().width(); + int converterWidth = mConverter->sizeHint().width(); w = TQMAX( w, converterWidth ); } return( w ); diff --git a/khexedit/hextoolwidget.cc b/khexedit/hextoolwidget.cc index 48a6a08..a2c0cd9 100644 --- a/khexedit/hextoolwidget.cc +++ b/khexedit/hextoolwidget.cc @@ -64,30 +64,30 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) for( int i=0; i<4; i++ ) { TQLabel *Label = new TQLabel( msg1[i], this ); - Label->tqsetAlignment( AlignRight|AlignVCenter ); + Label->setAlignment( AlignRight|AlignVCenter ); ValuesBox->addWidget( Label, i, 0 ); mText1[i] = new TQLineEdit( this ); mText1[i]->setReadOnly( true ); - mText1[i]->tqsetAlignment( AlignRight ); + mText1[i]->setAlignment( AlignRight ); ValuesBox->addWidget( mText1[i], i, 1 ); Label = new TQLabel( msg2[i], this ); - Label->tqsetAlignment( AlignRight|AlignVCenter ); + Label->setAlignment( AlignRight|AlignVCenter ); ValuesBox->addWidget( Label, i, 3 ); mText2[i] = new TQLineEdit( this ); mText2[i]->setReadOnly( true ); - mText2[i]->tqsetAlignment( AlignRight ); + mText2[i]->setAlignment( AlignRight ); ValuesBox->addWidget( mText2[i], i, 4 ); Label = new TQLabel( msg3[i], this ); - Label->tqsetAlignment( AlignRight|AlignVCenter ); + Label->setAlignment( AlignRight|AlignVCenter ); mUtilBox->addWidget( Label, i, 1 ); mText3[i] = new TQLineEdit( this ); mText3[i]->setReadOnly( true ); - mText3[i]->tqsetAlignment( AlignRight ); + mText3[i]->setAlignment( AlignRight ); mUtilBox->addWidget( mText3[i], i, 2 ); } @@ -95,7 +95,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) text = i18n("Show little endian decoding"); mCheckIntelFormat = new TQCheckBox( text, this ); - mCheckIntelFormat->setMinimumSize( mCheckIntelFormat->tqsizeHint() ); + mCheckIntelFormat->setMinimumSize( mCheckIntelFormat->sizeHint() ); connect( mCheckIntelFormat, TQT_SIGNAL(clicked()), this, TQT_SLOT(intelFormat()) ); SettingsBox->addWidget( mCheckIntelFormat, 0, AlignVCenter ); mCheckIntelFormat->setChecked( // default value to please endian system users @@ -109,7 +109,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) text = i18n("Show unsigned as hexadecimal"); mCheckHexadecimal = new TQCheckBox( text, this ); - mCheckHexadecimal->setMinimumSize( mCheckHexadecimal->tqsizeHint() ); + mCheckHexadecimal->setMinimumSize( mCheckHexadecimal->sizeHint() ); connect( mCheckHexadecimal, TQT_SIGNAL(clicked()), this, TQT_SLOT(unsignedFormat()) ); SettingsBox->addWidget( mCheckHexadecimal, 0, AlignVCenter ); @@ -120,7 +120,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) // Variable bitwidth. Based on Craig Graham's work. // TQLabel *bitLabel = new TQLabel( i18n("Stream length:"), this ); - bitLabel->tqsetAlignment( AlignRight|AlignVCenter ); + bitLabel->setAlignment( AlignRight|AlignVCenter ); mUtilBox->addWidget( bitLabel, 4, 1 ); mBitCombo = new TQComboBox( false, this ); @@ -132,7 +132,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) text += i==0 ? i18n("Bit Window") : i18n("Bits Window"); mBitCombo->insertItem( text ); } - mBitCombo->setMinimumSize( mBitCombo->tqsizeHint() ); + mBitCombo->setMinimumSize( mBitCombo->sizeHint() ); connect( mBitCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(bitWidthChanged(int))); mUtilBox->addWidget( mBitCombo, 4, 2 ); @@ -147,7 +147,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) mCursorState.valid = false; mViewHexCaps = true; - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); show(); } diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc index 555e0cc..0ac3ab8 100644 --- a/khexedit/hexviewwidget.cc +++ b/khexedit/hexviewwidget.cc @@ -739,7 +739,7 @@ void CHexViewWidget::setCursor( const SDisplayCursor &cursor, bool /*updateDisplay*/ ) { mCursor = cursor; - mHexBuffer->settqCursorShapeModifier( cursor.alwaysBlockShape, + mHexBuffer->setCursorShapeModifier( cursor.alwaysBlockShape, cursor.thickInsertShape ); setupCursorTimer(); redrawFromOffset( mHexBuffer->cursorOffset(), false ); @@ -1103,7 +1103,7 @@ int CHexViewWidget::bookmarkMenu( const TQString &title ) popup->insertItem( text, i ); } - TQSize s(popup->tqsizeHint()); + TQSize s(popup->sizeHint()); TQPoint center( (width()-s.width())/2, (height()-s.height())/2 ); int position = popup->exec( mapToGlobal(center) ); delete popup; diff --git a/khexedit/lib/codecs/kebcdic1047charcodec.cpp b/khexedit/lib/codecs/kebcdic1047charcodec.cpp index 2e91035..48986b2 100644 --- a/khexedit/lib/codecs/kebcdic1047charcodec.cpp +++ b/khexedit/lib/codecs/kebcdic1047charcodec.cpp @@ -119,6 +119,6 @@ const TQString& KEBCDIC1047CharCodec::name() const const TQString& KEBCDIC1047CharCodec::codecName() { - static const TQString Name( TQString::tqfromLatin1(KEBCDIC1047CharCodecName) ); + static const TQString Name( TQString::fromLatin1(KEBCDIC1047CharCodecName) ); return Name; } diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp index f5bcc65..b45c76d 100644 --- a/khexedit/lib/codecs/ktextcharcodec.cpp +++ b/khexedit/lib/codecs/ktextcharcodec.cpp @@ -127,7 +127,7 @@ const TQStringList &KTextCharCodec::codecNames() bool Found = true; TQTextCodec* Codec = KGlobal::charsets()->codecForName( *it, Found ); if( Found && is8Bit(Codec) ) - CodecNames.append( TQString::tqfromLatin1(Codec->name()) ); + CodecNames.append( TQString::fromLatin1(Codec->name()) ); } } @@ -150,7 +150,7 @@ TQString KTextCharCodec::nameOfEncoding( KEncoding C ) if( N != 0 ) { - TQString CodeName = TQString::tqfromLatin1( N ); + TQString CodeName = TQString::fromLatin1( N ); } return Codec; } @@ -186,10 +186,10 @@ const TQStringList &KTextCharCodec::codecNames() for( unsigned int i=0; icodecForName( Name, Found ); if( Found ) - CodecNames.append( TQString::tqfromLatin1(Codec->name()) ); + CodecNames.append( TQString::fromLatin1(Codec->name()) ); } } @@ -231,6 +231,6 @@ KHEChar KTextCharCodec::decode( char Byte ) const const TQString& KTextCharCodec::name() const { if( Name.isNull() ) - Name = TQString::tqfromLatin1( Codec->name() ); + Name = TQString::fromLatin1( Codec->name() ); return Name; } diff --git a/khexedit/lib/kbordercolumn.cpp b/khexedit/lib/kbordercolumn.cpp index 170f972..4a22919 100644 --- a/khexedit/lib/kbordercolumn.cpp +++ b/khexedit/lib/kbordercolumn.cpp @@ -49,8 +49,8 @@ void KBorderColumn::paintLine( TQPainter *P ) if( Middle ) { - int GridColor = View->tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, View ); - P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->tqcolorGroup().mid() ); + int GridColor = View->tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, View ); + P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() ); P->drawLine( LineX, 0, LineX, LineHeight-1 ) ; } } @@ -75,8 +75,8 @@ void KBorderColumn::paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys ) KPixelX LX = x() + LineX; if( Middle && Xs.includes(LX) ) { - int GridColor = View->tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, View ); - P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->tqcolorGroup().mid() ); + int GridColor = View->tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, View ); + P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() ); P->drawLine( LX, Ys.start(), LX, Ys.end() ) ; } } diff --git a/khexedit/lib/kbuffercolumn.cpp b/khexedit/lib/kbuffercolumn.cpp index 1d26bf0..fb2cfb9 100644 --- a/khexedit/lib/kbuffercolumn.cpp +++ b/khexedit/lib/kbuffercolumn.cpp @@ -395,7 +395,7 @@ void KBufferColumn::paintLine( TQPainter *P, int Line ) // TODO: could be remove void KBufferColumn::paintPositions( TQPainter *P, int Line, KSection Pos ) { - const TQColorGroup &CG = View->tqcolorGroup(); + const TQColorGroup &CG = View->colorGroup(); // clear background unsigned int BlankFlag = (Pos.start()!=0?StartsBefore:0) | (Pos.end()!=LastPos?EndsLater:0); @@ -501,7 +501,7 @@ void KBufferColumn::paintPlain( TQPainter *P, KSection Positions, int Index ) void KBufferColumn::paintSelection( TQPainter *P, KSection Positions, int Index, int Flag ) { - const TQColorGroup &CG = View->tqcolorGroup(); + const TQColorGroup &CG = View->colorGroup(); paintRange( P, CG.highlight(), Positions, Flag ); @@ -524,7 +524,7 @@ void KBufferColumn::paintSelection( TQPainter *P, KSection Positions, int Index, void KBufferColumn::paintMarking( TQPainter *P, KSection Positions, int Index, int Flag ) { - const TQColorGroup &CG = View->tqcolorGroup(); + const TQColorGroup &CG = View->colorGroup(); paintRange( P, CG.text(), Positions, Flag ); @@ -581,7 +581,7 @@ void KBufferColumn::paintByte( TQPainter *P, int Index ) char Byte = ( Index > -1 ) ? Buffer->datum( Index ) : EmptyByte; KHEChar B = Codec->decode( Byte ); - const TQColorGroup &CG = View->tqcolorGroup(); + const TQColorGroup &CG = View->colorGroup(); TQColor Color = CG.text(); TQBrush Brush( CG.base(), TQt::SolidPattern ); diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp index c9cc54a..3809b61 100644 --- a/khexedit/lib/kbufferdrag.cpp +++ b/khexedit/lib/kbufferdrag.cpp @@ -135,7 +135,7 @@ const char *KBufferDrag::format( int i ) const } -TQByteArray KBufferDrag::tqencodedData( const char *Format ) const +TQByteArray KBufferDrag::encodedData( const char *Format ) const { if( Format != 0 ) { @@ -224,12 +224,12 @@ bool KBufferDrag::canDecode( const TQMimeSource* Source ) bool KBufferDrag::decode( const TQMimeSource* Source, TQByteArray &Dest ) { -// Dest = Source->tqencodedData( MediaString ); +// Dest = Source->encodedData( MediaString ); // return Dest.size() != 0; bool CanDecode = Source->provides( OctetStream ); if( CanDecode ) - Dest = Source->tqencodedData( OctetStream ); + Dest = Source->encodedData( OctetStream ); return CanDecode; } diff --git a/khexedit/lib/kbufferdrag.h b/khexedit/lib/kbufferdrag.h index effd9a2..3af0ebd 100644 --- a/khexedit/lib/kbufferdrag.h +++ b/khexedit/lib/kbufferdrag.h @@ -52,7 +52,7 @@ class KBufferDrag : public TQDragObject public: // TQDragObject API virtual const char *format( int i ) const; - virtual TQByteArray tqencodedData( const char* ) const; + virtual TQByteArray encodedData( const char* ) const; public: virtual void setData( const TQByteArray &); diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp index 01d7602..1e59d2f 100644 --- a/khexedit/lib/khexedit.cpp +++ b/khexedit/lib/khexedit.cpp @@ -548,17 +548,17 @@ void KHexEdit::toggleOffsetColumn( bool Visible ) } -TQSize KHexEdit::tqsizeHint() const +TQSize KHexEdit::sizeHint() const { return TQSize( totalWidth(), totalHeight() ); } -TQSize KHexEdit::tqminimumSizeHint() const +TQSize KHexEdit::minimumSizeHint() const { // TODO: better minimal width (visibility!) return TQSize( OffsetColumn->visibleWidth()+FirstBorderColumn->visibleWidth()+SecondBorderColumn->visibleWidth()+valueColumn().byteWidth()+charColumn().byteWidth(), - lineHeight() + noOfLines()>1? tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent):0 ); + lineHeight() + noOfLines()>1? tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent):0 ); } @@ -598,7 +598,7 @@ int KHexEdit::fittingBytesPerLine( const TQSize &NewSize ) const // check influence of dis-/appearing of the vertical scrollbar bool VerticalScrollbarIsVisible = verticalScrollBar()->isVisible(); - KPixelX ScrollbarExtent = tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width(); + KPixelX ScrollbarExtent = tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width(); KPixelX AvailableWidth = FullWidth; if( VerticalScrollbarIsVisible ) @@ -1192,11 +1192,11 @@ bool KHexEdit::eventFilter( TQObject *O, TQEvent *E ) // if( O == this && E->type() == TQEvent::PaletteChange ) // { -// TQColor old( viewport()->tqcolorGroup().color(TQColorGroup::Text) ); +// TQColor old( viewport()->colorGroup().color(TQColorGroup::Text) ); // -// if( old != tqcolorGroup().color(TQColorGroup::Text) ) +// if( old != colorGroup().color(TQColorGroup::Text) ) // { -// TQColor c( tqcolorGroup().color(TQColorGroup::Text) ); +// TQColor c( colorGroup().color(TQColorGroup::Text) ); // doc->setMinimumWidth( -1 ); // doc->setDefaultFormat( doc->formatCollection()->defaultFormat()->font(), c ); // lastFormatted = doc->firstParagraph(); diff --git a/khexedit/lib/khexedit.h b/khexedit/lib/khexedit.h index 00a25d6..b974542 100644 --- a/khexedit/lib/khexedit.h +++ b/khexedit/lib/khexedit.h @@ -130,8 +130,8 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView // void focusOutEvent( TQFocusEvent *FocusEvent ); virtual bool eventFilter( TQObject *O, TQEvent *E ); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; public: // value access diff --git a/khexedit/lib/koffsetcolumn.cpp b/khexedit/lib/koffsetcolumn.cpp index c2be15a..43897b1 100644 --- a/khexedit/lib/koffsetcolumn.cpp +++ b/khexedit/lib/koffsetcolumn.cpp @@ -42,7 +42,7 @@ KOffsetColumn::~KOffsetColumn() void KOffsetColumn::paintLine( TQPainter *P, int Line ) { - const TQColor &ButtonColor = View->tqcolorGroup().button(); + const TQColor &ButtonColor = View->colorGroup().button(); P->fillRect( 0,0,width(),LineHeight, TQBrush(ButtonColor,TQt::SolidPattern) ); printFunction()( CodedOffset,FirstLineOffset+Delta*Line ); @@ -68,7 +68,7 @@ void KOffsetColumn::paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys ) { Xs.restrictTo( XSpan ); - const TQColor &ButtonColor = View->tqcolorGroup().button(); + const TQColor &ButtonColor = View->colorGroup().button(); P->fillRect( Xs.start(), Ys.start(), Xs.width(), Ys.width(), TQBrush(ButtonColor,TQt::SolidPattern) ); } diff --git a/khexedit/lib/kvaluecolumn.cpp b/khexedit/lib/kvaluecolumn.cpp index beb706a..645dc89 100644 --- a/khexedit/lib/kvaluecolumn.cpp +++ b/khexedit/lib/kvaluecolumn.cpp @@ -105,7 +105,7 @@ void KValueColumn::paintEditedByte( TQPainter *P, char Byte, const TQString &Edi { KHEChar B = Codec->decode( Byte ); - const TQColorGroup &CG = View->tqcolorGroup(); + const TQColorGroup &CG = View->colorGroup(); P->fillRect( 0,0,ByteWidth,LineHeight, TQBrush(colorForChar(B),TQt::SolidPattern) ); diff --git a/khexedit/listview.cc b/khexedit/listview.cc index 3217cac..63f18d8 100644 --- a/khexedit/listview.cc +++ b/khexedit/listview.cc @@ -35,20 +35,20 @@ void CListView::setVisibleItem( int visibleItem, bool updateSize ) mVisibleItem = TQMAX( 1, visibleItem ); if( updateSize == true ) { - TQSize s = tqsizeHint(); - setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() + + TQSize s = sizeHint(); + setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() + lineWidth() * 2, s.height() ); } } -TQSize CListView::tqsizeHint( void ) const +TQSize CListView::sizeHint( void ) const { - TQSize s = TQListView::tqsizeHint(); + TQSize s = TQListView::sizeHint(); int h = fontMetrics().height() + 2*itemMargin(); if( h % 2 > 0 ) { h++; } - s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height()); + s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height()); return( s ); } #include "listview.moc" diff --git a/khexedit/listview.h b/khexedit/listview.h index 975f3da..b9182bf 100644 --- a/khexedit/listview.h +++ b/khexedit/listview.h @@ -32,7 +32,7 @@ class CListView : public KListView CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 ); void setVisibleItem( int visibleItem, bool updateSize=true ); - virtual TQSize tqsizeHint( void ) const; + virtual TQSize sizeHint( void ) const; private: int mVisibleItem; diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc index a754e72..8709df4 100644 --- a/khexedit/optiondialog.cc +++ b/khexedit/optiondialog.cc @@ -439,7 +439,7 @@ void COptionDialog::setupFilePage( void ) modeList.append( i18n("Most Recent Document") ); modeList.append( i18n("All Recent Documents") ); mFile.openCombo->insertStringList( modeList ); - mFile.openCombo->setMinimumWidth( mFile.openCombo->tqsizeHint().width() ); + mFile.openCombo->setMinimumWidth( mFile.openCombo->sizeHint().width() ); connect( mFile.openCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT( slotChanged())); diff --git a/khexedit/printdialogpage.cc b/khexedit/printdialogpage.cc index cc01c8a..2677ac4 100644 --- a/khexedit/printdialogpage.cc +++ b/khexedit/printdialogpage.cc @@ -78,14 +78,14 @@ void LayoutDialogPage::setupLayoutPage( void ) { mLayout.marginSpin[i] = new TQSpinBox( group ); mLayout.marginSpin[i]->setFixedHeight( - mLayout.marginSpin[i]->tqsizeHint().height() ); + mLayout.marginSpin[i]->sizeHint().height() ); mLayout.marginSpin[i]->setMinimumWidth( mLayout.marginSpin[i]->fontMetrics().width("M")*10 ); mLayout.marginSpin[i]->setRange( 0, INT_MAX ); TQLabel *label = new TQLabel( mLayout.marginSpin[i], name[i], group ); - label->setFixedHeight( mLayout.marginSpin[i]->tqsizeHint().height() ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedHeight( mLayout.marginSpin[i]->sizeHint().height() ); + label->setFixedWidth( label->sizeHint().width() ); if( i < 2 ) { @@ -101,7 +101,7 @@ void LayoutDialogPage::setupLayoutPage( void ) text = i18n("Draw h&eader above text"); mLayout.headerCheck = new TQCheckBox( text, this ); - mLayout.headerCheck->setFixedSize( mLayout.headerCheck->tqsizeHint() ); + mLayout.headerCheck->setFixedSize( mLayout.headerCheck->sizeHint() ); connect( mLayout.headerCheck, TQT_SIGNAL( toggled(bool)), TQT_SLOT( slotDrawHeader(bool))); topLayout->addWidget( mLayout.headerCheck, 0, AlignLeft ); @@ -135,16 +135,16 @@ void LayoutDialogPage::setupLayoutPage( void ) { mLayout.headerCombo[i] = new TQComboBox( false, this ); mLayout.headerCombo[i]->setFixedHeight( - mLayout.headerCombo[i]->tqsizeHint().height() ); + mLayout.headerCombo[i]->sizeHint().height() ); mLayout.headerCombo[i]->setMinimumWidth( mLayout.headerCombo[i]->fontMetrics().width("M")*10 ); mLayout.headerLabel[i] = new TQLabel( mLayout.headerCombo[i], name[i], this ); mLayout.headerLabel[i]->setFixedHeight( - mLayout.headerLabel[i]->tqsizeHint().height() ); + mLayout.headerLabel[i]->sizeHint().height() ); mLayout.headerLabel[i]->setFixedWidth( - mLayout.headerLabel[i]->tqsizeHint().width() ); + mLayout.headerLabel[i]->sizeHint().width() ); if( i<3 ) { @@ -163,7 +163,7 @@ void LayoutDialogPage::setupLayoutPage( void ) text = i18n("Draw &footer below text"); mLayout.footerCheck = new TQCheckBox( text, this ); - mLayout.footerCheck->setFixedSize( mLayout.footerCheck->tqsizeHint() ); + mLayout.footerCheck->setFixedSize( mLayout.footerCheck->sizeHint() ); connect( mLayout.footerCheck, TQT_SIGNAL( toggled(bool)), TQT_SLOT( slotDrawFooter(bool))); topLayout->addWidget( mLayout.footerCheck, 0, AlignLeft ); @@ -181,16 +181,16 @@ void LayoutDialogPage::setupLayoutPage( void ) { mLayout.footerCombo[i] = new TQComboBox( false, this ); mLayout.footerCombo[i]->setFixedHeight( - mLayout.footerCombo[i]->tqsizeHint().height() ); + mLayout.footerCombo[i]->sizeHint().height() ); mLayout.footerCombo[i]->setMinimumWidth( mLayout.footerCombo[i]->fontMetrics().width("M")*10 ); mLayout.footerLabel[i] = new TQLabel( mLayout.footerCombo[i], name[i], this ); mLayout.footerLabel[i]->setFixedHeight( - mLayout.footerLabel[i]->tqsizeHint().height() ); + mLayout.footerLabel[i]->sizeHint().height() ); mLayout.footerLabel[i]->setFixedWidth( - mLayout.footerLabel[i]->tqsizeHint().width() ); + mLayout.footerLabel[i]->sizeHint().width() ); if( i<3 ) { diff --git a/khexedit/searchbar.cc b/khexedit/searchbar.cc index 3122980..23449b5 100644 --- a/khexedit/searchbar.cc +++ b/khexedit/searchbar.cc @@ -74,7 +74,7 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f ) mFindButton->setAutoDefault(false); connect( mFindButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(start()) ); connect(mInputEdit,TQT_SIGNAL(returnPressed()),mFindButton,TQT_SLOT(animateClick())); - mFindButton->setFixedHeight( mTypeCombo->tqsizeHint().height() ); + mFindButton->setFixedHeight( mTypeCombo->sizeHint().height() ); mBackwards = new TQCheckBox( i18n("Backwards"), this ); mIgnoreCase = new TQCheckBox( i18n("Ignore case"), this ); diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cc index ca1e918..493f002 100644 --- a/khexedit/statusbarprogress.cc +++ b/khexedit/statusbarprogress.cc @@ -176,7 +176,7 @@ bool CStatusBarProgress::textEnabled( void ) const return( mTextEnabled ); } -TQSize CStatusBarProgress::tqsizeHint( void ) const +TQSize CStatusBarProgress::sizeHint( void ) const { TQSize s( size() ); diff --git a/khexedit/statusbarprogress.h b/khexedit/statusbarprogress.h index f477055..531c9aa 100644 --- a/khexedit/statusbarprogress.h +++ b/khexedit/statusbarprogress.h @@ -115,7 +115,7 @@ class CStatusBarProgress : public TQFrame, public TQRangeControl * Returns the recommended width for vertical progress bars or * the recommended height for vertical progress bars */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc index 351a35d..d31bb7f 100644 --- a/khexedit/toplevel.cc +++ b/khexedit/toplevel.cc @@ -545,7 +545,7 @@ KHexEdit *KHexEdit::newWindow( void ) { TQString msg = i18n( "Can not create new window.\n" ); msg += hexError( Err_NoMemory ); - KMessageBox::error( tqtopLevelWidget(), msg ); + KMessageBox::error( topLevelWidget(), msg ); return(0); } hexEdit->show(); @@ -582,7 +582,7 @@ void KHexEdit::closeProgram( void ) TQString msg = i18n("" "There are windows with unsaved modified documents. " "If you quit now, these modifications will be lost."); - int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg, TQString(), KStdGuiItem::quit() ); + int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg, TQString(), KStdGuiItem::quit() ); if( reply == KMessageBox::Continue ) { break; -- cgit v1.2.1