diff options
Diffstat (limited to 'khexedit')
132 files changed, 2600 insertions, 2600 deletions
diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cc index 212d126..70a5a22 100644 --- a/khexedit/bitswapwidget.cc +++ b/khexedit/bitswapwidget.cc @@ -18,14 +18,14 @@ * */ -#include <qpainter.h> +#include <tqpainter.h> #include <kglobalsettings.h> #include "bitswapwidget.h" -CDigitLabel::CDigitLabel( QWidget *parent, uint digit, const char *name ) - :QLabel(parent, name), mDigit( digit ), mDotPosition( 0 ) +CDigitLabel::CDigitLabel( TQWidget *parent, uint digit, const char *name ) + :TQLabel(parent, name), mDigit( digit ), mDotPosition( 0 ) { setFocusPolicy( StrongFocus ); initialize(); @@ -38,13 +38,13 @@ CDigitLabel::~CDigitLabel( void ) void CDigitLabel::initialize( void ) { - QFont font( KGlobalSettings::generalFont() ); + TQFont font( KGlobalSettings::generalFont() ); font.setBold( true ); setFont( font ); } -void CDigitLabel::paletteChange( const QPalette & ) +void CDigitLabel::paletteChange( const TQPalette & ) { update(); } @@ -81,10 +81,10 @@ void CDigitLabel::setDotPosition( uint dotPosition ) -QSize CDigitLabel::sizeHint( void ) const +TQSize CDigitLabel::sizeHint( void ) const { int h = fontMetrics().height(); - QSize s( h, h ); // Retangular + TQSize s( h, h ); // Retangular return( s ); } @@ -92,9 +92,9 @@ QSize CDigitLabel::sizeHint( void ) const #include <stdio.h> -void CDigitLabel::drawContents( QPainter *p ) +void CDigitLabel::drawContents( TQPainter *p ) { - QRect cr = contentsRect(); + TQRect cr = contentsRect(); if( hasFocus() == true ) { @@ -130,7 +130,7 @@ void CDigitLabel::drawContents( QPainter *p ) */ } - QString text; + TQString text; text.setNum( mDigit ); p->drawText( 0, 0, cr.width(), cr.height(), alignment(), text ); @@ -139,7 +139,7 @@ void CDigitLabel::drawContents( QPainter *p ) } -void CDigitLabel::keyPressEvent( QKeyEvent *e ) +void CDigitLabel::keyPressEvent( TQKeyEvent *e ) { switch ( e->key() ) { @@ -174,22 +174,22 @@ void CDigitLabel::keyPressEvent( QKeyEvent *e ) -CByteWidget::CByteWidget( QWidget *parent, const char *name ) - :QWidget(parent, name) +CByteWidget::CByteWidget( TQWidget *parent, const char *name ) + :TQWidget(parent, name) { - mHBox = new QHBoxLayout( this, 0 ); + mHBox = new TQHBoxLayout( this, 0 ); for( uint i=0; i<8; i++ ) { mDigit[i] = new CDigitLabel( this, 7-i ); mDigit[i]->setLineWidth( 1 ); mDigit[i]->setFixedSize( mDigit[i]->sizeHint()*2 ); - mDigit[i]->setFrameStyle( QFrame::Panel | QFrame::Sunken ); + mDigit[i]->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); mDigit[i]->setAlignment( AlignCenter ); - connect( mDigit[i], SIGNAL(stepCell(const QObject *, bool )), - this, SLOT(stepCell(const QObject *, bool ))); - connect( mDigit[i], SIGNAL(valueChanged(const QObject *, uint, bool )), - this, SLOT(valueChanged(const QObject *, uint, bool ))); + 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 ))); mHBox->addWidget( mDigit[i] ); } @@ -202,7 +202,7 @@ CByteWidget::~CByteWidget( void ) delete mHBox; } -void CByteWidget::stepCell( const QObject *obj, bool next ) +void CByteWidget::stepCell( const TQObject *obj, bool next ) { for( uint i=0; i<8; i++ ) { @@ -222,7 +222,7 @@ void CByteWidget::stepCell( const QObject *obj, bool next ) -void CByteWidget::valueChanged( const QObject *obj, uint val, bool after ) +void CByteWidget::valueChanged( const TQObject *obj, uint val, bool after ) { if( after == false ) { @@ -278,7 +278,7 @@ void CByteWidget::reset( void ) } -void CByteWidget::setBuddy( const QObject *obj ) +void CByteWidget::setBuddy( const TQObject *obj ) { for( uint i=0; i<8; i++ ) { @@ -298,7 +298,7 @@ void CByteWidget::setBuddy( const QObject *obj ) -bool CByteWidget::flag( QByteArray &buf ) +bool CByteWidget::flag( TQByteArray &buf ) { bool swapPresent = false; uint i, j; diff --git a/khexedit/bitswapwidget.h b/khexedit/bitswapwidget.h index f1d3582..9f54ab6 100644 --- a/khexedit/bitswapwidget.h +++ b/khexedit/bitswapwidget.h @@ -21,9 +21,9 @@ #ifndef _BITSWAP_WIDGET_H_ #define _BITSWAP_WIDGET_H_ -#include <qlabel.h> -#include <qlayout.h> -#include <qstring.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqstring.h> class CDigitLabel : public QLabel @@ -31,24 +31,24 @@ class CDigitLabel : public QLabel Q_OBJECT public: - CDigitLabel( QWidget *parent, uint digit = 0, const char *name=0 ); + CDigitLabel( TQWidget *parent, uint digit = 0, const char *name=0 ); ~CDigitLabel( void ); - virtual QSize sizeHint() const; + virtual TQSize sizeHint() const; inline uint value( void ); signals: - void stepCell( const QObject *obj, bool next ); - void valueChanged( const QObject *obj, uint newVal, bool after ); + void stepCell( const TQObject *obj, bool next ); + void valueChanged( const TQObject *obj, uint newVal, bool after ); public slots: void setValue( uint digit, bool notify ); void setDotPosition( uint dotPosition ); protected: - void paletteChange( const QPalette & ); - void drawContents( QPainter * ); - virtual void keyPressEvent( QKeyEvent *e ); + void paletteChange( const TQPalette & ); + void drawContents( TQPainter * ); + virtual void keyPressEvent( TQKeyEvent *e ); private: void initialize( void ); @@ -72,23 +72,23 @@ class CByteWidget : public QWidget Q_OBJECT public: - CByteWidget( QWidget *parent, const char *name=0 ); + CByteWidget( TQWidget *parent, const char *name=0 ); ~CByteWidget( void ); - bool flag( QByteArray &buf ); + bool flag( TQByteArray &buf ); public slots: void reset( void ); private slots: - void stepCell( const QObject *obj, bool next ); - void valueChanged( const QObject *obj, uint newVal, bool after ); + void stepCell( const TQObject *obj, bool next ); + void valueChanged( const TQObject *obj, uint newVal, bool after ); private: - void setBuddy( const QObject *obj ); + void setBuddy( const TQObject *obj ); private: - QHBoxLayout *mHBox; + TQHBoxLayout *mHBox; CDigitLabel *mDigit[8]; }; diff --git a/khexedit/chartabledialog.cc b/khexedit/chartabledialog.cc index 1914750..3f67b0e 100644 --- a/khexedit/chartabledialog.cc +++ b/khexedit/chartabledialog.cc @@ -20,10 +20,10 @@ #include <limits.h> -#include <qlabel.h> -#include <qheader.h> -#include <qlayout.h> -#include <qspinbox.h> +#include <tqlabel.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqspinbox.h> #include <kglobalsettings.h> #include <klocale.h> @@ -32,16 +32,16 @@ #include "chartabledialog.h" -CCharTableDialog::CCharTableDialog( QWidget *parent, const char *name, +CCharTableDialog::CCharTableDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Character Table"), Help|User1|Cancel, User1, parent, name, modal, true, KStdGuiItem::insert()) { updateGeometry(); - setHelp( "khexedit/khexedit.html", QString::null ); + setHelp( "khexedit/khexedit.html", TQString::null ); - QString text; - QVBoxLayout *topLayout = new QVBoxLayout( plainPage(), 0, spacingHint() ); + TQString text; + TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); if( topLayout == 0 ) { return; } mCharacterList = new CListView( plainPage(), "characterList" ); @@ -52,27 +52,27 @@ CCharTableDialog::CCharTableDialog( QWidget *parent, const char *name, mCharacterList->addColumn( i18n("Binary") ); mCharacterList->addColumn( i18n("Text") ); mCharacterList->setAllColumnsShowFocus( true ); - mCharacterList->setFrameStyle( QFrame::WinPanel + QFrame::Sunken ); + mCharacterList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken ); mCharacterList->setSorting( -1 ); // // I am setting the min. size below // - //connect( mCharacterList, SIGNAL(doubleClicked(QListViewItem *) ), - //SLOT(startAssign(QListViewItem *))); + //connect( mCharacterList, TQT_SIGNAL(doubleClicked(TQListViewItem *) ), + //TQT_SLOT(startAssign(TQListViewItem *))); topLayout->addWidget( mCharacterList, 10 ); - QHBoxLayout *hbox = new QHBoxLayout(); + TQHBoxLayout *hbox = new TQHBoxLayout(); if( hbox == 0 ) { return; } topLayout->addLayout( hbox ); text = i18n("Insert this number of characters:"); - QLabel *label = new QLabel( text, plainPage() ); + TQLabel *label = new TQLabel( text, plainPage() ); label->setFixedWidth( label->sizeHint().width() ); hbox->addWidget( label ); - mInputCountSpin = new QSpinBox( plainPage(), "spin" ); + mInputCountSpin = new TQSpinBox( plainPage(), "spin" ); mInputCountSpin->setMinimumWidth( fontMetrics().maxWidth()*7 ); mInputCountSpin->setRange( 1, INT_MAX ); mInputCountSpin->setValue( 1 ); @@ -106,8 +106,8 @@ const char *printBinary( uint val ) void CCharTableDialog::createListData( void ) { - QString d, h, o, b, c; - QListViewItem *item = 0; + TQString d, h, o, b, c; + TQListViewItem *item = 0; char buf[10]; memset( buf, 0, sizeof( buf ) ); @@ -119,16 +119,16 @@ void CCharTableDialog::createListData( void ) o.sprintf("%03o", i ); b.sprintf("%s", printBinary(i) ); - if( QChar((char)i).isPrint() == true ) + if( TQChar((char)i).isPrint() == true ) { - c = QChar((char)i); + c = TQChar((char)i); } else { - c = QChar('.'); + c = TQChar('.'); } - item = new QListViewItem( mCharacterList, item, d, h, o, b, c ); + item = new TQListViewItem( mCharacterList, item, d, h, o, b, c ); if( i == 0 ) { mCharacterList->setSelected( item, true ); @@ -140,7 +140,7 @@ void CCharTableDialog::createListData( void ) void CCharTableDialog::slotUser1( void ) // Insert { - QListViewItem *item = mCharacterList->selectedItem(); + TQListViewItem *item = mCharacterList->selectedItem(); if( item != 0 ) { startAssign( item ); @@ -148,9 +148,9 @@ void CCharTableDialog::slotUser1( void ) // Insert } -void CCharTableDialog::startAssign( QListViewItem *item ) +void CCharTableDialog::startAssign( TQListViewItem *item ) { - QByteArray buf; + TQByteArray buf; if( buf.fill( item->text(0).toInt(), mInputCountSpin->value() ) == false ) { return; @@ -161,7 +161,7 @@ void CCharTableDialog::startAssign( QListViewItem *item ) void CCharTableDialog::setColumnWidth( void ) { - const QFontMetrics &fm = mCharacterList->fontMetrics(); + const TQFontMetrics &fm = mCharacterList->fontMetrics(); int w0, w1, w2, w3, w4; w0 = -fm.minLeftBearing() - fm.minRightBearing() + 8 + fm.maxWidth(); @@ -195,13 +195,13 @@ void CCharTableDialog::setColumnWidth( void ) } -void CCharTableDialog::resizeEvent( QResizeEvent * ) +void CCharTableDialog::resizeEvent( TQResizeEvent * ) { setColumnWidth(); } -void CCharTableDialog::showEvent( QShowEvent *e ) +void CCharTableDialog::showEvent( TQShowEvent *e ) { KDialogBase::showEvent(e); setColumnWidth(); diff --git a/khexedit/chartabledialog.h b/khexedit/chartabledialog.h index a35246b..09f1485 100644 --- a/khexedit/chartabledialog.h +++ b/khexedit/chartabledialog.h @@ -37,26 +37,26 @@ class CCharTableDialog : public KDialogBase Q_OBJECT public: - CCharTableDialog( QWidget *parent=0, const char *name=0,bool modal=false ); + CCharTableDialog( TQWidget *parent=0, const char *name=0,bool modal=false ); ~CCharTableDialog( void ); signals: - void assign( const QByteArray &buf ); + void assign( const TQByteArray &buf ); protected slots: virtual void slotUser1( void ); - virtual void startAssign( QListViewItem * ); + virtual void startAssign( TQListViewItem * ); protected: - virtual void resizeEvent( QResizeEvent *e ); - virtual void showEvent( QShowEvent *e ); + virtual void resizeEvent( TQResizeEvent *e ); + virtual void showEvent( TQShowEvent *e ); private: void createListData( void ); void setColumnWidth( void ); private: - QSpinBox *mInputCountSpin; + TQSpinBox *mInputCountSpin; CListView *mCharacterList; }; diff --git a/khexedit/conversion.cc b/khexedit/conversion.cc index 7a5c25c..7eeea5d 100644 --- a/khexedit/conversion.cc +++ b/khexedit/conversion.cc @@ -41,9 +41,9 @@ const SEncodeState &CConversion::state( void ) return( mState ); } -QString CConversion::names( unsigned int index ) +TQString CConversion::names( unsigned int index ) { - static const QString strings[4] = + static const TQString strings[4] = { i18n("Default encoding", "Default"), i18n("EBCDIC"), @@ -298,7 +298,7 @@ void CConversion::setMode( EMode cnvMode ) -int CConversion::convert( QByteArray &buf, EMode newMode, CProgress &p ) +int CConversion::convert( TQByteArray &buf, EMode newMode, CProgress &p ) { if( newMode == mode() ) { @@ -316,7 +316,7 @@ int CConversion::convert( QByteArray &buf, EMode newMode, CProgress &p ) // // Make backup // - const QByteArray tmp( buf.copy() ); + const TQByteArray tmp( buf.copy() ); if( tmp.isEmpty() ) { p.finish(); diff --git a/khexedit/conversion.h b/khexedit/conversion.h index ef453ca..76a055b 100644 --- a/khexedit/conversion.h +++ b/khexedit/conversion.h @@ -21,7 +21,7 @@ #ifndef _CONVERSION_H_ #define _CONVERSION_H_ -#include <qstring.h> +#include <tqstring.h> #include "progress.h" @@ -29,7 +29,7 @@ struct SEncodeState { unsigned int mode; - QString name; + TQString name; }; @@ -46,7 +46,7 @@ class CConversion public: CConversion( void ); - int convert( QByteArray &buf, EMode mode, CProgress &p ); + int convert( TQByteArray &buf, EMode mode, CProgress &p ); bool lossless( EMode cnvMode ); EMode mode( void ); @@ -58,7 +58,7 @@ class CConversion } private: - QString names( unsigned int index ); + TQString names( unsigned int index ); const unsigned char *tables( EMode cnvMode ); void setMode( EMode cnvMode ); diff --git a/khexedit/converterdialog.cc b/khexedit/converterdialog.cc index f8dd9be..6f3a82e 100644 --- a/khexedit/converterdialog.cc +++ b/khexedit/converterdialog.cc @@ -19,8 +19,8 @@ */ -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <klocale.h> @@ -28,14 +28,14 @@ #include "hexvalidator.h" -CValidateLineEdit::CValidateLineEdit( QWidget *parent, int validateType, +CValidateLineEdit::CValidateLineEdit( TQWidget *parent, int validateType, const char *name ) - :QLineEdit( parent, name ), mBusy(false) + :TQLineEdit( parent, name ), mBusy(false) { mValidator = new CHexValidator( this, (CHexValidator::EState)validateType ); setValidator( mValidator ); - connect( this, SIGNAL(textChanged(const QString &)), - this, SLOT(convertText(const QString &)) ); + connect( this, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SLOT(convertText(const TQString &)) ); } @@ -44,20 +44,20 @@ CValidateLineEdit::~CValidateLineEdit( void ) } -void CValidateLineEdit::setData( const QByteArray &buf ) +void CValidateLineEdit::setData( const TQByteArray &buf ) { if( mBusy == false ) { - QString text; + TQString text; mValidator->format( text, buf ); setText( text ); } } -void CValidateLineEdit::convertText( const QString &text ) +void CValidateLineEdit::convertText( const TQString &text ) { - QByteArray buf; + TQByteArray buf; mValidator->convert( buf, text ); mBusy = true; // Don't update while editing emit dataChanged( buf ); @@ -66,27 +66,27 @@ void CValidateLineEdit::convertText( const QString &text ) -CConverterDialog::CConverterDialog( QWidget *parent, const char *name, +CConverterDialog::CConverterDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( parent, name, modal, i18n("Converter"), Cancel|User2|User1, Cancel, true, KStdGuiItem::clear(), i18n("&On Cursor") ) { - QWidget *page = new QWidget( this ); + TQWidget *page = new TQWidget( this ); setMainWidget( page ); - QGridLayout *topLayout = new QGridLayout( page, 6, 2, 0, spacingHint() ); + TQGridLayout *topLayout = new TQGridLayout( page, 6, 2, 0, spacingHint() ); topLayout->setRowStretch( 5, 10 ); topLayout->setColStretch( 1, 10 ); - QLabel *label = new QLabel( i18n("Hexadecimal:"), page ); + TQLabel *label = new TQLabel( i18n("Hexadecimal:"), page ); topLayout->addWidget( label, 0, 0 ); - label = new QLabel( i18n("Decimal:"), page ); + label = new TQLabel( i18n("Decimal:"), page ); topLayout->addWidget( label, 1, 0 ); - label = new QLabel( i18n("Octal:"), page ); + label = new TQLabel( i18n("Octal:"), page ); topLayout->addWidget( label, 2, 0 ); - label = new QLabel( i18n("Binary:"), page ); + label = new TQLabel( i18n("Binary:"), page ); topLayout->addWidget( label, 3, 0 ); - label = new QLabel( i18n("Text:"), page ); + label = new TQLabel( i18n("Text:"), page ); topLayout->addWidget( label, 4, 0 ); mHexInput = new CValidateLineEdit( page, CHexValidator::hexadecimal ); @@ -101,16 +101,16 @@ CConverterDialog::CConverterDialog( QWidget *parent, const char *name, mTxtInput = new CValidateLineEdit( page, CHexValidator::regularText ); topLayout->addWidget( mTxtInput, 4, 1 ); - connect( mHexInput, SIGNAL(dataChanged(const QByteArray &)), - this, SLOT(setData(const QByteArray &)) ); - connect( mDecInput, SIGNAL(dataChanged(const QByteArray &)), - this, SLOT(setData(const QByteArray &)) ); - connect( mOctInput, SIGNAL(dataChanged(const QByteArray &)), - this, SLOT(setData(const QByteArray &)) ); - connect( mBinInput, SIGNAL(dataChanged(const QByteArray &)), - this, SLOT(setData(const QByteArray &)) ); - connect( mTxtInput, SIGNAL(dataChanged(const QByteArray &)), - this, SLOT(setData(const QByteArray &)) ); + 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 &)) ); } @@ -120,14 +120,14 @@ CConverterDialog::~CConverterDialog( void ) } -void CConverterDialog::showEvent( QShowEvent *e ) +void CConverterDialog::showEvent( TQShowEvent *e ) { KDialogBase::showEvent(e); mHexInput->setFocus(); } -void CConverterDialog::setData( const QByteArray &data ) +void CConverterDialog::setData( const TQByteArray &data ) { mHexInput->blockSignals(true); mDecInput->blockSignals(true); @@ -148,13 +148,13 @@ void CConverterDialog::setData( const QByteArray &data ) void CConverterDialog::slotUser1( void ) // Clear { - QByteArray buf; + TQByteArray buf; setData( buf ); } void CConverterDialog::slotUser2( void ) // On Cursor { - QByteArray buf; + TQByteArray buf; emit probeCursorValue( buf, 1 ); setData( buf ); } diff --git a/khexedit/converterdialog.h b/khexedit/converterdialog.h index f84fe66..abcc432 100644 --- a/khexedit/converterdialog.h +++ b/khexedit/converterdialog.h @@ -21,28 +21,28 @@ #ifndef _CONVERTER_DIALOG_H_ #define _CONVERTER_DIALOG_H_ -#include <qlineedit.h> +#include <tqlineedit.h> #include <kdialogbase.h> class CHexValidator; -class CValidateLineEdit : public QLineEdit +class CValidateLineEdit : public TQLineEdit { Q_OBJECT public: - CValidateLineEdit( QWidget *parent, int validateType, const char *name=0 ); + CValidateLineEdit( TQWidget *parent, int validateType, const char *name=0 ); ~CValidateLineEdit( void ); public slots: - void setData( const QByteArray &buf ); + void setData( const TQByteArray &buf ); private slots: - void convertText( const QString &text ); + void convertText( const TQString &text ); signals: - void dataChanged( const QByteArray &buf ); + void dataChanged( const TQByteArray &buf ); private: bool mBusy; @@ -55,21 +55,21 @@ class CConverterDialog : public KDialogBase Q_OBJECT public: - CConverterDialog( QWidget *parent, const char *name=0, bool modal=true ); + CConverterDialog( TQWidget *parent, const char *name=0, bool modal=true ); ~CConverterDialog( void ); protected: - void showEvent( QShowEvent *e ); + void showEvent( TQShowEvent *e ); protected slots: virtual void slotUser1( void ); virtual void slotUser2( void ); private slots: - void setData( const QByteArray &data ); + void setData( const TQByteArray &data ); signals: - void probeCursorValue( QByteArray &buf, uint size ); + void probeCursorValue( TQByteArray &buf, uint size ); private: CValidateLineEdit *mHexInput; diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc index 6ef1273..8bc2cbe 100644 --- a/khexedit/dialog.cc +++ b/khexedit/dialog.cc @@ -22,10 +22,10 @@ #include <iostream> #include <limits.h> -#include <qbuttongroup.h> -#include <qfileinfo.h> -#include <qlayout.h> -#include <qvalidator.h> +#include <tqbuttongroup.h> +#include <tqfileinfo.h> +#include <tqlayout.h> +#include <tqvalidator.h> #include <kfiledialog.h> #include <klocale.h> @@ -34,47 +34,47 @@ #include <kstdguiitem.h> #include "dialog.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> -static const QStringList &formatStrings( void ); -static const QStringList &operationStrings( void ); +static const TQStringList &formatStrings( void ); +static const TQStringList &operationStrings( void ); -CGotoDialog::CGotoDialog( QWidget *parent, const char *name, bool modal ) +CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Goto Offset"), Ok|Cancel, Ok, parent, name, modal ) { - QVBoxLayout *topLayout = new QVBoxLayout( plainPage(), 0, spacingHint() ); + TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); if( topLayout == 0 ) { return; } - QVBoxLayout *vbox = new QVBoxLayout(); + TQVBoxLayout *vbox = new TQVBoxLayout(); if( vbox == 0 ) { return; } topLayout->addLayout( vbox ); - mComboBox = new QComboBox( true, plainPage() ); + mComboBox = new TQComboBox( true, plainPage() ); if( mComboBox == 0 ) { return; } mComboBox->setMaxCount( 10 ); - mComboBox->setInsertionPolicy( QComboBox::AtTop ); + mComboBox->setInsertionPolicy( TQComboBox::AtTop ); mComboBox->setMinimumWidth( fontMetrics().maxWidth()*17 ); - QLabel *label = new QLabel( mComboBox, i18n("O&ffset:"), plainPage() ); + TQLabel *label = new TQLabel( mComboBox, i18n("O&ffset:"), plainPage() ); if( label == 0 ) { return; } vbox->addWidget( label ); vbox->addWidget( mComboBox ); - QButtonGroup *group = new QButtonGroup( i18n("Options"), plainPage() ); + TQButtonGroup *group = new TQButtonGroup( i18n("Options"), plainPage() ); if( group == 0 ) { return; } topLayout->addWidget( group, 10 ); - QGridLayout *gbox = new QGridLayout( group, 4, 2, spacingHint() ); + TQGridLayout *gbox = new TQGridLayout( group, 4, 2, spacingHint() ); if( gbox == 0 ) { return; } gbox->addRowSpacing( 0, fontMetrics().lineSpacing() ); - mCheckFromCursor = new QCheckBox( i18n("&From cursor"), group ); + mCheckFromCursor = new TQCheckBox( i18n("&From cursor"), group ); gbox->addWidget( mCheckFromCursor, 1, 0 ); - mCheckBackward = new QCheckBox( i18n("&Backwards"), group ); + mCheckBackward = new TQCheckBox( i18n("&Backwards"), group ); gbox->addWidget( mCheckBackward, 1, 1 ); - mCheckVisible = new QCheckBox( i18n("&Stay visible"), group ); + mCheckVisible = new TQCheckBox( i18n("&Stay visible"), group ); gbox->addWidget( mCheckVisible, 2, 0 ); gbox->setRowStretch( 3, 10 ); @@ -99,7 +99,7 @@ CGotoDialog::~CGotoDialog( void ) -void CGotoDialog::showEvent( QShowEvent *e ) +void CGotoDialog::showEvent( TQShowEvent *e ) { KDialogBase::showEvent(e); mComboBox->setFocus(); @@ -118,7 +118,7 @@ void CGotoDialog::slotOk( void ) bool success = stringToOffset( mComboBox->currentText(), offset ); if( success == false ) { - showEntryFailure( this, QString("") ); + showEntryFailure( this, TQString("") ); return; } @@ -174,61 +174,61 @@ void CGotoDialog::slotOk( void ) -CFindDialog::CFindDialog( QWidget *parent, const char *name, bool modal ) +CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Find"), Ok|Cancel, Ok, parent, name, modal ) { - QVBoxLayout *topLayout = new QVBoxLayout( plainPage(), 0, spacingHint() ); + TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); if( topLayout == 0 ) { return; } - QVBoxLayout *vbox = new QVBoxLayout(); + TQVBoxLayout *vbox = new TQVBoxLayout(); if( vbox == 0 ) { return; } topLayout->addLayout( vbox ); - mSelector = new QComboBox( false, plainPage() ); + mSelector = new TQComboBox( false, plainPage() ); if( mSelector == 0 ) { return; } mSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mSelector->insertStringList( formatStrings() ); - connect( mSelector, SIGNAL(activated(int)), SLOT(selectorChanged(int)) ); + connect( mSelector, TQT_SIGNAL(activated(int)), TQT_SLOT(selectorChanged(int)) ); - QLabel *label = new QLabel( mSelector, i18n("Fo&rmat:"), plainPage() ); + TQLabel *label = new TQLabel( mSelector, i18n("Fo&rmat:"), plainPage() ); if( label == 0 ) { return; } vbox->addWidget( label ); vbox->addWidget( mSelector ); - mInput = new QLineEdit( plainPage() ); + mInput = new TQLineEdit( plainPage() ); if( mInput == 0 ) { return; } mInput->setMinimumWidth( fontMetrics().maxWidth()*17 ); - connect( mInput, SIGNAL(textChanged(const QString&)), - SLOT(inputChanged(const QString&)) ); + connect( mInput, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(inputChanged(const TQString&)) ); mFindValidator = new CHexValidator( this, CHexValidator::regularText ); if( mFindValidator == 0 ) { return; } mInput->setValidator( mFindValidator ); - label = new QLabel( mInput, i18n("F&ind:"), plainPage() ); + label = new TQLabel( mInput, i18n("F&ind:"), plainPage() ); if( label == 0 ) { return; } vbox->addWidget( label ); vbox->addWidget( mInput ); - QButtonGroup *group = new QButtonGroup( i18n("Options"), plainPage() ); + TQButtonGroup *group = new TQButtonGroup( i18n("Options"), plainPage() ); if( group == 0 ) { return; } topLayout->addWidget( group, 10 ); - QGridLayout *gbox = new QGridLayout( group, 5, 2, spacingHint() ); + TQGridLayout *gbox = new TQGridLayout( group, 5, 2, spacingHint() ); if( gbox == 0 ) { return; } gbox->addRowSpacing( 0, fontMetrics().lineSpacing() ); - mCheckFromCursor = new QCheckBox( i18n("&From cursor"), group ); + mCheckFromCursor = new TQCheckBox( i18n("&From cursor"), group ); gbox->addWidget( mCheckFromCursor, 1, 0 ); - mCheckBackward = new QCheckBox( i18n("&Backwards"), group ); + mCheckBackward = new TQCheckBox( i18n("&Backwards"), group ); gbox->addWidget( mCheckBackward, 1, 1 ); - mCheckInSelection = new QCheckBox( i18n("&In selection"), group ); + mCheckInSelection = new TQCheckBox( i18n("&In selection"), group ); gbox->addWidget( mCheckInSelection, 2, 0 ); - mCheckUseNavigator = new QCheckBox( i18n("&Use navigator"),group); + mCheckUseNavigator = new TQCheckBox( i18n("&Use navigator"),group); gbox->addWidget( mCheckUseNavigator, 2, 1 ); - mCheckIgnoreCase = new QCheckBox( i18n("Ignore c&ase"),group); + mCheckIgnoreCase = new TQCheckBox( i18n("Ignore c&ase"),group); gbox->addWidget( mCheckIgnoreCase, 3, 0 ); gbox->setRowStretch( 4, 10 ); @@ -268,7 +268,7 @@ void CFindDialog::selectorChanged( int index ) } -void CFindDialog::inputChanged( const QString &text ) +void CFindDialog::inputChanged( const TQString &text ) { mFindString[ mSelector->currentItem() ] = text; mFindValidator->convert( mFindData, @@ -277,7 +277,7 @@ void CFindDialog::inputChanged( const QString &text ) } -void CFindDialog::showEvent( QShowEvent *e ) +void CFindDialog::showEvent( TQShowEvent *e ) { KDialogBase::showEvent(e); mInput->setFocus(); @@ -294,7 +294,7 @@ void CFindDialog::slotOk( void ) { if( isEmpty() == true ) { - showEntryFailure( this, QString("") ); + showEntryFailure( this, TQString("") ); return; } @@ -315,7 +315,7 @@ void CFindDialog::findAgain( EOperation operation ) { if( isEmpty() == true ) { - showEntryFailure( this, QString("") ); + showEntryFailure( this, TQString("") ); return; } @@ -343,29 +343,29 @@ void CFindDialog::findAgain( EOperation operation ) -CFindNavigatorDialog::CFindNavigatorDialog( QWidget *parent, const char *name, +CFindNavigatorDialog::CFindNavigatorDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Find (Navigator)"), User3|User2|User1|Close, User2, parent, name, modal, true, i18n("New &Key"), i18n("&Next"), i18n("&Previous") ) { - QString text; - QBoxLayout *topLayout = new QVBoxLayout( plainPage(), 0, spacingHint() ); + TQString text; + TQBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); if( topLayout == 0 ) { return; } topLayout->addSpacing( spacingHint() ); // A little bit extra space - QHBoxLayout *hbox = new QHBoxLayout(); + TQHBoxLayout *hbox = new TQHBoxLayout(); if( hbox == 0 ) { return; } topLayout->addLayout( hbox ); text = i18n("Searching for:"); - QLabel *label = new QLabel( text, plainPage() ); + TQLabel *label = new TQLabel( text, plainPage() ); hbox->addWidget( label ); - mKey = new QLineEdit( plainPage() ); + mKey = new TQLineEdit( plainPage() ); mKey->setMinimumWidth( fontMetrics().width("M") * 20 ); - mKey->setFocusPolicy( QWidget::NoFocus ); + mKey->setFocusPolicy( TQWidget::NoFocus ); hbox->addWidget( mKey ); topLayout->addSpacing( spacingHint() ); // A little bit extra space @@ -391,7 +391,7 @@ void CFindNavigatorDialog::defineData( SSearchControl &sc ) if( mSearchControl.keyType == 0 ) { - QString str; + TQString str; for( uint i=0; i<mSearchControl.key.size(); i++ ) { str += mSearchControl.key[i]; @@ -401,19 +401,19 @@ void CFindNavigatorDialog::defineData( SSearchControl &sc ) } else if( mSearchControl.keyType == 1 ) { - QString str("0x "); + TQString str("0x "); for( uint i=0; i<mSearchControl.key.size(); i++ ) { - str += QString().sprintf("%02X ", (unsigned char)mSearchControl.key[i]); + str += TQString().sprintf("%02X ", (unsigned char)mSearchControl.key[i]); } mKey->setText( str ); } else if( mSearchControl.keyType == 2 ) { - QString str; + TQString str; for( uint i=0; i<mSearchControl.key.size(); i++ ) { - str += QString().sprintf("%03o ", (unsigned char)mSearchControl.key[i]); + str += TQString().sprintf("%03o ", (unsigned char)mSearchControl.key[i]); } mKey->setText( str ); } @@ -422,7 +422,7 @@ void CFindNavigatorDialog::defineData( SSearchControl &sc ) char buf[10]; memset( buf, 0, sizeof( buf ) ); buf[8] = ' '; - QString str; + TQString str; for( uint i=0; i<mSearchControl.key.size(); i++ ) { unsigned char data = (unsigned char)mSearchControl.key[i]; @@ -481,95 +481,95 @@ void CFindNavigatorDialog::done( int resultCode ) -CReplaceDialog::CReplaceDialog( QWidget *parent, const char *name, bool modal ) +CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Find & Replace"), Ok|Cancel, Ok, parent, name, modal ) { - QString text; - QVBoxLayout *topLayout = new QVBoxLayout( plainPage(), 0, spacingHint() ); + TQString text; + TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); if( topLayout == 0 ) { return; } - QVBoxLayout *vbox = new QVBoxLayout(); + TQVBoxLayout *vbox = new TQVBoxLayout(); if( vbox == 0 ) { return; } topLayout->addLayout( vbox ); - mFindSelector = new QComboBox( false, plainPage() ); + mFindSelector = new TQComboBox( false, plainPage() ); if( mFindSelector == 0 ) { return; } mFindSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mFindSelector->insertStringList( formatStrings() ); - connect( mFindSelector, SIGNAL(activated(int)), - SLOT(findSelectorChanged(int)) ); + connect( mFindSelector, TQT_SIGNAL(activated(int)), + TQT_SLOT(findSelectorChanged(int)) ); text = i18n("Fo&rmat (find):"); - QLabel *label = new QLabel( mFindSelector, text, plainPage() ); + TQLabel *label = new TQLabel( mFindSelector, text, plainPage() ); if( label == 0 ) { return; } vbox->addWidget( label ); vbox->addWidget( mFindSelector ); - mFindInput = new QLineEdit( plainPage() ); + mFindInput = new TQLineEdit( plainPage() ); if( mFindInput == 0 ) { return; } mFindInput->setMinimumWidth( fontMetrics().maxWidth()*17 ); mFindValidator = new CHexValidator( this, CHexValidator::regularText ); if( mFindValidator == 0 ) { return; } mFindInput->setValidator( mFindValidator ); - connect( mFindInput, SIGNAL(textChanged(const QString&)), - SLOT(findInputChanged(const QString&)) ); + connect( mFindInput, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(findInputChanged(const TQString&)) ); - label = new QLabel( mFindInput, i18n("F&ind:"), plainPage() ); + label = new TQLabel( mFindInput, i18n("F&ind:"), plainPage() ); if( label == 0 ) { return; } vbox->addWidget( label ); vbox->addWidget( mFindInput ); - mReplaceSelector = new QComboBox( false, plainPage() ); + mReplaceSelector = new TQComboBox( false, plainPage() ); if( mReplaceSelector == 0 ) { return; } mReplaceSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mReplaceSelector->insertStringList( formatStrings() ); - connect( mReplaceSelector, SIGNAL(activated(int)), - SLOT(replaceSelectorChanged(int)) ); + connect( mReplaceSelector, TQT_SIGNAL(activated(int)), + TQT_SLOT(replaceSelectorChanged(int)) ); text = i18n("For&mat (replace):"); - label = new QLabel( mReplaceSelector, text, plainPage() ); + label = new TQLabel( mReplaceSelector, text, plainPage() ); if( label == 0 ) { return; } label->setFixedHeight( label->sizeHint().height() ); vbox->addWidget( label ); vbox->addWidget( mReplaceSelector ); - mReplaceInput = new QLineEdit( plainPage() ); + mReplaceInput = new TQLineEdit( plainPage() ); if( mReplaceInput == 0 ) { return; } mReplaceInput->setMinimumWidth( fontMetrics().maxWidth()*17 ); mReplaceValidator = new CHexValidator( this, CHexValidator::regularText ); if( mReplaceValidator == 0 ) { return; } mReplaceInput->setValidator( mReplaceValidator ); - connect( mReplaceInput, SIGNAL(textChanged(const QString&)), - SLOT(replaceInputChanged(const QString&)) ); + connect( mReplaceInput, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(replaceInputChanged(const TQString&)) ); - label = new QLabel( mReplaceInput, i18n("Rep&lace:"), plainPage() ); + label = new TQLabel( mReplaceInput, i18n("Rep&lace:"), plainPage() ); if( label == 0 ) { return; } label->setFixedHeight( label->sizeHint().height() ); vbox->addWidget( label ); vbox->addWidget( mReplaceInput ); - QButtonGroup *group = new QButtonGroup( i18n("Options"), plainPage() ); + TQButtonGroup *group = new TQButtonGroup( i18n("Options"), plainPage() ); if( group == 0 ) { return; } topLayout->addWidget( group, 10 ); - QGridLayout *gbox = new QGridLayout( group, 5, 2, spacingHint() ); + TQGridLayout *gbox = new TQGridLayout( group, 5, 2, spacingHint() ); if( gbox == 0 ) { return; } gbox->addRowSpacing( 0, fontMetrics().lineSpacing() ); - mCheckFromCursor = new QCheckBox( i18n("&From cursor"), group ); + mCheckFromCursor = new TQCheckBox( i18n("&From cursor"), group ); gbox->addWidget( mCheckFromCursor, 1, 0 ); - mCheckBackward = new QCheckBox( i18n("&Backwards"), group ); + mCheckBackward = new TQCheckBox( i18n("&Backwards"), group ); gbox->addWidget( mCheckBackward, 1, 1 ); - mCheckInSelection = new QCheckBox( i18n("&In selection"), group ); + mCheckInSelection = new TQCheckBox( i18n("&In selection"), group ); gbox->addWidget( mCheckInSelection, 2, 0 ); - mCheckPrompt = new QCheckBox( i18n("&Prompt"), group ); + mCheckPrompt = new TQCheckBox( i18n("&Prompt"), group ); gbox->addWidget( mCheckPrompt, 2, 1 ); - mCheckIgnoreCase = new QCheckBox( i18n("Ignore c&ase"), group ); + mCheckIgnoreCase = new TQCheckBox( i18n("Ignore c&ase"), group ); gbox->addWidget( mCheckIgnoreCase, 3, 0 ); gbox->setRowStretch( 4, 10 ); @@ -613,7 +613,7 @@ void CReplaceDialog::findSelectorChanged( int index ) } -void CReplaceDialog::findInputChanged( const QString &text ) +void CReplaceDialog::findInputChanged( const TQString &text ) { mFindString[ mFindSelector->currentItem() ] = text; mFindValidator->convert( mFindData, @@ -629,7 +629,7 @@ void CReplaceDialog::replaceSelectorChanged( int index ) } -void CReplaceDialog::replaceInputChanged( const QString &text ) +void CReplaceDialog::replaceInputChanged( const TQString &text ) { mReplaceString[ mReplaceSelector->currentItem() ] = text; mReplaceValidator->convert( mReplaceData, @@ -637,7 +637,7 @@ void CReplaceDialog::replaceInputChanged( const QString &text ) } -void CReplaceDialog::showEvent( QShowEvent *e ) +void CReplaceDialog::showEvent( TQShowEvent *e ) { KDialogBase::showEvent(e); mFindInput->setFocus(); @@ -648,7 +648,7 @@ void CReplaceDialog::slotOk( void ) { if( mFindData.isEmpty() == true ) { - showEntryFailure( this, QString("") ); + showEntryFailure( this, TQString("") ); return; } @@ -676,20 +676,20 @@ void CReplaceDialog::slotOk( void ) -CReplacePromptDialog::CReplacePromptDialog( QWidget *parent, const char *name, +CReplacePromptDialog::CReplacePromptDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Find & Replace"), User3|User2|User1|Close, User2, parent, name, modal, true, i18n("Replace &All"), i18n("Do Not Replace"), i18n("Replace")) { - QString text; - QBoxLayout *topLayout = new QVBoxLayout( plainPage(), 0, spacingHint() ); + TQString text; + TQBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); if( topLayout == 0 ) { return; } topLayout->addSpacing( spacingHint() ); // A little bit extra space text = i18n("Replace marked data at cursor position?"); - QLabel* label = new QLabel( text, plainPage() ); + TQLabel* label = new TQLabel( text, plainPage() ); topLayout->addWidget( label ); topLayout->addSpacing( spacingHint() ); // A little bit extra space @@ -757,39 +757,39 @@ void CReplacePromptDialog::done( int returnCode ) -CFilterDialog::CFilterDialog( QWidget *parent, const char *name, bool modal ) +CFilterDialog::CFilterDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Binary Filter"), Ok|Cancel, Ok, parent, name, modal ) { - QString text; - QVBoxLayout *topLayout = new QVBoxLayout( plainPage(), 0, spacingHint() ); + TQString text; + TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); if( topLayout == 0 ) { return; } - QVBoxLayout *vbox = new QVBoxLayout(); + TQVBoxLayout *vbox = new TQVBoxLayout(); if( vbox == 0 ) { return; } topLayout->addLayout( vbox ); - mOperationSelector = new QComboBox( false, plainPage() ); + mOperationSelector = new TQComboBox( false, plainPage() ); if( mOperationSelector == 0 ) { return; } mOperationSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mOperationSelector->insertStringList( operationStrings() ); - connect( mOperationSelector, SIGNAL(activated(int)), - SLOT(operationSelectorChanged(int)) ); + connect( mOperationSelector, TQT_SIGNAL(activated(int)), + TQT_SLOT(operationSelectorChanged(int)) ); text = i18n("O&peration:"); - QLabel *label = new QLabel( mOperationSelector, text, plainPage() ); + TQLabel *label = new TQLabel( mOperationSelector, text, plainPage() ); if( label == 0 ) { return; } vbox->addWidget( label ); vbox->addWidget( mOperationSelector ); KSeparator *separator = new KSeparator( plainPage() ); - separator->setOrientation( QFrame::HLine ); + separator->setOrientation( TQFrame::HLine ); vbox->addWidget( separator ); - mWidgetStack = new QWidgetStack( plainPage(), "pagestack" ); + mWidgetStack = new TQWidgetStack( plainPage(), "pagestack" ); if( mWidgetStack == 0 ) { return; } vbox->addWidget( mWidgetStack ); @@ -800,20 +800,20 @@ CFilterDialog::CFilterDialog( QWidget *parent, const char *name, bool modal ) mWidgetStack->raiseWidget( (int)OperandPage ); - QButtonGroup *group = new QButtonGroup( i18n("Options"), plainPage() ); + TQButtonGroup *group = new TQButtonGroup( i18n("Options"), plainPage() ); if( group == 0 ) { return; } topLayout->addWidget( group, 10 ); - QGridLayout *gbox = new QGridLayout( group, 4, 2, spacingHint() ); + TQGridLayout *gbox = new TQGridLayout( group, 4, 2, spacingHint() ); if( gbox == 0 ) { return; } gbox->addRowSpacing( 0, fontMetrics().lineSpacing() ); - mCheckFromCursor = new QCheckBox( i18n("&From cursor"), group ); + mCheckFromCursor = new TQCheckBox( i18n("&From cursor"), group ); gbox->addWidget( mCheckFromCursor, 1, 0 ); - mCheckBackward = new QCheckBox( i18n("&Backwards"), group ); + mCheckBackward = new TQCheckBox( i18n("&Backwards"), group ); gbox->addWidget( mCheckBackward, 1, 1 ); - mCheckInSelection = new QCheckBox( i18n("&In selection"), group ); + mCheckInSelection = new TQCheckBox( i18n("&In selection"), group ); gbox->addWidget( mCheckInSelection, 2, 0 ); - mCheckVisible = new QCheckBox( i18n("&Stay visible"), group ); + mCheckVisible = new TQCheckBox( i18n("&Stay visible"), group ); gbox->addWidget( mCheckVisible, 2, 1 ); gbox->setRowStretch( 3, 10 ); } @@ -827,7 +827,7 @@ CFilterDialog::~CFilterDialog( void ) void CFilterDialog::makeEmptyLayout( void ) { - QFrame *page = new QFrame( plainPage() ); + TQFrame *page = new TQFrame( plainPage() ); if( page == 0 ) { return; } mWidgetStack->addWidget( page, EmptyPage ); } @@ -835,40 +835,40 @@ void CFilterDialog::makeEmptyLayout( void ) void CFilterDialog::makeOperandLayout( void ) { - QString text; + TQString text; - QFrame *page = new QFrame( plainPage() ); + TQFrame *page = new TQFrame( plainPage() ); if( page == 0 ) { return; } mWidgetStack->addWidget( page, OperandPage ); - QVBoxLayout *vbox = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *vbox = new TQVBoxLayout( page, 0, spacingHint() ); if( vbox == 0 ) { return; } - mOperandSelector = new QComboBox( false, page ); + mOperandSelector = new TQComboBox( false, page ); if( mOperandSelector == 0 ) { return; } mOperandSelector->setFixedHeight( mOperandSelector->sizeHint().height()); mOperandSelector->setMinimumWidth( fontMetrics().width("M")*20 ); mOperandSelector->insertStringList( formatStrings() ); - connect( mOperandSelector, SIGNAL(activated(int)), - SLOT(operandSelectorChanged(int)) ); + connect( mOperandSelector, TQT_SIGNAL(activated(int)), + TQT_SLOT(operandSelectorChanged(int)) ); text = i18n("Fo&rmat (operand):"); - mOperandFormatLabel = new QLabel( mOperandSelector, text, page ); + mOperandFormatLabel = new TQLabel( mOperandSelector, text, page ); if( mOperandFormatLabel == 0 ) { return; } vbox->addWidget( mOperandFormatLabel ); vbox->addWidget( mOperandSelector ); - mOperandInput = new QLineEdit( page ); + mOperandInput = new TQLineEdit( page ); if( mOperandInput == 0 ) { return; } mOperandInput->setMinimumWidth( fontMetrics().width("M") * 20 ); mOperandValidator = new CHexValidator( this, CHexValidator::regularText ); if( mOperandValidator == 0 ) { return; } mOperandInput->setValidator( mOperandValidator ); - connect( mOperandInput, SIGNAL(textChanged(const QString&)), - SLOT(operandInputChanged(const QString&)) ); + connect( mOperandInput, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(operandInputChanged(const TQString&)) ); - mOperandInputLabel = new QLabel( mOperandInput, i18n("O&perand:"), page ); + mOperandInputLabel = new TQLabel( mOperandInput, i18n("O&perand:"), page ); if( mOperandInputLabel == 0 ) { return; } vbox->addWidget( mOperandInputLabel ); @@ -879,17 +879,17 @@ void CFilterDialog::makeOperandLayout( void ) void CFilterDialog::makeBitSwapLayout( void ) { - QString text; + TQString text; - QFrame *page = new QFrame( plainPage() ); + TQFrame *page = new TQFrame( plainPage() ); if( page == 0 ) { return; } mWidgetStack->addWidget( page, BitSwapPage ); - QVBoxLayout *vbox = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *vbox = new TQVBoxLayout( page, 0, spacingHint() ); if( vbox == 0 ) { return; } text = i18n("Swap rule"); - QLabel *label = new QLabel( text, page ); + TQLabel *label = new TQLabel( text, page ); if( label == 0 ) { return; } label->setFixedHeight( label->sizeHint().height() ); vbox->addWidget( label ); @@ -897,13 +897,13 @@ void CFilterDialog::makeBitSwapLayout( void ) mByteWidget = new CByteWidget( page ); vbox->addWidget( mByteWidget ); - QHBoxLayout *hbox = new QHBoxLayout( 0 ); + TQHBoxLayout *hbox = new TQHBoxLayout( 0 ); vbox->addLayout( hbox ); text = i18n("&Reset"); - QPushButton *resetButton = new QPushButton( text, page ); + TQPushButton *resetButton = new TQPushButton( text, page ); resetButton->setFixedHeight( resetButton->sizeHint().height() ); - connect( resetButton, SIGNAL(clicked()), mByteWidget, SLOT(reset()) ); + connect( resetButton, TQT_SIGNAL(clicked()), mByteWidget, TQT_SLOT(reset()) ); hbox->addWidget( resetButton ); hbox->addStretch( 10 ); @@ -912,34 +912,34 @@ void CFilterDialog::makeBitSwapLayout( void ) void CFilterDialog::makeRotateLayout( void ) { - QString text; + TQString text; - QFrame *page = new QFrame( plainPage() ); + TQFrame *page = new TQFrame( plainPage() ); if( page == 0 ) { return; } mWidgetStack->addWidget( page, RotatePage ); - QVBoxLayout *vbox = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *vbox = new TQVBoxLayout( page, 0, spacingHint() ); if( vbox == 0 ) { return; } - mGroupSpin = new QSpinBox( page ); + mGroupSpin = new TQSpinBox( page ); if( mGroupSpin == 0 ) { return; } mGroupSpin->setMinimumWidth( fontMetrics().width("M")*20 ); mGroupSpin->setRange(1, INT_MAX ); text = i18n("&Group size [bytes]"); - QLabel *label = new QLabel( mGroupSpin, text, page ); + TQLabel *label = new TQLabel( mGroupSpin, text, page ); if( label == 0 ) { return; } vbox->addWidget( label ); vbox->addWidget( mGroupSpin ); - mBitSpin = new QSpinBox( page ); + mBitSpin = new TQSpinBox( page ); if( mBitSpin == 0 ) { return; } mBitSpin->setMinimumWidth( fontMetrics().width("M")*20 ); mBitSpin->setRange(INT_MIN, INT_MAX); text = i18n("S&hift size [bits]"); - label = new QLabel( mBitSpin, text, page ); + label = new TQLabel( mBitSpin, text, page ); if( label == 0 ) { return; } vbox->addWidget( label ); @@ -948,7 +948,7 @@ void CFilterDialog::makeRotateLayout( void ) -void CFilterDialog::showEvent( QShowEvent *e ) +void CFilterDialog::showEvent( TQShowEvent *e ) { KDialogBase::showEvent(e); mOperandInput->setFocus(); @@ -966,7 +966,7 @@ void CFilterDialog::slotOk( void ) case SFilterControl::OperandXorData: if( mOperandData.isEmpty() == true ) { - showEntryFailure( this, QString("") ); + showEntryFailure( this, TQString("") ); return; } fc.operand = mOperandData; @@ -982,7 +982,7 @@ void CFilterDialog::slotOk( void ) fc.rotate[1] = mBitSpin->value(); if( fc.rotate[1] == 0 ) { - QString msg = i18n("Shift size is zero."); + TQString msg = i18n("Shift size is zero."); showEntryFailure( this, msg ); return; } @@ -991,7 +991,7 @@ void CFilterDialog::slotOk( void ) case SFilterControl::SwapBits: if( mByteWidget->flag( fc.operand ) == false ) { - QString msg = i18n("Swap rule does not define any swapping."); + TQString msg = i18n("Swap rule does not define any swapping."); showEntryFailure( this, msg ); return; } @@ -1031,7 +1031,7 @@ void CFilterDialog::operandSelectorChanged( int index ) } -void CFilterDialog::operandInputChanged( const QString &text ) +void CFilterDialog::operandInputChanged( const TQString &text ) { mOperandString[ mOperandSelector->currentItem() ] = text; mOperandValidator->convert( mOperandData, @@ -1066,84 +1066,84 @@ void CFilterDialog::operationSelectorChanged( int index ) -CInsertDialog::CInsertDialog( QWidget *parent, const char *name, bool modal ) +CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Insert Pattern"), Ok|Cancel, Ok, parent, name, modal ) { setButtonOKText(i18n("&Insert")); - QString text; - QVBoxLayout *topLayout = new QVBoxLayout( plainPage(), 0, spacingHint() ); + TQString text; + TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); if( topLayout == 0 ) { return; } - QVBoxLayout *vbox = new QVBoxLayout(); + TQVBoxLayout *vbox = new TQVBoxLayout(); if( vbox == 0 ) { return; } topLayout->addLayout( vbox ); - mSizeBox = new QSpinBox( plainPage() ); + mSizeBox = new TQSpinBox( plainPage() ); if( mSizeBox == 0 ) { return; } mSizeBox->setMinimumWidth( fontMetrics().maxWidth()*17 ); mSizeBox->setRange( 1, INT_MAX ); mSizeBox->setValue( 1 ); - QLabel *label = new QLabel( mSizeBox, i18n("&Size:"), plainPage() ); + TQLabel *label = new TQLabel( mSizeBox, i18n("&Size:"), plainPage() ); if( label == 0 ) { return; } vbox->addWidget( label ); vbox->addWidget( mSizeBox ); - mPatternSelector = new QComboBox( false, plainPage() ); + mPatternSelector = new TQComboBox( false, plainPage() ); if( mPatternSelector == 0 ) { return; } mPatternSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mPatternSelector->insertStringList( formatStrings() ); - connect( mPatternSelector, SIGNAL(activated(int)), - SLOT(patternSelectorChanged(int)) ); + connect( mPatternSelector, TQT_SIGNAL(activated(int)), + TQT_SLOT(patternSelectorChanged(int)) ); text = i18n("Fo&rmat (pattern):"); - label = new QLabel( mPatternSelector, text, plainPage() ); + label = new TQLabel( mPatternSelector, text, plainPage() ); if( label == 0 ) { return; } vbox->addWidget( label ); vbox->addWidget( mPatternSelector ); - mPatternInput = new QLineEdit( plainPage() ); + mPatternInput = new TQLineEdit( plainPage() ); if( mPatternInput == 0 ) { return; } mPatternInput->setMinimumWidth( fontMetrics().maxWidth()*17 ); mPatternValidator = new CHexValidator( this, CHexValidator::regularText ); if( mPatternValidator == 0 ) { return; } mPatternInput->setValidator( mPatternValidator ); - connect( mPatternInput, SIGNAL(textChanged(const QString&)), - SLOT(patternInputChanged(const QString&)) ); + connect( mPatternInput, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(patternInputChanged(const TQString&)) ); - label = new QLabel( mPatternInput, i18n("&Pattern:"), plainPage() ); + label = new TQLabel( mPatternInput, i18n("&Pattern:"), plainPage() ); if( label == 0 ) { return; } vbox->addWidget( label ); vbox->addWidget( mPatternInput ); - mOffsetInput = new QLineEdit( plainPage() ); + mOffsetInput = new TQLineEdit( plainPage() ); mOffsetInput->setMinimumWidth( fontMetrics().maxWidth()*17 ); - mOffsetLabel = new QLabel( mOffsetInput, i18n("&Offset:"), plainPage() ); + mOffsetLabel = new TQLabel( mOffsetInput, i18n("&Offset:"), plainPage() ); if( mOffsetLabel == 0 ) { return; } vbox->addWidget( mOffsetLabel ); vbox->addWidget( mOffsetInput ); - QButtonGroup *group = new QButtonGroup( i18n("Options"), plainPage() ); + TQButtonGroup *group = new TQButtonGroup( i18n("Options"), plainPage() ); if( group == 0 ) { return; } topLayout->addWidget( group, 10 ); - QGridLayout *gbox = new QGridLayout( group, 4, 2, spacingHint() ); + TQGridLayout *gbox = new TQGridLayout( group, 4, 2, spacingHint() ); if( gbox == 0 ) { return; } gbox->addRowSpacing( 0, fontMetrics().lineSpacing() ); - mCheckPattern = new QCheckBox( i18n("R&epeat pattern"), group ); + mCheckPattern = new TQCheckBox( i18n("R&epeat pattern"), group ); gbox->addWidget( mCheckPattern, 1, 0 ); - mCheckOnCursor = new QCheckBox( i18n("&Insert on cursor position"), group ); + mCheckOnCursor = new TQCheckBox( i18n("&Insert on cursor position"), group ); gbox->addWidget( mCheckOnCursor, 2, 0 ); - connect( mCheckOnCursor, SIGNAL(clicked()), SLOT(cursorCheck()) ); + connect( mCheckOnCursor, TQT_SIGNAL(clicked()), TQT_SLOT(cursorCheck()) ); gbox->setRowStretch( 3, 10 ); KConfig &config = *kapp->config(); @@ -1168,7 +1168,7 @@ CInsertDialog::~CInsertDialog( void ) } -void CInsertDialog::showEvent( QShowEvent *e ) +void CInsertDialog::showEvent( TQShowEvent *e ) { KDialogBase::showEvent(e); mPatternInput->setFocus(); @@ -1182,7 +1182,7 @@ void CInsertDialog::patternSelectorChanged( int index ) } -void CInsertDialog::patternInputChanged( const QString &text ) +void CInsertDialog::patternInputChanged( const TQString &text ) { mPatternString[ mPatternSelector->currentItem() ] = text; mPatternValidator->convert( mPatternData, @@ -1194,7 +1194,7 @@ void CInsertDialog::slotOk( void ) { if( mPatternData.isEmpty() == true ) { - showEntryFailure( this, QString("") ); + showEntryFailure( this, TQString("") ); return; } @@ -1209,7 +1209,7 @@ void CInsertDialog::slotOk( void ) bool success = stringToOffset( mOffsetInput->text(), id.offset ); if( success == false ) { - showEntryFailure( this, QString("") ); + showEntryFailure( this, TQString("") ); return; } } @@ -1229,15 +1229,15 @@ void CInsertDialog::cursorCheck( void ) -void centerDialog( QWidget *widget, QWidget *centerParent ) +void centerDialog( TQWidget *widget, TQWidget *centerParent ) { if( centerParent == 0 || widget == 0 ) { return; } - QPoint point = centerParent->mapToGlobal( QPoint(0,0) ); - QRect pos = centerParent->geometry(); + TQPoint point = centerParent->mapToGlobal( TQPoint(0,0) ); + TQRect pos = centerParent->geometry(); widget->setGeometry( point.x() + pos.width()/2 - widget->width()/2, point.y() + pos.height()/2 - widget->height()/2, @@ -1245,15 +1245,15 @@ void centerDialog( QWidget *widget, QWidget *centerParent ) } -void centerDialogBottom( QWidget *widget, QWidget *centerParent ) +void centerDialogBottom( TQWidget *widget, TQWidget *centerParent ) { if( centerParent == 0 || widget == 0 ) { return; } - QPoint point = centerParent->mapToGlobal( QPoint(0,0) ); - QRect pos = centerParent->geometry(); + TQPoint point = centerParent->mapToGlobal( TQPoint(0,0) ); + TQRect pos = centerParent->geometry(); widget->setGeometry( point.x() + pos.width()/2 - widget->width()/2, point.y() + pos.height() - widget->height(), @@ -1261,7 +1261,7 @@ void centerDialogBottom( QWidget *widget, QWidget *centerParent ) } -void comboMatchText( QComboBox *combo, const QString &text ) +void comboMatchText( TQComboBox *combo, const TQString &text ) { for( int i=0; i < combo->count(); i++ ) { @@ -1278,9 +1278,9 @@ void comboMatchText( QComboBox *combo, const QString &text ) -void showEntryFailure( QWidget *parent, const QString &msg ) +void showEntryFailure( TQWidget *parent, const TQString &msg ) { - QString message; + TQString message; message += i18n("Your request can not be processed."); message += "\n"; if( msg.isNull() == true || msg.isEmpty() == true ) @@ -1295,34 +1295,34 @@ void showEntryFailure( QWidget *parent, const QString &msg ) } -bool verifyFileDestnation( QWidget *parent, const QString &title, - const QString &path ) +bool verifyFileDestnation( TQWidget *parent, const TQString &title, + const TQString &path ) { if( path.isEmpty() == true ) { - QString msg = i18n("You must specify a destination file."); + TQString msg = i18n("You must specify a destination file."); KMessageBox::sorry( parent, msg, title ); return( false ); } - QFileInfo info( path ); + TQFileInfo info( path ); if( info.exists() == true ) { if( info.isDir() == true ) { - QString msg = i18n("You have specified an existing folder."); + TQString msg = i18n("You have specified an existing folder."); KMessageBox::sorry( parent, msg, title ); return( false ); } if( info.isWritable() == false ) { - QString msg = i18n("You do not have write permission to this file."); + TQString msg = i18n("You do not have write permission to this file."); KMessageBox::sorry( parent, msg, title ); return( false ); } - QString msg = i18n( "" + TQString msg = i18n( "" "You have specified an existing file.\n" "Overwrite current file?" ); int reply = KMessageBox::warningContinueCancel( parent, msg, title, i18n("Overwrite") ); @@ -1337,7 +1337,7 @@ bool verifyFileDestnation( QWidget *parent, const QString &title, -bool stringToOffset( const QString & text, uint &offset ) +bool stringToOffset( const TQString & text, uint &offset ) { if( text.isEmpty() ) { @@ -1393,9 +1393,9 @@ bool stringToOffset( const QString & text, uint &offset ) } -static const QStringList &formatStrings( void ) +static const TQStringList &formatStrings( void ) { - static QStringList list; + static TQStringList list; if( list.isEmpty() == true ) { list.append( i18n( "Hexadecimal" ) ); @@ -1408,9 +1408,9 @@ static const QStringList &formatStrings( void ) } -static const QStringList &operationStrings( void ) +static const TQStringList &operationStrings( void ) { - static QStringList list; + static TQStringList list; if( list.isEmpty() == true ) { list.append( i18n( "operand AND data" ) ); diff --git a/khexedit/dialog.h b/khexedit/dialog.h index 6a6aae1..226825e 100644 --- a/khexedit/dialog.h +++ b/khexedit/dialog.h @@ -26,15 +26,15 @@ #endif -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qdialog.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qradiobutton.h> -#include <qspinbox.h> -#include <qstring.h> -#include <qwidgetstack.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqdialog.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqradiobutton.h> +#include <tqspinbox.h> +#include <tqstring.h> +#include <tqwidgetstack.h> #include <kdialogbase.h> @@ -42,10 +42,10 @@ #include "hexbuffer.h" #include "hexvalidator.h" -const int repYes = QDialog::Accepted; +const int repYes = TQDialog::Accepted; const int repNo = 11; const int repAll = 12; -const int repClose = QDialog::Rejected; +const int repClose = TQDialog::Rejected; const int repNext = 13; const int repPrevious = 14; const int repNewKey = 15; @@ -66,11 +66,11 @@ class CGotoDialog : public KDialogBase Q_OBJECT public: - CGotoDialog( QWidget *parent, const char *name = 0, bool modal = false ); + CGotoDialog( TQWidget *parent, const char *name = 0, bool modal = false ); ~CGotoDialog( void ); protected: - virtual void showEvent( QShowEvent *e ); + virtual void showEvent( TQShowEvent *e ); private slots: void slotOk( void ); @@ -79,10 +79,10 @@ class CGotoDialog : public KDialogBase void gotoOffset( uint offset, uint bit, bool fromCursor, bool forward ); private: - QComboBox *mComboBox; - QCheckBox *mCheckBackward; - QCheckBox *mCheckFromCursor; - QCheckBox *mCheckVisible; + TQComboBox *mComboBox; + TQCheckBox *mCheckBackward; + TQCheckBox *mCheckFromCursor; + TQCheckBox *mCheckVisible; }; @@ -100,7 +100,7 @@ class CFindDialog : public KDialogBase }; public: - CFindDialog( QWidget *parent=0, const char *name=0, bool modal=false ); + CFindDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); ~CFindDialog( void ); bool isEmpty( void ); @@ -108,27 +108,27 @@ class CFindDialog : public KDialogBase void findAgain( EOperation operation ); protected: - virtual void showEvent( QShowEvent *e ); + virtual void showEvent( TQShowEvent *e ); private slots: void slotOk( void ); void selectorChanged( int index ); - void inputChanged( const QString &text ); + void inputChanged( const TQString &text ); signals: void findData( SSearchControl &sc, uint mode, bool navigator ); private: - QComboBox *mSelector; - QLineEdit *mInput; - QCheckBox *mCheckBackward; - QCheckBox *mCheckFromCursor; - QCheckBox *mCheckInSelection; - QCheckBox *mCheckUseNavigator; - QCheckBox *mCheckIgnoreCase; - - QString mFindString[5]; - QByteArray mFindData; + TQComboBox *mSelector; + TQLineEdit *mInput; + TQCheckBox *mCheckBackward; + TQCheckBox *mCheckFromCursor; + TQCheckBox *mCheckInSelection; + TQCheckBox *mCheckUseNavigator; + TQCheckBox *mCheckIgnoreCase; + + TQString mFindString[5]; + TQByteArray mFindData; CHexValidator *mFindValidator; }; @@ -139,7 +139,7 @@ class CFindNavigatorDialog : public KDialogBase Q_OBJECT public: - CFindNavigatorDialog( QWidget *parent=0, const char *name=0, + CFindNavigatorDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); ~CFindNavigatorDialog( void ); void defineData( SSearchControl &sc ); @@ -158,7 +158,7 @@ class CFindNavigatorDialog : public KDialogBase void makeKey( void ); private: - QLineEdit *mKey; + TQLineEdit *mKey; SSearchControl mSearchControl; }; @@ -168,38 +168,38 @@ class CReplaceDialog : public KDialogBase Q_OBJECT public: - CReplaceDialog( QWidget *parent=0, const char *name=0, bool modal=false ); + CReplaceDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); ~CReplaceDialog( void ); protected: - virtual void showEvent( QShowEvent *e ); + virtual void showEvent( TQShowEvent *e ); private slots: void slotOk( void ); void findSelectorChanged( int index ); - void findInputChanged( const QString &text ); + void findInputChanged( const TQString &text ); void replaceSelectorChanged( int index ); - void replaceInputChanged( const QString &text ); + void replaceInputChanged( const TQString &text ); signals: void replaceData( SSearchControl &sc, uint mode ); private: - QComboBox *mFindSelector; - QComboBox *mReplaceSelector; - QLineEdit *mFindInput; - QLineEdit *mReplaceInput; - - QCheckBox *mCheckBackward; - QCheckBox *mCheckFromCursor; - QCheckBox *mCheckInSelection; - QCheckBox *mCheckPrompt; - QCheckBox *mCheckIgnoreCase; - - QString mFindString[5]; - QString mReplaceString[5]; - QByteArray mFindData; - QByteArray mReplaceData; + TQComboBox *mFindSelector; + TQComboBox *mReplaceSelector; + TQLineEdit *mFindInput; + TQLineEdit *mReplaceInput; + + TQCheckBox *mCheckBackward; + TQCheckBox *mCheckFromCursor; + TQCheckBox *mCheckInSelection; + TQCheckBox *mCheckPrompt; + TQCheckBox *mCheckIgnoreCase; + + TQString mFindString[5]; + TQString mReplaceString[5]; + TQByteArray mFindData; + TQByteArray mReplaceData; CHexValidator *mFindValidator; CHexValidator *mReplaceValidator; }; @@ -211,7 +211,7 @@ class CReplacePromptDialog : public KDialogBase Q_OBJECT public: - CReplacePromptDialog( QWidget *parent=0, const char *name=0, + CReplacePromptDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); ~CReplacePromptDialog( void ); void defineData( SSearchControl &sc ); @@ -249,11 +249,11 @@ class CFilterDialog : public KDialogBase }; public: - CFilterDialog( QWidget *parent=0, const char *name=0, bool modal=false ); + CFilterDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); ~CFilterDialog( void ); protected: - virtual void showEvent( QShowEvent *e ); + virtual void showEvent( TQShowEvent *e ); private: void makeEmptyLayout( void ); @@ -264,30 +264,30 @@ class CFilterDialog : public KDialogBase private slots: void slotOk( void ); void operandSelectorChanged( int index ); - void operandInputChanged( const QString &text ); + void operandInputChanged( const TQString &text ); void operationSelectorChanged( int index ); signals: void filterData( SFilterControl &fc ); private: - QWidgetStack *mWidgetStack; - QLabel *mOperandFormatLabel; - QLabel *mOperandInputLabel; - QComboBox *mOperandSelector; - QLineEdit *mOperandInput; - QComboBox *mOperationSelector; - QSpinBox *mGroupSpin; - QSpinBox *mBitSpin; + TQWidgetStack *mWidgetStack; + TQLabel *mOperandFormatLabel; + TQLabel *mOperandInputLabel; + TQComboBox *mOperandSelector; + TQLineEdit *mOperandInput; + TQComboBox *mOperationSelector; + TQSpinBox *mGroupSpin; + TQSpinBox *mBitSpin; CByteWidget *mByteWidget; - QCheckBox *mCheckBackward; - QCheckBox *mCheckFromCursor; - QCheckBox *mCheckInSelection; - QCheckBox *mCheckVisible; + TQCheckBox *mCheckBackward; + TQCheckBox *mCheckFromCursor; + TQCheckBox *mCheckInSelection; + TQCheckBox *mCheckVisible; - QString mOperandString[5]; - QByteArray mOperandData; + TQString mOperandString[5]; + TQByteArray mOperandData; CHexValidator *mOperandValidator; }; @@ -299,46 +299,46 @@ class CInsertDialog : public KDialogBase Q_OBJECT public: - CInsertDialog( QWidget *parent=0, const char *name=0, bool modal=false ); + CInsertDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); ~CInsertDialog( void ); protected: - virtual void showEvent( QShowEvent *e ); + virtual void showEvent( TQShowEvent *e ); private slots: void slotOk( void ); void cursorCheck( void ); void patternSelectorChanged( int index ); - void patternInputChanged( const QString &text ); + void patternInputChanged( const TQString &text ); signals: void execute( SInsertData &id ); private: - QSpinBox *mSizeBox; - QLabel *mOffsetLabel; - QComboBox *mPatternSelector; - QLineEdit *mPatternInput; - QLineEdit *mOffsetInput; - QCheckBox *mCheckPattern; - QCheckBox *mCheckOnCursor; - - QString mPatternString[5]; - QByteArray mPatternData; + TQSpinBox *mSizeBox; + TQLabel *mOffsetLabel; + TQComboBox *mPatternSelector; + TQLineEdit *mPatternInput; + TQLineEdit *mOffsetInput; + TQCheckBox *mCheckPattern; + TQCheckBox *mCheckOnCursor; + + TQString mPatternString[5]; + TQByteArray mPatternData; CHexValidator *mPatternValidator; }; -void centerDialog( QWidget *widget, QWidget *centerParent ); -void centerDialogBottom( QWidget *widget, QWidget *centerParent ); -void comboMatchText( QComboBox *combo, const QString &text ); -bool stringToOffset( const QString & text, uint &offset ); +void centerDialog( TQWidget *widget, TQWidget *centerParent ); +void centerDialogBottom( TQWidget *widget, TQWidget *centerParent ); +void comboMatchText( TQComboBox *combo, const TQString &text ); +bool stringToOffset( const TQString & text, uint &offset ); -void showEntryFailure( QWidget *parent, const QString &msg ); -bool verifyFileDestnation( QWidget *parent, const QString &title, - const QString &path ); +void showEntryFailure( TQWidget *parent, const TQString &msg ); +bool verifyFileDestnation( TQWidget *parent, const TQString &title, + const TQString &path ); diff --git a/khexedit/draglabel.cc b/khexedit/draglabel.cc index e20088c..8a98945 100644 --- a/khexedit/draglabel.cc +++ b/khexedit/draglabel.cc @@ -20,16 +20,16 @@ #include <stdlib.h> -#include <qbitmap.h> -#include <qpainter.h> +#include <tqbitmap.h> +#include <tqpainter.h> #include <kurldrag.h> #include "draglabel.h" -CDragLabel::CDragLabel( QWidget *parent ) - : QLabel( "draglabel", parent, "kde toolbar widget" ) +CDragLabel::CDragLabel( TQWidget *parent ) + : TQLabel( "draglabel", parent, "kde toolbar widget" ) { mValid = true; mDragPending = false; @@ -42,7 +42,7 @@ CDragLabel::~CDragLabel( void ) } -void CDragLabel::mousePressEvent( QMouseEvent *e ) +void CDragLabel::mousePressEvent( TQMouseEvent *e ) { if( mValid == false || e->button() != LeftButton || mUrl.isEmpty() == true ) { @@ -54,7 +54,7 @@ void CDragLabel::mousePressEvent( QMouseEvent *e ) } -void CDragLabel::mouseMoveEvent( QMouseEvent *e ) +void CDragLabel::mouseMoveEvent( TQMouseEvent *e ) { if( mDragPending == true ) { @@ -78,19 +78,19 @@ void CDragLabel::mouseMoveEvent( QMouseEvent *e ) } } -void CDragLabel::mouseReleaseEvent( QMouseEvent * ) +void CDragLabel::mouseReleaseEvent( TQMouseEvent * ) { mDragPending = false; } -void CDragLabel::setUrl( const QString &url ) +void CDragLabel::setUrl( const TQString &url ) { mUrl = url; } -void CDragLabel::setDragMask( const QPixmap pix ) +void CDragLabel::setDragMask( const TQPixmap pix ) { mDragMask = pix; } @@ -103,7 +103,7 @@ void CDragLabel::prepPixmap( KURLDrag &uriDrag ) return; } - QString text; + TQString text; int index = mUrl.findRev( '/', mUrl.length() ); if( index < 0 ) { @@ -115,16 +115,16 @@ void CDragLabel::prepPixmap( KURLDrag &uriDrag ) } int sep = 2; - QRect rect = fontMetrics().boundingRect(text); + TQRect rect = fontMetrics().boundingRect(text); int w = pixmap()->width() + rect.width() + sep + 2; int h = fontMetrics().lineSpacing(); if( pixmap()->height() > h ) { h = pixmap()->height(); } - QBitmap mask( w, h, TRUE ); - QPixmap dragPixmap( w, h ); + TQBitmap mask( w, h, TRUE ); + TQPixmap dragPixmap( w, h ); dragPixmap.fill( black ); - QPainter p; + TQPainter p; p.begin( &mask ); p.setPen( white ); p.drawPixmap( 0, 0, mDragMask ); @@ -138,7 +138,7 @@ void CDragLabel::prepPixmap( KURLDrag &uriDrag ) dragPixmap.setMask( mask ); - QPoint hotspot( pixmap()->width(), pixmap()->height()/2 ); + TQPoint hotspot( pixmap()->width(), pixmap()->height()/2 ); uriDrag.setPixmap( dragPixmap, hotspot ); } diff --git a/khexedit/draglabel.h b/khexedit/draglabel.h index d90b5ed..441473e 100644 --- a/khexedit/draglabel.h +++ b/khexedit/draglabel.h @@ -21,11 +21,11 @@ #ifndef _DRAG_SOURCE_H_ #define _DRAG_SOURCE_H_ -#include <qdropsite.h> -#include <qlabel.h> -#include <qbitmap.h> -#include <qstring.h> -#include <qstrlist.h> +#include <tqdropsite.h> +#include <tqlabel.h> +#include <tqbitmap.h> +#include <tqstring.h> +#include <tqstrlist.h> class KURLDrag; @@ -34,26 +34,26 @@ class CDragLabel: public QLabel Q_OBJECT public: - CDragLabel( QWidget *parent ); + CDragLabel( TQWidget *parent ); ~CDragLabel( void ); - void setUrl( const QString &url ); - void setDragMask( const QPixmap pix ); + void setUrl( const TQString &url ); + void setDragMask( const TQPixmap pix ); protected: - void mousePressEvent( QMouseEvent * ); - void mouseMoveEvent( QMouseEvent * ); - void mouseReleaseEvent( QMouseEvent * ); + void mousePressEvent( TQMouseEvent * ); + void mouseMoveEvent( TQMouseEvent * ); + void mouseReleaseEvent( TQMouseEvent * ); private: void prepPixmap( KURLDrag &uriDrag ); private: bool mValid; - QString mUrl; - QBitmap mDragMask; + TQString mUrl; + TQBitmap mDragMask; bool mDragPending; - QPoint mDragOrigin; + TQPoint mDragOrigin; }; diff --git a/khexedit/exportdialog.cc b/khexedit/exportdialog.cc index a178319..3d13d7c 100644 --- a/khexedit/exportdialog.cc +++ b/khexedit/exportdialog.cc @@ -19,8 +19,8 @@ */ #include <limits.h> -#include <qbuttongroup.h> -#include <qlineedit.h> +#include <tqbuttongroup.h> +#include <tqlineedit.h> #include <kfiledialog.h> #include <klocale.h> @@ -28,14 +28,14 @@ #include "dialog.h" #include "exportdialog.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> -CExportDialog::CExportDialog( QWidget *parent, char *name, bool modal ) +CExportDialog::CExportDialog( TQWidget *parent, char *name, bool modal ) :KDialogBase( Tabbed, i18n("Export Document"), Help|Ok|Cancel, Ok, parent, name, modal ) { - setHelp( "khexedit/khexedit.html", QString::null ); + setHelp( "khexedit/khexedit.html", TQString::null ); mFrame[ page_destination ] = addPage( i18n("Destination") ); mFrame[ page_option ] = addPage( i18n("Options") ); @@ -46,7 +46,7 @@ CExportDialog::CExportDialog( QWidget *parent, char *name, bool modal ) mConfig = 0; readConfiguration(); - QString path = mDestination.fileInput->text(); + TQString path = mDestination.fileInput->text(); int index = path.findRev( '/' ); if( index != -1 ) { mWorkDir = path.left( index+1 ); } } @@ -59,7 +59,7 @@ CExportDialog::~CExportDialog( void ) } -void CExportDialog::showEvent( QShowEvent *e ) +void CExportDialog::showEvent( TQShowEvent *e ) { KDialogBase::showEvent(e); showPage(0); @@ -71,7 +71,7 @@ void CExportDialog::readConfiguration( void ) { if( mConfig != 0 ) { return; } - mConfig = new KSimpleConfig( QString("hexexport") ); + mConfig = new KSimpleConfig( TQString("hexexport") ); if( mConfig == 0 ) { return; } mConfig->setGroup( "Destination" ); @@ -83,7 +83,7 @@ void CExportDialog::readConfiguration( void ) mConfig->setGroup( "Option" ); val = mConfig->readNumEntry( "HtmlLine", 80 ); mHtml.lineSpin->setValue( val ); - QString text = mConfig->readEntry( "HtmlPrefix", "table" ); + TQString text = mConfig->readEntry( "HtmlPrefix", "table" ); mHtml.prefixInput->setText( text ); val = mConfig->readNumEntry( "HtmlHeader", 1 ); mHtml.topCombo->setCurrentItem( val < 0 || val >= 4 ? 0 : val ); @@ -148,113 +148,113 @@ void CExportDialog::writeConfiguration( void ) void CExportDialog::setupDestinationPage( void ) { - QString text; - QFrame *page = mFrame[ page_destination ]; + TQString text; + TQFrame *page = mFrame[ page_destination ]; - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); if( topLayout == 0 ) { return; } - QStringList formatList; + TQStringList formatList; formatList.append( i18n("Plain Text") ); formatList.append( i18n("HTML Tables") ); formatList.append( i18n("Rich Text (RTF)") ); formatList.append( i18n("C Array") ); - mDestination.formatCombo = new QComboBox( false, page ); + mDestination.formatCombo = new TQComboBox( false, page ); mDestination.formatCombo->insertStringList( formatList ); mDestination.formatCombo->setMinimumWidth( fontMetrics().maxWidth()*10 ); - connect( mDestination.formatCombo, SIGNAL(activated(int)), - SLOT(formatChanged(int)) ); + connect( mDestination.formatCombo, TQT_SIGNAL(activated(int)), + TQT_SLOT(formatChanged(int)) ); text = i18n("&Format:"); - QLabel *label = new QLabel( mDestination.formatCombo, text, page ); + TQLabel *label = new TQLabel( mDestination.formatCombo, text, page ); topLayout->addWidget( label ); topLayout->addWidget( mDestination.formatCombo ); - QHBoxLayout *hbox = new QHBoxLayout(); + TQHBoxLayout *hbox = new TQHBoxLayout(); topLayout->addLayout( hbox ); text = i18n("&Destination:"); - label = new QLabel( text, page ); + label = new TQLabel( text, page ); hbox->addWidget( label ); text = i18n("(Package folder)"); - mDestination.fileExtraLabel = new QLabel( text, page ); + mDestination.fileExtraLabel = new TQLabel( text, page ); hbox->addWidget( mDestination.fileExtraLabel, 10, AlignLeft|AlignVCenter ); - hbox = new QHBoxLayout(); + hbox = new TQHBoxLayout(); topLayout->addLayout( hbox ); - mDestination.fileInput = new QLineEdit( page ); + mDestination.fileInput = new TQLineEdit( page ); hbox->addWidget( mDestination.fileInput ); - connect(mDestination.fileInput, SIGNAL(textChanged ( const QString & )),this,SLOT(destinationChanged(const QString &))); + connect(mDestination.fileInput, TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(destinationChanged(const TQString &))); text = i18n("Choose..."); - QPushButton *browseButton = new QPushButton( text, page, "browse" ); + TQPushButton *browseButton = new TQPushButton( text, page, "browse" ); hbox->addWidget( browseButton ); - connect( browseButton, SIGNAL(clicked()), SLOT(browserClicked()) ); + connect( browseButton, TQT_SIGNAL(clicked()), TQT_SLOT(browserClicked()) ); mDestination.fileInput->setMinimumWidth( fontMetrics().maxWidth()*15 ); label->setBuddy(mDestination.fileInput); - hbox = new QHBoxLayout(); + hbox = new TQHBoxLayout(); topLayout->addLayout( hbox, 10 ); - mDestination.rangeBox = new QButtonGroup( i18n("Export Range"), page ); + mDestination.rangeBox = new TQButtonGroup( i18n("Export Range"), page ); hbox->addWidget( mDestination.rangeBox ); - QButtonGroup *group = mDestination.rangeBox; // convenience + TQButtonGroup *group = mDestination.rangeBox; // convenience - QVBoxLayout *vbox = new QVBoxLayout( group, spacingHint() ); + TQVBoxLayout *vbox = new TQVBoxLayout( group, spacingHint() ); vbox->addSpacing( fontMetrics().lineSpacing() ); - QRadioButton *radio1 = new QRadioButton( i18n("&Everything"), group ); + TQRadioButton *radio1 = new TQRadioButton( i18n("&Everything"), group ); radio1->setFixedSize( radio1->sizeHint() ); mDestination.rangeBox->insert( radio1, 0 ); vbox->addWidget( radio1, 0, AlignLeft ); - QRadioButton *radio2 = new QRadioButton( i18n("&Selection"), group ); + TQRadioButton *radio2 = new TQRadioButton( i18n("&Selection"), group ); radio2->setFixedSize( radio2->sizeHint() ); mDestination.rangeBox->insert( radio2, 1 ); vbox->addWidget( radio2, 0, AlignLeft ); - QRadioButton *radio3 = new QRadioButton( i18n("&Range"), group ); + TQRadioButton *radio3 = new TQRadioButton( i18n("&Range"), group ); radio3->setFixedSize( radio3->sizeHint() ); mDestination.rangeBox->insert( radio3, 2 ); vbox->addWidget( radio3, 0, AlignLeft ); - QGridLayout *gbox = new QGridLayout( 2, 2, spacingHint() ); + TQGridLayout *gbox = new TQGridLayout( 2, 2, spacingHint() ); vbox->addLayout( gbox ); - mDestination.fromInput = new QLineEdit( group ); + mDestination.fromInput = new TQLineEdit( group ); text = i18n("&From offset:"); - mDestination.fromLabel = new QLabel( mDestination.fromInput, text, group ); + mDestination.fromLabel = new TQLabel( mDestination.fromInput, text, group ); gbox->addWidget( mDestination.fromLabel, 0, 0 ); gbox->addWidget( mDestination.fromInput, 0, 1 ); - mDestination.toInput = new QLineEdit( group ); + mDestination.toInput = new TQLineEdit( group ); text = i18n("&To offset:"); - mDestination.toLabel = new QLabel( mDestination.toInput, text, group ); + mDestination.toLabel = new TQLabel( mDestination.toInput, text, group ); gbox->addWidget( mDestination.toLabel, 1, 0 ); gbox->addWidget( mDestination.toInput, 1, 1 ); - connect( group, SIGNAL(clicked(int)), SLOT(rangeChanged(int)) ); + connect( group, TQT_SIGNAL(clicked(int)), TQT_SLOT(rangeChanged(int)) ); group->setButton(0); rangeChanged(0); enableButtonOK( !mDestination.fileInput->text().isEmpty() ); } -void CExportDialog::destinationChanged(const QString &_text) +void CExportDialog::destinationChanged(const TQString &_text) { enableButtonOK( !_text.isEmpty() ); } void CExportDialog::setupOptionPage( void ) { - QFrame *page = mFrame[ page_option ]; - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); + TQFrame *page = mFrame[ page_option ]; + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); if( topLayout == 0 ) { return; } - mOptionStack = new QWidgetStack( page, "stack" ); + mOptionStack = new TQWidgetStack( page, "stack" ); if( mOptionStack == 0 ) { return; } topLayout->addWidget( mOptionStack ); @@ -264,100 +264,100 @@ void CExportDialog::setupOptionPage( void ) makeCArrayOption(); mOptionStack->raiseWidget( (int)option_text ); - QSize size = mOptionStack->sizeHint(); - size += QSize(spacingHint()*2, spacingHint()*2); + TQSize size = mOptionStack->sizeHint(); + size += TQSize(spacingHint()*2, spacingHint()*2); page->setMinimumSize( size ); } void CExportDialog::makeTextOption( void ) { - QFrame *page = new QFrame( mFrame[ page_option ] ); + TQFrame *page = new TQFrame( mFrame[ page_option ] ); if( page == 0 ) { return; } mOptionStack->addWidget( page, option_text ); - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); - QString text = i18n("No options for this format."); - QLabel *label = new QLabel( text, page ); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); + TQString text = i18n("No options for this format."); + TQLabel *label = new TQLabel( text, page ); topLayout->addWidget( label, 0, AlignCenter ); } void CExportDialog::makeHtmlOption( void ) { - QFrame *page = new QFrame( mFrame[ page_option ] ); + TQFrame *page = new TQFrame( mFrame[ page_option ] ); if( page == 0 ) { return; } mOptionStack->addWidget( page, option_html ); - QString text; - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); + TQString text; + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); if( topLayout == 0 ) { return; } text = i18n("HTML Options (one table per page)"); - QLabel *label = new QLabel( text, page ); + TQLabel *label = new TQLabel( text, page ); topLayout->addWidget( label ); - QFrame *hline = new QFrame( page ); - hline->setFrameStyle( QFrame::Sunken | QFrame::HLine ); + TQFrame *hline = new TQFrame( page ); + hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); topLayout->addWidget( hline ); - QFrame *frame = new QFrame( page ); + TQFrame *frame = new TQFrame( page ); if( frame == 0 ) { return; } topLayout->addWidget( frame ); - QGridLayout *gbox = new QGridLayout( frame, 4, 2, 0, spacingHint() ); + TQGridLayout *gbox = new TQGridLayout( frame, 4, 2, 0, spacingHint() ); if( gbox == 0 ) { return; } gbox->setColStretch( 1, 10 ); - mHtml.lineSpin = new QSpinBox( frame ); + mHtml.lineSpin = new TQSpinBox( frame ); mHtml.lineSpin->setMinimumWidth( fontMetrics().maxWidth()*10 ); mHtml.lineSpin->setRange( 5, INT_MAX ); gbox->addWidget( mHtml.lineSpin, 0, 1 ); text = i18n("&Lines per table:"); - label = new QLabel( mHtml.lineSpin, text, frame ); + label = new TQLabel( mHtml.lineSpin, text, frame ); gbox->addWidget( label, 0, 0 ); - mHtml.prefixInput = new QLineEdit( frame, "prefix" ); + mHtml.prefixInput = new TQLineEdit( frame, "prefix" ); mHtml.prefixInput->setMinimumWidth( fontMetrics().maxWidth()*10 ); gbox->addWidget( mHtml.prefixInput, 1, 1 ); text = i18n("Filename &prefix (in package):"); - label = new QLabel( mHtml.prefixInput, text, frame ); + label = new TQLabel( mHtml.prefixInput, text, frame ); gbox->addWidget( label, 1, 0 ); - QStringList headerList; + TQStringList headerList; headerList.append( i18n("None") ); headerList.append( i18n("Filename with Path") ); headerList.append( i18n("Filename") ); headerList.append( i18n("Page Number") ); - mHtml.topCombo = new QComboBox( false, frame ); + mHtml.topCombo = new TQComboBox( false, frame ); mHtml.topCombo->insertStringList( headerList ); gbox->addWidget( mHtml.topCombo, 2, 1 ); text = i18n("Header &above text:"); - label = new QLabel( mHtml.topCombo, text, frame ); + label = new TQLabel( mHtml.topCombo, text, frame ); gbox->addWidget( label, 2, 0 ); - mHtml.bottomCombo = new QComboBox( false, frame ); + mHtml.bottomCombo = new TQComboBox( false, frame ); mHtml.bottomCombo->insertStringList( headerList ); gbox->addWidget( mHtml.bottomCombo, 3, 1 ); text = i18n("&Footer below text:"); - label = new QLabel( mHtml.bottomCombo, text, frame ); + label = new TQLabel( mHtml.bottomCombo, text, frame ); gbox->addWidget( label, 3, 0 ); text = i18n("Link \"index.html\" to &table of contents file"); - mHtml.symlinkCheck = new QCheckBox( text, page ); + mHtml.symlinkCheck = new TQCheckBox( text, page ); topLayout->addWidget( mHtml.symlinkCheck ); text = i18n("&Include navigator bar"); - mHtml.navigatorCheck = new QCheckBox( text, page ); + mHtml.navigatorCheck = new TQCheckBox( text, page ); topLayout->addWidget( mHtml.navigatorCheck ); text = i18n("&Use black and white only"); - mHtml.bwCheck = new QCheckBox( text, page ); + mHtml.bwCheck = new TQCheckBox( text, page ); topLayout->addWidget( mHtml.bwCheck ); topLayout->addStretch(10); @@ -366,44 +366,44 @@ void CExportDialog::makeHtmlOption( void ) void CExportDialog::makeRtfOption( void ) { - QFrame *page = new QFrame( mFrame[ page_option ] ); + TQFrame *page = new TQFrame( mFrame[ page_option ] ); if( page == 0 ) { return; } mOptionStack->addWidget( page, option_rtf ); - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); - QString text = i18n("No options for this format."); - QLabel *label = new QLabel( text, page ); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); + TQString text = i18n("No options for this format."); + TQLabel *label = new TQLabel( text, page ); topLayout->addWidget( label, 0, AlignCenter ); } void CExportDialog::makeCArrayOption( void ) { - QFrame *page = new QFrame( mFrame[ page_option ] ); + TQFrame *page = new TQFrame( mFrame[ page_option ] ); mOptionStack->addWidget( page, option_carray ); - QString text; - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); + TQString text; + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); text = i18n("C Array Options"); - QLabel *label = new QLabel( text, page ); + TQLabel *label = new TQLabel( text, page ); topLayout->addWidget( label, 0, AlignLeft ); - QFrame *hline = new QFrame( page ); - hline->setFrameStyle( QFrame::Sunken | QFrame::HLine ); + TQFrame *hline = new TQFrame( page ); + hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); topLayout->addWidget( hline ); - QGridLayout *gbox = new QGridLayout( 3, 2, spacingHint() ); + TQGridLayout *gbox = new TQGridLayout( 3, 2, spacingHint() ); topLayout->addLayout( gbox ); gbox->setColStretch( 1, 10 ); - mArray.nameInput = new QLineEdit( page ); + mArray.nameInput = new TQLineEdit( page ); gbox->addWidget( mArray.nameInput, 0, 1 ); text = i18n("Array name:"); - label = new QLabel( mArray.nameInput, text, page ); + label = new TQLabel( mArray.nameInput, text, page ); gbox->addWidget( label, 0, 0 ); - QStringList typeList; + TQStringList typeList; typeList.append( i18n("char") ); typeList.append( i18n("unsigned char") ); typeList.append( i18n("short") ); @@ -412,24 +412,24 @@ void CExportDialog::makeCArrayOption( void ) typeList.append( i18n("unsigned int") ); typeList.append( i18n("float") ); typeList.append( i18n("double") ); - mArray.typeCombo = new QComboBox( false, page ); + mArray.typeCombo = new TQComboBox( false, page ); mArray.typeCombo->insertStringList( typeList ); mArray.typeCombo->setMinimumWidth( fontMetrics().maxWidth()*10 ); gbox->addWidget( mArray.typeCombo, 1, 1 ); text = i18n("Element type:"); - label = new QLabel( mArray.typeCombo, text, page ); + label = new TQLabel( mArray.typeCombo, text, page ); gbox->addWidget( label, 1, 0 ); - mArray.lineSizeSpin = new QSpinBox( page ); + mArray.lineSizeSpin = new TQSpinBox( page ); mArray.lineSizeSpin->setMinimumWidth( fontMetrics().maxWidth()*10 ); mArray.lineSizeSpin->setRange( 1, INT_MAX ); gbox->addWidget( mArray.lineSizeSpin, 2, 1 ); text = i18n("Elements per line:"); - label = new QLabel( mArray.lineSizeSpin, text, page ); + label = new TQLabel( mArray.lineSizeSpin, text, page ); gbox->addWidget( label, 2, 0 ); text = i18n("Print unsigned values as hexadecimal"); - mArray.hexadecimalCheck = new QCheckBox( text, page ); + mArray.hexadecimalCheck = new TQCheckBox( text, page ); topLayout->addWidget( mArray.hexadecimalCheck ); topLayout->addStretch(10); @@ -459,7 +459,7 @@ void CExportDialog::rangeChanged( int id ) void CExportDialog::browserClicked( void ) { - QString url; + TQString url; if( mDestination.formatCombo->currentItem() == option_html ) { url = KFileDialog::getExistingDirectory( mWorkDir, topLevelWidget() ); @@ -485,7 +485,7 @@ void CExportDialog::browserClicked( void ) void CExportDialog::slotOk( void ) { - QString path( mDestination.fileInput->text() ); + TQString path( mDestination.fileInput->text() ); int format = mDestination.formatCombo->currentItem(); if( format == option_text ) @@ -499,7 +499,7 @@ void CExportDialog::slotOk( void ) uint mode; if( collectRange( mode, e.range.start, e.range.stop ) == false ) { - showEntryFailure( this, QString("") ); + showEntryFailure( this, TQString("") ); return; } e.range.mode = (SExportRange::EMode)mode; // FIXME @@ -514,25 +514,25 @@ void CExportDialog::slotOk( void ) uint mode; if( collectRange( mode, e.range.start, e.range.stop ) == false ) { - showEntryFailure( this, QString("") ); + showEntryFailure( this, TQString("") ); return; } e.range.mode = (SExportRange::EMode)mode; // FIXME - const QString str = mHtml.prefixInput->text().stripWhiteSpace(); + const TQString str = mHtml.prefixInput->text().stripWhiteSpace(); mHtml.prefixInput->setText( str ); if( mHtml.prefixInput->text().isEmpty() == true ) { mHtml.prefixInput->setText( "table" ); } - const QString prefix = mHtml.prefixInput->text(); + const TQString prefix = mHtml.prefixInput->text(); for( uint i=0; i<prefix.length(); i++ ) { - QChar c = prefix[i]; + TQChar c = prefix[i]; if( c.isSpace() == true || c.isPunct() == true ) { - QString msg = i18n("The filename prefix can not contain empty letters " + TQString msg = i18n("The filename prefix can not contain empty letters " "or punctuation marks."); KMessageBox::sorry( this, msg, i18n("Export Document") ); return; @@ -558,7 +558,7 @@ void CExportDialog::slotOk( void ) } else if( format == option_rtf ) { - QString msg = i18n("This format is not yet supported."); + TQString msg = i18n("This format is not yet supported."); KMessageBox::sorry( this, msg ); } else if( format == option_carray ) @@ -572,7 +572,7 @@ void CExportDialog::slotOk( void ) uint mode; if( collectRange( mode, e.range.start, e.range.stop ) == false ) { - showEntryFailure( this, QString("") ); + showEntryFailure( this, TQString("") ); return; } e.range.mode = (SExportRange::EMode)mode; // FIXME @@ -591,7 +591,7 @@ void CExportDialog::slotOk( void ) bool CExportDialog::collectRange( uint &mode, uint &start, uint &stop ) { - QButton *b = mDestination.rangeBox->selected(); + TQButton *b = mDestination.rangeBox->selected(); if( b == 0 ) { return( false ); @@ -629,24 +629,24 @@ bool CExportDialog::collectRange( uint &mode, uint &start, uint &stop ) // This one will attempt to create a directory if 'path' // specifies a nonexistent name. // -bool CExportDialog::verifyPackage( const QString &path ) +bool CExportDialog::verifyPackage( const TQString &path ) { - const QString title = i18n("Export Document"); + const TQString title = i18n("Export Document"); if( path.isEmpty() == true ) { - QString msg = i18n("You must specify a destination."); + TQString msg = i18n("You must specify a destination."); KMessageBox::sorry( this, msg, title ); return( false ); } - QFileInfo info( path ); + TQFileInfo info( path ); if( info.exists() == false ) { - QDir directory; + TQDir directory; if( directory.mkdir( path ) == false ) { - QString msg; + TQString msg; msg += i18n("Unable to create a new folder"); msg += "\n"; msg += path; @@ -658,7 +658,7 @@ bool CExportDialog::verifyPackage( const QString &path ) { if( info.isDir() == false ) { - QString msg = i18n("You have specified an existing file"); + TQString msg = i18n("You have specified an existing file"); KMessageBox::sorry( this, msg, title ); return( false ); } @@ -666,17 +666,17 @@ bool CExportDialog::verifyPackage( const QString &path ) { if( info.isWritable() == false ) { - QString msg = i18n( "" + TQString msg = i18n( "" "You do not have write permission to this folder."); KMessageBox::sorry( this, msg, title ); return( false ); } - const QString prefix = mHtml.prefixInput->text(); - QString f1 = QString("%1%2.html").arg(prefix).arg("00000000"); - QString f2 = QString("%1%2.html").arg(prefix).arg("99999999"); + const TQString prefix = mHtml.prefixInput->text(); + TQString f1 = TQString("%1%2.html").arg(prefix).arg("00000000"); + TQString f2 = TQString("%1%2.html").arg(prefix).arg("99999999"); - QString msg = i18n( "" + TQString msg = i18n( "" "You have specified an existing folder.\n" "If you continue, any existing file in the range " "\"%1\" to \"%2\" can be lost.\n" diff --git a/khexedit/exportdialog.h b/khexedit/exportdialog.h index 6d89ac3..91716f0 100644 --- a/khexedit/exportdialog.h +++ b/khexedit/exportdialog.h @@ -57,46 +57,46 @@ class CExportDialog : public KDialogBase option_max }; - CExportDialog( QWidget *parent = 0, char *name = 0, bool modal = false ); + CExportDialog( TQWidget *parent = 0, char *name = 0, bool modal = false ); ~CExportDialog( void ); void writeConfiguration( void ); protected: - void showEvent( QShowEvent *e ); + void showEvent( TQShowEvent *e ); protected slots: virtual void slotOk( void ); - void destinationChanged(const QString &); + void destinationChanged(const TQString &); private: struct SDestinationWidgets { - QComboBox *formatCombo; - QLabel *fileExtraLabel; - QLineEdit *fileInput; - QLabel *fromLabel; - QLabel *toLabel; - QButtonGroup *rangeBox; - QLineEdit *fromInput; - QLineEdit *toInput; + TQComboBox *formatCombo; + TQLabel *fileExtraLabel; + TQLineEdit *fileInput; + TQLabel *fromLabel; + TQLabel *toLabel; + TQButtonGroup *rangeBox; + TQLineEdit *fromInput; + TQLineEdit *toInput; }; struct SHtmlWidgets { - QSpinBox *lineSpin; - QLineEdit *prefixInput; - QComboBox *topCombo; - QComboBox *bottomCombo; - QCheckBox *navigatorCheck; - QCheckBox *symlinkCheck; - QCheckBox *bwCheck; + TQSpinBox *lineSpin; + TQLineEdit *prefixInput; + TQComboBox *topCombo; + TQComboBox *bottomCombo; + TQCheckBox *navigatorCheck; + TQCheckBox *symlinkCheck; + TQCheckBox *bwCheck; }; struct SArrayWidgets { - QLineEdit *nameInput; - QComboBox *typeCombo; - QSpinBox *lineSizeSpin; - QCheckBox *hexadecimalCheck; + TQLineEdit *nameInput; + TQComboBox *typeCombo; + TQSpinBox *lineSizeSpin; + TQCheckBox *hexadecimalCheck; }; private slots: @@ -113,7 +113,7 @@ class CExportDialog : public KDialogBase void makeCArrayOption( void ); void readConfiguration( void ); bool collectRange( uint &mode, uint &start, uint &stop ); - bool verifyPackage( const QString &path ); + bool verifyPackage( const TQString &path ); signals: void exportText( const SExportText &e ); @@ -121,14 +121,14 @@ class CExportDialog : public KDialogBase void exportCArray( const SExportCArray &e ); private: - QFrame *mFrame[ page_max ]; - QWidgetStack *mOptionStack; + TQFrame *mFrame[ page_max ]; + TQWidgetStack *mOptionStack; SDestinationWidgets mDestination; SHtmlWidgets mHtml; SArrayWidgets mArray; KSimpleConfig *mConfig; - QString mWorkDir; + TQString mWorkDir; }; diff --git a/khexedit/fileinfodialog.cc b/khexedit/fileinfodialog.cc index b9dff60..465c7f3 100644 --- a/khexedit/fileinfodialog.cc +++ b/khexedit/fileinfodialog.cc @@ -18,9 +18,9 @@ * */ -#include <qheader.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqheader.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <kglobalsettings.h> #include <kglobal.h> @@ -33,15 +33,15 @@ class CStatisticListViewItem : public QListViewItem { public: - CStatisticListViewItem( QListView * parent, QListViewItem * after, - QString label1, QString label2, QString label3, QString label4, - QString label5, QString label6, QString label7, int i, int o) - : QListViewItem( parent, after, label1, label2, label3, label4, label5, label6, label7), + CStatisticListViewItem( TQListView * parent, TQListViewItem * after, + TQString label1, TQString label2, TQString label3, TQString label4, + TQString label5, TQString label6, TQString label7, int i, int o) + : TQListViewItem( parent, after, label1, label2, label3, label4, label5, label6, label7), item( i ), occurrence( o ) {} - virtual int compare( QListViewItem *i, int col, bool ascending/*Qt doc says: ignore this one*/ ) const + virtual int compare( TQListViewItem *i, int col, bool ascending/*Qt doc says: ignore this one*/ ) const { // occurrence column (or the percent one)? if( col == 5 || col == 6 ) @@ -57,7 +57,7 @@ class CStatisticListViewItem : public QListViewItem } // default else - return QListViewItem::compare(i,col,ascending); + return TQListViewItem::compare(i,col,ascending); } protected: @@ -69,33 +69,33 @@ class CStatisticListViewItem : public QListViewItem -CFileInfoDialog::CFileInfoDialog( QWidget *parent,const char *name,bool modal) +CFileInfoDialog::CFileInfoDialog( TQWidget *parent,const char *name,bool modal) :KDialogBase( Plain, i18n("Statistics"), Help|User1|Cancel, User1, parent, name, modal, true, i18n("&Update") ), mBusy(false), mDirty(false) { - setHelp( "khexedit/khexedit.html", QString::null ); + setHelp( "khexedit/khexedit.html", TQString::null ); - QString text; - QVBoxLayout *topLayout = new QVBoxLayout( plainPage(), 0, spacingHint() ); + TQString text; + TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); if( topLayout == 0 ) { return; } - QGridLayout *gbox = new QGridLayout( 2, 2, spacingHint() ); + TQGridLayout *gbox = new TQGridLayout( 2, 2, spacingHint() ); if( gbox == 0 ) { return; } topLayout->addLayout( gbox ); gbox->setColStretch( 1, 10 ); text = i18n("File name: "); - QLabel *label = new QLabel( text, plainPage() ); + TQLabel *label = new TQLabel( text, plainPage() ); gbox->addWidget( label, 0, 0 ); text = i18n("Size [bytes]: "); - label = new QLabel( text, plainPage() ); + label = new TQLabel( text, plainPage() ); gbox->addWidget( label, 1, 0 ); - mFileNameLabel = new QLabel( plainPage() ); - mFileSizeLabel = new QLabel( plainPage() ); + mFileNameLabel = new TQLabel( plainPage() ); + mFileSizeLabel = new TQLabel( plainPage() ); gbox->addWidget( mFileNameLabel, 0, 1 ); gbox->addWidget( mFileSizeLabel, 1, 1 ); @@ -110,10 +110,10 @@ CFileInfoDialog::CFileInfoDialog( QWidget *parent,const char *name,bool modal) mFrequencyList->addColumn( i18n("Occurrence") ); mFrequencyList->addColumn( i18n("Percent") ); mFrequencyList->setAllColumnsShowFocus( true ); - mFrequencyList->setFrameStyle( QFrame::WinPanel + QFrame::Sunken ); + mFrequencyList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken ); topLayout->addWidget( mFrequencyList, 10 ); - mDirtyLabel = new QLabel( plainPage() ); + mDirtyLabel = new TQLabel( plainPage() ); mDirtyLabel->setFixedHeight( fontMetrics().height() ); topLayout->addWidget( mDirtyLabel ); @@ -189,9 +189,9 @@ void CFileInfoDialog::setStatistics() // Default mFileNameLabel->clear(); mFileSizeLabel->clear(); - static const QString u("?"); - QString d, h, o, b, c; - QListViewItem *item = 0; + static const TQString u("?"); + TQString d, h, o, b, c; + TQListViewItem *item = 0; char buf[10]; memset( buf, 0, sizeof( buf ) ); @@ -203,8 +203,8 @@ void CFileInfoDialog::setStatistics() // Default o.sprintf("%03o", i ); b.sprintf("%s", printBin(i) ); - const QChar _i((char)i); - c = _i.isPrint() ? _i : QChar('.'); + const TQChar _i((char)i); + c = _i.isPrint() ? _i : TQChar('.'); item = new CStatisticListViewItem( mFrequencyList, item, h, d, o, b, c, u, u, i, -1 ); if( i == 0 ) @@ -221,8 +221,8 @@ void CFileInfoDialog::setStatistics( SStatisticControl &sc ) mFileNameLabel->setText( sc.documentName ); mFileSizeLabel->setText( KGlobal::locale()->formatNumber(sc.documentSize, 0) ); - QString d, h, o, b, c, n, p; - QListViewItem *item = 0; + TQString d, h, o, b, c, n, p; + TQListViewItem *item = 0; uint size, pre, i; // find width of occurrence @@ -239,17 +239,17 @@ void CFileInfoDialog::setStatistics( SStatisticControl &sc ) o.sprintf("%03o", i ); b.sprintf("%s", printBin(i) ); - n = QString("%1").arg( sc.occurrence[i], pre ); + n = TQString("%1").arg( sc.occurrence[i], pre ); if( sc.documentSize == 0 ) p = "0.00"; else { double val = 100.0*((double)sc.occurrence[i]/(double)sc.documentSize); - p = QString("%1").arg( val, 6, 'f', 2 ); + p = TQString("%1").arg( val, 6, 'f', 2 ); } - const QChar _i((char)i); - c = _i.isPrint() ? _i : QChar('.'); + const TQChar _i((char)i); + c = _i.isPrint() ? _i : TQChar('.'); item = new CStatisticListViewItem( mFrequencyList, item, h, d, o, b, c, n, p, i, sc.occurrence[i] ); if( i == 0 ) @@ -261,7 +261,7 @@ void CFileInfoDialog::setStatistics( SStatisticControl &sc ) void CFileInfoDialog::setColumnWidth( void ) { - const QFontMetrics &fm = mFrequencyList->fontMetrics(); + const TQFontMetrics &fm = mFrequencyList->fontMetrics(); int w0, w1, w2, w3, w4; w0 = -fm.minLeftBearing() - fm.minRightBearing() + 8 + fm.maxWidth(); @@ -305,13 +305,13 @@ void CFileInfoDialog::setColumnWidth( void ) } -void CFileInfoDialog::resizeEvent( QResizeEvent * ) +void CFileInfoDialog::resizeEvent( TQResizeEvent * ) { setColumnWidth(); } -void CFileInfoDialog::showEvent( QShowEvent *e ) +void CFileInfoDialog::showEvent( TQShowEvent *e ) { KDialogBase::showEvent(e); setColumnWidth(); @@ -319,7 +319,7 @@ void CFileInfoDialog::showEvent( QShowEvent *e ) } -void CFileInfoDialog::timerEvent( QTimerEvent * ) +void CFileInfoDialog::timerEvent( TQTimerEvent * ) { killTimers(); slotUser1(); diff --git a/khexedit/fileinfodialog.h b/khexedit/fileinfodialog.h index c994d48..3c2b6bf 100644 --- a/khexedit/fileinfodialog.h +++ b/khexedit/fileinfodialog.h @@ -38,7 +38,7 @@ class CFileInfoDialog : public KDialogBase Q_OBJECT public: - CFileInfoDialog( QWidget *parent=0, const char *name=0,bool modal=false ); + CFileInfoDialog( TQWidget *parent=0, const char *name=0,bool modal=false ); ~CFileInfoDialog( void ); void setStatistics( void ); @@ -52,9 +52,9 @@ class CFileInfoDialog : public KDialogBase virtual void slotUser1( void ); protected: - virtual void resizeEvent( QResizeEvent * ); - virtual void showEvent( QShowEvent * ); - virtual void timerEvent( QTimerEvent * ); + virtual void resizeEvent( TQResizeEvent * ); + virtual void showEvent( TQShowEvent * ); + virtual void timerEvent( TQTimerEvent * ); private: void setColumnWidth( void ); @@ -66,9 +66,9 @@ class CFileInfoDialog : public KDialogBase bool mBusy; bool mDirty; CListView *mFrequencyList; - QLabel *mFileNameLabel; - QLabel *mFileSizeLabel; - QLabel *mDirtyLabel; + TQLabel *mFileNameLabel; + TQLabel *mFileSizeLabel; + TQLabel *mDirtyLabel; }; #endif diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc index 0c1d598..81b8fe6 100644 --- a/khexedit/hexbuffer.cc +++ b/khexedit/hexbuffer.cc @@ -24,7 +24,7 @@ #include <time.h> #include <unistd.h> -#include <qfileinfo.h> +#include <tqfileinfo.h> #include <klocale.h> #include <kglobal.h> @@ -37,7 +37,7 @@ // // There are some comments marked with a "// ##" at various places. // These indicate a patch from Sergey A. Sukiyazov which I have applied -// "as is" for now. The number of QString::fromLocal8Bit in this modification +// "as is" for now. The number of TQString::fromLocal8Bit in this modification // indicates that I should perhaps modify code elsewhere as well // (espen 2000-11-26) // @@ -430,7 +430,7 @@ const char *SExportCArray::printFormatted( const char *b, uint maxSize ) const } -QString SExportCArray::variableName( uint range ) const +TQString SExportCArray::variableName( uint range ) const { const char *typeString[] = { @@ -447,7 +447,7 @@ QString SExportCArray::variableName( uint range ) const uint es = elementSize(); uint numElement = range / es + ((range % es) ? 1 : 0); - return( QString("%1 %2[%2]").arg(typeString[elementType]). + return( TQString("%1 %2[%2]").arg(typeString[elementType]). arg(arrayName).arg(numElement) ); } @@ -510,7 +510,7 @@ SFileState CHexBuffer::mFileState; CHexBuffer::CHexBuffer( void ) - :QByteArray() + :TQByteArray() { mColorIndex = 0; mPrintBuf = 0; @@ -748,7 +748,7 @@ bool CHexBuffer::matchWidth( uint width ) } -void CHexBuffer::setNonPrintChar( QChar nonPrintChar ) +void CHexBuffer::setNonPrintChar( TQChar nonPrintChar ) { mFontInfo.nonPrintChar = nonPrintChar; } @@ -913,7 +913,7 @@ void CHexBuffer::setBookmarkVisibility( bool showInColumn, bool showInEditor ) mShowBookmarkInEditor = showInEditor; } -int CHexBuffer::writeFile( QFile &file, CProgress &p ) +int CHexBuffer::writeFile( TQFile &file, CProgress &p ) { uint offset = 0; uint remaining = documentSize(); @@ -950,7 +950,7 @@ int CHexBuffer::writeFile( QFile &file, CProgress &p ) } -int CHexBuffer::readFile( QFile &file, const QString &url, CProgress &p ) +int CHexBuffer::readFile( TQFile &file, const TQString &url, CProgress &p ) { if( resize( file.size() + 100 ) == false ) { @@ -1010,7 +1010,7 @@ int CHexBuffer::readFile( QFile &file, const QString &url, CProgress &p ) } -int CHexBuffer::insertFile( QFile &file, CProgress &p ) +int CHexBuffer::insertFile( TQFile &file, CProgress &p ) { if( file.size() == 0 ) { @@ -1018,7 +1018,7 @@ int CHexBuffer::insertFile( QFile &file, CProgress &p ) return( Err_Success ); } - QByteArray array( file.size() ); + TQByteArray array( file.size() ); if( array.isNull() == true ) { p.finish(); @@ -1062,7 +1062,7 @@ int CHexBuffer::insertFile( QFile &file, CProgress &p ) } -int CHexBuffer::newFile( const QString &url ) +int CHexBuffer::newFile( const TQString &url ) { if( resize( 100 ) == 0 ) { @@ -1090,7 +1090,7 @@ void CHexBuffer::closeFile( void ) setDocumentSize(0); mDocumentModified = false; - QString emptyUrl; + TQString emptyUrl; setUrl( emptyUrl ); mSelect.reset(); @@ -1100,9 +1100,9 @@ void CHexBuffer::closeFile( void ) } -void CHexBuffer::registerDiskModifyTime( const QFile &file ) +void CHexBuffer::registerDiskModifyTime( const TQFile &file ) { - QFileInfo fileInfo( file ); + TQFileInfo fileInfo( file ); mDiskModifyTime = fileInfo.lastModified(); } @@ -1111,18 +1111,18 @@ void CHexBuffer::registerDiskModifyTime( const QFile &file ) void CHexBuffer::setFont( const SDisplayFontInfo &fontInfo ) { mFontInfo = fontInfo; - QFontMetrics fm( mFontInfo.font ); + TQFontMetrics fm( mFontInfo.font ); mFontHeight = fm.height(); mFontAscent = fm.ascent(); computeLineWidth(); for( int i=0; i < 256; i++ ) { - mCharValid[i] = QChar(i).isPrint(); + mCharValid[i] = TQChar(i).isPrint(); } /* - QFontInfo info( mFontInfo.font ); + TQFontInfo info( mFontInfo.font ); puts("CHexBuffer mCharValid broken"); KCharset charset( info.charSet() ); @@ -1154,7 +1154,7 @@ int CHexBuffer::setEncoding( CConversion::EMode mode, CProgress &p ) void CHexBuffer::computeLineWidth( void ) { - QFontMetrics fm( mFontInfo.font ); + TQFontMetrics fm( mFontInfo.font ); mUnitWidth = fm.width( "M" ); if( mLayout.primaryMode == SDisplayLayout::textOnly ) @@ -1335,7 +1335,7 @@ void CHexBuffer::computeNumLines( void ) -void CHexBuffer::drawSelection( QPainter &paint, QColor &color, uint start, +void CHexBuffer::drawSelection( TQPainter &paint, TQColor &color, uint start, uint stop, int sx ) { if( start >= stop ) { return; } @@ -1371,7 +1371,7 @@ void CHexBuffer::drawSelection( QPainter &paint, QColor &color, uint start, -void CHexBuffer::drawText( QPainter &paint, uint line, int sx, int x1, int x2 ) +void CHexBuffer::drawText( TQPainter &paint, uint line, int sx, int x1, int x2 ) { uint fileOffset = line * mLayout.lineSize; if( documentPresent() == false || mLoadingData == true ) @@ -1488,7 +1488,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int sx, int x1, int x2 ) // ## paint.drawText(offset,mFontAscent,&mPrintBuf[mOffsetIndex], // mOffsetSize); paint.drawText( offset, mFontAscent, - QString::fromLocal8Bit(&mPrintBuf[mOffsetIndex]), + TQString::fromLocal8Bit(&mPrintBuf[mOffsetIndex]), mOffsetSize ); } offset += s0; @@ -1500,7 +1500,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int sx, int x1, int x2 ) int s2 = mLayout.leftSeparatorWidth + mLayout.separatorMarginWidth; if( x1 < offset + s2 && x2 >= offset ) { - QPen pen( mColor.leftSeparatorFg, mLayout.leftSeparatorWidth ); + TQPen pen( mColor.leftSeparatorFg, mLayout.leftSeparatorWidth ); paint.setPen( pen ); int center = offset + mLayout.leftSeparatorWidth/2; paint.drawLine( center, 0, center, lineHeight() ); @@ -1541,7 +1541,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int sx, int x1, int x2 ) // ## paint.drawText( localOffset, mFontAscent, mPrintBuf, mNumCell ); paint.drawText( localOffset, mFontAscent, - QString::fromLocal8Bit(mPrintBuf), mNumCell ); + TQString::fromLocal8Bit(mPrintBuf), mNumCell ); } localOffset += s; @@ -1568,7 +1568,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int sx, int x1, int x2 ) int s = mLayout.separatorMarginWidth + mLayout.rightSeparatorWidth; if( x1 < offset + s && x2 >= offset ) { - QPen pen( mColor.rightSeparatorFg, mLayout.rightSeparatorWidth ); + TQPen pen( mColor.rightSeparatorFg, mLayout.rightSeparatorWidth ); paint.setPen( pen ); int center = offset + mLayout.rightSeparatorWidth/2; paint.drawLine( center, 0, center, lineHeight() ); @@ -1601,7 +1601,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int sx, int x1, int x2 ) // ## paint.drawText( offset, mFontAscent, mPrintBuf, 1 ); paint.drawText( offset, mFontAscent, - QString::fromLocal8Bit(mPrintBuf), 1 ); + TQString::fromLocal8Bit(mPrintBuf), 1 ); } offset += s; } @@ -1630,7 +1630,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int sx, int x1, int x2 ) int s1 = s0 + mLayout.separatorMarginWidth + mLayout.edgeMarginWidth - sx; if( x1 < s1 && x2 > 0 ) { - QColor bg = mShowBookmarkInOffsetColumn && + TQColor bg = mShowBookmarkInOffsetColumn && (bookmarkPosition & BookmarkOnLine) ? mColor.bookmarkBg : mColor.offsetBg; if( outsideText == true ) @@ -1655,7 +1655,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int sx, int x1, int x2 ) // ## paint.drawText(offset,mFontAscent,&mPrintBuf[mOffsetIndex], // mOffsetSize); paint.drawText( offset, mFontAscent, - QString::fromLocal8Bit(&mPrintBuf[mOffsetIndex]), + TQString::fromLocal8Bit(&mPrintBuf[mOffsetIndex]), mOffsetSize ); } @@ -1668,7 +1668,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int sx, int x1, int x2 ) int s2 = mLayout.leftSeparatorWidth + mLayout.separatorMarginWidth; if( x1 < offset + s2 && x2 >= offset ) { - QPen pen( mColor.leftSeparatorFg, mLayout.leftSeparatorWidth ); + TQPen pen( mColor.leftSeparatorFg, mLayout.leftSeparatorWidth ); paint.setPen( pen ); int center = offset + mLayout.leftSeparatorWidth/2; paint.drawLine( center, 0, center, lineHeight() ); @@ -1694,7 +1694,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int sx, int x1, int x2 ) -void CHexBuffer::drawText( QPainter &paint, uint line, int x1, int x2, int y, +void CHexBuffer::drawText( TQPainter &paint, uint line, int x1, int x2, int y, bool useBlackWhite ) { uint fileOffset = line * mLayout.lineSize; @@ -1722,7 +1722,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int x1, int x2, int y, if( mLayout.horzGridWidth > 0 && outsideText == false ) { - QPen pen( useBlackWhite == true ? Qt::black : mColor.gridFg, + TQPen pen( useBlackWhite == true ? Qt::black : mColor.gridFg, mLayout.horzGridWidth ); paint.setPen( pen ); paint.drawLine( x1, y+mFontHeight, x2+x1, y+mFontHeight ); @@ -1758,7 +1758,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int x1, int x2, int y, // ## paint.drawText( offset, mFontAscent+y, &mPrintBuf[mOffsetIndex], // mOffsetSize ); paint.drawText( offset, mFontAscent+y, - QString::fromLocal8Bit(&mPrintBuf[mOffsetIndex]), + TQString::fromLocal8Bit(&mPrintBuf[mOffsetIndex]), mOffsetSize ); } offset += s1; @@ -1768,7 +1768,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int x1, int x2, int y, offset += mLayout.separatorMarginWidth; int s2 = mLayout.leftSeparatorWidth + mLayout.separatorMarginWidth; - QPen pen( useBlackWhite == true ? Qt::black : mColor.leftSeparatorFg, + TQPen pen( useBlackWhite == true ? Qt::black : mColor.leftSeparatorFg, mLayout.leftSeparatorWidth ); paint.setPen( pen ); int center = offset + mLayout.leftSeparatorWidth/2; @@ -1797,14 +1797,14 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int x1, int x2, int y, } // ## paint.drawText( localOffset, mFontAscent+y, mPrintBuf, mNumCell ); paint.drawText( localOffset, mFontAscent+y, - QString::fromLocal8Bit(mPrintBuf), mNumCell ); + TQString::fromLocal8Bit(mPrintBuf), mNumCell ); localOffset += s; if( mLayout.vertGridWidth > 0 && i+1 < dataSize ) { if( (i+1) % mLayout.columnSize == 0 ) { - QPen pen( useBlackWhite == true ? Qt::black : mColor.gridFg, + TQPen pen( useBlackWhite == true ? Qt::black : mColor.gridFg, mLayout.vertGridWidth ); paint.setPen( pen ); int x = localOffset - (mSplitWidth+1) / 2; @@ -1822,7 +1822,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int x1, int x2, int y, { offset += mLayout.separatorMarginWidth; int s = mLayout.separatorMarginWidth + mLayout.rightSeparatorWidth; - QPen pen( useBlackWhite == true ? Qt::black : mColor.rightSeparatorFg, + TQPen pen( useBlackWhite == true ? Qt::black : mColor.rightSeparatorFg, mLayout.rightSeparatorWidth ); paint.setPen( pen ); int center = offset + mLayout.rightSeparatorWidth/2; @@ -1849,7 +1849,7 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int x1, int x2, int y, } // ## paint.drawText( offset, mFontAscent+y, mPrintBuf, 1 ); paint.drawText( offset, mFontAscent+y, - QString::fromLocal8Bit(mPrintBuf), 1 ); + TQString::fromLocal8Bit(mPrintBuf), 1 ); offset += s; } } @@ -1857,22 +1857,22 @@ void CHexBuffer::drawText( QPainter &paint, uint line, int x1, int x2, int y, } -int CHexBuffer::headerHeight( QPainter &paint ) +int CHexBuffer::headerHeight( TQPainter &paint ) { - QFont font( paint.font() ); + TQFont font( paint.font() ); paint.setFont( KGlobalSettings::generalFont() ); - const QFontMetrics &fm = paint.fontMetrics(); + const TQFontMetrics &fm = paint.fontMetrics(); int height = fm.height(); paint.setFont( font ); return( height ); } -int CHexBuffer::headerMargin( QPainter &paint ) +int CHexBuffer::headerMargin( TQPainter &paint ) { - QFont font( paint.font() ); + TQFont font( paint.font() ); paint.setFont( KGlobalSettings::generalFont() ); - const QFontMetrics &fm = paint.fontMetrics(); + const TQFontMetrics &fm = paint.fontMetrics(); int margin = fm.height() / 2; paint.setFont( font ); @@ -1880,13 +1880,13 @@ int CHexBuffer::headerMargin( QPainter &paint ) } -void CHexBuffer::drawHeader( QPainter &paint, int sx, int width, int y, +void CHexBuffer::drawHeader( TQPainter &paint, int sx, int width, int y, bool isFooter, const SPageHeader &header, const SPagePosition &position ) { - QFont font( paint.font() ); + TQFont font( paint.font() ); paint.setFont( KGlobalSettings::generalFont() ); - const QFontMetrics &fm = paint.fontMetrics(); + const TQFontMetrics &fm = paint.fontMetrics(); paint.fillRect( sx, y, width, fm.height(), Qt::white ); paint.setPen( Qt::black ); @@ -1908,15 +1908,15 @@ void CHexBuffer::drawHeader( QPainter &paint, int sx, int width, int y, int pos[3] = { - QPainter::AlignLeft, QPainter::AlignHCenter, QPainter::AlignRight + TQPainter::AlignLeft, TQPainter::AlignHCenter, TQPainter::AlignRight }; - QString msg; + TQString msg; for( int i=0; i<3; i++ ) { if( header.pos[i] == SPageHeader::DateTime ) { - QDateTime datetime; + TQDateTime datetime; datetime.setTime_t( position.now ); msg = KGlobal::locale()->formatDateTime(datetime); } @@ -1935,10 +1935,10 @@ void CHexBuffer::drawHeader( QPainter &paint, int sx, int width, int y, continue; } - if( 0 && pos[i] == QPainter::AlignRight ) + if( 0 && pos[i] == TQPainter::AlignRight ) { - //const QFontMetrics &f = QFontMetrics( KGlobalSettings::generalFont() ); - //QRect r = paint.boundingRect(sx, y, width, fm.height(), pos[i], msg ); + //const TQFontMetrics &f = TQFontMetrics( KGlobalSettings::generalFont() ); + //TQRect r = paint.boundingRect(sx, y, width, fm.height(), pos[i], msg ); //printf("R: %d, %d, %d, %d\n", r.x(), r.y(), r.width(), r.height() ); int x = sx + width - /*r.width();*/ fm.width(msg); @@ -1960,7 +1960,7 @@ void CHexBuffer::drawHeader( QPainter &paint, int sx, int width, int y, -int CHexBuffer::drawBookmarks( QPainter &paint, uint line, int startx ) +int CHexBuffer::drawBookmarks( TQPainter &paint, uint line, int startx ) { if( documentPresent() == false || mLoadingData == true ) { @@ -1969,8 +1969,8 @@ int CHexBuffer::drawBookmarks( QPainter &paint, uint line, int startx ) uint start = line*mLayout.lineSize; uint stop = start+mLayout.lineSize; - QColor bg = mColor.bookmarkBg; - QColor fg = mColor.bookmarkFg; + TQColor bg = mColor.bookmarkBg; + TQColor fg = mColor.bookmarkFg; int bookmarkPosition = 0; @@ -2019,14 +2019,14 @@ int CHexBuffer::drawBookmarks( QPainter &paint, uint line, int startx ) paint.setPen( flag == 0 ? fg : mColor.nonPrintFg ); // ## paint.drawText( x1-startx, mFontAscent, mPrintBuf, mNumCell ); paint.drawText( x1-startx, mFontAscent, - QString::fromLocal8Bit(mPrintBuf), mNumCell ); + TQString::fromLocal8Bit(mPrintBuf), mNumCell ); if( mLayout.secondaryMode != SDisplayLayout::hide ) { flag = printAsciiCell( mPrintBuf, c ); paint.setPen( flag == 0 ? fg : mColor.nonPrintFg ); // ## paint.drawText( x2-startx, mFontAscent, mPrintBuf, 1 ); paint.drawText( x2-startx, mFontAscent, - QString::fromLocal8Bit(mPrintBuf), 1 ); + TQString::fromLocal8Bit(mPrintBuf), 1 ); } } } @@ -2036,7 +2036,7 @@ int CHexBuffer::drawBookmarks( QPainter &paint, uint line, int startx ) -void CHexBuffer::drawCursor( QPainter &paint, uint line, int startx, +void CHexBuffer::drawCursor( TQPainter &paint, uint line, int startx, bool onBookmark ) { if( documentPresent() == false || mLoadingData == true ) @@ -2049,7 +2049,7 @@ void CHexBuffer::drawCursor( QPainter &paint, uint line, int startx, // // Draw the cursor in primary edit area. // - QColor bg, fg; + TQColor bg, fg; bool useFg; if( mMark.inside( c.offset ) == true ) { @@ -2070,8 +2070,8 @@ void CHexBuffer::drawCursor( QPainter &paint, uint line, int startx, useFg = false; // Can be true later. } - QColor cbg = mColor.cursorBg; - QColor cfg = mColor.cursorFg; + TQColor cbg = mColor.cursorBg; + TQColor cfg = mColor.cursorFg; // // Fill in the general backround color @@ -2144,7 +2144,7 @@ void CHexBuffer::drawCursor( QPainter &paint, uint line, int startx, // ## paint.drawText( c.x1-startx, mFontAscent, &mPrintBuf[c.cell], // mNumCell-c.cell ); paint.drawText( c.x1-startx, mFontAscent, - QString::fromLocal8Bit(&mPrintBuf[c.cell]), + TQString::fromLocal8Bit(&mPrintBuf[c.cell]), mNumCell-c.cell ); } @@ -2153,7 +2153,7 @@ void CHexBuffer::drawCursor( QPainter &paint, uint line, int startx, paint.setPen( flag == 0 || useFg == true ? fg : mColor.nonPrintFg ); // ## paint.drawText( c.x1 - startx, mFontAscent, &mPrintBuf[c.cell], 1); paint.drawText( c.x1 - startx, mFontAscent, - QString::fromLocal8Bit(&mPrintBuf[c.cell]), 1 ); + TQString::fromLocal8Bit(&mPrintBuf[c.cell]), 1 ); } } @@ -2261,14 +2261,14 @@ void CHexBuffer::drawCursor( QPainter &paint, uint line, int startx, paint.setPen( flag == 0 ? mColor.bookmarkFg : mColor.nonPrintFg ); // ## paint.drawText( c.x2-startx, mFontAscent, mPrintBuf, 1 ); paint.drawText( c.x2-startx, mFontAscent, - QString::fromLocal8Bit(mPrintBuf), 1 ); + TQString::fromLocal8Bit(mPrintBuf), 1 ); } if( transparent == false || onBookmark == false ) { paint.setPen( flag == 0 || useFg == true ? fg : mColor.nonPrintFg ); // ## paint.drawText( c.x2 - startx, mFontAscent, mPrintBuf, 1 ); paint.drawText( c.x2 - startx, mFontAscent, - QString::fromLocal8Bit(mPrintBuf), 1 ); + TQString::fromLocal8Bit(mPrintBuf), 1 ); } } @@ -2507,7 +2507,7 @@ bool CHexBuffer::setCursorPosition( int x, int y, bool init, bool cellLevel ) -bool CHexBuffer::inputAtCursor( QChar c ) +bool CHexBuffer::inputAtCursor( TQChar c ) { if( documentPresent() == false || mInputMode.noInput() == true ) { @@ -2552,7 +2552,7 @@ bool CHexBuffer::inputAtCursor( QChar c ) { // ## if( THIS_FPTR(inputCell)( &dest, c.latin1(), mCursor.curr.cell ) //== false ) - if( THIS_FPTR(inputCell)( &dest, QString(c).local8Bit()[0], + if( THIS_FPTR(inputCell)( &dest, TQString(c).local8Bit()[0], mCursor.curr.cell ) == false ) { inputSound(); @@ -2562,7 +2562,7 @@ bool CHexBuffer::inputAtCursor( QChar c ) else if( mActiveEditor == edit_secondary ) { // ## if( inputAscii( &dest, c.latin1(), mCursor.curr.cell ) == false ) - if( !inputAscii( &dest, QString(c).local8Bit()[0], mCursor.curr.cell ) ) + if( !inputAscii( &dest, TQString(c).local8Bit()[0], mCursor.curr.cell ) ) { inputSound(); return( false ); @@ -2584,7 +2584,7 @@ bool CHexBuffer::inputAtCursor( QChar c ) -int CHexBuffer::inputAtCursor( const QByteArray &buf, uint oldSize ) +int CHexBuffer::inputAtCursor( const TQByteArray &buf, uint oldSize ) { if( documentPresent() == false ) { @@ -2716,7 +2716,7 @@ int CHexBuffer::exportText( const SExportText &ex, CProgress &p ) return( errCode ); } - QFile file( ex.destFile ); + TQFile file( ex.destFile ); if( file.open( IO_WriteOnly ) == false ) { p.finish(); @@ -2740,7 +2740,7 @@ int CHexBuffer::exportText( const SExportText &ex, CProgress &p ) uint bytePerLine = mOffsetSize + 1 + (mNumCell + 2)*mLayout.lineSize + 1; uint linePerStep = 20; - QByteArray array( bytePerLine * linePerStep + 1 ); // Line is 0 terminated + TQByteArray array( bytePerLine * linePerStep + 1 ); // Line is 0 terminated if( array.isEmpty() == true ) { p.finish(); @@ -2817,21 +2817,21 @@ int CHexBuffer::exportHtml( const SExportHtml &ex, CProgress &p ) uint numFiles = remaining/linePerPage + (remaining%linePerPage ? 1 : 0); uint fileCount = 0; - QStringList fileNames, offsets; - QString name, offset; + TQStringList fileNames, offsets; + TQString name, offset; for( uint i=0; i < numFiles; i++ ) { name.sprintf( "%08d.html", i+1 ); - fileNames.append( QString("%1/%2%3").arg(ex.package).arg(ex.prefix). + fileNames.append( TQString("%1/%2%3").arg(ex.package).arg(ex.prefix). arg(name)); } name.sprintf( "%08d.html", 0 ); - QString tocName =QString("%1/%2%3").arg(ex.package).arg(ex.prefix).arg(name); + TQString tocName =TQString("%1/%2%3").arg(ex.package).arg(ex.prefix).arg(name); - QString linkName; + TQString linkName; if( ex.symLink == true ) { - linkName = QString("%1/%2").arg(ex.package).arg("index.html"); + linkName = TQString("%1/%2").arg(ex.package).arg("index.html"); } while( remaining > 0 ) @@ -2849,7 +2849,7 @@ int CHexBuffer::exportHtml( const SExportHtml &ex, CProgress &p ) THIS_FPTR(printOffset)( mPrintBuf, (startLine-1)*mLayout.lineSize ); mPrintBuf[mOffsetSize]=0; - offset += QString(" %1 [%2]").arg(i18n("to")).arg(mPrintBuf); + offset += TQString(" %1 [%2]").arg(i18n("to")).arg(mPrintBuf); offsets.append(offset); if( p.expired() == true ) @@ -2881,7 +2881,7 @@ int CHexBuffer::exportCArray( const SExportCArray &ex, CProgress &p ) return( errCode ); } - QFile file( ex.destFile ); + TQFile file( ex.destFile ); if( file.open( IO_WriteOnly ) == false ) { p.finish(); @@ -2903,7 +2903,7 @@ int CHexBuffer::exportCArray( const SExportCArray &ex, CProgress &p ) uint elementSize = ex.elementSize(); uint elementOnThisLine = 0; - QTextStream dest( &file ); + TQTextStream dest( &file ); dest << ex.variableName(stop-start).latin1() << "={" << endl; for( unsigned int i=start; i<stop; i+=elementSize ) @@ -2942,7 +2942,7 @@ int CHexBuffer::exportCArray( const SExportCArray &ex, CProgress &p ) -int CHexBuffer::copySelectedText( QByteArray &array, int columnSegment ) +int CHexBuffer::copySelectedText( TQByteArray &array, int columnSegment ) { SExportRange range; range.mode = SExportRange::Selection; @@ -2950,7 +2950,7 @@ int CHexBuffer::copySelectedText( QByteArray &array, int columnSegment ) } -int CHexBuffer::copyAllText( QByteArray &array ) +int CHexBuffer::copyAllText( TQByteArray &array ) { SExportRange range; range.mode = SExportRange::All; @@ -2958,7 +2958,7 @@ int CHexBuffer::copyAllText( QByteArray &array ) } -int CHexBuffer::copyText( QByteArray &array, const SExportRange &range, +int CHexBuffer::copyText( TQByteArray &array, const SExportRange &range, int columnSegment ) { uint start, stop; @@ -3010,7 +3010,7 @@ int CHexBuffer::copyText( QByteArray &array, const SExportRange &range, } -int CHexBuffer::copySelectedData( QByteArray &array ) +int CHexBuffer::copySelectedData( TQByteArray &array ) { uint start = mSelect.start(); uint stop = mSelect.stop(); @@ -3036,7 +3036,7 @@ int CHexBuffer::copySelectedData( QByteArray &array ) uint CHexBuffer::numPage( CHexPrinter &printer ) { - QPainter paint( &printer ); + TQPainter paint( &printer ); paint.setFont( font() ); SPageMargin margin = printer.pageMargin(); @@ -3074,7 +3074,7 @@ int CHexBuffer::print( CHexPrinter &printer, CProgress &p ) { printer.setDocName( mUrl ); - QPainter paint( &printer ); + TQPainter paint( &printer ); paint.setFont( font() ); SPageMargin margin = printer.pageMargin(); @@ -4251,7 +4251,7 @@ int CHexBuffer::filter( SFilterControl &fc ) } if( start >= stop ) { return( Err_IllegalRange ); } - QByteArray buf( stop - start ); + TQByteArray buf( stop - start ); if( buf.isEmpty() == true ) { return( Err_NoMemory ); } int errCode = fc.execute((uchar*)&buf[0],(uchar*)&data()[start],buf.size()); @@ -4284,7 +4284,7 @@ int CHexBuffer::collectStrings( CStringCollectControl &sc ) { if( on == true && i-start >= sc.minLength ) { - QByteArray a( i-start ); + TQByteArray a( i-start ); for( uint j=0; j<(i-start); a[j]=data()[start+j], j++ ); sc.add( start, a ); } @@ -4299,7 +4299,7 @@ int CHexBuffer::collectStrings( CStringCollectControl &sc ) if( on == true && i-start >= sc.minLength ) { - QByteArray a( i-start ); + TQByteArray a( i-start ); for( uint j=0; j<(i-start); a[j]=data()[start+j], j++ ); sc.add( start, a ); } @@ -4668,7 +4668,7 @@ int CHexBuffer::resizeBuffer( uint newSize ) if( newSize >= size() ) { - QByteArray tmp; + TQByteArray tmp; tmp.duplicate( data(), size() ); if( tmp.isNull() == true ) { @@ -4692,7 +4692,7 @@ void CHexBuffer::inputSound( void ) { if( mInputErrorSound == true ) { - KNotifyClient::beep( QObject::tr("Edit operation failed") ); + KNotifyClient::beep( TQObject::tr("Edit operation failed") ); } } @@ -4701,13 +4701,13 @@ void CHexBuffer::fatalSound( void ) { if( mFatalErrorSound == true ) { - KNotifyClient::beep( QObject::tr("Could not allocate memory") ); + KNotifyClient::beep( TQObject::tr("Could not allocate memory") ); } } -int CHexBuffer::printHtmlDataPage( const QString &tocName, - const QStringList &fileNames, uint index, +int CHexBuffer::printHtmlDataPage( const TQString &tocName, + const TQStringList &fileNames, uint index, const SExportHtml &ex, uint line, uint numLine ) { @@ -4721,16 +4721,16 @@ int CHexBuffer::printHtmlDataPage( const QString &tocName, index = fileNames.count()-1; } - QFile file( fileNames[index] ); + TQFile file( fileNames[index] ); if( file.open( IO_WriteOnly ) == false ) { return( Err_OperationAborted ); } - QTextStream os( &file ); - const QString *next = index+1 >= fileNames.count() ? 0 : &fileNames[index+1]; - const QString *prev = index == 0 ? 0 : &fileNames[index-1]; - const QString *toc = tocName.length() == 0 ? 0 : &tocName; + TQTextStream os( &file ); + const TQString *next = index+1 >= fileNames.count() ? 0 : &fileNames[index+1]; + const TQString *prev = index == 0 ? 0 : &fileNames[index-1]; + const TQString *toc = tocName.length() == 0 ? 0 : &tocName; printHtmlHeader( os, true ); if( ex.navigator == true ) @@ -4752,10 +4752,10 @@ int CHexBuffer::printHtmlDataPage( const QString &tocName, } -void CHexBuffer::printHtmlTocPage( const QString &tocName, - const QString &linkName, - const QStringList &fileNames, - const QStringList &offsets, +void CHexBuffer::printHtmlTocPage( const TQString &tocName, + const TQString &linkName, + const TQStringList &fileNames, + const TQStringList &offsets, uint numPage ) { if( numPage == 0 || fileNames.count() == 0 ) @@ -4767,13 +4767,13 @@ void CHexBuffer::printHtmlTocPage( const QString &tocName, numPage = fileNames.count() - 1; } - QFile file( tocName ); + TQFile file( tocName ); if( file.open( IO_WriteOnly ) == false ) { return; } - QTextStream os( &file ); + TQTextStream os( &file ); printHtmlHeader( os, true ); os << "<P ALIGN=\"CENTER\">" << endl; @@ -4785,7 +4785,7 @@ void CHexBuffer::printHtmlTocPage( const QString &tocName, os << "<P ALIGN=\"CENTER\"><TT>" << endl; for( uint i=0; i<=numPage; i++ ) { - QString n( fileNames[i].right( fileNames[i].length() - + TQString n( fileNames[i].right( fileNames[i].length() - fileNames[i].findRev('/') - 1) ); os << "<A HREF=\"" << n << "\">" << i18n("Page") << i+1; os << "</A>"; @@ -4802,7 +4802,7 @@ void CHexBuffer::printHtmlTocPage( const QString &tocName, // Make a symlink. We ignore any error here. I don't consider // it to be fatal. // - QString n( tocName.right( tocName.length() - tocName.findRev('/') - 1) ); + TQString n( tocName.right( tocName.length() - tocName.findRev('/') - 1) ); symlink( n.latin1(), linkName.latin1() ); } @@ -4810,10 +4810,10 @@ void CHexBuffer::printHtmlTocPage( const QString &tocName, -void CHexBuffer::printHtmlCaption( QTextStream &os, uint captionType, +void CHexBuffer::printHtmlCaption( TQTextStream &os, uint captionType, uint curPage, uint numPage ) { - QString caption; + TQString caption; switch( captionType ) { case 0: @@ -4842,8 +4842,8 @@ void CHexBuffer::printHtmlCaption( QTextStream &os, uint captionType, -void CHexBuffer::printHtmlNavigator( QTextStream &os, const QString *next, - const QString *prev, const QString *toc ) +void CHexBuffer::printHtmlNavigator( TQTextStream &os, const TQString *next, + const TQString *prev, const TQString *toc ) { os << "<TABLE BORDER=\"0\" CELLSPACING=\"0\" WIDTH=\"100%\">" << endl; os << "<TR>" << endl; @@ -4854,7 +4854,7 @@ void CHexBuffer::printHtmlNavigator( QTextStream &os, const QString *next, } else { - QString n( next->right( next->length() - next->findRev('/') - 1) ); + TQString n( next->right( next->length() - next->findRev('/') - 1) ); os << "<A HREF=\"" << n << "\">" << i18n("Next") << "</A>" << " "; } @@ -4864,7 +4864,7 @@ void CHexBuffer::printHtmlNavigator( QTextStream &os, const QString *next, } else { - QString p( prev->right( prev->length() - prev->findRev('/') - 1) ); + TQString p( prev->right( prev->length() - prev->findRev('/') - 1) ); os << "<A HREF=\"" << p << "\">" << i18n("Previous") << "</A>" << " "; } @@ -4874,7 +4874,7 @@ void CHexBuffer::printHtmlNavigator( QTextStream &os, const QString *next, } else { - QString t( toc->right( toc->length() - toc->findRev('/') - 1) ); + TQString t( toc->right( toc->length() - toc->findRev('/') - 1) ); os << "<A HREF=\"" << t << "\">" << i18n("Contents"); os << "</A>" << " "; } @@ -4891,7 +4891,7 @@ void CHexBuffer::printHtmlNavigator( QTextStream &os, const QString *next, } -int CHexBuffer::printHtmlHeader( QTextStream &os, bool isFront ) +int CHexBuffer::printHtmlHeader( TQTextStream &os, bool isFront ) { if( isFront == true ) { @@ -4910,11 +4910,11 @@ int CHexBuffer::printHtmlHeader( QTextStream &os, bool isFront ) } -int CHexBuffer::printHtmlTable( QTextStream &os, uint line, uint numLine, +int CHexBuffer::printHtmlTable( TQTextStream &os, uint line, uint numLine, bool bw ) { uint i; - QColor color; + TQColor color; int numCol = 1; @@ -4969,13 +4969,13 @@ int CHexBuffer::printHtmlTable( QTextStream &os, uint line, uint numLine, } -int CHexBuffer::printHtmlLine( QTextStream &os, uint line, bool isPrimary, +int CHexBuffer::printHtmlLine( TQTextStream &os, uint line, bool isPrimary, bool bw ) { uint offset = line * mLayout.lineSize; - QColor prevColor; + TQColor prevColor; - QColor color; + TQColor color; if( bw == true ) { color = Qt::white; diff --git a/khexedit/hexbuffer.h b/khexedit/hexbuffer.h index ea11d95..755cca1 100644 --- a/khexedit/hexbuffer.h +++ b/khexedit/hexbuffer.h @@ -28,14 +28,14 @@ #include <iostream> #include <time.h> -#include <qbitarray.h> -#include <qdatetime.h> -#include <qfile.h> -#include <qfont.h> -#include <qptrlist.h> -#include <qpainter.h> -#include <qstring.h> -#include <qtextstream.h> +#include <tqbitarray.h> +#include <tqdatetime.h> +#include <tqfile.h> +#include <tqfont.h> +#include <tqptrlist.h> +#include <tqpainter.h> +#include <tqstring.h> +#include <tqtextstream.h> #include <kapplication.h> @@ -51,8 +51,8 @@ struct SSearchControl { - QByteArray key; - QByteArray val; + TQByteArray key; + TQByteArray val; uint keyType; bool fromCursor; bool inSelection; @@ -84,7 +84,7 @@ struct SFilterControl int execute( uchar *dest, uchar *src, uint size ); - QByteArray operand; + TQByteArray operand; int rotate[2]; Operation operation; bool fromCursor; @@ -96,7 +96,7 @@ struct SFilterControl struct SInsertData { uint size; - QByteArray pattern; + TQByteArray pattern; uint offset; bool repeatPattern; bool onCursor; @@ -121,15 +121,15 @@ struct SExportRange struct SExportText { SExportRange range; - QString destFile; + TQString destFile; }; struct SExportHtml { SExportRange range; - QString package; - QString prefix; + TQString package; + TQString prefix; uint linePerPage; uint topCaption; uint bottomCaption; @@ -154,12 +154,12 @@ struct SExportCArray }; const char *printFormatted( const char *b, uint maxSize ) const; - QString variableName( uint range ) const; + TQString variableName( uint range ) const; int elementSize( void ) const; SExportRange range; - QString destFile; - QString arrayName; + TQString destFile; + TQString arrayName; int elementType; uint elementPerLine; bool unsignedAsHexadecimal; @@ -176,7 +176,7 @@ struct SStatisticControl uint documentSize; uint occurrence[256]; - QString documentName; + TQString documentName; }; @@ -233,9 +233,9 @@ class CStringCollectControl mList.setAutoDelete( true ); } - int add( uint offset, const QByteArray &a ) + int add( uint offset, const TQByteArray &a ) { - QString *s = new QString(); + TQString *s = new TQString(); if( s == 0 ) { return( Err_NoMemory ); @@ -250,7 +250,7 @@ class CStringCollectControl s->sprintf( "%04x:%04x", offset>>16, offset&0x0000FFFF ); } - *s += QString( a ); + *s += TQString( a ); mList.append( s ); return( Err_Success ); @@ -266,7 +266,7 @@ class CStringCollectControl mList.clear(); } - const QString *get( uint index ) + const TQString *get( uint index ) { return( mList.at( index ) ); } @@ -276,7 +276,7 @@ class CStringCollectControl return( mList.count() ); } - QPtrList<QString> &list( void ) + TQPtrList<TQString> &list( void ) { return( mList ); } @@ -287,7 +287,7 @@ class CStringCollectControl bool allow8bit; private: - QPtrList<QString> mList; + TQPtrList<TQString> mList; }; @@ -1079,7 +1079,7 @@ class CHexBuffer : public QByteArray bool matchWidth( uint width ); - void setNonPrintChar( QChar nonPrintChar ); + void setNonPrintChar( TQChar nonPrintChar ); void setShowCursor( bool showCursor ); void setDisableCursor( bool disableCursor ); void setCursorShapeModifier( bool alwaysBlock, bool thickInsert ); @@ -1096,37 +1096,37 @@ class CHexBuffer : public QByteArray bool setCursorPosition( int x, int y, bool init, bool cellLevel ); - int readFile( QFile &file, const QString &url, CProgress &p ); - int insertFile( QFile &file, CProgress &p ); - int writeFile( QFile &file, CProgress &p ); - int newFile( const QString &url ); + int readFile( TQFile &file, const TQString &url, CProgress &p ); + int insertFile( TQFile &file, CProgress &p ); + int writeFile( TQFile &file, CProgress &p ); + int newFile( const TQString &url ); void closeFile( void ); - void registerDiskModifyTime( const QFile &file ); + void registerDiskModifyTime( const TQFile &file ); bool changedOnDisk( void ); - void drawText( QPainter &paint, uint line, int sx, int x, int w ); - void drawText( QPainter &paint, uint line, int x1, int x2, int y, + void drawText( TQPainter &paint, uint line, int sx, int x, int w ); + void drawText( TQPainter &paint, uint line, int x1, int x2, int y, bool useBlackWhite ); - void drawHeader( QPainter &paint, int sx, int width, int y, bool isFooter, + void drawHeader( TQPainter &paint, int sx, int width, int y, bool isFooter, const SPageHeader &header,const SPagePosition &position ); - int headerHeight( QPainter &paint ); - int headerMargin( QPainter &paint ); + int headerHeight( TQPainter &paint ); + int headerMargin( TQPainter &paint ); - bool inputAtCursor( QChar c ); - int inputAtCursor( const QByteArray &buf, uint oldSize ); + bool inputAtCursor( TQChar c ); + int inputAtCursor( const TQByteArray &buf, uint oldSize ); bool removeAtCursor( bool beforeCursor ); int locateRange( const SExportRange &range, uint &start, uint &stop ); int exportText( const SExportText &ex, CProgress &p ); int exportHtml( const SExportHtml &ex, CProgress &p ); int exportCArray( const SExportCArray &ex, CProgress &p ); - int copySelectedText( QByteArray &array, int columnSegment=VisibleColumn); - int copyAllText( QByteArray &array ); - int copyText( QByteArray &array, const SExportRange &range, + int copySelectedText( TQByteArray &array, int columnSegment=VisibleColumn); + int copyAllText( TQByteArray &array ); + int copyText( TQByteArray &array, const SExportRange &range, int columnSegment ); - int copySelectedData( QByteArray &array ); + int copySelectedData( TQByteArray &array ); uint numPage( CHexPrinter &printer ); int print( CHexPrinter &printer, CProgress &p ); @@ -1154,12 +1154,12 @@ class CHexBuffer : public QByteArray void doAction( CHexAction *action ); inline SCursorState &cursorState( void ); - inline void valueOnCursor( QByteArray &buf, uint size ); + inline void valueOnCursor( TQByteArray &buf, uint size ); inline SFileState &fileState( void ); inline const SDisplayLayout &layout( void ); inline const SDisplayInputMode &inputMode( void ); - inline QPtrList<SCursorOffset> &bookmarkList( void ); + inline TQPtrList<SCursorOffset> &bookmarkList( void ); inline bool documentPresent( void ); inline bool modified( void ); @@ -1169,11 +1169,11 @@ class CHexBuffer : public QByteArray inline const SEncodeState &encoding( void ); inline bool losslessEncoding( CConversion::EMode mode ); - inline QString &url( void ); + inline TQString &url( void ); bool hasFileName( void ); - inline void setUrl( const QString &url ); + inline void setUrl( const TQString &url ); inline void setModified( bool modified ); - inline const QDateTime &diskModifyTime( void ); + inline const TQDateTime &diskModifyTime( void ); @@ -1185,9 +1185,9 @@ class CHexBuffer : public QByteArray inline int unitWidth( void ); inline int numLines( void ); inline int totalHeight( void ); - inline const QFont &font( void ); + inline const TQFont &font( void ); inline SCursor *textCursor( void ); - inline const QColor &backgroundColor( void ); + inline const TQColor &backgroundColor( void ); inline int startX( void ); inline int startY( void ); inline void setStartX( int val ); @@ -1239,10 +1239,10 @@ class CHexBuffer : public QByteArray void computeNumLines( void ); void cursorCompute( void ); - void drawSelection( QPainter &paint, QColor &color, uint start, uint stop, + void drawSelection( TQPainter &paint, TQColor &color, uint start, uint stop, int sx ); - int drawBookmarks(QPainter &paint, uint line, int startx); - void drawCursor( QPainter &paint, uint line, int startx, bool onBookmark ); + int drawBookmarks(TQPainter &paint, uint line, int startx); + void drawCursor( TQPainter &paint, uint line, int startx, bool onBookmark ); void recordStart( SCursor &cursor ); void recordReplace( SCursor &cursor, uint size, char *data, uint dataSize); @@ -1251,7 +1251,7 @@ class CHexBuffer : public QByteArray int scanData( SSearchControl &sc, bool init ); int initScanData( SSearchControl &sc ); - inline const QColor &foregroundColor( uint column ); + inline const TQColor &foregroundColor( uint column ); inline int printDummyCell( char *buf, unsigned char data ); inline int printHexadecimalBigCell( char *buf, unsigned char data ); inline int printHexadecimalSmallCell( char *buf, unsigned char data ); @@ -1277,27 +1277,27 @@ class CHexBuffer : public QByteArray void inputSound( void ); void fatalSound( void ); - int printHtmlDataPage( const QString &tocName, - const QStringList &fileNames, uint index, + int printHtmlDataPage( const TQString &tocName, + const TQStringList &fileNames, uint index, const SExportHtml &ex, uint line, uint numLine ); - void printHtmlCaption( QTextStream &os, uint captionType, uint curPage, + void printHtmlCaption( TQTextStream &os, uint captionType, uint curPage, uint numPage ); - void printHtmlNavigator( QTextStream &os, const QString *next, - const QString *prev, const QString *toc ); - void printHtmlTocPage( const QString &tocName, - const QString &linkName, - const QStringList &fileNames, - const QStringList &offsets, uint numPage ); - int printHtmlHeader( QTextStream &os, bool isFront ); - int printHtmlTable( QTextStream &os, uint line, uint numLine, bool bw ); - int printHtmlLine( QTextStream &os, uint offset, bool isPrimary, bool bw ); + void printHtmlNavigator( TQTextStream &os, const TQString *next, + const TQString *prev, const TQString *toc ); + void printHtmlTocPage( const TQString &tocName, + const TQString &linkName, + const TQStringList &fileNames, + const TQStringList &offsets, uint numPage ); + int printHtmlHeader( TQTextStream &os, bool isFront ); + int printHtmlTable( TQTextStream &os, uint line, uint numLine, bool bw ); + int printHtmlLine( TQTextStream &os, uint offset, bool isPrimary, bool bw ); signals: void fileSize( uint size ); private: - QString mUrl; - QDateTime mDiskModifyTime; + TQString mUrl; + TQDateTime mDiskModifyTime; SDisplayLayout mLayout; SDisplayColor mColor; SDisplayFontInfo mFontInfo; @@ -1349,9 +1349,9 @@ class CHexBuffer : public QByteArray uint mUndoLimit; uint mUndoIndex; - QPtrList<CHexActionGroup> mUndoList; - QPtrList<SCursorOffset> mBookmarkList; - QBitArray mBookmarkMap; + TQPtrList<CHexActionGroup> mUndoList; + TQPtrList<SCursorOffset> mBookmarkList; + TQBitArray mBookmarkMap; PrintCellFunc printCell; PrintOffsetFunc printOffset; @@ -1401,7 +1401,7 @@ inline SCursorState &CHexBuffer::cursorState( void ) } -inline void CHexBuffer::valueOnCursor( QByteArray &buf, uint size ) +inline void CHexBuffer::valueOnCursor( TQByteArray &buf, uint size ) { int offset = cursorOffset(); if( offset + size >= mDocumentSize ) @@ -1429,7 +1429,7 @@ inline const SDisplayInputMode &CHexBuffer::inputMode( void ) return( mInputMode ); } -inline QPtrList<SCursorOffset> &CHexBuffer::bookmarkList( void ) +inline TQPtrList<SCursorOffset> &CHexBuffer::bookmarkList( void ) { return( mBookmarkList ); } @@ -1502,7 +1502,7 @@ inline bool CHexBuffer::losslessEncoding( CConversion::EMode mode ) return( mEncode.lossless(mode) ); } -inline QString &CHexBuffer::url( void ) +inline TQString &CHexBuffer::url( void ) { return( mUrl ); } @@ -1512,12 +1512,12 @@ inline bool CHexBuffer::documentPresent( void ) return( size() == 0 ? false : true ); } -inline void CHexBuffer::setUrl( const QString &url ) +inline void CHexBuffer::setUrl( const TQString &url ) { mUrl = url; } -inline const QDateTime &CHexBuffer::diskModifyTime( void ) +inline const TQDateTime &CHexBuffer::diskModifyTime( void ) { return( mDiskModifyTime ); } @@ -1527,7 +1527,7 @@ inline uint CHexBuffer::calculateLine( uint offset ) return( mLayout.lineSize == 0 ? 0 : offset / mLayout.lineSize ); } -inline const QColor &CHexBuffer::foregroundColor( uint column ) +inline const TQColor &CHexBuffer::foregroundColor( uint column ) { if( column > mLayout.lineSize ) { @@ -1999,7 +1999,7 @@ inline int CHexBuffer::totalHeight( void ) return( mNumLines * (mFontHeight+mLayout.horzGridWidth) ); } -inline const QFont &CHexBuffer::font( void ) +inline const TQFont &CHexBuffer::font( void ) { return( mFontInfo.font ); } @@ -2009,7 +2009,7 @@ inline SCursor *CHexBuffer::textCursor( void ) return( &mCursor ); } -inline const QColor &CHexBuffer::backgroundColor( void ) +inline const TQColor &CHexBuffer::backgroundColor( void ) { return( documentPresent() == true ? mColor.textBg : mColor.inactiveBg ); } diff --git a/khexedit/hexclipboard.cc b/khexedit/hexclipboard.cc index 0de70d6..4732647 100644 --- a/khexedit/hexclipboard.cc +++ b/khexedit/hexclipboard.cc @@ -87,7 +87,7 @@ CHexClipboard::~CHexClipboard( void ) } -bool CHexClipboard::encode( QByteArray &dst, QByteArray &src ) +bool CHexClipboard::encode( TQByteArray &dst, TQByteArray &src ) { if( src.size() == 0 ) { @@ -165,7 +165,7 @@ bool CHexClipboard::encode( QByteArray &dst, QByteArray &src ) -bool CHexClipboard::decode( QByteArray &dst, QString &src ) +bool CHexClipboard::decode( TQByteArray &dst, TQString &src ) { uint mimeSize = strlen( mimeHeader() ); if( src.length() <= mimeSize ) @@ -240,7 +240,7 @@ bool CHexClipboard::decode( QByteArray &dst, QString &src ) } -bool CHexClipboard::plainDecode( QByteArray &dst, QString &src ) +bool CHexClipboard::plainDecode( TQByteArray &dst, TQString &src ) { dst.resize( src.length() ); if( dst.isNull() == true ) diff --git a/khexedit/hexclipboard.h b/khexedit/hexclipboard.h index 9a7710d..3c45f79 100644 --- a/khexedit/hexclipboard.h +++ b/khexedit/hexclipboard.h @@ -21,7 +21,7 @@ #ifndef _HEX_CLIPBOARD_H_ #define _HEX_CLIPBOARD_H_ -#include <qstring.h> +#include <tqstring.h> class CHexClipboard { @@ -29,11 +29,11 @@ class CHexClipboard CHexClipboard( void ); ~CHexClipboard( void ); - bool encode( QByteArray &dst, QByteArray &src ); - bool decode( QByteArray &dst, QString &src ); + bool encode( TQByteArray &dst, TQByteArray &src ); + bool decode( TQByteArray &dst, TQString &src ); private: - bool plainDecode( QByteArray &dst, QString &src ); + bool plainDecode( TQByteArray &dst, TQString &src ); }; diff --git a/khexedit/hexdrag.cc b/khexedit/hexdrag.cc index d09b28d..19cb34e 100644 --- a/khexedit/hexdrag.cc +++ b/khexedit/hexdrag.cc @@ -23,23 +23,23 @@ static const char *mediaString = "application/octet-stream"; -CHexDrag::CHexDrag( const QByteArray &data, QWidget *dragSource, +CHexDrag::CHexDrag( const TQByteArray &data, TQWidget *dragSource, const char *name ) - :QDragObject(dragSource,name) + :TQDragObject(dragSource,name) { setData( data ); prepPixmap(); } -CHexDrag::CHexDrag( QWidget *dragSource, const char *name ) - :QDragObject(dragSource,name) +CHexDrag::CHexDrag( TQWidget *dragSource, const char *name ) + :TQDragObject(dragSource,name) { prepPixmap(); } -void CHexDrag::setData( const QByteArray &data ) +void CHexDrag::setData( const TQByteArray &data ) { mData = data; } @@ -53,9 +53,9 @@ void CHexDrag::prepPixmap(void) // /* KIconLoader &loader = *KGlobal::iconLoader(); - QPixmap pix = loader.loadIcon( "binary.xpm" ); + TQPixmap pix = loader.loadIcon( "binary.xpm" ); - QPoint hotspot( pix.width()-20,pix.height()/2 ); + TQPoint hotspot( pix.width()-20,pix.height()/2 ); setPixmap( pix, hotspot ); */ } @@ -75,7 +75,7 @@ const char *CHexDrag::format( int i ) const } -QByteArray CHexDrag::encodedData( const char *fmt ) const +TQByteArray CHexDrag::encodedData( const char *fmt ) const { if( fmt != 0 ) { @@ -85,18 +85,18 @@ QByteArray CHexDrag::encodedData( const char *fmt ) const } } - QByteArray buf; + TQByteArray buf; return( buf ); } -bool CHexDrag::canDecode( const QMimeSource *e ) +bool CHexDrag::canDecode( const TQMimeSource *e ) { return( e->provides(mediaString) ); } -bool CHexDrag::decode( const QMimeSource *e, QByteArray &dest ) +bool CHexDrag::decode( const TQMimeSource *e, TQByteArray &dest ) { dest = e->encodedData(mediaString); return( dest.size() == 0 ? false : true ); diff --git a/khexedit/hexdrag.h b/khexedit/hexdrag.h index b29b197..2705124 100644 --- a/khexedit/hexdrag.h +++ b/khexedit/hexdrag.h @@ -22,31 +22,31 @@ #define _HEX_DRAG_H_ -#include <qdragobject.h> -#include <qstring.h> +#include <tqdragobject.h> +#include <tqstring.h> class CHexDrag : public QDragObject { Q_OBJECT public: - CHexDrag( const QByteArray &data, QWidget *dragSource = 0, + CHexDrag( const TQByteArray &data, TQWidget *dragSource = 0, const char *name = 0 ); - CHexDrag( QWidget *dragSource = 0, const char *name = 0 ); + CHexDrag( TQWidget *dragSource = 0, const char *name = 0 ); - void setData( const QByteArray &data ); + void setData( const TQByteArray &data ); const char* format ( int i ) const; - QByteArray encodedData( const char *fmt ) const; + TQByteArray encodedData( const char *fmt ) const; - static bool canDecode( const QMimeSource *e ); - static bool decode( const QMimeSource *e, QByteArray &dest ); + static bool canDecode( const TQMimeSource *e ); + static bool decode( const TQMimeSource *e, TQByteArray &dest ); private: void prepPixmap( void ); private: - QByteArray mData; + TQByteArray mData; }; diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc index 16b62a4..60107f3 100644 --- a/khexedit/hexeditorwidget.cc +++ b/khexedit/hexeditorwidget.cc @@ -47,8 +47,8 @@ -CHexEditorWidget::CHexEditorWidget( QWidget *parent, const char *name ) - : QWidget( parent, name ) +CHexEditorWidget::CHexEditorWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { CHexBuffer *hexBuffer = new CHexBuffer; if( hexBuffer == 0 ) { return; } @@ -60,16 +60,16 @@ CHexEditorWidget::CHexEditorWidget( QWidget *parent, const char *name ) mHexView = new CHexViewWidget( this, "hexview", hexBuffer ); if( mHexView == 0 || mHexView->widgetValid() == false ) { return; } - connect( mHexView, SIGNAL(pleaseOpenNewFile()), SLOT( newFile()) ); - connect( mHexView, SIGNAL(pleaseOpenFile( const QString&, bool, uint )), - SLOT( open(const QString&, bool, uint)) ); - connect( mHexView, SIGNAL(pleaseStepFile(bool)), SLOT( stepFile(bool)) ); - connect( kapp, SIGNAL( kdisplayFontChanged() ), SLOT( fontChanged() ) ); - connect( kapp, SIGNAL( kdisplayPaletteChanged() ),SLOT( paletteChanged()) ); - connect( mHexView, SIGNAL( layoutChanged( const SDisplayLayout & ) ), - SLOT( layoutChanged( const SDisplayLayout & ) ) ); - connect( mHexView, SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), - this, SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); + 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( kdisplayFontChanged() ), TQT_SLOT( fontChanged() ) ); + connect( kapp, TQT_SIGNAL( kdisplayPaletteChanged() ),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 & ) ) ); mHexView->setFocus(); setBackgroundColor( palette().active().base() ); @@ -379,7 +379,7 @@ void CHexEditorWidget::readConfiguration( KConfig &config ) -void CHexEditorWidget::resizeEvent( QResizeEvent *e ) +void CHexEditorWidget::resizeEvent( TQResizeEvent *e ) { mHexView->resize( e->size().width(), e->size().height() ); } @@ -557,7 +557,7 @@ void CHexEditorWidget::setTextMode( void ) -void CHexEditorWidget::saveWorkingDirectory( const QString &url ) +void CHexEditorWidget::saveWorkingDirectory( const TQString &url ) { if( url.isEmpty() == true ) { @@ -580,7 +580,7 @@ void CHexEditorWidget::newFile( void ) return; } - QString url = i18n("Untitled %1").arg( mUntitledCount ); + TQString url = i18n("Untitled %1").arg( mUntitledCount ); // // If the url is already present in the document list (should not happen), @@ -604,7 +604,7 @@ void CHexEditorWidget::newFile( void ) int errCode = mHexView->newFile( url ); if( errCode != Err_Success ) { - QString msg = i18n("Unable to create new document."); + TQString msg = i18n("Unable to create new document."); KMessageBox::sorry( topLevelWidget(), msg, i18n("Operation Failed") ); return; } @@ -615,7 +615,7 @@ void CHexEditorWidget::newFile( void ) -void CHexEditorWidget::newFile( const QByteArray &data ) +void CHexEditorWidget::newFile( const TQByteArray &data ) { newFile(); mHexView->append( data ); @@ -631,7 +631,7 @@ void CHexEditorWidget::open() if( file.isEmpty() ) return; - QString url = file.url(); + TQString url = file.url(); saveWorkingDirectory( url ); @@ -665,7 +665,7 @@ void CHexEditorWidget::open() -void CHexEditorWidget::open( const QString &url, bool reloadWhenChanged, +void CHexEditorWidget::open( const TQString &url, bool reloadWhenChanged, uint offset ) { if( busy( true ) == true ) @@ -727,7 +727,7 @@ void CHexEditorWidget::stepFile( bool next ) -bool CHexEditorWidget::isOpen( const QString &url, uint &offset ) +bool CHexEditorWidget::isOpen( const TQString &url, uint &offset ) { CHexBuffer *hexBuffer = documentItem( url ); if( hexBuffer == 0 ) @@ -739,7 +739,7 @@ bool CHexEditorWidget::isOpen( const QString &url, uint &offset ) } -bool CHexEditorWidget::selectDocument( const QString &url, +bool CHexEditorWidget::selectDocument( const TQString &url, bool reloadWhenChanged ) { CHexBuffer *hexBuffer = documentItem( url ); @@ -764,7 +764,7 @@ bool CHexEditorWidget::selectDocument( const QString &url, void CHexEditorWidget::insertFile( void ) { - KFileDialog fdlg(mWorkDir, QString::null, topLevelWidget(), 0, TRUE); + KFileDialog fdlg(mWorkDir, TQString::null, topLevelWidget(), 0, TRUE); fdlg.setOperationMode( KFileDialog::Opening ); fdlg.okButton()->setGuiItem( KStdGuiItem::insert() ); fdlg.setCaption(i18n("Insert File")); @@ -781,7 +781,7 @@ void CHexEditorWidget::insertFile( void ) return; } - QString url = file.path(); + TQString url = file.path(); saveWorkingDirectory( url ); @@ -865,10 +865,10 @@ bool CHexEditorWidget::querySave( void ) return( true ); } - QString msg = i18n("" + TQString msg = i18n("" "The current document has been modified.\n" "Do you want to save it?" ); - int reply = KMessageBox::warningYesNoCancel( topLevelWidget(), msg, QString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); + int reply = KMessageBox::warningYesNoCancel( topLevelWidget(), msg, TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); if( reply == KMessageBox::Yes ) { return( save() ); @@ -897,8 +897,8 @@ bool CHexEditorWidget::backup( void ) return( false ); } - const QString currentName = kurl.path(); - QString backupName = currentName + '~'; + const TQString currentName = kurl.path(); + TQString backupName = currentName + '~'; int errCode = rename( currentName.latin1(), backupName.latin1() ); if( errCode != 0 ) @@ -930,7 +930,7 @@ bool CHexEditorWidget::save( void ) { if( modifiedByAlien( mHexView->url() ) == true ) { - QString msg = i18n("" + TQString msg = i18n("" "Current document has been changed on disk.\n" "If you save now, those changes will be lost.\n" "Proceed?" ); @@ -978,12 +978,12 @@ bool CHexEditorWidget::saveAs( void ) if( url.isLocalFile() ) { - QString name( url.path() ); - QFileInfo info( name ); + TQString name( url.path() ); + TQFileInfo info( name ); if( info.exists() ) { - QString msg = i18n("" + TQString msg = i18n("" "A document with this name already exists.\n" "Do you want to overwrite it?" ); int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg, @@ -996,7 +996,7 @@ bool CHexEditorWidget::saveAs( void ) } } - QString symbolicName( url.url() ); + TQString symbolicName( url.url() ); // KURL::decode( symbolicName ); mHexView->setUrl( symbolicName ); @@ -1020,14 +1020,14 @@ void CHexEditorWidget::reload( void ) if( mHexView->urlValid() == false ) { - QString msg = i18n( "The current document does not exist on the disk." ); + TQString msg = i18n( "The current document does not exist on the disk." ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Reload") ); return; } if( mHexView->modified() == true ) { - QString msg; + TQString msg; if( modifiedByAlien( mHexView->url() ) == true ) { msg = i18n( "The current document has changed on the disk and " @@ -1047,7 +1047,7 @@ void CHexEditorWidget::reload( void ) } } - QString url( mHexView->url() ); + TQString url( mHexView->url() ); uint offset = mHexView->offset(); //mHexView->closeFile(); @@ -1108,7 +1108,7 @@ void CHexEditorWidget::printPostscript( CHexPrinter &printer ) // No i18n() on this one! // Constants come from config.h // - QString creator( PACKAGE ); + TQString creator( PACKAGE ); creator += " "; creator += VERSION; @@ -1120,7 +1120,7 @@ void CHexEditorWidget::printPostscript( CHexPrinter &printer ) errCode = mHexView->print( printer, mProgressData ); } - QString msg = i18n("Could not print data.\n"); + TQString msg = i18n("Could not print data.\n"); msg += hexError( errCode ); if( errCode != Err_Success ) @@ -1140,7 +1140,7 @@ bool CHexEditorWidget::confirmPrintPageNumber( CHexPrinter &printer ) if( numPageSelected > mDisplayState.misc.thresholdValue ) { - QString msg = i18n( + TQString msg = i18n( "<qt>Print threshold exceeded.<br>" "You are about to print one page.<br>" "Proceed?</qt>", @@ -1167,12 +1167,12 @@ void CHexEditorWidget::exportDialog( void ) { mExportDialog = new CExportDialog( topLevelWidget(), 0, false ); if( mExportDialog == 0 ) { return; } - connect( mExportDialog, SIGNAL( exportText(const SExportText &)), - this, SLOT( exportText( const SExportText &)) ); - connect( mExportDialog, SIGNAL( exportHtml(const SExportHtml &)), - this, SLOT( exportHtml( const SExportHtml &)) ); - connect( mExportDialog, SIGNAL( exportCArray(const SExportCArray &)), - this, SLOT( exportCArray( const SExportCArray &)) ); + 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 &)) ); } mExportDialog->show(); } @@ -1189,7 +1189,7 @@ void CHexEditorWidget::exportText( const SExportText &ex ) if( errCode != Err_Success ) { - QString msg = i18n("Unable to export data.\n"); + TQString msg = i18n("Unable to export data.\n"); msg += hexError( errCode ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Export") ); } @@ -1206,7 +1206,7 @@ void CHexEditorWidget::exportHtml( const SExportHtml &ex ) if( errCode != Err_Success ) { - QString msg = i18n("Unable to export data.\n"); + TQString msg = i18n("Unable to export data.\n"); msg += hexError( errCode ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Export") ); } @@ -1223,7 +1223,7 @@ void CHexEditorWidget::exportCArray( const SExportCArray &ex ) if( errCode != Err_Success ) { - QString msg = i18n("Unable to export data.\n"); + TQString msg = i18n("Unable to export data.\n"); msg += hexError( errCode ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Export") ); } @@ -1234,7 +1234,7 @@ void CHexEditorWidget::encode( CConversion::EMode mode ) { if( mHexView->losslessEncoding( mode ) == false ) { - QString msg = i18n("" + TQString msg = i18n("" "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."); @@ -1256,7 +1256,7 @@ void CHexEditorWidget::encode( CConversion::EMode mode ) if( errCode != Err_Success ) { - QString msg = i18n("Could not encode data.\n"); + TQString msg = i18n("Could not encode data.\n"); msg += hexError( errCode ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Encode") ); } @@ -1409,7 +1409,7 @@ void CHexEditorWidget::removeAllBookmark( void ) { if( mHexView->bookmarkCount() > 0 ) { - QString msg = i18n("" + TQString msg = i18n("" "Deleted bookmarks can not be restored.\n" "Proceed?" ); int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg ); @@ -1449,8 +1449,8 @@ void CHexEditorWidget::gotoOffset( void ) { mGotoDialog = new CGotoDialog( topLevelWidget(), 0, false ); if( mGotoDialog == 0 ) { return; } - connect( mGotoDialog, SIGNAL(gotoOffset( uint, uint, bool, bool )), - mHexView, SLOT(gotoOffset( uint, uint, bool, bool )) ); + connect( mGotoDialog, TQT_SIGNAL(gotoOffset( uint, uint, bool, bool )), + mHexView, TQT_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, - SIGNAL(findData(SSearchControl &, uint, bool)), - SLOT(findData(SSearchControl &, uint, bool)) ); + TQT_SIGNAL(findData(SSearchControl &, uint, bool)), + TQT_SLOT(findData(SSearchControl &, uint, bool)) ); } mFindDialog->show(); } @@ -1525,7 +1525,7 @@ void CHexEditorWidget::findData( SSearchControl &sc, uint mode, bool navigator) if( mode == Find_First ) { - QString msg = i18n( "Search key not found in document." ); + TQString msg = i18n( "Search key not found in document." ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Find") ); } } @@ -1559,14 +1559,14 @@ void CHexEditorWidget::findPrevious( void ) } -bool CHexEditorWidget::askWrap( bool fwd, const QString &header ) +bool CHexEditorWidget::askWrap( bool fwd, const TQString &header ) { if( mDisplayState.misc.confirmWrap == false ) { return( true ); // Never ask the user } - QString msg; + TQString msg; if( fwd == true ) { msg += i18n("" @@ -1591,7 +1591,7 @@ bool CHexEditorWidget::canFind( bool showError ) { if( showError == true ) { - QString msg = i18n("" + TQString msg = i18n("" "Your request can not be processed.\n" "No search pattern defined." ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Find") ); @@ -1616,10 +1616,10 @@ void CHexEditorWidget::findNavigator( SSearchControl &sc ) mFindNavigatorDialog = new CFindNavigatorDialog(topLevelWidget(),0,false); if( mFindNavigatorDialog == 0 ) { return; } connect( mFindNavigatorDialog, - SIGNAL(findData(SSearchControl &, uint, bool)), - SLOT(findData(SSearchControl &, uint, bool)) ); - connect( mFindNavigatorDialog, SIGNAL(makeKey(void)), - SLOT(find()) ); + TQT_SIGNAL(findData(SSearchControl &, uint, bool)), + TQT_SLOT(findData(SSearchControl &, uint, bool)) ); + connect( mFindNavigatorDialog, TQT_SIGNAL(makeKey(void)), + TQT_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, - SIGNAL( replaceData( SSearchControl &, uint)), - SLOT( replaceData( SSearchControl &, uint))); + TQT_SIGNAL( replaceData( SSearchControl &, uint)), + TQT_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, - SIGNAL( replaceData( SSearchControl &, uint)), - SLOT( replaceData( SSearchControl &, uint))); + TQT_SIGNAL( replaceData( SSearchControl &, uint)), + TQT_SLOT( replaceData( SSearchControl &, uint))); } if( mReplacePromptDialog->isVisible() == false ) { @@ -1756,7 +1756,7 @@ void CHexEditorWidget::replaceResult( SSearchControl &sc ) if( sc.match == false ) { - QString msg; + TQString msg; if( sc.inSelection == true ) { msg += i18n( "Search key not found in selected area." ); @@ -1769,7 +1769,7 @@ void CHexEditorWidget::replaceResult( SSearchControl &sc ) } else { - const QString msg = i18n( + const TQString msg = i18n( "<qt>Operation complete.<br><br>One replacement was made.</qt>", "<qt>Operation complete.<br><br>%n replacements were made.</qt>", sc.numReplace ); KMessageBox::information( topLevelWidget(), msg, i18n("Find & Replace")); @@ -1783,8 +1783,8 @@ void CHexEditorWidget::insertPattern( void ) { mInsertDialog = new CInsertDialog( topLevelWidget(), 0, false ); if( mInsertDialog == 0 ) { return; } - connect( mInsertDialog, SIGNAL(execute( SInsertData & )), - mHexView, SLOT(insert( SInsertData & )) ); + connect( mInsertDialog, TQT_SIGNAL(execute( SInsertData & )), + mHexView, TQT_SLOT(insert( SInsertData & )) ); } mInsertDialog->show(); } @@ -1792,7 +1792,7 @@ void CHexEditorWidget::insertPattern( void ) void CHexEditorWidget::encoding( void ) { - QString msg = i18n("" + TQString msg = i18n("" "Not available yet!\n" "Define your own encoding" ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Encoding") ); @@ -1805,13 +1805,13 @@ void CHexEditorWidget::strings( void ) { mStringDialog = new CStringDialog( topLevelWidget(), 0, false ); if( mStringDialog == 0 ) { return; } - connect( mStringDialog, SIGNAL(markText( uint, uint, bool )), - mHexView, SLOT(setMark( uint, uint, bool )) ); - connect( mStringDialog, SIGNAL(collect()), SLOT(collectStrings()) ); - connect( mHexView, SIGNAL(fileName( const QString &, bool ) ), - mStringDialog, SLOT( removeList() ) ); - connect( mHexView, SIGNAL(dataChanged()), - mStringDialog, SLOT(setDirty()) ); + 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()) ); } mStringDialog->show(); } @@ -1828,7 +1828,7 @@ void CHexEditorWidget::collectStrings( void ) if( errCode != Err_Success && errCode != Err_Stop ) { - QString msg = i18n("Could not collect strings.\n"); + TQString msg = i18n("Could not collect strings.\n"); msg += hexError( errCode ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Collect Strings") ); } @@ -1839,7 +1839,7 @@ void CHexEditorWidget::collectStrings( void ) void CHexEditorWidget::recordView( void ) { - QString msg = i18n("" + TQString msg = i18n("" "Not available yet!\n" "Define a record (structure) and fill it with data from the document." ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Record Viewer") ); @@ -1851,8 +1851,8 @@ void CHexEditorWidget::filter( void ) { mFilterDialog = new CFilterDialog( topLevelWidget(), 0, false ); if( mFilterDialog == 0 ) { return; } - connect( mFilterDialog, SIGNAL(filterData( SFilterControl & )), - mHexView, SLOT(filter( SFilterControl & )) ); + connect( mFilterDialog, TQT_SIGNAL(filterData( SFilterControl & )), + mHexView, TQT_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, SIGNAL(assign( const QByteArray & )), - mHexView, SLOT(insert( const QByteArray & )) ); + connect( mCharTableDialog, TQT_SIGNAL(assign( const TQByteArray & )), + mHexView, TQT_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, SIGNAL(probeCursorValue(QByteArray &, uint)), - mHexView, SLOT(valueOnCursor(QByteArray &, uint)) ); + connect( mConverterDialog, TQT_SIGNAL(probeCursorValue(TQByteArray &, uint)), + mHexView, TQT_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, SIGNAL(collectStatistic(SStatisticControl &)), - SLOT(collectStatistics(SStatisticControl &))); - connect( mHexView, SIGNAL(dataChanged()), - mFileInfoDialog, SLOT(setDirty()) ); + connect( mFileInfoDialog, TQT_SIGNAL(collectStatistic(SStatisticControl &)), + TQT_SLOT(collectStatistics(SStatisticControl &))); + connect( mHexView, TQT_SIGNAL(dataChanged()), + mFileInfoDialog, TQT_SLOT(setDirty()) ); } mFileInfoDialog->show(); } @@ -1914,7 +1914,7 @@ void CHexEditorWidget::collectStatistics( SStatisticControl &sc ) { mFileInfoDialog->setStatistics(); // Default values - QString msg = i18n("Could not collect document statistics.\n"); + TQString msg = i18n("Could not collect document statistics.\n"); msg += hexError( errCode ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Collect Document Statistics") ); @@ -1930,20 +1930,20 @@ void CHexEditorWidget::options( void ) mOptionDialog = new COptionDialog( topLevelWidget(), 0, false ); if( mOptionDialog == 0 ) { return; } - connect( mOptionDialog, SIGNAL(lineSizeChoice(const SDisplayLine &)), - SLOT(setLineSize(const SDisplayLine &)) ); - connect( mOptionDialog, SIGNAL(layoutChoice(const SDisplayLayout &)), - SLOT(setLayout(const SDisplayLayout &)) ); - connect( mOptionDialog, SIGNAL(fontChoice(const SDisplayFont &)), - SLOT(setFont(const SDisplayFont &)) ); - connect( mOptionDialog, SIGNAL(colorChoice(const SDisplayColor &)), - SLOT(setColor(const SDisplayColor &)) ); - connect( mOptionDialog, SIGNAL(cursorChoice(const SDisplayCursor &)), - SLOT(setCursor(const SDisplayCursor &)) ); - connect( mOptionDialog, SIGNAL(miscChoice(const SDisplayMisc &)), - SLOT(setMisc(const SDisplayMisc &)) ); - connect( mOptionDialog, SIGNAL(removeRecentFiles()), - SIGNAL(removeRecentFiles()) ); + 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()) ); } if( mOptionDialog->isVisible() == false ) { @@ -1956,7 +1956,7 @@ void CHexEditorWidget::options( void ) void CHexEditorWidget::favorites( void ) { - QString msg = i18n("" + TQString msg = i18n("" "Not available yet!\n" "Save or retrive your favorite layout" ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Profiles") ); @@ -1978,7 +1978,7 @@ int CHexEditorWidget::readURL( const KURL &url, bool insert ) // if( !url.isValid() ) { - QString msg = i18n("Malformed URL\n%1").arg( url.url() ); + TQString msg = i18n("Malformed URL\n%1").arg( url.url() ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Read URL") ); return( Err_IllegalArgument ); } @@ -1986,7 +1986,7 @@ int CHexEditorWidget::readURL( const KURL &url, bool insert ) // // 3) Load the file. // - QString tmpfile; + TQString tmpfile; if ( !KIO::NetAccess::download( url, tmpfile, this ) ) return Err_ReadFailed; @@ -1998,7 +1998,7 @@ int CHexEditorWidget::readURL( const KURL &url, bool insert ) } -void CHexEditorWidget::writeURL( QString &url ) +void CHexEditorWidget::writeURL( TQString &url ) { KURL kurl( url ); if( kurl.isLocalFile() ) @@ -2012,13 +2012,13 @@ void CHexEditorWidget::writeURL( QString &url ) if( !KIO::NetAccess::upload(tf.name(),url,this) ) { mHexView->setModified( modified ); - QString msg = i18n("Could not save remote file."); + TQString msg = i18n("Could not save remote file."); KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") ); } } } -bool CHexEditorWidget::modifiedByAlien( const QString &url ) +bool CHexEditorWidget::modifiedByAlien( const TQString &url ) { KURL kurl( url ); if( kurl.isLocalFile() == false ) @@ -2026,7 +2026,7 @@ bool CHexEditorWidget::modifiedByAlien( const QString &url ) return( false ); } - QFileInfo fileInfo( kurl.path() ); + TQFileInfo fileInfo( kurl.path() ); if( fileInfo.exists() == false ) { return( false ); @@ -2042,36 +2042,36 @@ bool CHexEditorWidget::modifiedByAlien( const QString &url ) -bool CHexEditorWidget::readFile( const QString &diskPath, const QString &url, +bool CHexEditorWidget::readFile( const TQString &diskPath, const TQString &url, bool insert ) { - QFileInfo info( diskPath ); + TQFileInfo info( diskPath ); if( info.exists() == false ) { - const QString msg = i18n("The specified file does not exist.\n%1").arg( diskPath ); + const TQString msg = i18n("The specified file does not exist.\n%1").arg( diskPath ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") ); return( false ); } if( info.isDir() == true ) { - const QString msg = i18n("You have specified a folder.\n%1").arg( diskPath ); + const TQString msg = i18n("You have specified a folder.\n%1").arg( diskPath ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") ); return( false ); } if( info.isReadable() == false ) { - const QString msg = i18n("You do not have read permission to this file.\n%1").arg( diskPath ); + const TQString msg = i18n("You do not have read permission to this file.\n%1").arg( diskPath ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") ); return( false ); } - QFile file( diskPath ); + TQFile file( diskPath ); if( file.open( IO_ReadOnly | IO_Raw ) == false ) { - const QString msg = i18n("An error occurred while trying to open the file.\n%1").arg( diskPath ); + const TQString msg = i18n("An error occurred while trying to open the file.\n%1").arg( diskPath ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") ); return( false ); } @@ -2099,8 +2099,8 @@ bool CHexEditorWidget::readFile( const QString &diskPath, const QString &url, if( errCode != Err_Success ) { - QString header = insert == true ? i18n("Insert") : i18n("Read"); - QString msg = i18n("Could not read file.\n"); + TQString header = insert == true ? i18n("Insert") : i18n("Read"); + TQString msg = i18n("Could not read file.\n"); msg += hexError( errCode ); KMessageBox::sorry( topLevelWidget(), msg, header ); } @@ -2112,30 +2112,30 @@ bool CHexEditorWidget::readFile( const QString &diskPath, const QString &url, -bool CHexEditorWidget::writeFile( const QString &diskPath ) +bool CHexEditorWidget::writeFile( const TQString &diskPath ) { - QFileInfo info( diskPath ); + TQFileInfo info( diskPath ); if( info.exists() == true ) { if( info.isDir() == true ) { - QString msg = i18n("You have specified a folder."); + TQString msg = i18n("You have specified a folder."); KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") ); return( false ); } if( info.isWritable() == false ) { - QString msg = i18n("You do not have write permission."); + TQString msg = i18n("You do not have write permission."); KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") ); return( false ); } } - QFile file( diskPath ); + TQFile file( diskPath ); if( file.open( IO_WriteOnly | IO_Raw | IO_Truncate ) == false ) { - QString msg = i18n("An error occurred while trying to open the file."); + TQString msg = i18n("An error occurred while trying to open the file."); KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") ); return( false ); } @@ -2147,7 +2147,7 @@ bool CHexEditorWidget::writeFile( const QString &diskPath ) } if( errCode != Err_Success ) { - QString msg = i18n("Could not write data to disk.\n"); + TQString msg = i18n("Could not write data to disk.\n"); msg += hexError( errCode ); KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") ); } @@ -2157,9 +2157,9 @@ bool CHexEditorWidget::writeFile( const QString &diskPath ) } -CHexBuffer *CHexEditorWidget::documentItem( const QString &url ) +CHexBuffer *CHexEditorWidget::documentItem( const TQString &url ) { - QString symbolicName( url ); + TQString symbolicName( url ); // KURL::decode( symbolicName ); for( CHexBuffer *hexBuffer = mDocumentList.first(); hexBuffer != 0; @@ -2175,14 +2175,14 @@ CHexBuffer *CHexEditorWidget::documentItem( const QString &url ) } -CHexBuffer *CHexEditorWidget::documentItem( const QString &url, bool next ) +CHexBuffer *CHexEditorWidget::documentItem( const TQString &url, bool next ) { if( mDocumentList.count() <= 1 ) { return( 0 ); } - QString symbolicName( url ); + TQString symbolicName( url ); // KURL::decode( symbolicName ); if( next == true ) @@ -2229,7 +2229,7 @@ bool CHexEditorWidget::createBuffer( void ) CHexBuffer *hexBuffer = new CHexBuffer; if( hexBuffer == 0 ) { - QString msg = i18n( "Can not create text buffer.\n" ); + TQString msg = i18n( "Can not create text buffer.\n" ); msg += hexError( Err_NoMemory ); KMessageBox::error( topLevelWidget(), msg, i18n("Loading Failed" ) ); return( false ); @@ -2304,7 +2304,7 @@ int CHexEditorWidget::prepareProgressData( EProgressMode mode ) mProgressStop = false; enableInputLock( true ); - static QString names[] = + static TQString names[] = { i18n("Reading"), i18n("Writing"), @@ -2317,7 +2317,7 @@ int CHexEditorWidget::prepareProgressData( EProgressMode mode ) }; mProgressData.define( progressReceiver, this ); - emit setProgressText( QString(names[mode]) ); + emit setProgressText( TQString(names[mode]) ); emit operationChanged( true ); return( Err_Success ); @@ -2368,7 +2368,7 @@ int CHexEditorWidget::progressParse( const SProgressData &pd ) return( Err_Success ); } - QString msg, header; + TQString msg, header; switch( mProgressMode ) { case pg_read: @@ -2429,7 +2429,7 @@ bool CHexEditorWidget::busy( bool showWarning ) { if( mProgressBusy == true && showWarning == true ) { - QString msg = i18n("Could not finish operation.\n"); + TQString msg = i18n("Could not finish operation.\n"); msg += hexError( Err_Busy ); KMessageBox::sorry( topLevelWidget(), msg ); } diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h index 5c4d86a..04701f6 100644 --- a/khexedit/hexeditorwidget.h +++ b/khexedit/hexeditorwidget.h @@ -26,8 +26,8 @@ #endif -#include <qvariant.h> -#include <qptrdict.h> +#include <tqvariant.h> +#include <tqptrdict.h> #include <kapplication.h> #include "hexbuffer.h" @@ -70,14 +70,14 @@ class CHexEditorWidget : public QWidget }; public: - CHexEditorWidget( QWidget *parent = 0, const char *name = 0 ); + CHexEditorWidget( TQWidget *parent = 0, const char *name = 0 ); ~CHexEditorWidget( void ); void initialize( void ); void writeConfiguration( KConfig &config ); void readConfiguration( KConfig &config ); - bool isOpen( const QString &url, uint &offset ); + bool isOpen( const TQString &url, uint &offset ); bool modified( void ); inline int defaultTextWidth( void ); @@ -91,11 +91,11 @@ class CHexEditorWidget : public QWidget inline bool gotoReloadOffset( void ); signals: - void errorLoadFile( const QString &url ); + void errorLoadFile( const TQString &url ); void setProgress( int percent ); void setProgress( int curPage, int maxPage ); void enableProgressText( bool state ); - void setProgressText( const QString &msg ); + void setProgressText( const TQString &msg ); void operationChanged( bool state ); void removeRecentFiles( void ); @@ -105,9 +105,9 @@ class CHexEditorWidget : public QWidget void setOctalMode( void ); void setTextMode( void ); void setBinaryMode( void ); - void open( const QString &url, bool reloadWhenChanged, uint offset ); + void open( const TQString &url, bool reloadWhenChanged, uint offset ); void newFile( void ); - void newFile( const QByteArray &data ); + void newFile( const TQByteArray &data ); void stepFile( bool next ); void open( void ); void insertFile( void ); @@ -191,28 +191,28 @@ class CHexEditorWidget : public QWidget void collectStatistics( SStatisticControl &sc ); protected: - void resizeEvent( QResizeEvent *e ); + void resizeEvent( TQResizeEvent *e ); private: - bool selectDocument( const QString &url, bool reloadWhenChanged ); + bool selectDocument( const TQString &url, bool reloadWhenChanged ); bool querySave( void ); int readURL( const KURL &url, bool insert ); - void writeURL( QString &url ); - bool readFile( const QString &diskPath, const QString &url, bool insert ); - bool writeFile( const QString &diskPath ); - void saveWorkingDirectory( const QString &url ); + void writeURL( TQString &url ); + bool readFile( const TQString &diskPath, const TQString &url, bool insert ); + bool writeFile( const TQString &diskPath ); + void saveWorkingDirectory( const TQString &url ); bool confirmPrintPageNumber( CHexPrinter &printer ); - CHexBuffer *documentItem( const QString &url ); - CHexBuffer *documentItem( const QString &url, bool next ); + CHexBuffer *documentItem( const TQString &url ); + CHexBuffer *documentItem( const TQString &url, bool next ); bool createBuffer( void ); void removeBuffer( void ); - bool askWrap( bool fwd, const QString &header ); + bool askWrap( bool fwd, const TQString &header ); bool canFind( bool showError ); void hideReplacePrompt( void ); - bool modifiedByAlien( const QString &url ); + bool modifiedByAlien( const TQString &url ); void enableInputLock( bool inputLock ); int prepareProgressData( EProgressMode mode ); @@ -221,10 +221,10 @@ class CHexEditorWidget : public QWidget bool busy( bool showWarning ); private: - QString mWorkDir; // Remembers last directroy used by file dialogs + TQString mWorkDir; // Remembers last directroy used by file dialogs uint mUntitledCount; - QPtrList<CHexBuffer> mDocumentList; + TQPtrList<CHexBuffer> mDocumentList; SDisplayState mDisplayState; CProgress mProgressData; diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h index f3f8fff..13a6c66 100644 --- a/khexedit/hexeditstate.h +++ b/khexedit/hexeditstate.h @@ -22,8 +22,8 @@ #define _HEX_EDIT_STATE_H_ #include <kapplication.h> -#include <qfont.h> -#include <qpalette.h> +#include <tqfont.h> +#include <tqpalette.h> #include <kglobalsettings.h> @@ -137,7 +137,7 @@ class SDisplayLayout } } - QString modeStrings( uint index ) + TQString modeStrings( uint index ) { if( index == hexadecimal ) { @@ -166,23 +166,23 @@ class SDisplayLayout } - QString primaryModeString( void ) + TQString primaryModeString( void ) { return( modeStrings( primaryMode > textOnly ? hexadecimal : primaryMode )); } - QString secondaryModeString( void ) + TQString secondaryModeString( void ) { return( modeStrings( secondaryMode == textOnly ? textOnly : hide ) ); } - QString offsetModeString( void ) + TQString offsetModeString( void ) { return( modeStrings( offsetMode == hexadecimal ? hexadecimal : hide ) ); } - QString gridModeString( void ) + TQString gridModeString( void ) { if( horzGridWidth == 0 && vertGridWidth == 0 ) { @@ -202,7 +202,7 @@ class SDisplayLayout } } - void setPrimaryMode( const QString & str ) + void setPrimaryMode( const TQString & str ) { if( str.isNull() || str == "hexadecimal" ) { @@ -230,7 +230,7 @@ class SDisplayLayout } } - void setSecondaryMode( const QString & str ) + void setSecondaryMode( const TQString & str ) { if( str.isNull() || str == "textOnly" ) { @@ -242,7 +242,7 @@ class SDisplayLayout } } - void setOffsetMode( const QString & str ) + void setOffsetMode( const TQString & str ) { if( str.isNull() || str == "hexadecimal" ) { @@ -254,7 +254,7 @@ class SDisplayLayout } } - void setGridMode( const QString & str ) + void setGridMode( const TQString & str ) { if( str.isNull() || str == "none" ) { @@ -322,7 +322,7 @@ class SDisplayCursor thickInsertShape = true; } - QString modeStrings( uint index ) + TQString modeStrings( uint index ) { if( index == hide ) { @@ -338,12 +338,12 @@ class SDisplayCursor } } - QString focusModeString( void ) + TQString focusModeString( void ) { return( modeStrings( focusMode > ignore ? stopBlinking : focusMode )); } - void setFocusMode( const QString & str ) + void setFocusMode( const TQString & str ) { if( str.isNull() || str == "hide" ) { @@ -401,25 +401,25 @@ class SDisplayColor } bool useSystemColor; - QColor offsetBg; - QColor textBg; - QColor secondTextBg; - QColor inactiveBg; - QColor selectBg; - QColor selectFg; - QColor markBg; - QColor markFg; - QColor primaryFg[2]; - QColor offsetFg; - QColor secondaryFg; - QColor nonPrintFg; - QColor gridFg; - QColor leftSeparatorFg; - QColor rightSeparatorFg; - QColor cursorBg; - QColor cursorFg; - QColor bookmarkBg; - QColor bookmarkFg; + TQColor offsetBg; + TQColor textBg; + TQColor secondTextBg; + TQColor inactiveBg; + TQColor selectBg; + TQColor selectFg; + TQColor markBg; + TQColor markFg; + TQColor primaryFg[2]; + TQColor offsetFg; + TQColor secondaryFg; + TQColor nonPrintFg; + TQColor gridFg; + TQColor leftSeparatorFg; + TQColor rightSeparatorFg; + TQColor cursorBg; + TQColor cursorFg; + TQColor bookmarkBg; + TQColor bookmarkFg; }; @@ -434,8 +434,8 @@ class SDisplayFontInfo return( *this ); } - QFont font; - QChar nonPrintChar; + TQFont font; + TQChar nonPrintChar; }; class SDisplayFont @@ -449,8 +449,8 @@ class SDisplayFont } bool useSystemFont; - QFont localFont; - QChar nonPrintChar; + TQFont localFont; + TQChar nonPrintChar; }; @@ -487,7 +487,7 @@ class SDisplayMisc } - QString fileStrings( uint index ) + TQString fileStrings( uint index ) { if( index == mostRecent ) { @@ -504,12 +504,12 @@ class SDisplayMisc } - QString openFileString( void ) + TQString openFileString( void ) { return( fileStrings( openFile > allRecent ? none : openFile )); } - void setOpenFile( const QString &str ) + void setOpenFile( const TQString &str ) { if( str.isNull() == true || str == "none" ) { diff --git a/khexedit/hexerror.cc b/khexedit/hexerror.cc index ac179e6..ed05b4b 100644 --- a/khexedit/hexerror.cc +++ b/khexedit/hexerror.cc @@ -22,12 +22,12 @@ #include "hexerror.h" -static QString message; +static TQString message; -const QString &hexError( int index ) +const TQString &hexError( int index ) { - static QString messages[ Err_MAXERROR - Err_NoData ] = + static TQString messages[ Err_MAXERROR - Err_NoData ] = { i18n("No data"), // Err_NoData i18n("Insufficient memory"), // Err_NoMemory diff --git a/khexedit/hexerror.h b/khexedit/hexerror.h index d17d302..4d9d209 100644 --- a/khexedit/hexerror.h +++ b/khexedit/hexerror.h @@ -51,7 +51,7 @@ enum EHexError Err_MAXERROR // Must be the last }; -const QString &hexError( int index ); +const TQString &hexError( int index ); #endif diff --git a/khexedit/hexmanagerwidget.cc b/khexedit/hexmanagerwidget.cc index 1073b95..b5fe32c 100644 --- a/khexedit/hexmanagerwidget.cc +++ b/khexedit/hexmanagerwidget.cc @@ -19,15 +19,15 @@ */ #include <klocale.h> -#include <qlayout.h> +#include <tqlayout.h> #include "hexmanagerwidget.h" #include "searchbar.h" -CHexManagerWidget::CHexManagerWidget( QWidget *parent, const char *name, +CHexManagerWidget::CHexManagerWidget( TQWidget *parent, const char *name, EConversionPosition conversionPosition, EPosition tabBarPosition, EPosition searchBarPosition ) - : QWidget( parent, name ) + : TQWidget( parent, name ) { mValid = false; @@ -38,18 +38,18 @@ CHexManagerWidget::CHexManagerWidget( QWidget *parent, const char *name, mConverter = new CHexToolWidget( this ); - connect( mEditor->view(), SIGNAL(fileName(const QString &, bool)), - this, SLOT( addName(const QString &))); - connect( mEditor->view(), SIGNAL( fileClosed(const QString &)), - this, SLOT( removeName(const QString &))); - connect( mEditor->view(),SIGNAL(fileRename(const QString &,const QString &)), - this, SLOT(changeName(const QString &,const QString &))); - connect( mEditor->view(), SIGNAL( cursorChanged( SCursorState & ) ), - mConverter, SLOT( cursorChanged( SCursorState & ) ) ); - connect( mConverter, SIGNAL( closed(void) ), - this, SIGNAL( conversionClosed(void) ) ); - connect( mTabBar, SIGNAL(selected(const QString &)), - this, SLOT(open(const QString &))); + 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 &))); mValid = true; setConversionVisibility( conversionPosition ); @@ -71,7 +71,7 @@ void CHexManagerWidget::updateLayout( void ) if( mValid == false ) { return; } delete layout(); - QVBoxLayout *vlay = new QVBoxLayout( this, 0, 0 ); + TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, 0 ); if( mSearchBar && mSearchBarPosition == AboveEditor ) { @@ -125,9 +125,9 @@ void CHexManagerWidget::setConversionVisibility( EConversionPosition position ) } else if( mConversionPosition == Float ) { - QPoint point = mapToGlobal( QPoint(0,0) ); - QRect rect = geometry(); - QPoint p; + TQPoint point = mapToGlobal( TQPoint(0,0) ); + TQRect rect = geometry(); + TQPoint p; p.setX(point.x() + rect.width()/2 - mConverter->minimumSize().width()/2); p.setY(point.y() + rect.height()/2 - mConverter->minimumSize().height()/2); @@ -139,7 +139,7 @@ void CHexManagerWidget::setConversionVisibility( EConversionPosition position ) { mConversionPosition = Embed; uint utilHeight = mConverter->minimumSize().height(); - QPoint p( 0, height() - utilHeight ); + TQPoint p( 0, height() - utilHeight ); mConverter->reparent( this, 0, p, true ); } @@ -154,11 +154,11 @@ void CHexManagerWidget::setTabBarPosition( EPosition position ) { if( mTabPosition == AboveEditor ) { - mTabBar->setShape( QTabBar::RoundedAbove ); + mTabBar->setShape( TQTabBar::RoundedAbove ); } else { - mTabBar->setShape( QTabBar::RoundedBelow ); + mTabBar->setShape( TQTabBar::RoundedBelow ); } mTabBar->show(); } @@ -179,11 +179,11 @@ void CHexManagerWidget::setSearchBarPosition( EPosition position ) if( mSearchBar == 0 ) { mSearchBar = new CSearchBar( this ); - connect( mSearchBar, SIGNAL(hidden()), this, SLOT(searchBarHidden()) ); - connect( mSearchBar, SIGNAL(findData(SSearchControl &, uint, bool)), - mEditor, SLOT(findData(SSearchControl &, uint, bool)) ); - connect( editor()->view(), SIGNAL( cursorChanged( SCursorState & ) ), - mSearchBar, SLOT( cursorMoved() ) ); + 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() ) ); } mSearchBar->show(); } @@ -207,7 +207,7 @@ void CHexManagerWidget::searchBarHidden( void ) } -void CHexManagerWidget::addName( const QString &name ) +void CHexManagerWidget::addName( const TQString &name ) { if( name.isEmpty() == true ) { @@ -222,7 +222,7 @@ void CHexManagerWidget::addName( const QString &name ) } -void CHexManagerWidget::removeName( const QString &name ) +void CHexManagerWidget::removeName( const TQString &name ) { mTabBar->removeName( name ); if( mTabBar->isVisible() == true && mTabBar->count() == 0 ) @@ -232,14 +232,14 @@ void CHexManagerWidget::removeName( const QString &name ) } -void CHexManagerWidget::changeName( const QString &curName, - const QString &newName ) +void CHexManagerWidget::changeName( const TQString &curName, + const TQString &newName ) { mTabBar->changeName( curName, newName ); } -void CHexManagerWidget::open( const QString &name ) +void CHexManagerWidget::open( const TQString &name ) { mEditor->open( name, false, 0 ); } @@ -258,21 +258,21 @@ int CHexManagerWidget::preferredWidth( void ) -CTabBar::CTabBar( QWidget *parent, char *name ) - :QTabBar( parent, name ) +CTabBar::CTabBar( TQWidget *parent, char *name ) + :TQTabBar( parent, name ) { - connect( this, SIGNAL(selected(int)), this, SLOT(slotSelected(int)) ); + connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotSelected(int)) ); } -void CTabBar::addName( const QString &name ) +void CTabBar::addName( const TQString &name ) { - QString n( name.right(name.length()-name.findRev('/')-1) ); + TQString n( name.right(name.length()-name.findRev('/')-1) ); - QTab *t = find( n ); + TQTab *t = find( n ); if( t == 0 ) { - t = new QTab(); + t = new TQTab(); t->setText( n); int id = addTab( t ); mFileList.append( CFileKey(name,id) ); @@ -281,16 +281,16 @@ void CTabBar::addName( const QString &name ) } -void CTabBar::removeName( const QString &name ) +void CTabBar::removeName( const TQString &name ) { - QString n( name.right(name.length()-name.findRev('/')-1) ); - QTab *t = find(n); + TQString n( name.right(name.length()-name.findRev('/')-1) ); + TQTab *t = find(n); if( t == 0 ) { return; } - QValueList<CFileKey>::Iterator it; + TQValueList<CFileKey>::Iterator it; for( it = mFileList.begin(); it != mFileList.end(); ++it ) { if( (*it).id() == t->identifier() ) @@ -304,21 +304,21 @@ void CTabBar::removeName( const QString &name ) } -void CTabBar::changeName( const QString &curName, const QString &newName ) +void CTabBar::changeName( const TQString &curName, const TQString &newName ) { - QString n( curName.right(curName.length()-curName.findRev('/')-1) ); - QTab *t = find(n); + TQString n( curName.right(curName.length()-curName.findRev('/')-1) ); + TQTab *t = find(n); if( t == 0 ) { return; } - QValueList<CFileKey>::Iterator it; + TQValueList<CFileKey>::Iterator it; for( it = mFileList.begin(); it != mFileList.end(); ++it ) { if( (*it).id() == t->identifier() ) { - QString m( newName.right(newName.length()-newName.findRev('/')-1) ); + TQString m( newName.right(newName.length()-newName.findRev('/')-1) ); t->setText(m); mFileList.remove(it); @@ -331,10 +331,10 @@ void CTabBar::changeName( const QString &curName, const QString &newName ) } -QTab *CTabBar::find( const QString &name ) +TQTab *CTabBar::find( const TQString &name ) { - QPtrList<QTab> &list = *tabList(); - for( QTab *t = list.first(); t != 0; t = list.next() ) + TQPtrList<TQTab> &list = *tabList(); + for( TQTab *t = list.first(); t != 0; t = list.next() ) { if( t->text() == name ) { @@ -354,7 +354,7 @@ int CTabBar::count( void ) void CTabBar::slotSelected( int id ) { - QValueList<CFileKey>::Iterator it; + TQValueList<CFileKey>::Iterator it; for( it = mFileList.begin(); it != mFileList.end(); ++it ) { if( (*it).id() == id ) diff --git a/khexedit/hexmanagerwidget.h b/khexedit/hexmanagerwidget.h index 08924da..2d90233 100644 --- a/khexedit/hexmanagerwidget.h +++ b/khexedit/hexmanagerwidget.h @@ -25,9 +25,9 @@ #include <config.h> #endif -#include <qtabbar.h> -#include <qvaluelist.h> -#include <qwidget.h> +#include <tqtabbar.h> +#include <tqvaluelist.h> +#include <tqwidget.h> #include "hexeditorwidget.h" #include "hextoolwidget.h" @@ -38,7 +38,7 @@ class CSearchBar; class CFileKey { public: - CFileKey( const QString &fname, int fid ) + CFileKey( const TQString &fname, int fid ) { mFilename = fname; mId = fid; @@ -54,7 +54,7 @@ class CFileKey { } - QString filename( void ) const + TQString filename( void ) const { return( mFilename ); } @@ -65,7 +65,7 @@ class CFileKey } private: - QString mFilename; + TQString mFilename; int mId; }; @@ -77,23 +77,23 @@ class CTabBar : public QTabBar Q_OBJECT public: - CTabBar( QWidget *parent=0, char *name=0 ); - void addName( const QString &name ); - void removeName( const QString &name ); - void changeName( const QString &curName, const QString &newName ); + CTabBar( TQWidget *parent=0, char *name=0 ); + void addName( const TQString &name ); + void removeName( const TQString &name ); + void changeName( const TQString &curName, const TQString &newName ); int count( void ); protected slots: void slotSelected( int id ); private: - QTab *find( const QString &name ); + TQTab *find( const TQString &name ); private: - QValueList<CFileKey> mFileList; + TQValueList<CFileKey> mFileList; signals: - void selected( const QString &filename ); + void selected( const TQString &filename ); }; @@ -117,7 +117,7 @@ class CHexManagerWidget : public QWidget }; public: - CHexManagerWidget( QWidget *parent = 0, const char *name = 0, + CHexManagerWidget( TQWidget *parent = 0, const char *name = 0, EConversionPosition state = Embed, EPosition tabBarPosition = HideItem, EPosition searchBarPosition = HideItem ); @@ -136,12 +136,12 @@ class CHexManagerWidget : public QWidget void setConversionVisibility( EConversionPosition position ); void setTabBarPosition( EPosition position ); void setSearchBarPosition( EPosition position ); - void addName( const QString &name ); - void removeName( const QString &name ); - void changeName( const QString &curName, const QString &newName ); + void addName( const TQString &name ); + void removeName( const TQString &name ); + void changeName( const TQString &curName, const TQString &newName ); protected slots: - void open( const QString &name ); + void open( const TQString &name ); void searchBarHidden( void ); private: diff --git a/khexedit/hexprinter.cc b/khexedit/hexprinter.cc index 0127751..2d55a6a 100644 --- a/khexedit/hexprinter.cc +++ b/khexedit/hexprinter.cc @@ -107,7 +107,7 @@ void CHexPrinter::setPageFooter( bool enable, uint left, uint center, SPageMargin CHexPrinter::pageMargin( void ) { - QPaintDeviceMetrics metric( this ); + TQPaintDeviceMetrics metric( this ); float f = (float)metric.width()/(float)metric.widthMM(); SPageMargin margin; @@ -128,7 +128,7 @@ SPageMargin CHexPrinter::pageMarginMM( void ) SPageSize CHexPrinter::pageFullSize( void ) { - QPaintDeviceMetrics metric( this ); + TQPaintDeviceMetrics metric( this ); SPageSize size; size.width = metric.width(); size.height = metric.height(); @@ -139,7 +139,7 @@ SPageSize CHexPrinter::pageFullSize( void ) SPageSize CHexPrinter::pageUsableSize( void ) { - QPaintDeviceMetrics metric( this ); + TQPaintDeviceMetrics metric( this ); SPageMargin margin = pageMargin(); SPageSize size; diff --git a/khexedit/hexprinter.h b/khexedit/hexprinter.h index 2d6eeba..f27d4b8 100644 --- a/khexedit/hexprinter.h +++ b/khexedit/hexprinter.h @@ -22,7 +22,7 @@ #define _HEX_PRINTER_H_ #include <kprinter.h> -#include <qpaintdevicemetrics.h> +#include <tqpaintdevicemetrics.h> struct SPageSize { diff --git a/khexedit/hextoolwidget.cc b/khexedit/hextoolwidget.cc index f0baf09..b5e918e 100644 --- a/khexedit/hextoolwidget.cc +++ b/khexedit/hextoolwidget.cc @@ -22,81 +22,81 @@ #include <klocale.h> #include "hextoolwidget.h" -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qcombobox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> -CHexToolWidget::CHexToolWidget( QWidget *parent, const char *name ) - : QFrame( parent, name ) +CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) + : TQFrame( parent, name ) { - setFrameStyle( QFrame::Panel | QFrame::Raised ); + setFrameStyle( TQFrame::Panel | TQFrame::Raised ); setLineWidth( 1 ); - QString text; - mUtilBox = new QGridLayout( this, 5, 4, KDialog::marginHint(), KDialog::spacingHint() ); + TQString text; + mUtilBox = new TQGridLayout( this, 5, 4, KDialog::marginHint(), KDialog::spacingHint() ); mUtilBox->setColStretch( 3, 10 ); - QString msg1[4] = + TQString msg1[4] = { i18n("Signed 8 bit:"), i18n("Unsigned 8 bit:"), i18n("Signed 16 bit:"), i18n("Unsigned 16 bit:") }; - QString msg2[4] = + TQString msg2[4] = { i18n("Signed 32 bit:"), i18n("Unsigned 32 bit:"), i18n("32 bit float:"), i18n("64 bit float:") }; - QString msg3[4] = + TQString msg3[4] = { i18n("Hexadecimal:"), i18n("Octal:"), i18n("Binary:"), i18n("Text:") }; - QGridLayout *ValuesBox = new QGridLayout( this, 4, 6, 0, KDialog::spacingHint() ); + TQGridLayout *ValuesBox = new TQGridLayout( this, 4, 6, 0, KDialog::spacingHint() ); ValuesBox->setColStretch( 2, 10 ); ValuesBox->setColStretch( 5, 10 ); for( int i=0; i<4; i++ ) { - QLabel *Label = new QLabel( msg1[i], this ); + TQLabel *Label = new TQLabel( msg1[i], this ); Label->setAlignment( AlignRight|AlignVCenter ); ValuesBox->addWidget( Label, i, 0 ); - mText1[i] = new QLineEdit( this ); + mText1[i] = new TQLineEdit( this ); mText1[i]->setReadOnly( true ); mText1[i]->setAlignment( AlignRight ); ValuesBox->addWidget( mText1[i], i, 1 ); - Label = new QLabel( msg2[i], this ); + Label = new TQLabel( msg2[i], this ); Label->setAlignment( AlignRight|AlignVCenter ); ValuesBox->addWidget( Label, i, 3 ); - mText2[i] = new QLineEdit( this ); + mText2[i] = new TQLineEdit( this ); mText2[i]->setReadOnly( true ); mText2[i]->setAlignment( AlignRight ); ValuesBox->addWidget( mText2[i], i, 4 ); - Label = new QLabel( msg3[i], this ); + Label = new TQLabel( msg3[i], this ); Label->setAlignment( AlignRight|AlignVCenter ); mUtilBox->addWidget( Label, i, 1 ); - mText3[i] = new QLineEdit( this ); + mText3[i] = new TQLineEdit( this ); mText3[i]->setReadOnly( true ); mText3[i]->setAlignment( AlignRight ); mUtilBox->addWidget( mText3[i], i, 2 ); } - QBoxLayout * SettingsBox = new QHBoxLayout( this, 0, KDialog::spacingHint() ); + TQBoxLayout * SettingsBox = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); text = i18n("Show little endian decoding"); - mCheckIntelFormat = new QCheckBox( text, this ); + mCheckIntelFormat = new TQCheckBox( text, this ); mCheckIntelFormat->setMinimumSize( mCheckIntelFormat->sizeHint() ); - connect( mCheckIntelFormat, SIGNAL(clicked()), this, SLOT(intelFormat()) ); + connect( mCheckIntelFormat, TQT_SIGNAL(clicked()), this, TQT_SLOT(intelFormat()) ); SettingsBox->addWidget( mCheckIntelFormat, 0, AlignVCenter ); mCheckIntelFormat->setChecked( // default value to please endian system users #ifdef WORDS_BIGENDIAN @@ -108,9 +108,9 @@ CHexToolWidget::CHexToolWidget( QWidget *parent, const char *name ) // TODO: make this a pulldown box, adding PDP endianess text = i18n("Show unsigned as hexadecimal"); - mCheckHexadecimal = new QCheckBox( text, this ); + mCheckHexadecimal = new TQCheckBox( text, this ); mCheckHexadecimal->setMinimumSize( mCheckHexadecimal->sizeHint() ); - connect( mCheckHexadecimal, SIGNAL(clicked()), this, SLOT(unsignedFormat()) ); + connect( mCheckHexadecimal, TQT_SIGNAL(clicked()), this, TQT_SLOT(unsignedFormat()) ); SettingsBox->addWidget( mCheckHexadecimal, 0, AlignVCenter ); mUtilBox->addMultiCellLayout( ValuesBox, 0, 3, 0, 0, AlignLeft|AlignVCenter ); @@ -119,11 +119,11 @@ CHexToolWidget::CHexToolWidget( QWidget *parent, const char *name ) // // Variable bitwidth. Based on Craig Graham's work. // - QLabel *bitLabel = new QLabel( i18n("Stream length:"), this ); + TQLabel *bitLabel = new TQLabel( i18n("Stream length:"), this ); bitLabel->setAlignment( AlignRight|AlignVCenter ); mUtilBox->addWidget( bitLabel, 4, 1 ); - mBitCombo = new QComboBox( false, this ); + mBitCombo = new TQComboBox( false, this ); text = i18n("Fixed 8 Bit" ); mBitCombo->insertItem( text ); for( int i=0; i<16; i++ ) @@ -133,7 +133,7 @@ CHexToolWidget::CHexToolWidget( QWidget *parent, const char *name ) mBitCombo->insertItem( text ); } mBitCombo->setMinimumSize( mBitCombo->sizeHint() ); - connect( mBitCombo, SIGNAL(activated(int)), SLOT(bitWidthChanged(int))); + connect( mBitCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(bitWidthChanged(int))); mUtilBox->addWidget( mBitCombo, 4, 2 ); /* load font metrics */ @@ -141,8 +141,8 @@ CHexToolWidget::CHexToolWidget( QWidget *parent, const char *name ) mUtilBox->activate(); - connect( kapp, SIGNAL( kdisplayFontChanged() ), - SLOT( fontChanged() ) ); + connect( kapp, TQT_SIGNAL( kdisplayFontChanged() ), + TQT_SLOT( fontChanged() ) ); mCursorState.valid = false; mViewHexCaps = true; @@ -253,7 +253,7 @@ void CHexToolWidget::cursorChanged( SCursorState &state ) { if( state.valid == true ) { - QString buf; + TQString buf; // change by Kossebau[03.11.2003]: // checking for system endianess, using the compiler for the byte interpretation and cutting bloaded code // TODO: add PDP endianess @@ -332,7 +332,7 @@ void CHexToolWidget::cursorChanged( SCursorState &state ) bitBuf[7-i] = (data&(1<<i)) ? '1' : '0'; bitBuf[8] = 0; - mText3[2]->setText( QString(bitBuf) ); + mText3[2]->setText( TQString(bitBuf) ); } else { @@ -348,20 +348,20 @@ void CHexToolWidget::cursorChanged( SCursorState &state ) for( int i = 0; i<numBits; i++ ) bitBuf[numBits-i-1] = (data&(1L<<i)) ? '1' : '0'; bitBuf[numBits] = 0; - mText3[2]->setText( QString(bitBuf) ); + mText3[2]->setText( TQString(bitBuf) ); } // Fix by Sergey A. Sukiyazov unsigned char data[2] = { 0, 0 }; data[0] = state.charValid == false ? '.' : (char)((unsigned char)state.data[0]&0xff ); - buf = QString::fromLocal8Bit( (const char *)data ); + buf = TQString::fromLocal8Bit( (const char *)data ); mText3[3]->setText( buf ); } else { - QString str; + TQString str; for( int i=0; i<4; i++) { mText1[i]->setText( str ); @@ -376,7 +376,7 @@ void CHexToolWidget::cursorChanged( SCursorState &state ) void CHexToolWidget::fontChanged( void ) { - QFontMetrics fm( mText1[0]->font() ); + TQFontMetrics fm( mText1[0]->font() ); int W1 = fm.width( "XXXXXXXX" ); int W2 = fm.width( "XXXXXXXXXXXX" ); int W3 = fm.width( "888888888888888888" ); @@ -401,13 +401,13 @@ void CHexToolWidget::unsignedFormat( void ) } -void CHexToolWidget::resizeEvent( QResizeEvent */*e*/ ) +void CHexToolWidget::resizeEvent( TQResizeEvent */*e*/ ) { } -void CHexToolWidget::closeEvent( QCloseEvent *e ) +void CHexToolWidget::closeEvent( TQCloseEvent *e ) { e->accept(); emit closed(); diff --git a/khexedit/hextoolwidget.h b/khexedit/hextoolwidget.h index d2ce892..eaf4e3c 100644 --- a/khexedit/hextoolwidget.h +++ b/khexedit/hextoolwidget.h @@ -29,14 +29,14 @@ class QLineEdit; class QCheckBox; #include "hexbuffer.h" -#include <qframe.h> +#include <tqframe.h> class CHexToolWidget : public QFrame { Q_OBJECT public: - CHexToolWidget( QWidget *parent = 0, const char *name = 0 ); + CHexToolWidget( TQWidget *parent = 0, const char *name = 0 ); ~CHexToolWidget( void ); void writeConfiguration( KConfig &config ); @@ -44,8 +44,8 @@ class CHexToolWidget : public QFrame unsigned long bitValue( SCursorState &state, int n ); protected: - void resizeEvent( QResizeEvent *e ); - void closeEvent( QCloseEvent *e ); + void resizeEvent( TQResizeEvent *e ); + void closeEvent( TQCloseEvent *e ); public slots: void cursorChanged( SCursorState &state ); @@ -64,13 +64,13 @@ class CHexToolWidget : public QFrame SCursorState mCursorState; bool mViewHexCaps; - QGridLayout *mUtilBox; - QLineEdit *mText1[4]; - QLineEdit *mText2[4]; - QLineEdit *mText3[4]; - QCheckBox *mCheckIntelFormat; - QCheckBox *mCheckHexadecimal; - QComboBox *mBitCombo; + TQGridLayout *mUtilBox; + TQLineEdit *mText1[4]; + TQLineEdit *mText2[4]; + TQLineEdit *mText3[4]; + TQCheckBox *mCheckIntelFormat; + TQCheckBox *mCheckHexadecimal; + TQComboBox *mBitCombo; }; diff --git a/khexedit/hexvalidator.cc b/khexedit/hexvalidator.cc index e8c1731..96cd982 100644 --- a/khexedit/hexvalidator.cc +++ b/khexedit/hexvalidator.cc @@ -20,12 +20,12 @@ #include <ctype.h> #include <stdio.h> -#include <qwidget.h> +#include <tqwidget.h> #include "hexvalidator.h" -CHexValidator::CHexValidator( QWidget *parent, EState state, +CHexValidator::CHexValidator( TQWidget *parent, EState state, const char *name ) - :QValidator( parent, name ) + :TQValidator( parent, name ) { setState( state ); } @@ -34,7 +34,7 @@ CHexValidator::~CHexValidator( void ) { } -QValidator::State CHexValidator::validate( QString &string, int &/*pos*/ ) const +TQValidator::State CHexValidator::validate( TQString &string, int &/*pos*/ ) const { if( mState == hexadecimal ) { @@ -43,10 +43,10 @@ QValidator::State CHexValidator::validate( QString &string, int &/*pos*/ ) const int val = string[i].latin1(); if( isxdigit( val ) == 0 && isspace( val ) == 0 ) { - return( QValidator::Invalid ); + return( TQValidator::Invalid ); } } - return( QValidator::Valid ); + return( TQValidator::Valid ); } if( mState == decimal ) { @@ -55,10 +55,10 @@ QValidator::State CHexValidator::validate( QString &string, int &/*pos*/ ) const int val = string[i].latin1(); if( isdigit( val ) == 0 && isspace( val ) == 0 ) { - return( QValidator::Invalid ); + return( TQValidator::Invalid ); } } - return( QValidator::Valid ); + return( TQValidator::Valid ); } else if( mState == octal ) { @@ -68,10 +68,10 @@ QValidator::State CHexValidator::validate( QString &string, int &/*pos*/ ) const if( (isdigit( val ) == 0 || val == '8' || val == '9') && isspace( val ) == 0 ) { - return( QValidator::Invalid ); + return( TQValidator::Invalid ); } } - return( QValidator::Valid ); + return( TQValidator::Valid ); } else if( mState == binary ) { @@ -80,18 +80,18 @@ QValidator::State CHexValidator::validate( QString &string, int &/*pos*/ ) const int val = string[i].latin1(); if( val != '0' && val != '1' && isspace( val ) == 0 ) { - return( QValidator::Invalid ); + return( TQValidator::Invalid ); } } - return( QValidator::Valid ); + return( TQValidator::Valid ); } else if( mState == regularText ) { - return( QValidator::Valid ); + return( TQValidator::Valid ); } else { - return( QValidator::Invalid ); + return( TQValidator::Invalid ); } } @@ -103,7 +103,7 @@ void CHexValidator::setState( EState state ) } -void CHexValidator::convert( QByteArray &dest, const QString &src ) +void CHexValidator::convert( TQByteArray &dest, const TQString &src ) { uint value; uint k=0; @@ -286,29 +286,29 @@ void CHexValidator::convert( QByteArray &dest, const QString &src ) -void CHexValidator::format( QString &dest, const QByteArray &src ) +void CHexValidator::format( TQString &dest, const TQByteArray &src ) { for( uint i=0; i<src.size(); ++i ) { unsigned char srcCh = (unsigned char)src[i]; - QString formattedCh; + TQString formattedCh; switch( mState ) { case hexadecimal: - formattedCh = zeroExtend( QString::number( srcCh, 16 ), 2 ); + formattedCh = zeroExtend( TQString::number( srcCh, 16 ), 2 ); break; case decimal: - formattedCh = zeroExtend( QString::number( srcCh, 10), 3 ); + formattedCh = zeroExtend( TQString::number( srcCh, 10), 3 ); break; case octal: - formattedCh = zeroExtend( QString::number( srcCh, 8), 3 ); + formattedCh = zeroExtend( TQString::number( srcCh, 8), 3 ); break; case binary: - formattedCh = zeroExtend( QString::number( srcCh, 2), 8 ); + formattedCh = zeroExtend( TQString::number( srcCh, 2), 8 ); break; case regularText: - formattedCh = QString( QChar( srcCh ) ); + formattedCh = TQString( TQChar( srcCh ) ); break; } @@ -317,12 +317,12 @@ void CHexValidator::format( QString &dest, const QByteArray &src ) } -QString CHexValidator::zeroExtend( const QString &src, unsigned destLen) const +TQString CHexValidator::zeroExtend( const TQString &src, unsigned destLen) const { if( src.length() >= destLen ) return src; - QString zeroes; + TQString zeroes; zeroes.fill( '0', destLen - src.length() ); return zeroes + src; } diff --git a/khexedit/hexvalidator.h b/khexedit/hexvalidator.h index cfe9f95..69b6fc1 100644 --- a/khexedit/hexvalidator.h +++ b/khexedit/hexvalidator.h @@ -21,7 +21,7 @@ #ifndef _HEX_VALIDATOR_H_ #define _HEX_VALIDATOR_H_ -#include <qvalidator.h> +#include <tqvalidator.h> class CHexValidator: public QValidator { @@ -38,12 +38,12 @@ class CHexValidator: public QValidator }; public: - CHexValidator( QWidget *parent, EState state, const char *name = 0 ); + CHexValidator( TQWidget *parent, EState state, const char *name = 0 ); ~CHexValidator( void ); - QValidator::State validate( QString &string, int &pos ) const; + TQValidator::State validate( TQString &string, int &pos ) const; void setState( EState state ); - void convert( QByteArray &dest, const QString &src ); - void format( QString &dest, const QByteArray &src ); + void convert( TQByteArray &dest, const TQString &src ); + void format( TQString &dest, const TQByteArray &src ); private: /** @@ -52,7 +52,7 @@ class CHexValidator: public QValidator * * e.g. zeroExtend( "32", 3 ) => "032" */ - QString zeroExtend( const QString &src, unsigned destLen ) const; + TQString zeroExtend( const TQString &src, unsigned destLen ) const; EState mState; diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc index 12226ed..5f3e32c 100644 --- a/khexedit/hexviewwidget.cc +++ b/khexedit/hexviewwidget.cc @@ -20,8 +20,8 @@ #include <iostream> -#include <qclipboard.h> -#include <qdrawutil.h> +#include <tqclipboard.h> +#include <tqdrawutil.h> #include <kglobalsettings.h> @@ -80,7 +80,7 @@ void CDragManager::setup( int x, int y ) mPending = true; } -bool CDragManager::start( QMouseEvent *e ) +bool CDragManager::start( TQMouseEvent *e ) { if( mPending == false ) { @@ -131,7 +131,7 @@ bool CDragManager::clear( void ) return( true ); } -void CDragManager::timerEvent( QTimerEvent *e ) +void CDragManager::timerEvent( TQTimerEvent *e ) { if( e->timerId() == mTimerId ) { @@ -167,9 +167,9 @@ void CDragManager::setupTimer( void ) // // This widget will use the entire space of the parent widget // -CHexViewWidget::CHexViewWidget( QWidget *parent, const char *name, +CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name, CHexBuffer *hexBuffer ) - : QFrame( parent, name, + : TQFrame( parent, name, #ifdef USE_NORTHWEST_GRAVITY Qt::WStaticContents #else @@ -190,19 +190,19 @@ CHexViewWidget::CHexViewWidget( QWidget *parent, const char *name, // I tried to do a // "while( mHorzScroll->isVisible() ) { mHorzScroll->hide(); }" // but then the loop never ended. The "CScrollBar" emits a "hidden()" - // signal whenever is receives a QHideEvent. + // signal whenever is receives a TQHideEvent. // - mVertScroll = new CScrollBar( QScrollBar::Vertical, this ); + mVertScroll = new CScrollBar( TQScrollBar::Vertical, this ); if( mVertScroll == 0 ) { return; } - mHorzScroll = new CScrollBar( QScrollBar::Horizontal, this ); + mHorzScroll = new CScrollBar( TQScrollBar::Horizontal, this ); if( mHorzScroll == 0 ) { return; } - mCorner = new QWidget( this ); + mCorner = new TQWidget( this ); if( mCorner == 0 ) { return; } - connect( mHorzScroll, SIGNAL(valueChanged(int)), SLOT(changeXPos(int)) ); - connect( mVertScroll, SIGNAL(valueChanged(int)), SLOT(changeYPos(int)) ); - connect( mHorzScroll, SIGNAL(hidden()), SLOT(update()) ); - connect( mVertScroll, SIGNAL(hidden()), SLOT(update()) ); + 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()) ); mHorzScroll->hide(); mVertScroll->hide(); @@ -213,9 +213,9 @@ CHexViewWidget::CHexViewWidget( QWidget *parent, const char *name, #else mDragManager->setActivateMode( CDragManager::Timer ); #endif - connect( mDragManager, SIGNAL(startDrag(bool)), SLOT(startDrag(bool)) ); + connect( mDragManager, TQT_SIGNAL(startDrag(bool)), TQT_SLOT(startDrag(bool)) ); - setFrameStyle( QFrame::WinPanel|QFrame::Sunken ); + setFrameStyle( TQFrame::WinPanel|TQFrame::Sunken ); setWFlags( WResizeNoErase ); setFocusPolicy( StrongFocus ); @@ -247,7 +247,7 @@ CHexViewWidget::~CHexViewWidget( void ) } -int CHexViewWidget::readFile( QFile &file, const QString &url, CProgress &p ) +int CHexViewWidget::readFile( TQFile &file, const TQString &url, CProgress &p ) { int errCode = mHexBuffer->readFile( file, url, p ); if( errCode != Err_Success ) @@ -260,7 +260,7 @@ int CHexViewWidget::readFile( QFile &file, const QString &url, CProgress &p ) } -int CHexViewWidget::insertFile( QFile &file, CProgress &p ) +int CHexViewWidget::insertFile( TQFile &file, CProgress &p ) { int errCode = mHexBuffer->insertFile( file, p ); if( errCode != Err_Success ) @@ -277,7 +277,7 @@ int CHexViewWidget::insertFile( QFile &file, CProgress &p ) } -int CHexViewWidget::newFile( const QString &url ) +int CHexViewWidget::newFile( const TQString &url ) { int errCode = mHexBuffer->newFile( url ); if( errCode != Err_Success ) @@ -290,7 +290,7 @@ int CHexViewWidget::newFile( const QString &url ) } -int CHexViewWidget::writeFile( QFile &file, CProgress &p ) +int CHexViewWidget::writeFile( TQFile &file, CProgress &p ) { int errCode = mHexBuffer->writeFile( file, p ); if( errCode == Err_Success ) @@ -392,7 +392,7 @@ void CHexViewWidget::changeXPos( int p ) } else { - QWidget::update(); + TQWidget::update(); } // @@ -420,7 +420,7 @@ void CHexViewWidget::changeYPos( int p ) } else { - QWidget::update(); + TQWidget::update(); } // @@ -438,8 +438,8 @@ void CHexViewWidget::changeYPos( int p ) void CHexViewWidget::clipboardChanged( void ) { - disconnect(QApplication::clipboard(),SIGNAL(dataChanged()), - this,SLOT(clipboardChanged())); + disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), + this,TQT_SLOT(clipboardChanged())); unselect(); } @@ -481,7 +481,7 @@ void CHexViewWidget::insert( SInsertData &id ) return; } - QByteArray buf( id.size ); + TQByteArray buf( id.size ); if( buf.isNull() == true ) { return; @@ -513,7 +513,7 @@ void CHexViewWidget::insert( SInsertData &id ) } -void CHexViewWidget::insert( const QByteArray &buf ) +void CHexViewWidget::insert( const TQByteArray &buf ) { if( mHexBuffer->documentPresent() == false ) { @@ -534,7 +534,7 @@ void CHexViewWidget::insert( const QByteArray &buf ) } -void CHexViewWidget::append( const QByteArray &buf ) +void CHexViewWidget::append( const TQByteArray &buf ) { if( mHexBuffer->documentPresent() == false ) { @@ -556,7 +556,7 @@ void CHexViewWidget::append( const QByteArray &buf ) } -void CHexViewWidget::valueOnCursor( QByteArray &buf, uint size ) +void CHexViewWidget::valueOnCursor( TQByteArray &buf, uint size ) { mHexBuffer->valueOnCursor( buf, size ); } @@ -702,14 +702,14 @@ void CHexViewWidget::updateView( bool redraw, bool fixCursor ) if( redraw == true ) { - QWidget::update(); + TQWidget::update(); } } -void CHexViewWidget::setPalette( const QPalette &p ) +void CHexViewWidget::setPalette( const TQPalette &p ) { - QWidget::setPalette( p ); + TQWidget::setPalette( p ); mCorner->setPalette( p ); mVertScroll->setPalette( p ); mHorzScroll->setPalette( p ); @@ -779,7 +779,7 @@ void CHexViewWidget::setMisc( SDisplayMisc &misc ) misc.bookmarkEditor ); if( mHexBuffer->documentPresent() == true ) { - QWidget::update(); + TQWidget::update(); } } @@ -934,14 +934,14 @@ int CHexViewWidget::exportCArray( const SExportCArray &ex, CProgress &p ) void CHexViewWidget::startDrag( bool asText ) { - QByteArray buf; + TQByteArray buf; if( asText == true ) { if( mHexBuffer->copySelectedText( buf ) != Err_Success ) { return; } - QDragObject *d = new QTextDrag( buf.data(), this ); + TQDragObject *d = new TQTextDrag( buf.data(), this ); d->dragCopy(); } else @@ -950,7 +950,7 @@ void CHexViewWidget::startDrag( bool asText ) { return; } - QDragObject *d = new CHexDrag( buf, this ); + TQDragObject *d = new CHexDrag( buf, this ); d->dragCopy(); } } @@ -959,13 +959,13 @@ void CHexViewWidget::startDrag( bool asText ) void CHexViewWidget::copy( void ) { - QByteArray buf; + TQByteArray buf; if( mHexBuffer->copySelectedData( buf ) != Err_Success ) { return; } - disconnect(QApplication::clipboard(),SIGNAL(dataChanged()), - this,SLOT(clipboardChanged())); + disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), + this,TQT_SLOT(clipboardChanged())); // // Note: Do no give the CHexDrag a parent != 0. The clipboard // owns the current dragdata and will destroy it on exit or @@ -974,45 +974,45 @@ void CHexViewWidget::copy( void ) // is destroyed. We will then have a double destroy situation // when the app. is closed (=> segfault). // - QApplication::clipboard()->setData(new CHexDrag( buf )); - connect(QApplication::clipboard(),SIGNAL(dataChanged()), - this,SLOT(clipboardChanged())); + TQApplication::clipboard()->setData(new CHexDrag( buf )); + connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), + this,TQT_SLOT(clipboardChanged())); } void CHexViewWidget::copyText( int columnSegment ) { - QByteArray buf; + TQByteArray buf; if( mHexBuffer->copySelectedText( buf, columnSegment ) != Err_Success ) { return; } - disconnect(QApplication::clipboard(),SIGNAL(dataChanged()), - this,SLOT(clipboardChanged())); - QApplication::clipboard()->setText( buf.data() ); - connect(QApplication::clipboard(),SIGNAL(dataChanged()), - this,SLOT(clipboardChanged())); + disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), + this,TQT_SLOT(clipboardChanged())); + TQApplication::clipboard()->setText( buf.data() ); + connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), + this,TQT_SLOT(clipboardChanged())); } void CHexViewWidget::paste( void ) { - QMimeSource *data = QApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::clipboard()->data(); if( data != 0 ) { - QByteArray buf; + TQByteArray buf; if( CHexDrag::decode( data, buf ) == true ) { insert( buf ); return; } - QString text; - if( QTextDrag::decode( data, text ) == true ) + TQString text; + if( TQTextDrag::decode( data, text ) == true ) { - QByteArray buf; + TQByteArray buf; if( mClipConvert.decode( buf, text ) == true ) { insert( buf ); @@ -1082,15 +1082,15 @@ void CHexViewWidget::addBookmark( int position ) -int CHexViewWidget::bookmarkMenu( const QString &title ) +int CHexViewWidget::bookmarkMenu( const TQString &title ) { - QPtrList<SCursorOffset> &list = mHexBuffer->bookmarkList(); + TQPtrList<SCursorOffset> &list = mHexBuffer->bookmarkList(); if( list.count() == 0 ) { return( -1 ); } - QString text; + TQString text; KPopupMenu *popup = new KPopupMenu( 0 ); popup->insertTitle( title ); for( uint i=0; i < list.count(); i++ ) @@ -1099,12 +1099,12 @@ int CHexViewWidget::bookmarkMenu( const QString &title ) if( p == 0 ) { continue; } text.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF ); - text.prepend( QString("[%1] %2: ").arg(i+1).arg(i18n("Offset")) ); + text.prepend( TQString("[%1] %2: ").arg(i+1).arg(i18n("Offset")) ); popup->insertItem( text, i ); } - QSize s(popup->sizeHint()); - QPoint center( (width()-s.width())/2, (height()-s.height())/2 ); + TQSize s(popup->sizeHint()); + TQPoint center( (width()-s.width())/2, (height()-s.height())/2 ); int position = popup->exec( mapToGlobal(center) ); delete popup; @@ -1121,7 +1121,7 @@ void CHexViewWidget::removeBookmark( bool all ) { return; } - QWidget::update(); // Redraw visisble area. + TQWidget::update(); // Redraw visisble area. } else { @@ -1149,7 +1149,7 @@ void CHexViewWidget::removeBookmark( bool all ) void CHexViewWidget::replaceBookmark( void ) { - QPtrList<SCursorOffset> &list = mHexBuffer->bookmarkList(); + TQPtrList<SCursorOffset> &list = mHexBuffer->bookmarkList(); if( list.count() == 0 ) { return; @@ -1166,7 +1166,7 @@ void CHexViewWidget::replaceBookmark( void ) void CHexViewWidget::gotoBookmark( uint position ) { - QPtrList<SCursorOffset> &list = mHexBuffer->bookmarkList(); + TQPtrList<SCursorOffset> &list = mHexBuffer->bookmarkList(); if( position >= list.count() ) { return; @@ -1186,7 +1186,7 @@ void CHexViewWidget::gotoBookmark( uint position ) void CHexViewWidget::gotoNextBookmark( bool next ) { - QPtrList<SCursorOffset> &list = mHexBuffer->bookmarkList(); + TQPtrList<SCursorOffset> &list = mHexBuffer->bookmarkList(); uint offset = mHexBuffer->cursorOffset(); uint diff = ~0; @@ -1298,7 +1298,7 @@ void CHexViewWidget::benchmark( void ) -void CHexViewWidget::resizeEvent( QResizeEvent * ) +void CHexViewWidget::resizeEvent( TQResizeEvent * ) { setTextBufferSize(); @@ -1330,7 +1330,7 @@ void CHexViewWidget::resizeEvent( QResizeEvent * ) #ifdef USE_NORTHWEST_GRAVITY if( w != dataWidth() ) { - QWidget::update(); + TQWidget::update(); } else { @@ -1342,7 +1342,7 @@ void CHexViewWidget::resizeEvent( QResizeEvent * ) -void CHexViewWidget::paintEvent( QPaintEvent *e ) +void CHexViewWidget::paintEvent( TQPaintEvent *e ) { paintText( e->rect(), true ); } @@ -1356,14 +1356,14 @@ void CHexViewWidget::updateFrameSize( void ) int h = height() - (mHorzScroll->isVisible() ? mScrollBarSize : 0); if( h < 0 ) { h = 0; } - setFrameRect( QRect(0,0,w,h) ); + setFrameRect( TQRect(0,0,w,h) ); } void CHexViewWidget::paintFrame( void ) { - QPainter paint; + TQPainter paint; paint.begin( this ); drawFrame( &paint ); paint.end(); @@ -1371,7 +1371,7 @@ void CHexViewWidget::paintFrame( void ) -void CHexViewWidget::drawFrame( QPainter *p ) +void CHexViewWidget::drawFrame( TQPainter *p ) { // // 2000-01-10 Espen Sand @@ -1379,21 +1379,21 @@ void CHexViewWidget::drawFrame( QPainter *p ) // accepts a drop. The setPalette() function causes quite a bit of flicker // in the scrollbars (even when PropagationMode is NoChildren), so I // draw the frame manually when it can accept a drop. Note that the - // code below is for the frame shape "QFrame::WinPanel|QFrame::Plain" + // code below is for the frame shape "TQFrame::WinPanel|TQFrame::Plain" // if( mDropHighlight == true ) { - qDrawPlainRect( p, frameRect(), QColor("SteelBlue2"), lineWidth() ); + qDrawPlainRect( p, frameRect(), TQColor("SteelBlue2"), lineWidth() ); } else { - QFrame::drawFrame(p); // Use standard drawFrame + TQFrame::drawFrame(p); // Use standard drawFrame } } -void CHexViewWidget::keyPressEvent( QKeyEvent *e ) +void CHexViewWidget::keyPressEvent( TQKeyEvent *e ) { SCursorConfig cc; cc.state = e->state(); @@ -1514,7 +1514,7 @@ void CHexViewWidget::keyPressEvent( QKeyEvent *e ) } -void CHexViewWidget::keyReleaseEvent( QKeyEvent *e ) +void CHexViewWidget::keyReleaseEvent( TQKeyEvent *e ) { if( ( e->state() & ShiftButton ) && shiftButtonState() == false ) { @@ -1528,7 +1528,7 @@ void CHexViewWidget::keyReleaseEvent( QKeyEvent *e ) } -void CHexViewWidget::mousePressEvent( QMouseEvent *e ) +void CHexViewWidget::mousePressEvent( TQMouseEvent *e ) { // // The RMB popup menu is managed by the KContextMenuManager @@ -1557,7 +1557,7 @@ void CHexViewWidget::mousePressEvent( QMouseEvent *e ) } -void CHexViewWidget::mouseMoveEvent( QMouseEvent *e ) +void CHexViewWidget::mouseMoveEvent( TQMouseEvent *e ) { if( e->state() & LeftButton ) { @@ -1569,7 +1569,7 @@ void CHexViewWidget::mouseMoveEvent( QMouseEvent *e ) } } -void CHexViewWidget::mouseReleaseEvent( QMouseEvent *e ) +void CHexViewWidget::mouseReleaseEvent( TQMouseEvent *e ) { // // The RMB popup menu is managed by the KContextMenuManager @@ -1606,18 +1606,18 @@ void CHexViewWidget::mouseReleaseEvent( QMouseEvent *e ) -void CHexViewWidget::wheelEvent( QWheelEvent *e ) +void CHexViewWidget::wheelEvent( TQWheelEvent *e ) { if( mVertScroll->isVisible() == true ) { - QApplication::sendEvent( mVertScroll, e ); + TQApplication::sendEvent( mVertScroll, e ); } } -void CHexViewWidget::dragEnterEvent( QDragEnterEvent *e ) +void CHexViewWidget::dragEnterEvent( TQDragEnterEvent *e ) { - if( QTextDrag::canDecode(e) || CHexDrag::canDecode(e) || + if( TQTextDrag::canDecode(e) || CHexDrag::canDecode(e) || KURLDrag::canDecode(e)) { e->accept(); @@ -1626,17 +1626,17 @@ void CHexViewWidget::dragEnterEvent( QDragEnterEvent *e ) } -void CHexViewWidget::dragLeaveEvent( QDragLeaveEvent * ) +void CHexViewWidget::dragLeaveEvent( TQDragLeaveEvent * ) { setDropHighlight( false ); } -void CHexViewWidget::dragMoveEvent( QDragMoveEvent *e ) +void CHexViewWidget::dragMoveEvent( TQDragMoveEvent *e ) { // // Move the cursor if we are dragging (readable) text or binary - // data. Note: the QTextDrag::canDecode() will return true if we + // data. Note: the TQTextDrag::canDecode() will return true if we // are dragging a file so we have to test for KURLDrag::canDecode() // first. // @@ -1646,7 +1646,7 @@ void CHexViewWidget::dragMoveEvent( QDragMoveEvent *e ) return; } - if( QTextDrag::canDecode(e) == true || CHexDrag::canDecode(e) == true ) + if( TQTextDrag::canDecode(e) == true || CHexDrag::canDecode(e) == true ) { int x = startX() + e->pos().x(); int y = startY() + e->pos().y(); @@ -1660,9 +1660,9 @@ void CHexViewWidget::dragMoveEvent( QDragMoveEvent *e ) } -void CHexViewWidget::dropEvent( QDropEvent *e ) +void CHexViewWidget::dropEvent( TQDropEvent *e ) { - QMimeSource &m = *(QDropEvent*)e; + TQMimeSource &m = *(TQDropEvent*)e; setDropHighlight( false ); KURL::List list; @@ -1679,15 +1679,15 @@ void CHexViewWidget::dropEvent( QDropEvent *e ) return; } - QByteArray buf; + TQByteArray buf; if( CHexDrag::decode( &m, buf ) == true ) { insert( buf ); return; } - QString text; - if( QTextDrag::decode( &m, text ) == true ) + TQString text; + if( TQTextDrag::decode( &m, text ) == true ) { bool success = mClipConvert.decode( buf, text ); if( success == true ) @@ -1700,7 +1700,7 @@ void CHexViewWidget::dropEvent( QDropEvent *e ) } -void CHexViewWidget::showEvent( QShowEvent * ) +void CHexViewWidget::showEvent( TQShowEvent * ) { // Currently we do nothing here. } @@ -1708,7 +1708,7 @@ void CHexViewWidget::showEvent( QShowEvent * ) -void CHexViewWidget::timerEvent( QTimerEvent *e ) +void CHexViewWidget::timerEvent( TQTimerEvent *e ) { if( e->timerId() == mCursorTimerId ) { @@ -1740,13 +1740,13 @@ void CHexViewWidget::timerEvent( QTimerEvent *e ) } } -void CHexViewWidget::focusInEvent( QFocusEvent * ) +void CHexViewWidget::focusInEvent( TQFocusEvent * ) { setupCursorTimer(); paintCursor( CHexBuffer::cursor_curr ); } -void CHexViewWidget::focusOutEvent( QFocusEvent * ) +void CHexViewWidget::focusOutEvent( TQFocusEvent * ) { if( mCursor.focusMode != SDisplayCursor::ignore ) { @@ -1893,14 +1893,14 @@ void CHexViewWidget::redrawLines( uint docLine, int numLine ) int t = docLine * lineHeight - startY() + frameWidth(); if( mEditMode == CHexBuffer::EditInsert ) { - QRect r = contentsRect(); + TQRect r = contentsRect(); r.setTop( t ); paintText( contentsRect().intersect( r ), false ); } else { int h = (numLine + (startY() % lineHeight ? 1 : 0)) * lineHeight; - QRect r( contentsRect().left(), t, contentsRect().width(), h ); + TQRect r( contentsRect().left(), t, contentsRect().width(), h ); paintText( contentsRect().intersect( r ), false ); } } @@ -1915,14 +1915,14 @@ void CHexViewWidget::redrawFromOffset( uint offset, bool finishWindow ) int t = docLine * lineHeight - startY() + frameWidth(); if( finishWindow == true ) { - QRect r = contentsRect(); + TQRect r = contentsRect(); r.setTop( t ); paintText( contentsRect().intersect( r ), false ); } else { int h = t + lineHeight; - QRect r( contentsRect().left(), t, contentsRect().width(), h ); + TQRect r( contentsRect().left(), t, contentsRect().width(), h ); paintText( contentsRect().intersect( r ), false ); } } @@ -1930,9 +1930,9 @@ void CHexViewWidget::redrawFromOffset( uint offset, bool finishWindow ) -void CHexViewWidget::paintText( const QRect &rect, bool expand ) +void CHexViewWidget::paintText( const TQRect &rect, bool expand ) { - QRect r = rect; + TQRect r = rect; if( expand == true ) { @@ -1957,7 +1957,7 @@ void CHexViewWidget::paintText( const QRect &rect, bool expand ) if( r.right() > maxX ) { r.setRight( maxX ); } if( r.bottom() > maxY ) { r.setBottom( maxY ); } - QPainter paint( &mTextBuffer ); + TQPainter paint( &mTextBuffer ); paint.setFont( mHexBuffer->font() ); int lineHeight = mHexBuffer->lineHeight(); @@ -1999,7 +1999,7 @@ void CHexViewWidget::paintText( const QRect &rect, bool expand ) void CHexViewWidget::paintCursor( int cursorMode ) { - QPainter paint; + TQPainter paint; paint.begin( &mTextBuffer ); paint.setFont( mHexBuffer->font() ); @@ -2233,7 +2233,7 @@ void CHexViewWidget::cursorBackspace( SCursorConfig &/*cc*/ ) } -void CHexViewWidget::cursorInput( QChar c ) +void CHexViewWidget::cursorInput( TQChar c ) { uint cursorLine = mHexBuffer->cursorLine(); bool success = mHexBuffer->inputAtCursor( c ); @@ -2269,15 +2269,15 @@ void CHexViewWidget::setDropHighlight( bool dropHighlight ) { // // 2000-01-10 Espen Sand - // Highlight. I have reimplemented QFrame::drawFrame(QPainter *) + // Highlight. I have reimplemented TQFrame::drawFrame(TQPainter *) // to support a custom frame color. I assume the frame shape is - // "QFrame::WinPanel|QFrame::Plain" in that function. + // "TQFrame::WinPanel|TQFrame::Plain" in that function. // - setFrameStyle( QFrame::WinPanel|QFrame::Plain ); + setFrameStyle( TQFrame::WinPanel|TQFrame::Plain ); } else { - setFrameStyle( QFrame::WinPanel|QFrame::Sunken ); + setFrameStyle( TQFrame::WinPanel|TQFrame::Sunken ); } } diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h index 9dc55e4..d0050e8 100644 --- a/khexedit/hexviewwidget.h +++ b/khexedit/hexviewwidget.h @@ -26,10 +26,10 @@ #endif -#include <qframe.h> -#include <qpixmap.h> -#include <qpopupmenu.h> -#include <qscrollbar.h> +#include <tqframe.h> +#include <tqpixmap.h> +#include <tqpopupmenu.h> +#include <tqscrollbar.h> #include <kapplication.h> #include <kcmenumngr.h> @@ -42,8 +42,8 @@ class CScrollBar : public QScrollBar Q_OBJECT public: - CScrollBar( Orientation o, QWidget *parent, const char *name = 0 ) - : QScrollBar( o, parent, name ) + CScrollBar( Orientation o, TQWidget *parent, const char *name = 0 ) + : TQScrollBar( o, parent, name ) { } @@ -51,7 +51,7 @@ class CScrollBar : public QScrollBar void hidden( void ); protected: - virtual void hideEvent( QHideEvent * ) + virtual void hideEvent( TQHideEvent * ) { emit hidden(); } @@ -73,11 +73,11 @@ class CDragManager : public QWidget CDragManager( void ); void setActivateMode( EDragActivateMode mode ); void setup( int x, int y ); - bool start( QMouseEvent *e ); + bool start( TQMouseEvent *e ); bool clear( void ); protected: - virtual void timerEvent( QTimerEvent *e ); + virtual void timerEvent( TQTimerEvent *e ); private: void removeTimer( void ); @@ -90,7 +90,7 @@ class CDragManager : public QWidget EDragActivateMode mActivateMode; bool mPending; int mTimerId; - QPoint mOrigin; + TQPoint mOrigin; }; @@ -100,14 +100,14 @@ class CHexViewWidget : public QFrame Q_OBJECT public: - CHexViewWidget( QWidget *parent, const char *name, CHexBuffer *hexBuffer ); + CHexViewWidget( TQWidget *parent, const char *name, CHexBuffer *hexBuffer ); ~CHexViewWidget( void ); inline bool widgetValid( void ); - int readFile( QFile &file, const QString &url, CProgress &p ); - int insertFile( QFile &file, CProgress &p ); - int writeFile( QFile &file, CProgress &p ); - int newFile( const QString &url ); + int readFile( TQFile &file, const TQString &url, CProgress &p ); + int insertFile( TQFile &file, CProgress &p ); + int writeFile( TQFile &file, CProgress &p ); + int newFile( const TQString &url ); void closeFile( void ); void initFile( void ); void setBuffer( CHexBuffer *hexBuffer ); @@ -135,7 +135,7 @@ class CHexViewWidget : public QFrame void gotoNextBookmark( bool next ); void benchmark( void ); - virtual void setPalette( const QPalette & ); + virtual void setPalette( const TQPalette & ); void setInputMode( SDisplayInputMode &mode ); void setLayout( SDisplayLayout &layout ); void setCursor( const SDisplayCursor &cursor, bool updateDisplay ); @@ -155,8 +155,8 @@ class CHexViewWidget : public QFrame int collectStatistic( SStatisticControl &sc, CProgress &p ); - inline void setPopupMenu( QPopupMenu *popupMenu ); - inline void setDocumentMenu( QPopupMenu *popupMenu ); + inline void setPopupMenu( TQPopupMenu *popupMenu ); + inline void setDocumentMenu( TQPopupMenu *popupMenu ); inline bool insertMode( void ); inline int scrollBarWidth( void ); inline int dataWidth( void ); @@ -165,21 +165,21 @@ class CHexViewWidget : public QFrame inline uint bookmarkCount( void ); inline bool modified( void ); inline void setModified( bool modified ); - inline const QDateTime &diskModifyTime( void ); + inline const TQDateTime &diskModifyTime( void ); inline bool losslessEncoding( CConversion::EMode mode ); inline const SEncodeState &encoding( void ); inline bool documentPresent( void ); inline bool urlValid( void ); - inline QString &url( void ); - inline void setUrl( QString &url ); + inline TQString &url( void ); + inline void setUrl( TQString &url ); inline const CHexBuffer *hexBuffer( void ); public slots: void filter( SFilterControl &fc ); void insert( SInsertData &id ); - void insert( const QByteArray &buf ); - void append( const QByteArray &buf ); - void valueOnCursor( QByteArray &buf, uint size ); + void insert( const TQByteArray &buf ); + void append( const TQByteArray &buf ); + void valueOnCursor( TQByteArray &buf, uint size ); void paletteChanged( void ); void fontChanged( void ); void gotoOffset( uint offset, uint bit, bool fromCursor, bool forward ); @@ -188,23 +188,23 @@ class CHexViewWidget : public QFrame void setDropHighlight( bool mode ); protected: - virtual void drawFrame( QPainter *p ); - virtual void paintEvent( QPaintEvent *e ); - virtual void resizeEvent( QResizeEvent *e ); - virtual void keyPressEvent( QKeyEvent *e ); - virtual void keyReleaseEvent( QKeyEvent *e ); - virtual void mousePressEvent( QMouseEvent *e ); - virtual void mouseMoveEvent( QMouseEvent *e ); - virtual void wheelEvent( QWheelEvent * ); - virtual void mouseReleaseEvent( QMouseEvent *e ); - virtual void dragEnterEvent( QDragEnterEvent *e ); - virtual void dragLeaveEvent( QDragLeaveEvent *e ); - virtual void dragMoveEvent( QDragMoveEvent *e ); - virtual void dropEvent( QDropEvent *e ); - virtual void showEvent( QShowEvent * ); - virtual void timerEvent( QTimerEvent *e ); - virtual void focusInEvent( QFocusEvent *e ); - virtual void focusOutEvent( QFocusEvent *e ); + virtual void drawFrame( TQPainter *p ); + virtual void paintEvent( TQPaintEvent *e ); + virtual void resizeEvent( TQResizeEvent *e ); + virtual void keyPressEvent( TQKeyEvent *e ); + virtual void keyReleaseEvent( TQKeyEvent *e ); + virtual void mousePressEvent( TQMouseEvent *e ); + virtual void mouseMoveEvent( TQMouseEvent *e ); + virtual void wheelEvent( TQWheelEvent * ); + virtual void mouseReleaseEvent( TQMouseEvent *e ); + virtual void dragEnterEvent( TQDragEnterEvent *e ); + virtual void dragLeaveEvent( TQDragLeaveEvent *e ); + virtual void dragMoveEvent( TQDragMoveEvent *e ); + virtual void dropEvent( TQDropEvent *e ); + virtual void showEvent( TQShowEvent * ); + virtual void timerEvent( TQTimerEvent *e ); + virtual void focusInEvent( TQFocusEvent *e ); + virtual void focusOutEvent( TQFocusEvent *e ); protected slots: void changeXPos( int pos ); @@ -217,17 +217,17 @@ class CHexViewWidget : public QFrame void dataChanged( void ); void layoutChanged( const SDisplayLayout &layout ); void inputModeChanged( const SDisplayInputMode &mode ); - void bookmarkChanged( QPtrList<SCursorOffset> &list ); + void bookmarkChanged( TQPtrList<SCursorOffset> &list ); void editMode( CHexBuffer::EEditMode editMode ); void encodingChanged( const SEncodeState &state ); void textWidth( uint width ); - void fileName( const QString &url, bool onDisk ); - void fileRename( const QString &curName, const QString &newName ); - void fileClosed( const QString &url ); + void fileName( const TQString &url, bool onDisk ); + void fileRename( const TQString &curName, const TQString &newName ); + void fileClosed( const TQString &url ); void pleaseOpenNewFile( void ); void pleaseStepFile( bool next ); - void pleaseOpenFile(const QString &url,bool reloadWhenChanged,uint offset); + void pleaseOpenFile(const TQString &url,bool reloadWhenChanged,uint offset); private: void setSelection( uint offset, bool init ); @@ -242,7 +242,7 @@ class CHexViewWidget : public QFrame void redrawInterval( uint start, uint stop ); void redrawLines( uint docLine, int numLine ); void redrawFromOffset( uint offset, bool finishWindow ); - void paintText( const QRect &r, bool expand ); + void paintText( const TQRect &r, bool expand ); void paintCursor( int cursorMode ); @@ -259,9 +259,9 @@ class CHexViewWidget : public QFrame void cursorInsert( SCursorConfig &cc ); void cursorDelete( SCursorConfig &cc ); void cursorBackspace( SCursorConfig &cc ); - void cursorInput( QChar c ); + void cursorInput( TQChar c ); - int bookmarkMenu( const QString &title ); + int bookmarkMenu( const TQString &title ); static inline bool shiftButtonState( void ); @@ -283,17 +283,17 @@ class CHexViewWidget : public QFrame private: CScrollBar *mVertScroll; CScrollBar *mHorzScroll; - QWidget *mCorner; + TQWidget *mCorner; CHexBuffer *mHexBuffer; - QPixmap mTextBuffer; + TQPixmap mTextBuffer; SDisplayLayout mLayout; SDisplayCursor mCursor; SDisplayColor mColor; SDisplayFontInfo mFontInfo; SDisplayMisc mMisc; - QPopupMenu *mDocumentMenu; + TQPopupMenu *mDocumentMenu; int mScrollBarSize; CHexBuffer::EEditMode mEditMode; @@ -367,13 +367,13 @@ inline void CHexViewWidget::setupCursorTimer( void ) mHexBuffer->setShowCursor( mShowCursor ); } -inline void CHexViewWidget::setPopupMenu( QPopupMenu *popupMenu ) +inline void CHexViewWidget::setPopupMenu( TQPopupMenu *popupMenu ) { KContextMenuManager::insert( this, popupMenu ); } -inline void CHexViewWidget::setDocumentMenu( QPopupMenu *popupMenu ) +inline void CHexViewWidget::setDocumentMenu( TQPopupMenu *popupMenu ) { mDocumentMenu = popupMenu; } @@ -517,7 +517,7 @@ inline uint CHexViewWidget::offset( void ) inline uint CHexViewWidget::bookmarkCount( void ) { - const QPtrList<SCursorOffset> &list = mHexBuffer->bookmarkList(); + const TQPtrList<SCursorOffset> &list = mHexBuffer->bookmarkList(); return( list.count() ); } @@ -532,7 +532,7 @@ inline void CHexViewWidget::setModified( bool modified ) emit fileState( mHexBuffer->fileState() ); } -inline const QDateTime &CHexViewWidget::diskModifyTime( void ) +inline const TQDateTime &CHexViewWidget::diskModifyTime( void ) { return( mHexBuffer->diskModifyTime() ); } @@ -557,12 +557,12 @@ inline bool CHexViewWidget::urlValid( void ) return( mHexBuffer->hasFileName() ); } -inline QString &CHexViewWidget::url( void ) +inline TQString &CHexViewWidget::url( void ) { return( mHexBuffer->url() ); } -inline void CHexViewWidget::setUrl( QString &url ) +inline void CHexViewWidget::setUrl( TQString &url ) { if( mHexBuffer->url() != url ) { diff --git a/khexedit/lib/codecs/kbinarybytecodec.cpp b/khexedit/lib/codecs/kbinarybytecodec.cpp index d665a05..a49a460 100644 --- a/khexedit/lib/codecs/kbinarybytecodec.cpp +++ b/khexedit/lib/codecs/kbinarybytecodec.cpp @@ -21,13 +21,13 @@ using namespace KHE; -void KBinaryByteCodec::encode( QString &Digits, unsigned int Pos, const unsigned char Char ) const +void KBinaryByteCodec::encode( TQString &Digits, unsigned int Pos, const unsigned char Char ) const { for( unsigned char M=1<<7; M>0; M>>=1 ) Digits.at(Pos++) = (Char & M) ? '1' : '0'; } -void KBinaryByteCodec::encodeShort( QString &Digits, unsigned int Pos, unsigned char Char ) const +void KBinaryByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned char Char ) const { unsigned char M = 1<<7; // find first set bit diff --git a/khexedit/lib/codecs/kbinarybytecodec.h b/khexedit/lib/codecs/kbinarybytecodec.h index d0354fa..631fa74 100644 --- a/khexedit/lib/codecs/kbinarybytecodec.h +++ b/khexedit/lib/codecs/kbinarybytecodec.h @@ -41,9 +41,9 @@ class KBinaryByteCodec : public KByteCodec virtual unsigned char digitsFilledLimit() const { return 128; } /** encodes the Char and writes the result to */ - virtual void encode( QString &Digits, unsigned int Pos, const unsigned char Char ) const; + virtual void encode( TQString &Digits, unsigned int Pos, const unsigned char Char ) const; /** */ - virtual void encodeShort( QString &Digits, unsigned int Pos, const unsigned char Char ) const; + virtual void encodeShort( TQString &Digits, unsigned int Pos, const unsigned char Char ) const; /** */ virtual bool appendDigit( unsigned char *Byte, const unsigned char Digit ) const; /** */ diff --git a/khexedit/lib/codecs/kbytecodec.cpp b/khexedit/lib/codecs/kbytecodec.cpp index dc5137f..f4847ba 100644 --- a/khexedit/lib/codecs/kbytecodec.cpp +++ b/khexedit/lib/codecs/kbytecodec.cpp @@ -38,9 +38,9 @@ KByteCodec *KByteCodec::createCodec( KCoding C ) return Codec; } -unsigned int KByteCodec::decode( unsigned char *Char, const QString &Digits, uint Pos ) const +unsigned int KByteCodec::decode( unsigned char *Char, const TQString &Digits, uint Pos ) const { - //kdDebug() << QString("KByteCodec::decode(%1,%2)").arg(Digits).arg(Pos) << endl; + //kdDebug() << TQString("KByteCodec::decode(%1,%2)").arg(Digits).arg(Pos) << endl; const uint P = Pos; // remove leading 0s diff --git a/khexedit/lib/codecs/kcharcodec.cpp b/khexedit/lib/codecs/kcharcodec.cpp index 5a58320..1aab79b 100644 --- a/khexedit/lib/codecs/kcharcodec.cpp +++ b/khexedit/lib/codecs/kcharcodec.cpp @@ -23,9 +23,9 @@ using namespace KHE; -QStringList KCharCodec::CodecNames; +TQStringList KCharCodec::CodecNames; -const QStringList &KCharCodec::codecNames() +const TQStringList &KCharCodec::codecNames() { // first call? if( CodecNames.isEmpty() ) @@ -38,7 +38,7 @@ const QStringList &KCharCodec::codecNames() } -KCharCodec *KCharCodec::createCodec( const QString &Name ) +KCharCodec *KCharCodec::createCodec( const TQString &Name ) { KCharCodec *Codec = 0; diff --git a/khexedit/lib/codecs/kdecimalbytecodec.cpp b/khexedit/lib/codecs/kdecimalbytecodec.cpp index 9470382..c556875 100644 --- a/khexedit/lib/codecs/kdecimalbytecodec.cpp +++ b/khexedit/lib/codecs/kdecimalbytecodec.cpp @@ -21,7 +21,7 @@ using namespace KHE; -void KDecimalByteCodec::encode( QString &Digits, unsigned int Pos, unsigned char Char ) const +void KDecimalByteCodec::encode( TQString &Digits, unsigned int Pos, unsigned char Char ) const { unsigned char C = Char / 100; Digits.at(Pos++) = '0'+C; @@ -33,7 +33,7 @@ void KDecimalByteCodec::encode( QString &Digits, unsigned int Pos, unsigned char } -void KDecimalByteCodec::encodeShort( QString &Digits, unsigned int Pos, unsigned char Char ) const +void KDecimalByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned char Char ) const { unsigned char C; if( (C = Char / 100) ) diff --git a/khexedit/lib/codecs/kdecimalbytecodec.h b/khexedit/lib/codecs/kdecimalbytecodec.h index 31f61d0..b91e6a8 100644 --- a/khexedit/lib/codecs/kdecimalbytecodec.h +++ b/khexedit/lib/codecs/kdecimalbytecodec.h @@ -41,9 +41,9 @@ class KDecimalByteCodec : public KByteCodec virtual unsigned char digitsFilledLimit() const { return 26; } /** encodes the Char and writes the result to */ - virtual void encode( QString &Digits, unsigned int Pos, const unsigned char Char ) const; + virtual void encode( TQString &Digits, unsigned int Pos, const unsigned char Char ) const; /** */ - virtual void encodeShort( QString &Digits, unsigned int Pos, const unsigned char Char ) const; + virtual void encodeShort( TQString &Digits, unsigned int Pos, const unsigned char Char ) const; /** */ virtual bool appendDigit( unsigned char *Byte, const unsigned char Digit ) const; /** */ diff --git a/khexedit/lib/codecs/kebcdic1047charcodec.cpp b/khexedit/lib/codecs/kebcdic1047charcodec.cpp index f26da37..d1002c3 100644 --- a/khexedit/lib/codecs/kebcdic1047charcodec.cpp +++ b/khexedit/lib/codecs/kebcdic1047charcodec.cpp @@ -96,7 +96,7 @@ static unsigned char EBCDICChars[256] = static const char KEBCDIC1047CharCodecName[] = "EBCDIC 1047"; -bool KEBCDIC1047CharCodec::encode( char *D, const QChar &C ) const +bool KEBCDIC1047CharCodec::encode( char *D, const TQChar &C ) const { int I = C.unicode(); // not in range? @@ -109,16 +109,16 @@ bool KEBCDIC1047CharCodec::encode( char *D, const QChar &C ) const KHEChar KEBCDIC1047CharCodec::decode( char Byte ) const { - return QChar(UnicodeChars[(unsigned char)Byte]); + return TQChar(UnicodeChars[(unsigned char)Byte]); } -const QString& KEBCDIC1047CharCodec::name() const +const TQString& KEBCDIC1047CharCodec::name() const { return codecName(); } -const QString& KEBCDIC1047CharCodec::codecName() +const TQString& KEBCDIC1047CharCodec::codecName() { - static const QString Name( QString::fromLatin1(KEBCDIC1047CharCodecName) ); + static const TQString Name( TQString::fromLatin1(KEBCDIC1047CharCodecName) ); return Name; } diff --git a/khexedit/lib/codecs/kebcdic1047charcodec.h b/khexedit/lib/codecs/kebcdic1047charcodec.h index 7c30956..8ac1d43 100644 --- a/khexedit/lib/codecs/kebcdic1047charcodec.h +++ b/khexedit/lib/codecs/kebcdic1047charcodec.h @@ -32,12 +32,12 @@ class KEBCDIC1047CharCodec : public KCharCodec public: // KCharCodec API virtual KHEChar decode( char Byte ) const; - virtual bool encode( char *D, const QChar &C ) const; - virtual const QString& name() const; + virtual bool encode( char *D, const TQChar &C ) const; + virtual const TQString& name() const; public: static KEBCDIC1047CharCodec *create(); - static const QString& codecName(); + static const TQString& codecName(); }; diff --git a/khexedit/lib/codecs/khexadecimalbytecodec.cpp b/khexedit/lib/codecs/khexadecimalbytecodec.cpp index 7072464..596fd24 100644 --- a/khexedit/lib/codecs/khexadecimalbytecodec.cpp +++ b/khexedit/lib/codecs/khexadecimalbytecodec.cpp @@ -21,9 +21,9 @@ using namespace KHE; -static const QChar BigDigit[16] = +static const TQChar BigDigit[16] = { '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F' }; -static const QChar SmallDigit[16] = +static const TQChar SmallDigit[16] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' }; @@ -39,13 +39,13 @@ bool KHexadecimalByteCodec::setSmallDigits( bool S ) bool KHexadecimalByteCodec::smallDigits() const { return Digit != BigDigit; } -void KHexadecimalByteCodec::encode( QString &Digits, unsigned int Pos, unsigned char Char ) const +void KHexadecimalByteCodec::encode( TQString &Digits, unsigned int Pos, unsigned char Char ) const { Digits.at(Pos++) = Digit[Char>>4]; Digits.at(Pos) = Digit[Char&0x0F]; } -void KHexadecimalByteCodec::encodeShort( QString &Digits, unsigned int Pos, unsigned char Char ) const +void KHexadecimalByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned char Char ) const { unsigned char C; if( (C = (Char>>4)) ) diff --git a/khexedit/lib/codecs/khexadecimalbytecodec.h b/khexedit/lib/codecs/khexadecimalbytecodec.h index 9bb1969..88b2f83 100644 --- a/khexedit/lib/codecs/khexadecimalbytecodec.h +++ b/khexedit/lib/codecs/khexadecimalbytecodec.h @@ -48,9 +48,9 @@ class KHexadecimalByteCodec : public KByteCodec virtual unsigned char digitsFilledLimit() const { return 16; } /** encodes the Char and writes the result to */ - virtual void encode( QString &Digits, unsigned int Pos, const unsigned char Char ) const; + virtual void encode( TQString &Digits, unsigned int Pos, const unsigned char Char ) const; /** */ - virtual void encodeShort( QString &Digits, unsigned int Pos, const unsigned char Char ) const; + virtual void encodeShort( TQString &Digits, unsigned int Pos, const unsigned char Char ) const; /** */ virtual bool appendDigit( unsigned char *Byte, const unsigned char Digit ) const; /** */ @@ -61,7 +61,7 @@ class KHexadecimalByteCodec : public KByteCodec virtual bool turnToValue( unsigned char *Digit ) const; protected: - const QChar* Digit; + const TQChar* Digit; }; } diff --git a/khexedit/lib/codecs/koctalbytecodec.cpp b/khexedit/lib/codecs/koctalbytecodec.cpp index 1167941..44c7952 100644 --- a/khexedit/lib/codecs/koctalbytecodec.cpp +++ b/khexedit/lib/codecs/koctalbytecodec.cpp @@ -21,7 +21,7 @@ using namespace KHE; -void KOctalByteCodec::encode( QString &Digits, unsigned int Pos, unsigned char Char ) const +void KOctalByteCodec::encode( TQString &Digits, unsigned int Pos, unsigned char Char ) const { Digits.at(Pos++) = '0'+(Char>>6); Digits.at(Pos++) = '0'+((Char>>3)&0x07); @@ -29,7 +29,7 @@ void KOctalByteCodec::encode( QString &Digits, unsigned int Pos, unsigned char C } -void KOctalByteCodec::encodeShort( QString &Digits, unsigned int Pos, unsigned char Char ) const +void KOctalByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned char Char ) const { unsigned char C; if( (C = (Char>>6)&0x07) ) diff --git a/khexedit/lib/codecs/koctalbytecodec.h b/khexedit/lib/codecs/koctalbytecodec.h index e05ca66..14693f3 100644 --- a/khexedit/lib/codecs/koctalbytecodec.h +++ b/khexedit/lib/codecs/koctalbytecodec.h @@ -41,9 +41,9 @@ class KOctalByteCodec : public KByteCodec virtual unsigned char digitsFilledLimit() const { return 64; } /** encodes the Char and writes the result to */ - virtual void encode( QString &Digits, unsigned int Pos, const unsigned char Char ) const; + virtual void encode( TQString &Digits, unsigned int Pos, const unsigned char Char ) const; /** */ - virtual void encodeShort( QString &Digits, unsigned int Pos, const unsigned char Char ) const; + virtual void encodeShort( TQString &Digits, unsigned int Pos, const unsigned char Char ) const; /** */ virtual bool appendDigit( unsigned char *Byte, const unsigned char Digit ) const; /** */ diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp index 613dedd..a9014dd 100644 --- a/khexedit/lib/codecs/ktextcharcodec.cpp +++ b/khexedit/lib/codecs/ktextcharcodec.cpp @@ -16,7 +16,7 @@ // qt specific -#include "qtextcodec.h" +#include "tqtextcodec.h" // kde specific #include <kglobal.h> #include <klocale.h> @@ -63,7 +63,7 @@ const EncodingNames[] = { //TODO: WS2 static const unsigned int NoOfEncodings = 26; -static bool is8Bit( QTextCodec *Codec ) +static bool is8Bit( TQTextCodec *Codec ) { bool Found = false; for( unsigned int i=0; i<NoOfEncodings; ++i ) @@ -77,13 +77,13 @@ static bool is8Bit( QTextCodec *Codec ) return Found; } -static QTextCodec *createLatin1() +static TQTextCodec *createLatin1() { return KGlobal::charsets()->codecForName( EncodingNames[0].Name ); } /** heuristic seems to be doomed :( -static bool is8Bit( QTextCodec *Codec ) +static bool is8Bit( TQTextCodec *Codec ) { bool Result = true; @@ -91,9 +91,9 @@ static bool is8Bit( QTextCodec *Codec ) unsigned char c[4]; c[0] = 0; c[1] = c[2] = c[3] = 230; - QString S = Codec->toUnicode( (const char*)&c,4 ); + TQString S = Codec->toUnicode( (const char*)&c,4 ); int Length = 1; - QCString CS = Codec->fromUnicode( S, Length ); + TQCString CS = Codec->fromUnicode( S, Length ); //kdDebug() << Codec->name() << " "<<Length << endl; if( Length > 0 ) Result = false; @@ -115,26 +115,26 @@ static bool is8Bit( QTextCodec *Codec ) while( c[0] < 255 ); return Result; } -const QStringList &KTextCharCodec::codecNames() +const TQStringList &KTextCharCodec::codecNames() { // first call? if( CodecNames.isEmpty() ) { - const QStringList &CharSets = KGlobal::charsets()->availableEncodingNames(); + const TQStringList &CharSets = KGlobal::charsets()->availableEncodingNames(); - for( QStringList::ConstIterator it = CharSets.begin(); it != CharSets.end(); ++it ) + for( TQStringList::ConstIterator it = CharSets.begin(); it != CharSets.end(); ++it ) { bool Found = true; - QTextCodec* Codec = KGlobal::charsets()->codecForName( *it, Found ); + TQTextCodec* Codec = KGlobal::charsets()->codecForName( *it, Found ); if( Found && is8Bit(Codec) ) - CodecNames.append( QString::fromLatin1(Codec->name()) ); + CodecNames.append( TQString::fromLatin1(Codec->name()) ); } } return CodecNames; } -QString KTextCharCodec::nameOfEncoding( KEncoding C ) +TQString KTextCharCodec::nameOfEncoding( KEncoding C ) { KTextCharCodec *Codec = 0; @@ -150,35 +150,35 @@ QString KTextCharCodec::nameOfEncoding( KEncoding C ) if( N != 0 ) { - QString CodeName = QString::fromLatin1( N ); + TQString CodeName = TQString::fromLatin1( N ); } return Codec; } */ -QStringList KTextCharCodec::CodecNames; +TQStringList KTextCharCodec::CodecNames; KTextCharCodec *KTextCharCodec::createLocalCodec() { - QTextCodec *Codec = KGlobal::locale()->codecForEncoding(); + TQTextCodec *Codec = KGlobal::locale()->codecForEncoding(); if( !is8Bit(Codec) ) Codec = createLatin1(); return new KTextCharCodec( Codec ); } -KTextCharCodec *KTextCharCodec::createCodec( const QString &CodeName ) +KTextCharCodec *KTextCharCodec::createCodec( const TQString &CodeName ) { bool Ok; - QTextCodec *Codec = KGlobal::charsets()->codecForName( CodeName, Ok ); + TQTextCodec *Codec = KGlobal::charsets()->codecForName( CodeName, Ok ); if( Ok ) Ok = is8Bit( Codec ); return Ok ? new KTextCharCodec( Codec ) : 0; } -const QStringList &KTextCharCodec::codecNames() +const TQStringList &KTextCharCodec::codecNames() { // first call? if( CodecNames.isEmpty() ) @@ -186,10 +186,10 @@ const QStringList &KTextCharCodec::codecNames() for( unsigned int i=0; i<NoOfEncodings; ++i ) { bool Found = true; - QString Name = QString::fromLatin1( EncodingNames[i].Name ); - QTextCodec* Codec = KGlobal::charsets()->codecForName( Name, Found ); + TQString Name = TQString::fromLatin1( EncodingNames[i].Name ); + TQTextCodec* Codec = KGlobal::charsets()->codecForName( Name, Found ); if( Found ) - CodecNames.append( QString::fromLatin1(Codec->name()) ); + CodecNames.append( TQString::fromLatin1(Codec->name()) ); } } @@ -197,7 +197,7 @@ const QStringList &KTextCharCodec::codecNames() } -KTextCharCodec::KTextCharCodec( QTextCodec *C ) +KTextCharCodec::KTextCharCodec( TQTextCodec *C ) : Codec( C ), Decoder( C->makeDecoder() ), Encoder( C->makeEncoder() ) @@ -209,7 +209,7 @@ KTextCharCodec::~KTextCharCodec() delete Encoder; } -bool KTextCharCodec::encode( char *D, const QChar &C ) const +bool KTextCharCodec::encode( char *D, const TQChar &C ) const { if( !Codec->canEncode(C) ) // TODO: do we really need the codec? return false; @@ -223,14 +223,14 @@ bool KTextCharCodec::encode( char *D, const QChar &C ) const KHEChar KTextCharCodec::decode( char Byte ) const { - QString S( Decoder->toUnicode(&Byte,1) ); + TQString S( Decoder->toUnicode(&Byte,1) ); return KHEChar(S.at(0)); } -const QString& KTextCharCodec::name() const +const TQString& KTextCharCodec::name() const { if( Name.isNull() ) - Name = QString::fromLatin1( Codec->name() ); + Name = TQString::fromLatin1( Codec->name() ); return Name; } diff --git a/khexedit/lib/codecs/ktextcharcodec.h b/khexedit/lib/codecs/ktextcharcodec.h index 683919c..48ca3b0 100644 --- a/khexedit/lib/codecs/ktextcharcodec.h +++ b/khexedit/lib/codecs/ktextcharcodec.h @@ -32,33 +32,33 @@ namespace KHE class KTextCharCodec : public KCharCodec { public: - static KTextCharCodec *createCodec( const QString &CodeName ); + static KTextCharCodec *createCodec( const TQString &CodeName ); static KTextCharCodec *createCodec( KEncoding C ); static KTextCharCodec *createLocalCodec(); - static const QStringList &codecNames(); + static const TQStringList &codecNames(); protected: - KTextCharCodec( QTextCodec *C ); + KTextCharCodec( TQTextCodec *C ); public: virtual ~KTextCharCodec(); public: // KCharCodec API - virtual bool encode( char *D, const QChar &C ) const; + virtual bool encode( char *D, const TQChar &C ) const; virtual KHEChar decode( char Byte ) const; - virtual const QString& name() const; + virtual const TQString& name() const; protected: - QTextCodec *Codec; + TQTextCodec *Codec; /** decodes the chars to unicode */ - QTextDecoder *Decoder; + TQTextDecoder *Decoder; /** encodes the chars from unicode */ - QTextEncoder *Encoder; + TQTextEncoder *Encoder; /** */ - mutable QString Name; + mutable TQString Name; - static QStringList CodecNames; + static TQStringList CodecNames; }; } diff --git a/khexedit/lib/controller/kchareditor.cpp b/khexedit/lib/controller/kchareditor.cpp index 5b48fc6..7225ec7 100644 --- a/khexedit/lib/controller/kchareditor.cpp +++ b/khexedit/lib/controller/kchareditor.cpp @@ -16,7 +16,7 @@ // qt specific -#include <qevent.h> +#include <tqevent.h> // lib specific #include "kcharcolumn.h" #include "kcharcodec.h" @@ -34,17 +34,17 @@ KCharEditor::KCharEditor( KCharColumn *CC, KBufferCursor *BC, KHexEdit *HE, KCon } -bool KCharEditor::handleKeyPress( QKeyEvent *KeyEvent ) +bool KCharEditor::handleKeyPress( TQKeyEvent *KeyEvent ) { bool KeyUsed = false; // some input that should be inserted? if( KeyEvent->text().length() > 0 && !(KeyEvent->state()&( Qt::ControlButton | Qt::AltButton | Qt::MetaButton )) ) { - QChar C = KeyEvent->text()[0]; + TQChar C = KeyEvent->text()[0]; if( C.isPrint() ) { - QByteArray D( 1 ); + TQByteArray D( 1 ); if( CharColumn->codec()->encode(&D[0],C) ) { // clearUndoRedoInfo = false; diff --git a/khexedit/lib/controller/kchareditor.h b/khexedit/lib/controller/kchareditor.h index 74c3d8d..fba1f66 100644 --- a/khexedit/lib/controller/kchareditor.h +++ b/khexedit/lib/controller/kchareditor.h @@ -32,7 +32,7 @@ class KCharEditor : public KEditor KCharEditor( KCharColumn *CC, KBufferCursor *BC, KHexEdit *HE, KController *P ); public: // KEditor API - virtual bool handleKeyPress( QKeyEvent *KeyEvent ); + virtual bool handleKeyPress( TQKeyEvent *KeyEvent ); protected: KCharColumn *CharColumn; diff --git a/khexedit/lib/controller/kcontroller.cpp b/khexedit/lib/controller/kcontroller.cpp index 490da93..b9c42a6 100644 --- a/khexedit/lib/controller/kcontroller.cpp +++ b/khexedit/lib/controller/kcontroller.cpp @@ -28,7 +28,7 @@ KController::KController( KHexEdit* HE, KController *P ) { } -bool KController::handleKeyPress( QKeyEvent *KeyEvent ) +bool KController::handleKeyPress( TQKeyEvent *KeyEvent ) { return Parent ? Parent->handleKeyPress( KeyEvent ) : false; } diff --git a/khexedit/lib/controller/kcontroller.h b/khexedit/lib/controller/kcontroller.h index daeb0d5..be1f9fc 100644 --- a/khexedit/lib/controller/kcontroller.h +++ b/khexedit/lib/controller/kcontroller.h @@ -32,7 +32,7 @@ class KController KController( KHexEdit *HE, KController *P ); public: // KController API - virtual bool handleKeyPress( QKeyEvent *KeyEvent ); + virtual bool handleKeyPress( TQKeyEvent *KeyEvent ); protected: KController *Parent; diff --git a/khexedit/lib/controller/keditor.cpp b/khexedit/lib/controller/keditor.cpp index 7d4e92f..5678b09 100644 --- a/khexedit/lib/controller/keditor.cpp +++ b/khexedit/lib/controller/keditor.cpp @@ -35,7 +35,7 @@ KEditor::KEditor( KBufferCursor *BC, KHexEdit* HE, KController *P ) } -bool KEditor::handleKeyPress( QKeyEvent *KeyEvent ) +bool KEditor::handleKeyPress( TQKeyEvent *KeyEvent ) { bool clearUndoRedoInfo = true; bool ShiftPressed = KeyEvent->state() & Qt::ShiftButton; diff --git a/khexedit/lib/controller/keditor.h b/khexedit/lib/controller/keditor.h index dc2b0fd..e4fa06c 100644 --- a/khexedit/lib/controller/keditor.h +++ b/khexedit/lib/controller/keditor.h @@ -37,7 +37,7 @@ class KEditor : public KController KEditor( KBufferCursor *BC, KHexEdit *HE, KController *P ); public: // API - virtual bool handleKeyPress( QKeyEvent *KeyEvent ); + virtual bool handleKeyPress( TQKeyEvent *KeyEvent ); protected: /** executes keyboard Action \a Action. This is normally called by a key event handler. */ diff --git a/khexedit/lib/controller/knavigator.cpp b/khexedit/lib/controller/knavigator.cpp index 51c8048..d865d12 100644 --- a/khexedit/lib/controller/knavigator.cpp +++ b/khexedit/lib/controller/knavigator.cpp @@ -17,7 +17,7 @@ // qt specific -#include <qevent.h> +#include <tqevent.h> // lib specific #include "kdatabuffer.h" #include "kbufferranges.h" @@ -34,7 +34,7 @@ KNavigator::KNavigator( KHexEdit* HE, KController *P ) { } -bool KNavigator::handleKeyPress( QKeyEvent *KeyEvent ) +bool KNavigator::handleKeyPress( TQKeyEvent *KeyEvent ) { bool KeyUsed = true; diff --git a/khexedit/lib/controller/knavigator.h b/khexedit/lib/controller/knavigator.h index 4615419..c20cd84 100644 --- a/khexedit/lib/controller/knavigator.h +++ b/khexedit/lib/controller/knavigator.h @@ -34,7 +34,7 @@ class KNavigator : public KController KNavigator( KHexEdit *HE, KController *P ); public: // KEditor API - virtual bool handleKeyPress( QKeyEvent *KeyEvent ); + virtual bool handleKeyPress( TQKeyEvent *KeyEvent ); protected: /** moves the cursor according to the action, handles all drawing */ diff --git a/khexedit/lib/controller/ktabcontroller.cpp b/khexedit/lib/controller/ktabcontroller.cpp index 76c3051..0531b2c 100644 --- a/khexedit/lib/controller/ktabcontroller.cpp +++ b/khexedit/lib/controller/ktabcontroller.cpp @@ -16,7 +16,7 @@ // qt specific -#include <qevent.h> +#include <tqevent.h> // lib specific #include "kvaluecolumn.h" #include "kcharcolumn.h" @@ -33,7 +33,7 @@ KTabController::KTabController( KHexEdit* HE, KController *P ) } -bool KTabController::handleKeyPress( QKeyEvent *KeyEvent ) +bool KTabController::handleKeyPress( TQKeyEvent *KeyEvent ) { bool KeyUsed = false; diff --git a/khexedit/lib/controller/ktabcontroller.h b/khexedit/lib/controller/ktabcontroller.h index e1898b4..a17d55d 100644 --- a/khexedit/lib/controller/ktabcontroller.h +++ b/khexedit/lib/controller/ktabcontroller.h @@ -32,7 +32,7 @@ class KTabController : public KController KTabController( KHexEdit *HE, KController *P ); public: // API - virtual bool handleKeyPress( QKeyEvent *KeyEvent ); + virtual bool handleKeyPress( TQKeyEvent *KeyEvent ); public: bool tabChangesFocus() const; diff --git a/khexedit/lib/controller/kvalueeditor.cpp b/khexedit/lib/controller/kvalueeditor.cpp index ebfb589..3bf4c9b 100644 --- a/khexedit/lib/controller/kvalueeditor.cpp +++ b/khexedit/lib/controller/kvalueeditor.cpp @@ -16,7 +16,7 @@ // qt specific -#include <qevent.h> +#include <tqevent.h> // lib specific #include "kvaluecolumn.h" #include "kbufferranges.h" @@ -36,7 +36,7 @@ KValueEditor::KValueEditor( KValueColumn *VC, KBufferCursor *BC, KHexEdit* HE, K } -bool KValueEditor::handleKeyPress( QKeyEvent *KeyEvent ) +bool KValueEditor::handleKeyPress( TQKeyEvent *KeyEvent ) { bool KeyUsed = true; @@ -79,7 +79,7 @@ bool KValueEditor::handleKeyPress( QKeyEvent *KeyEvent ) if( KeyEvent->text().length() > 0 && ( !(KeyEvent->state()&( Qt::ControlButton | Qt::AltButton | Qt::MetaButton )) ) ) { - QChar C = KeyEvent->text()[0]; + TQChar C = KeyEvent->text()[0]; // no usable char? if( !C.isLetterOrNumber() ) { diff --git a/khexedit/lib/controller/kvalueeditor.h b/khexedit/lib/controller/kvalueeditor.h index 496bcde..4656c36 100644 --- a/khexedit/lib/controller/kvalueeditor.h +++ b/khexedit/lib/controller/kvalueeditor.h @@ -39,7 +39,7 @@ class KValueEditor: public KEditor virtual ~KValueEditor(); public: // KEditor API - virtual bool handleKeyPress( QKeyEvent *KeyEvent ); + virtual bool handleKeyPress( TQKeyEvent *KeyEvent ); public: void reset(); @@ -62,7 +62,7 @@ class KValueEditor: public KEditor /** stores the old byte value */ unsigned char OldValue; /** buffer with the */ - QString ByteBuffer; + TQString ByteBuffer; }; inline KValueEditor::~KValueEditor() {} diff --git a/khexedit/lib/helper.h b/khexedit/lib/helper.h index 600ac5b..5f2b009 100644 --- a/khexedit/lib/helper.h +++ b/khexedit/lib/helper.h @@ -18,12 +18,12 @@ #define KHEXEDIT_HELPER // qt specific -#include <qcolor.h> +#include <tqcolor.h> // lib specific #include <khechar.h> // temporary solution until syntax highlighting is implemented -static inline QColor colorForChar( const KHE::KHEChar Byte ) +static inline TQColor colorForChar( const KHE::KHEChar Byte ) { return Byte.isUndefined() ? Qt::yellow : Byte.isPunct() ? Qt::red : Byte.isPrint() ? Qt::black : Qt::blue; } diff --git a/khexedit/lib/kbigbuffer.cpp b/khexedit/lib/kbigbuffer.cpp index 8505ef7..99925da 100644 --- a/khexedit/lib/kbigbuffer.cpp +++ b/khexedit/lib/kbigbuffer.cpp @@ -102,7 +102,7 @@ int KBigBuffer::rfind( const char*, int /*Length*/, int /*Pos*/ ) const { return -bool KBigBuffer::open( const QString& FileName ) +bool KBigBuffer::open( const TQString& FileName ) { // clear old data if( isOpen() && !close() ) // only occurs if close somehow fails. diff --git a/khexedit/lib/kbigbuffer.h b/khexedit/lib/kbigbuffer.h index 138e64b..63e6ec4 100644 --- a/khexedit/lib/kbigbuffer.h +++ b/khexedit/lib/kbigbuffer.h @@ -19,8 +19,8 @@ #define KHE_KBIGBUFFER_H // qt specific -#include <qvaluevector.h> -#include <qfile.h> +#include <tqvaluevector.h> +#include <tqfile.h> // lib specific #include "kdatabuffer.h" #include "khexedit_export.h" @@ -35,7 +35,7 @@ namespace KHE { class KHEXEDIT_EXPORT KBigBuffer : public KDataBuffer { - typedef QValueVector<char *> KPageOfChar; + typedef TQValueVector<char *> KPageOfChar; public: /** default is only 50*4k = 200k memory image */ @@ -63,12 +63,12 @@ class KHEXEDIT_EXPORT KBigBuffer : public KDataBuffer virtual int find( const char*KeyData, int Length, KSection Section ) const; virtual int rfind( const char*, int Length, int Pos = -1 ) const; -/* virtual int find( const QString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */ +/* virtual int find( const TQString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */ public: void setReadOnly( bool RO = true ); bool isOpen() const; - bool open (const QString& filename ); + bool open (const TQString& filename ); bool close(); protected: @@ -78,7 +78,7 @@ class KHEXEDIT_EXPORT KBigBuffer : public KDataBuffer protected: /** */ - mutable QFile File; + mutable TQFile File; /** */ bool ReadOnly:1; bool IsOpen:1; diff --git a/khexedit/lib/kbordercoltextexport.cpp b/khexedit/lib/kbordercoltextexport.cpp index d46490f..b60f249 100644 --- a/khexedit/lib/kbordercoltextexport.cpp +++ b/khexedit/lib/kbordercoltextexport.cpp @@ -16,7 +16,7 @@ // qt specific -#include <qstring.h> +#include <tqstring.h> // lib specific #include "kbordercoltextexport.h" @@ -31,17 +31,17 @@ int KBorderColTextExport::charsPerLine() const return BorderColumnTEWidth; } -void KBorderColTextExport::printFirstLine( QString &T, int /*Line*/ ) const +void KBorderColTextExport::printFirstLine( TQString &T, int /*Line*/ ) const { print( T ); } -void KBorderColTextExport::printNextLine( QString &T ) const +void KBorderColTextExport::printNextLine( TQString &T ) const { print( T ); } -void KBorderColTextExport::print( QString &T ) const +void KBorderColTextExport::print( TQString &T ) const { T.append( " | " ); } diff --git a/khexedit/lib/kbordercoltextexport.h b/khexedit/lib/kbordercoltextexport.h index 4103f0b..0fe6c5c 100644 --- a/khexedit/lib/kbordercoltextexport.h +++ b/khexedit/lib/kbordercoltextexport.h @@ -26,13 +26,13 @@ namespace KHE class KBorderColTextExport : public KColTextExport { public: // API - void printFirstLine( QString &T, int Line ) const; - void printNextLine( QString &T) const; + void printFirstLine( TQString &T, int Line ) const; + void printNextLine( TQString &T) const; /** tells how much chars per line are needed */ int charsPerLine() const ; protected: - void print( QString &T ) const; + void print( TQString &T ) const; }; } diff --git a/khexedit/lib/kbordercolumn.cpp b/khexedit/lib/kbordercolumn.cpp index c590246..d23bfea 100644 --- a/khexedit/lib/kbordercolumn.cpp +++ b/khexedit/lib/kbordercolumn.cpp @@ -16,8 +16,8 @@ // qt specific -#include <qpainter.h> -#include <qstyle.h> +#include <tqpainter.h> +#include <tqstyle.h> // lib specific #include "kcolumnsview.h" #include "kbordercolumn.h" @@ -41,7 +41,7 @@ KBorderColumn::~KBorderColumn() } -void KBorderColumn::paintLine( QPainter *P ) +void KBorderColumn::paintLine( TQPainter *P ) { if( LineHeight > 0 ) { @@ -49,7 +49,7 @@ void KBorderColumn::paintLine( QPainter *P ) if( Middle ) { - int GridColor = View->style().styleHint( QStyle::SH_Table_GridLineColor, View ); + int GridColor = View->style().styleHint( TQStyle::SH_Table_GridLineColor, View ); P->setPen( GridColor != -1 ? (QRgb)GridColor : View->colorGroup().mid() ); P->drawLine( LineX, 0, LineX, LineHeight-1 ) ; } @@ -57,25 +57,25 @@ void KBorderColumn::paintLine( QPainter *P ) } -void KBorderColumn::paintFirstLine( QPainter *P, KPixelXs , int ) +void KBorderColumn::paintFirstLine( TQPainter *P, KPixelXs , int ) { paintLine( P ); } -void KBorderColumn::paintNextLine( QPainter *P ) +void KBorderColumn::paintNextLine( TQPainter *P ) { paintLine( P ); } -void KBorderColumn::paintEmptyColumn( QPainter *P, KPixelXs Xs, KPixelYs Ys ) +void KBorderColumn::paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys ) { KColumn::paintEmptyColumn( P,Xs,Ys ); KPixelX LX = x() + LineX; if( Middle && Xs.includes(LX) ) { - int GridColor = View->style().styleHint( QStyle::SH_Table_GridLineColor, View ); + int GridColor = View->style().styleHint( TQStyle::SH_Table_GridLineColor, View ); P->setPen( GridColor != -1 ? (QRgb)GridColor : View->colorGroup().mid() ); P->drawLine( LX, Ys.start(), LX, Ys.end() ) ; } diff --git a/khexedit/lib/kbordercolumn.h b/khexedit/lib/kbordercolumn.h index 0a72c05..06446f2 100644 --- a/khexedit/lib/kbordercolumn.h +++ b/khexedit/lib/kbordercolumn.h @@ -35,12 +35,12 @@ class KBorderColumn : public KColumn ~KBorderColumn(); public: // KColumn-API - virtual void paintFirstLine( QPainter *P, KPixelXs Xs, int FirstLine ); - virtual void paintNextLine( QPainter *P ); - virtual void paintEmptyColumn( QPainter *P, KPixelXs Xs, KPixelYs Ys ); + virtual void paintFirstLine( TQPainter *P, KPixelXs Xs, int FirstLine ); + virtual void paintNextLine( TQPainter *P ); + virtual void paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys ); protected: - virtual void paintLine( QPainter *P ); + virtual void paintLine( TQPainter *P ); protected: /** true if we are between two columns and should show a line */ diff --git a/khexedit/lib/kbuffercoltextexport.cpp b/khexedit/lib/kbuffercoltextexport.cpp index a4ee91f..142504c 100644 --- a/khexedit/lib/kbuffercoltextexport.cpp +++ b/khexedit/lib/kbuffercoltextexport.cpp @@ -28,9 +28,9 @@ using namespace KHE; static const int DefaultTEByteSpacingWidth = 1; static const int TEGroupSpacingWidth = 3; -QString KBufferColTextExport::whiteSpace( uint s ) +TQString KBufferColTextExport::whiteSpace( uint s ) { - return QString().fill( ' ', s ); + return TQString().fill( ' ', s ); } KBufferColTextExport::KBufferColTextExport( const KBufferColumn* BufferColumn, const char *D, @@ -86,7 +86,7 @@ int KBufferColTextExport::charsPerLine() const } -void KBufferColTextExport::printFirstLine( QString &T, int Line ) const +void KBufferColTextExport::printFirstLine( TQString &T, int Line ) const { PrintLine = Line; PrintData = Data; @@ -94,13 +94,13 @@ void KBufferColTextExport::printFirstLine( QString &T, int Line ) const } -void KBufferColTextExport::printNextLine( QString &T ) const +void KBufferColTextExport::printNextLine( TQString &T ) const { print( T ); } -void KBufferColTextExport::print( QString &T ) const +void KBufferColTextExport::print( TQString &T ) const { T.append( whiteSpace(NoOfCharsPerLine) ); ++PrintLine; diff --git a/khexedit/lib/kbuffercoltextexport.h b/khexedit/lib/kbuffercoltextexport.h index 6cb161d..d26b21c 100644 --- a/khexedit/lib/kbuffercoltextexport.h +++ b/khexedit/lib/kbuffercoltextexport.h @@ -19,7 +19,7 @@ #define KHE_KBUFFERCOLTEXTEXPORT_H // qt specific -#include <qstring.h> +#include <tqstring.h> // lib specific #include "kcoltextexport.h" #include "kcoordrange.h" @@ -38,18 +38,18 @@ class KBufferColTextExport : public KColTextExport virtual ~KBufferColTextExport(); public: // API - void printFirstLine( QString &T, int Line ) const; - void printNextLine( QString &T ) const; + void printFirstLine( TQString &T, int Line ) const; + void printNextLine( TQString &T ) const; /** tells how much chars per line are needed */ int charsPerLine() const; protected: // API to be reimplemented by subclasses - virtual void print( QString &T ) const; + virtual void print( TQString &T ) const; protected: - static QString whiteSpace( uint s ); + static TQString whiteSpace( uint s ); protected: const char *Data; diff --git a/khexedit/lib/kbuffercolumn.cpp b/khexedit/lib/kbuffercolumn.cpp index 4291e00..d4f58d9 100644 --- a/khexedit/lib/kbuffercolumn.cpp +++ b/khexedit/lib/kbuffercolumn.cpp @@ -18,7 +18,7 @@ //#include <kdebug.h> // qt specific -#include <qpainter.h> +#include <tqpainter.h> // lib specific #include "kcolumnsview.h" #include "kbuffercursor.h" @@ -362,7 +362,7 @@ void KBufferColumn::preparePainting( KPixelXs Xs ) } -void KBufferColumn::paintFirstLine( QPainter *P, KPixelXs Xs, int FirstLine ) +void KBufferColumn::paintFirstLine( TQPainter *P, KPixelXs Xs, int FirstLine ) { preparePainting( Xs ); @@ -375,14 +375,14 @@ void KBufferColumn::paintFirstLine( QPainter *P, KPixelXs Xs, int FirstLine ) } -void KBufferColumn::paintNextLine( QPainter *P ) +void KBufferColumn::paintNextLine( TQPainter *P ) { // paintPositions( P, PaintLine++, PaintPositions ); paintLine( P, PaintLine++ ); } -void KBufferColumn::paintLine( QPainter *P, int Line ) // TODO: could be removed??? +void KBufferColumn::paintLine( TQPainter *P, int Line ) // TODO: could be removed??? { // kdDebug(1501) << "paintLine line: "<<Line<<" Start: "<<PaintPositions.start()<<" End: "<<PaintPositions.end() << "\n"; // no bytes to paint? @@ -393,9 +393,9 @@ void KBufferColumn::paintLine( QPainter *P, int Line ) // TODO: could be removed } -void KBufferColumn::paintPositions( QPainter *P, int Line, KSection Pos ) +void KBufferColumn::paintPositions( TQPainter *P, int Line, KSection Pos ) { - const QColorGroup &CG = View->colorGroup(); + const TQColorGroup &CG = View->colorGroup(); // clear background unsigned int BlankFlag = (Pos.start()!=0?StartsBefore:0) | (Pos.end()!=LastPos?EndsLater:0); @@ -481,7 +481,7 @@ void KBufferColumn::paintPositions( QPainter *P, int Line, KSection Pos ) } -void KBufferColumn::paintPlain( QPainter *P, KSection Positions, int Index ) +void KBufferColumn::paintPlain( TQPainter *P, KSection Positions, int Index ) { // paint all the bytes affected for( int p=Positions.start(); p<=Positions.end(); ++p,++Index ) @@ -499,13 +499,13 @@ void KBufferColumn::paintPlain( QPainter *P, KSection Positions, int Index ) } -void KBufferColumn::paintSelection( QPainter *P, KSection Positions, int Index, int Flag ) +void KBufferColumn::paintSelection( TQPainter *P, KSection Positions, int Index, int Flag ) { - const QColorGroup &CG = View->colorGroup(); + const TQColorGroup &CG = View->colorGroup(); paintRange( P, CG.highlight(), Positions, Flag ); - const QColor &HTC = CG.highlightedText(); + const TQColor &HTC = CG.highlightedText(); // paint all the bytes affected for( int p=Positions.start(); p<=Positions.end(); ++p,++Index ) { @@ -522,13 +522,13 @@ void KBufferColumn::paintSelection( QPainter *P, KSection Positions, int Index, } -void KBufferColumn::paintMarking( QPainter *P, KSection Positions, int Index, int Flag ) +void KBufferColumn::paintMarking( TQPainter *P, KSection Positions, int Index, int Flag ) { - const QColorGroup &CG = View->colorGroup(); + const TQColorGroup &CG = View->colorGroup(); paintRange( P, CG.text(), Positions, Flag ); - const QColor &BC = CG.base(); + const TQColor &BC = CG.base(); // paint all the bytes affected for( int p=Positions.start(); p<=Positions.end(); ++p,++Index ) { @@ -546,7 +546,7 @@ void KBufferColumn::paintMarking( QPainter *P, KSection Positions, int Index, in // TODO: smarter calculation -void KBufferColumn::paintGrid( QPainter *P, KSection Range ) +void KBufferColumn::paintGrid( TQPainter *P, KSection Range ) { int st = 0; // counter for spacing triggering P->setPen( Qt::black ); @@ -567,23 +567,23 @@ void KBufferColumn::paintGrid( QPainter *P, KSection Range ) } -void KBufferColumn::paintRange( QPainter *P, const QColor &Color, KSection Positions, int Flag ) +void KBufferColumn::paintRange( TQPainter *P, const TQColor &Color, KSection Positions, int Flag ) { KPixelX RangeX = Flag & StartsBefore ? relRightXOfPos( Positions.start()-1 ) + 1 : relXOfPos( Positions.start() ); KPixelX RangeW = (Flag & EndsLater ? relXOfPos( Positions.end()+1 ): relRightXOfPos( Positions.end() ) + 1) - RangeX; - P->fillRect( RangeX,0,RangeW,LineHeight, QBrush(Color,Qt::SolidPattern) ); + P->fillRect( RangeX,0,RangeW,LineHeight, TQBrush(Color,Qt::SolidPattern) ); } -void KBufferColumn::paintByte( QPainter *P, int Index ) +void KBufferColumn::paintByte( TQPainter *P, int Index ) { char Byte = ( Index > -1 ) ? Buffer->datum( Index ) : EmptyByte; KHEChar B = Codec->decode( Byte ); - const QColorGroup &CG = View->colorGroup(); - QColor Color = CG.text(); - QBrush Brush( CG.base(), Qt::SolidPattern ); + const TQColorGroup &CG = View->colorGroup(); + TQColor Color = CG.text(); + TQBrush Brush( CG.base(), Qt::SolidPattern ); if( Index > -1 ) { @@ -611,7 +611,7 @@ void KBufferColumn::paintByte( QPainter *P, int Index ) } -void KBufferColumn::paintFramedByte( QPainter *P, int Index, KFrameStyle FrameStyle ) +void KBufferColumn::paintFramedByte( TQPainter *P, int Index, KFrameStyle FrameStyle ) { paintByte( P, Index ); char Byte = ( Index > -1 ) ? Buffer->datum( Index ) : EmptyByte; @@ -627,15 +627,15 @@ void KBufferColumn::paintFramedByte( QPainter *P, int Index, KFrameStyle FrameSt } -void KBufferColumn::paintCursor( QPainter *P, int Index ) +void KBufferColumn::paintCursor( TQPainter *P, int Index ) { char Byte = ( Index > -1 ) ? Buffer->datum( Index ) : EmptyByte; KHEChar B = Codec->decode( Byte ); - P->fillRect( 0, 0, ByteWidth, LineHeight, QBrush(colorForChar(B),Qt::SolidPattern) ); + P->fillRect( 0, 0, ByteWidth, LineHeight, TQBrush(colorForChar(B),Qt::SolidPattern) ); } -void KBufferColumn::drawByte( QPainter *P, char /*Byte*/, KHEChar B, const QColor &Color ) const +void KBufferColumn::drawByte( TQPainter *P, char /*Byte*/, KHEChar B, const TQColor &Color ) const { P->setPen( Color ); P->drawText( 0, DigitBaseLine, B ); diff --git a/khexedit/lib/kbuffercolumn.h b/khexedit/lib/kbuffercolumn.h index 76ed8bc..37a495a 100644 --- a/khexedit/lib/kbuffercolumn.h +++ b/khexedit/lib/kbuffercolumn.h @@ -55,28 +55,28 @@ class KBufferColumn : public KColumn public: // KColumn-API - virtual void paintFirstLine( QPainter *P, KPixelXs Xs, int FirstLine ); - virtual void paintNextLine( QPainter *P ); + virtual void paintFirstLine( TQPainter *P, KPixelXs Xs, int FirstLine ); + virtual void paintNextLine( TQPainter *P ); public: void preparePainting( KPixelXs Xs ); public: - void paintLine( QPainter *P, int Line ); - void paintPositions( QPainter *P, int Line, KSection Positions ); + void paintLine( TQPainter *P, int Line ); + void paintPositions( TQPainter *P, int Line, KSection Positions ); /** paints a cursor based on the type of the byte. * @param Index Index of the byte to paint the cursor for. If -1 a space is used as char. */ - void paintCursor( QPainter *P, int Index ); + void paintCursor( TQPainter *P, int Index ); /** paints the byte with background. * @param Index Index of the byte to paint. If -1 only the background is painted. */ - void paintByte( QPainter *P, int Index ); + void paintByte( TQPainter *P, int Index ); /** paints the byte with background and a frame around. * @param Index Index of the byte to paint the frame for. If -1 a space is used as char. * @param Style the style of the framing */ - void paintFramedByte( QPainter *P, int Index, KFrameStyle Style ); + void paintFramedByte( TQPainter *P, int Index, KFrameStyle Style ); public: // modification access @@ -165,17 +165,17 @@ class KBufferColumn : public KColumn protected: // API to be refined /** default implementation simply prints the byte as ASCII */ - virtual void drawByte( QPainter *P, char Byte, KHEChar B, const QColor &Color ) const; + virtual void drawByte( TQPainter *P, char Byte, KHEChar B, const TQColor &Color ) const; /** default implementation sets byte width to one digit width */ virtual void recalcByteWidth(); protected: - void paintGrid( QPainter *P, KSection Range ); - void paintPlain( QPainter *P, KSection Positions, int Index ); - void paintSelection( QPainter *P, KSection Positions, int Index, int Flag ); - void paintMarking( QPainter *P, KSection Positions, int Index, int Flag ); - void paintRange( QPainter *P, const QColor &Color, KSection Positions, int Flag ); + void paintGrid( TQPainter *P, KSection Range ); + void paintPlain( TQPainter *P, KSection Positions, int Index ); + void paintSelection( TQPainter *P, KSection Positions, int Index, int Flag ); + void paintMarking( TQPainter *P, KSection Positions, int Index, int Flag ); + void paintRange( TQPainter *P, const TQColor &Color, KSection Positions, int Flag ); bool isSelected( KSection Range, KSection *Selection, unsigned int *Flag ) const; bool isMarked( KSection Range, KSection *Marking, unsigned int *Flag ) const; diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp index 199982c..3fb3cff 100644 --- a/khexedit/lib/kbufferdrag.cpp +++ b/khexedit/lib/kbufferdrag.cpp @@ -16,8 +16,8 @@ // qt specific -#include <qcstring.h> -#include <qtextcodec.h> +#include <tqcstring.h> +#include <tqtextcodec.h> // kde specific #include <kglobal.h> #include <klocale.h> @@ -43,11 +43,11 @@ static const char TextPlainLocalStub[] = "text/plain;charset="; // creates the name for the local text/plain static const char *localTextPlain() { - static QCString TextPlainLocal; + static TQCString TextPlainLocal; if( TextPlainLocal.isNull() ) { - TextPlainLocal = QCString(KGlobal::locale()->encoding()).lower(); + TextPlainLocal = TQCString(KGlobal::locale()->encoding()).lower(); // remove the whitespaces int s; while( (s=TextPlainLocal.find(' ')) >= 0 ) @@ -60,18 +60,18 @@ static const char *localTextPlain() } // tries to create a codec by the given charset description -static QTextCodec* codecForCharset( const QCString& Desc ) +static TQTextCodec* codecForCharset( const TQCString& Desc ) { int i = Desc.find( "charset=" ); if( i >= 0 ) { - QCString CharSetName = Desc.mid( i+8 ); + TQCString CharSetName = Desc.mid( i+8 ); // remove any further attributes if( (i=CharSetName.find( ';' )) >= 0 ) CharSetName = CharSetName.left( i ); // try to find codec - return QTextCodec::codecForName( CharSetName ); + return TQTextCodec::codecForName( CharSetName ); } // no charset=, use locale return KGlobal::locale()->codecForEncoding(); @@ -79,11 +79,11 @@ static QTextCodec* codecForCharset( const QCString& Desc ) -KBufferDrag::KBufferDrag( const QByteArray &D, KCoordRange Range, +KBufferDrag::KBufferDrag( const TQByteArray &D, KCoordRange Range, const KOffsetColumn *OC, const KValueColumn *HC, const KCharColumn *TC, - QChar SC, QChar UC, const QString &CN, - QWidget *Source, const char *Name ) - :QDragObject( Source, Name ), + TQChar SC, TQChar UC, const TQString &CN, + TQWidget *Source, const char *Name ) + :TQDragObject( Source, Name ), CoordRange( Range ), NoOfCol( 0 ), SubstituteChar( SC ), @@ -119,7 +119,7 @@ KBufferDrag::~KBufferDrag() -void KBufferDrag::setData( const QByteArray &D ) +void KBufferDrag::setData( const TQByteArray &D ) { Data = D; } @@ -135,7 +135,7 @@ const char *KBufferDrag::format( int i ) const } -QByteArray KBufferDrag::encodedData( const char *Format ) const +TQByteArray KBufferDrag::encodedData( const char *Format ) const { if( Format != 0 ) { @@ -146,19 +146,19 @@ QByteArray KBufferDrag::encodedData( const char *Format ) const // plain text wanted? if( qstrncmp(Format,TextPlain,10) == 0 ) { - QCString Output; - QTextCodec *TextCodec = codecForCharset( QCString(Format).lower() ); + TQCString Output; + TQTextCodec *TextCodec = codecForCharset( TQCString(Format).lower() ); if( TextCodec == 0 ) return Output; - QString Text; + TQString Text; // plain copy? if( NoOfCol == 0 ) { // duplicate the data and substitute all non-printable items with a space KCharCodec *CharCodec = KCharCodec::createCodec( CodecName ); - static const QChar Tab('\t'); - static const QChar Return('\n'); + static const TQChar Tab('\t'); + static const TQChar Return('\n'); uint Size = Data.size(); Text.setLength( Size ); @@ -201,20 +201,20 @@ QByteArray KBufferDrag::encodedData( const char *Format ) const // fix end //if( TextCodec->mibEnum() != 1000 ) //{ - // Don't include NUL in size (QCString::resize() adds NUL) - // ((QByteArray&)Output).resize( Output.length() ); + // Don't include NUL in size (TQCString::resize() adds NUL) + // ((TQByteArray&)Output).resize( Output.length() ); //} return Output; } } // return empty dummy - return QByteArray(); + return TQByteArray(); } -bool KBufferDrag::canDecode( const QMimeSource* Source ) +bool KBufferDrag::canDecode( const TQMimeSource* Source ) { bool c =( Source->provides(OctetStream) /*|| Source->provides(TextPlain)*/ ); return c; @@ -222,7 +222,7 @@ bool KBufferDrag::canDecode( const QMimeSource* Source ) } -bool KBufferDrag::decode( const QMimeSource* Source, QByteArray &Dest ) +bool KBufferDrag::decode( const TQMimeSource* Source, TQByteArray &Dest ) { // Dest = Source->encodedData( MediaString ); // return Dest.size() != 0; diff --git a/khexedit/lib/kbufferdrag.h b/khexedit/lib/kbufferdrag.h index 86c498f..d04bca6 100644 --- a/khexedit/lib/kbufferdrag.h +++ b/khexedit/lib/kbufferdrag.h @@ -19,7 +19,7 @@ #define KHE_KBUFFERDRAG_H // qt specific -#include <qdragobject.h> +#include <tqdragobject.h> // lib specific #include "khe.h" #include "kcoordrange.h" @@ -43,32 +43,32 @@ class KBufferDrag : public QDragObject public: // TODO: make this call somewhat more generic - KBufferDrag( const QByteArray &, KCoordRange Range, + KBufferDrag( const TQByteArray &, KCoordRange Range, const KOffsetColumn *OC, const KValueColumn *HC, const KCharColumn *TC, - QChar SC, QChar UC, const QString &CN, - QWidget *Source = 0, const char *Name = 0 ); + TQChar SC, TQChar UC, const TQString &CN, + TQWidget *Source = 0, const char *Name = 0 ); ~KBufferDrag(); - public: // QDragObject API + public: // TQDragObject API virtual const char *format( int i ) const; - virtual QByteArray encodedData( const char* ) const; + virtual TQByteArray encodedData( const char* ) const; public: - virtual void setData( const QByteArray &); + virtual void setData( const TQByteArray &); public: - static bool canDecode( const QMimeSource* Source ); - static bool decode( const QMimeSource* Source, QByteArray &Dest ); + static bool canDecode( const TQMimeSource* Source ); + static bool decode( const TQMimeSource* Source, TQByteArray &Dest ); protected: - QByteArray Data; + TQByteArray Data; KCoordRange CoordRange; /** collection of all the columns. All columns will be autodeleted. */ KColTextExportPtr Columns[5]; uint NoOfCol; - QChar SubstituteChar; - QChar UndefinedChar; - const QString &CodecName; + TQChar SubstituteChar; + TQChar UndefinedChar; + const TQString &CodecName; }; } diff --git a/khexedit/lib/kbytecodec.h b/khexedit/lib/kbytecodec.h index fc4e1b3..f966ac5 100644 --- a/khexedit/lib/kbytecodec.h +++ b/khexedit/lib/kbytecodec.h @@ -19,7 +19,7 @@ #define KHE_KBYTECODEC_H #include "khe.h" -#include <qstring.h> +#include <tqstring.h> namespace KHE { @@ -49,9 +49,9 @@ class KByteCodec virtual unsigned char digitsFilledLimit() const = 0; /** encodes the Char and writes the result to */ - virtual void encode( QString &Digits, unsigned int Pos, const unsigned char Char ) const = 0; + virtual void encode( TQString &Digits, unsigned int Pos, const unsigned char Char ) const = 0; /** */ - virtual void encodeShort( QString &Digits, unsigned int Pos, const unsigned char Char ) const = 0; + virtual void encodeShort( TQString &Digits, unsigned int Pos, const unsigned char Char ) const = 0; /** */ virtual bool appendDigit( unsigned char *Byte, const unsigned char Digit ) const = 0; @@ -65,7 +65,7 @@ class KByteCodec public: /** */ - uint decode( unsigned char *Char, const QString &Digits, uint Pos ) const; + uint decode( unsigned char *Char, const TQString &Digits, uint Pos ) const; }; } diff --git a/khexedit/lib/kbytesedit.cpp b/khexedit/lib/kbytesedit.cpp index 40b57a1..3eb49bd 100644 --- a/khexedit/lib/kbytesedit.cpp +++ b/khexedit/lib/kbytesedit.cpp @@ -24,14 +24,14 @@ using namespace KHE; -KBytesEdit::KBytesEdit( char *D, int DS_, int RS_, bool KM, QWidget *Parent, const char *Name, WFlags F ) +KBytesEdit::KBytesEdit( char *D, int DS_, int RS_, bool KM, TQWidget *Parent, const char *Name, WFlags F ) : KHexEdit( 0L, Parent, Name, F ), AutoDelete( false ) { setData( D, DS_, RS_, KM ); } -KBytesEdit::KBytesEdit( char *D, int DS_, QWidget *Parent, const char *Name, WFlags F ) +KBytesEdit::KBytesEdit( char *D, int DS_, TQWidget *Parent, const char *Name, WFlags F ) : KHexEdit( 0L, Parent, Name, F ), AutoDelete( false ) { @@ -39,7 +39,7 @@ KBytesEdit::KBytesEdit( char *D, int DS_, QWidget *Parent, const char *Name, WFl } -KBytesEdit::KBytesEdit( QWidget *Parent, const char *Name, WFlags F ) +KBytesEdit::KBytesEdit( TQWidget *Parent, const char *Name, WFlags F ) : KHexEdit( 0L, Parent, Name, F ), AutoDelete( false ) { diff --git a/khexedit/lib/kbytesedit.h b/khexedit/lib/kbytesedit.h index daf8b6e..e57d73a 100644 --- a/khexedit/lib/kbytesedit.h +++ b/khexedit/lib/kbytesedit.h @@ -73,7 +73,7 @@ class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit * @param Name name for this widget * @param F flags */ - KBytesEdit( char *D, int DS_, int RS_, bool KM, QWidget *Parent = 0, const char *Name = 0, WFlags F = 0 ); + KBytesEdit( char *D, int DS_, int RS_, bool KM, TQWidget *Parent = 0, const char *Name = 0, WFlags F = 0 ); /** hands over to the editor a new byte array. * If there exists an old one and autodelete is set the old one gets deleted. * @param D pointer to memory @@ -81,7 +81,7 @@ class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit * @param RS_ real size of the memory * @param KM keep the memory on resize (RS_ is the maximum size) */ - KBytesEdit( char *D, int DS_, QWidget *Parent = 0, const char *Name = 0, WFlags F = 0 ); + KBytesEdit( char *D, int DS_, TQWidget *Parent = 0, const char *Name = 0, WFlags F = 0 ); /** hands over to the editor a new byte array. * If there exists an old one and autodelete is set the old one gets deleted. * @param D pointer to memory @@ -89,7 +89,7 @@ class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit * @param RS_ real size of the memory * @param KM keep the memory on resize (RS_ is the maximum size) */ - KBytesEdit( QWidget *Parent = 0, const char *Name = 0, WFlags F = 0 ); + KBytesEdit( TQWidget *Parent = 0, const char *Name = 0, WFlags F = 0 ); virtual ~KBytesEdit(); diff --git a/khexedit/lib/kcharcodec.h b/khexedit/lib/kcharcodec.h index 9d1b628..15d47aa 100644 --- a/khexedit/lib/kcharcodec.h +++ b/khexedit/lib/kcharcodec.h @@ -19,7 +19,7 @@ #define KHE_KCHARCODEC_H // qt specific -#include <qstringlist.h> +#include <tqstringlist.h> // lib specific #include "khe.h" #include "khechar.h" @@ -35,18 +35,18 @@ class KHEXEDIT_EXPORT KCharCodec /** */ static KCharCodec* createCodec( KEncoding E ); /** */ - static KCharCodec* createCodec( const QString &Name ); + static KCharCodec* createCodec( const TQString &Name ); - static const QStringList &codecNames(); + static const TQStringList &codecNames(); public: // API to be implemented virtual KHEChar decode( char Byte ) const = 0; - virtual bool encode( char *D, const QChar &C ) const = 0; - virtual const QString& name() const = 0; + virtual bool encode( char *D, const TQChar &C ) const = 0; + virtual const TQString& name() const = 0; protected: /** */ - static QStringList CodecNames; + static TQStringList CodecNames; }; } diff --git a/khexedit/lib/kcharcoltextexport.cpp b/khexedit/lib/kcharcoltextexport.cpp index bc4a60e..d53d187 100644 --- a/khexedit/lib/kcharcoltextexport.cpp +++ b/khexedit/lib/kcharcoltextexport.cpp @@ -24,7 +24,7 @@ using namespace KHE; -KCharColTextExport::KCharColTextExport( const KCharColumn* TC, const char *D, KCoordRange CR, const QString &CodecName ) +KCharColTextExport::KCharColTextExport( const KCharColumn* TC, const char *D, KCoordRange CR, const TQString &CodecName ) : KBufferColTextExport( TC, D, CR, 1 ), CharCodec( KCharCodec::createCodec(CodecName) ), SubstituteChar( TC->substituteChar() ), @@ -39,7 +39,7 @@ KCharColTextExport::~KCharColTextExport() } -void KCharColTextExport::print( QString &T ) const +void KCharColTextExport::print( TQString &T ) const { int p = 0; int pEnd = NoOfBytesPerLine; diff --git a/khexedit/lib/kcharcoltextexport.h b/khexedit/lib/kcharcoltextexport.h index 05a570c..7d9da2f 100644 --- a/khexedit/lib/kcharcoltextexport.h +++ b/khexedit/lib/kcharcoltextexport.h @@ -33,16 +33,16 @@ class KCharCodec; class KCharColTextExport : public KBufferColTextExport { public: - KCharColTextExport( const KCharColumn* BF, const char *D, KCoordRange CR, const QString &CodecName ); + KCharColTextExport( const KCharColumn* BF, const char *D, KCoordRange CR, const TQString &CodecName ); virtual ~KCharColTextExport(); protected: //API - virtual void print( QString &T ) const; + virtual void print( TQString &T ) const; protected: KCharCodec *CharCodec; - QChar SubstituteChar; - QChar UndefinedChar; + TQChar SubstituteChar; + TQChar UndefinedChar; }; } diff --git a/khexedit/lib/kcharcolumn.cpp b/khexedit/lib/kcharcolumn.cpp index 9ecbd5a..10105a0 100644 --- a/khexedit/lib/kcharcolumn.cpp +++ b/khexedit/lib/kcharcolumn.cpp @@ -18,7 +18,7 @@ // c specific #include <ctype.h> // qt specific -#include <qpainter.h> +#include <tqpainter.h> // kde specific #include <kcharsets.h> #include <klocale.h> @@ -33,8 +33,8 @@ using namespace KHE; static const bool DefaultShowUnprintable = false; -static const QChar DefaultSubstituteChar = (char)'.'; -static const QChar DefaultUndefinedChar = (char)'?'; +static const TQChar DefaultSubstituteChar = (char)'.'; +static const TQChar DefaultUndefinedChar = (char)'?'; KCharColumn::KCharColumn( KColumnsView *CV, KDataBuffer *B, KBufferLayout *L, KBufferRanges *R ) @@ -51,10 +51,10 @@ KCharColumn::~KCharColumn() { } -void KCharColumn::drawByte( QPainter *P, char /*Byte*/, KHEChar B, const QColor &Color ) const +void KCharColumn::drawByte( TQPainter *P, char /*Byte*/, KHEChar B, const TQColor &Color ) const { // make a drawable String out of it - QString BS( B.isUndefined() ? KHEChar(UndefinedChar) : ( !(ShowUnprintable || B.isPrint()) ? KHEChar(SubstituteChar) : B )); + TQString BS( B.isUndefined() ? KHEChar(UndefinedChar) : ( !(ShowUnprintable || B.isPrint()) ? KHEChar(SubstituteChar) : B )); P->setPen( Color ); P->drawText( 0, DigitBaseLine, BS ); diff --git a/khexedit/lib/kcharcolumn.h b/khexedit/lib/kcharcolumn.h index 1e875b0..e196cf9 100644 --- a/khexedit/lib/kcharcolumn.h +++ b/khexedit/lib/kcharcolumn.h @@ -19,7 +19,7 @@ #define KHE_KCHARCOLUMN_H // qt specific -#include <qstring.h> +#include <tqstring.h> // lib specific #include "kbuffercolumn.h" @@ -52,11 +52,11 @@ class KCharColumn : public KBufferColumn /** sets the substitute character for "unprintable" chars * returns true if there was a change */ - bool setSubstituteChar( QChar SC ); + bool setSubstituteChar( TQChar SC ); /** sets the undefined character for "undefined" chars * returns true if there was a change */ - bool setUndefinedChar( QChar UC ); + bool setUndefinedChar( TQChar UC ); public: // value access @@ -65,29 +65,29 @@ class KCharColumn : public KBufferColumn */ bool showUnprintable() const; /** returns the actually used substitute character for "unprintable" chars, default is '.' */ - QChar substituteChar() const; + TQChar substituteChar() const; /** returns the actually used undefined character for "undefined" chars, default is '?' */ - QChar undefinedChar() const; + TQChar undefinedChar() const; protected: // KBufferColumn API - virtual void drawByte( QPainter *P, char Byte, KHEChar B, const QColor &Color ) const; + virtual void drawByte( TQPainter *P, char Byte, KHEChar B, const TQColor &Color ) const; protected: /** */ bool ShowUnprintable; /** */ - QChar SubstituteChar; + TQChar SubstituteChar; /** */ - QChar UndefinedChar; + TQChar UndefinedChar; }; inline bool KCharColumn::showUnprintable() const { return ShowUnprintable; } -inline QChar KCharColumn::substituteChar() const { return SubstituteChar; } -inline QChar KCharColumn::undefinedChar() const { return UndefinedChar; } +inline TQChar KCharColumn::substituteChar() const { return SubstituteChar; } +inline TQChar KCharColumn::undefinedChar() const { return UndefinedChar; } -inline bool KCharColumn::setSubstituteChar( QChar SC ) +inline bool KCharColumn::setSubstituteChar( TQChar SC ) { if( SubstituteChar == SC ) return false; @@ -95,7 +95,7 @@ inline bool KCharColumn::setSubstituteChar( QChar SC ) return true; } -inline bool KCharColumn::setUndefinedChar( QChar UC ) +inline bool KCharColumn::setUndefinedChar( TQChar UC ) { if( UndefinedChar == UC ) return false; diff --git a/khexedit/lib/kcoltextexport.h b/khexedit/lib/kcoltextexport.h index d0b3918..0042bae 100644 --- a/khexedit/lib/kcoltextexport.h +++ b/khexedit/lib/kcoltextexport.h @@ -29,8 +29,8 @@ namespace KHE class KColTextExport { public: // API - virtual void printFirstLine( QString &T, int Line ) const = 0; - virtual void printNextLine( QString &T ) const = 0; + virtual void printFirstLine( TQString &T, int Line ) const = 0; + virtual void printNextLine( TQString &T ) const = 0; /** tells how much chars per line are needed */ virtual int charsPerLine() const = 0; }; diff --git a/khexedit/lib/kcolumn.cpp b/khexedit/lib/kcolumn.cpp index f9b0ce5..c23f935 100644 --- a/khexedit/lib/kcolumn.cpp +++ b/khexedit/lib/kcolumn.cpp @@ -16,7 +16,7 @@ // qt specific -#include <qpainter.h> +#include <tqpainter.h> // lib specific #include "kcolumnsview.h" #include "kcolumn.h" @@ -34,26 +34,26 @@ KColumn::KColumn( KColumnsView *V ) } -void KColumn::paintFirstLine( QPainter *P, KPixelXs, int /*FirstLine*/ ) +void KColumn::paintFirstLine( TQPainter *P, KPixelXs, int /*FirstLine*/ ) { paintBlankLine( P ); } -void KColumn::paintNextLine( QPainter *P ) +void KColumn::paintNextLine( TQPainter *P ) { paintBlankLine( P ); } -void KColumn::paintBlankLine( QPainter *P ) const +void KColumn::paintBlankLine( TQPainter *P ) const { if( LineHeight > 0 ) P->fillRect( 0,0,width(),LineHeight, View->backgroundBrush() ); } -void KColumn::paintEmptyColumn( QPainter *P, KPixelXs Xs, KPixelYs Ys ) +void KColumn::paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys ) { Xs.restrictTo( XSpan ); P->fillRect( Xs.start(), Ys.start(), Xs.width(), Ys.width(), View->backgroundBrush() ); diff --git a/khexedit/lib/kcolumn.h b/khexedit/lib/kcolumn.h index 37c3118..ea219c6 100644 --- a/khexedit/lib/kcolumn.h +++ b/khexedit/lib/kcolumn.h @@ -55,14 +55,14 @@ class KColumn * @param cw * @param FirstLine no of the first of the range of lines to paint */ - virtual void paintFirstLine( QPainter *P, KPixelXs Xs, int FirstLine ); + virtual void paintFirstLine( TQPainter *P, KPixelXs Xs, int FirstLine ); /** the actual painting call for a column's line. * The default implementation simply paints the background */ - virtual void paintNextLine( QPainter *P ); + virtual void paintNextLine( TQPainter *P ); /** */ - virtual void paintEmptyColumn( QPainter *P, KPixelXs Xs, KPixelYs Ys ); + virtual void paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys ); public: // modification access /** sets starting point of the column */ @@ -92,7 +92,7 @@ class KColumn /** sets width of the column */ void setWidth( KPixelX W ); /** */ - void paintBlankLine( QPainter *P ) const; + void paintBlankLine( TQPainter *P ) const; protected: // general column data /** pointer to the view */ diff --git a/khexedit/lib/kcolumnsview.cpp b/khexedit/lib/kcolumnsview.cpp index 1c93af8..c855b51 100644 --- a/khexedit/lib/kcolumnsview.cpp +++ b/khexedit/lib/kcolumnsview.cpp @@ -18,7 +18,7 @@ //#include <kdebug.h> // qt specific -#include <qpainter.h> +#include <tqpainter.h> // lib specific #include "kcolumn.h" #include "kcolumnsview.h" @@ -28,8 +28,8 @@ using namespace KHE; static bool DefaultHorizontalGrid = false; -KColumnsView::KColumnsView( /*bool R,*/ QWidget *Parent, const char *Name, WFlags Flags ) - : QScrollView( Parent, Name, Flags | WRepaintNoErase /*| WStaticContents*/ ), +KColumnsView::KColumnsView( /*bool R,*/ TQWidget *Parent, const char *Name, WFlags Flags ) + : TQScrollView( Parent, Name, Flags | WRepaintNoErase /*| WStaticContents*/ ), NoOfLines( 0 ), LineHeight( 0 ), TotalWidth( 0 ), @@ -136,13 +136,13 @@ void KColumnsView::repaintView() } -void KColumnsView::paintEmptyArea( QPainter *P, int cx ,int cy, int cw, int ch) +void KColumnsView::paintEmptyArea( TQPainter *P, int cx ,int cy, int cw, int ch) { P->fillRect( cx, cy, cw, ch, backgroundBrush() ); } -void KColumnsView::drawContents( QPainter *P, int cx, int cy, int cw, int ch ) +void KColumnsView::drawContents( TQPainter *P, int cx, int cy, int cw, int ch ) { //kdDebug(1501) << "drawContents(" << cx<<","<<cw<<"#"<<cy<<","<<ch<<")\n"; KPixelXs AffectedXs( cx, cw, true ); @@ -152,7 +152,7 @@ void KColumnsView::drawContents( QPainter *P, int cx, int cy, int cw, int ch ) KPixelYs AffectedYs( cy, ch, true ); // collect affected columns - QPtrList<KColumn> RedrawColumns; + TQPtrList<KColumn> RedrawColumns; for( KColumn *C=Columns.first(); C; C=Columns.next() ) if( C->isVisible() && C->overlaps(AffectedXs) ) RedrawColumns.append( C ); @@ -166,7 +166,7 @@ void KColumnsView::drawContents( QPainter *P, int cx, int cy, int cw, int ch ) if( AffectedLines.isValid() ) { - QPainter Paint; + TQPainter Paint; Paint.begin( &LineBuffer, this ); // starting painting with the first line @@ -231,6 +231,6 @@ void KColumnsView::drawContents( QPainter *P, int cx, int cy, int cw, int ch ) } // Implemented to get rid of a compiler warning -void KColumnsView::drawContents( QPainter * ) {} +void KColumnsView::drawContents( TQPainter * ) {} #include "kcolumnsview.moc" diff --git a/khexedit/lib/kcolumnsview.h b/khexedit/lib/kcolumnsview.h index aa3521d..372a6f5 100644 --- a/khexedit/lib/kcolumnsview.h +++ b/khexedit/lib/kcolumnsview.h @@ -19,10 +19,10 @@ #define KHE_KCOLUMNSVIEW_H // qt specific -#include <qptrlist.h> -#include <qwidget.h> -#include <qpixmap.h> -#include <qscrollview.h> +#include <tqptrlist.h> +#include <tqwidget.h> +#include <tqpixmap.h> +#include <tqscrollview.h> // lib specific #include "kadds.h" #include "ksection.h" // TODO: think about moving this out of the public API @@ -46,12 +46,12 @@ class KColumnsView : public QScrollView friend class KColumn; public: - KColumnsView( /*bool R = false,*/ QWidget *parent=0, const char *name=0, WFlags Flags=0 ); + KColumnsView( /*bool R = false,*/ TQWidget *parent=0, const char *name=0, WFlags Flags=0 ); virtual ~KColumnsView(); public: // drawing - virtual void paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch ); - virtual void drawContents( QPainter *p, int cx, int cy, int cw, int ch ); + virtual void paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch ); + virtual void drawContents( TQPainter *p, int cx, int cy, int cw, int ch ); public: // data-wise sizes /** returns the number of all lines */ @@ -65,7 +65,7 @@ class KColumnsView : public QScrollView /** returns the height of each line */ KPixelY lineHeight() const; /** returns the size of all visible columns together */ - QSize totalViewSize() const; + TQSize totalViewSize() const; /** returns the width of all visible columns together */ KPixelX totalWidth() const; /** returns the height of all lines together */ @@ -116,12 +116,12 @@ class KColumnsView : public QScrollView private: /** hiding it*/ - void drawContents( QPainter* ); + void drawContents( TQPainter* ); protected: // calculated /** collection of all the columns. All columns will be autodeleted. */ - QPtrList<KColumn> Columns; + TQPtrList<KColumn> Columns; /** the number of lines which the column view has */ int NoOfLines; /** the height of each line in pixels */ @@ -135,7 +135,7 @@ class KColumnsView : public QScrollView // TODO: do we really want this? bool HorizontalGrid; /** Buffer where each line is drawn to before it is copied onto the screen */ - QPixmap LineBuffer; + TQPixmap LineBuffer; // bool Reversed; private: @@ -161,7 +161,7 @@ inline KSection KColumnsView::visibleLines( KPixelYs YPixels ) const inline KPixelY KColumnsView::totalHeight() const { return NoOfLines*LineHeight; } inline KPixelX KColumnsView::totalWidth() const { return TotalWidth; } -inline QSize KColumnsView::totalViewSize() const { return QSize( totalWidth(), totalHeight() ); } +inline TQSize KColumnsView::totalViewSize() const { return TQSize( totalWidth(), totalHeight() ); } } diff --git a/khexedit/lib/kcoordrangelist.h b/khexedit/lib/kcoordrangelist.h index 187ec7f..a4401f7 100644 --- a/khexedit/lib/kcoordrangelist.h +++ b/khexedit/lib/kcoordrangelist.h @@ -19,13 +19,13 @@ #define KHE_KCOORDRANGELIST_H // qt specific -#include <qvaluelist.h> +#include <tqvaluelist.h> // lib specific #include "kcoordrange.h" namespace KHE { -typedef QValueList<KCoordRange> KCoordRangeBasicList; +typedef TQValueList<KCoordRange> KCoordRangeBasicList; /** @author Friedrich W. H. Kossebau */ diff --git a/khexedit/lib/kcursor.h b/khexedit/lib/kcursor.h index 428c7ed..17b4371 100644 --- a/khexedit/lib/kcursor.h +++ b/khexedit/lib/kcursor.h @@ -19,7 +19,7 @@ #define KHE_KCURSOR_H -#include <qpixmap.h> +#include <tqpixmap.h> #include "kadds.h" @@ -42,23 +42,23 @@ class KCursor void setShape( KPixelX X, KPixelX W ); public: // access - const QPixmap &onPixmap() const; - const QPixmap &offPixmap() const; + const TQPixmap &onPixmap() const; + const TQPixmap &offPixmap() const; KPixelX cursorX() const; KPixelX cursorW() const; protected: - QPixmap OnPixmap; - QPixmap OffPixmap; + TQPixmap OnPixmap; + TQPixmap OffPixmap; KPixelX CursorX; KPixelX CursorW; }; -inline const QPixmap &KCursor::onPixmap() const { return OnPixmap; } -inline const QPixmap &KCursor::offPixmap() const { return OffPixmap; } +inline const TQPixmap &KCursor::onPixmap() const { return OnPixmap; } +inline const TQPixmap &KCursor::offPixmap() const { return OffPixmap; } inline KPixelX KCursor::cursorX() const { return CursorX; } inline KPixelX KCursor::cursorW() const { return CursorW; } diff --git a/khexedit/lib/kdatabuffer.h b/khexedit/lib/kdatabuffer.h index e9733d8..e7cc3bc 100644 --- a/khexedit/lib/kdatabuffer.h +++ b/khexedit/lib/kdatabuffer.h @@ -219,7 +219,7 @@ class KHEXEDIT_EXPORT KDataBuffer */ virtual int rfind( const char*, int Length, int Pos = -1 ) const = 0; -/* virtual int find( const QString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */ +/* virtual int find( const TQString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */ }; diff --git a/khexedit/lib/kfixedsizebuffer.cpp b/khexedit/lib/kfixedsizebuffer.cpp index 2945620..784858c 100644 --- a/khexedit/lib/kfixedsizebuffer.cpp +++ b/khexedit/lib/kfixedsizebuffer.cpp @@ -214,7 +214,7 @@ int KFixedSizeBuffer::fill( const char FChar, int FillLength, unsigned int Pos ) int KFixedSizeBuffer::compare( const KDataBuffer &Other, KSection OtherRange, unsigned int Pos ) { - //kdDebug() << QString("Pos: %1, OtherRange: (%3/%4)" ).arg(Pos).arg(OtherRange.start()).arg(OtherRange.end()) + //kdDebug() << TQString("Pos: %1, OtherRange: (%3/%4)" ).arg(Pos).arg(OtherRange.start()).arg(OtherRange.end()) // << endl; // test other values if( OtherRange.startsBehind(Other.size()-1) ) @@ -245,14 +245,14 @@ int KFixedSizeBuffer::compare( const KDataBuffer &Other, KSection OtherRange, un ValueByLength = -1; } //kdDebug() - // << QString( "Range: (%1/%2), OtherRange: (%3/%4)" ).arg(Range.start()).arg(Range.end()).arg(OtherRange.start()).arg(OtherRange.end()) + // << TQString( "Range: (%1/%2), OtherRange: (%3/%4)" ).arg(Range.start()).arg(Range.end()).arg(OtherRange.start()).arg(OtherRange.end()) // << endl; int oi = OtherRange.start(); for( int i=Range.start(); i<=Range.end(); ++i,++oi ) { char OD = Other.datum(oi); char D = Data[i]; - //kdDebug() << QString("%1==%2").arg((int)D).arg((int)OD) << endl; + //kdDebug() << TQString("%1==%2").arg((int)D).arg((int)OD) << endl; if( OD == D ) continue; return OD < D ? 1 : -1; diff --git a/khexedit/lib/kfixedsizebuffer.h b/khexedit/lib/kfixedsizebuffer.h index 15c17da..90060f0 100644 --- a/khexedit/lib/kfixedsizebuffer.h +++ b/khexedit/lib/kfixedsizebuffer.h @@ -58,7 +58,7 @@ class KFixedSizeBuffer : public KDataBuffer virtual int find( const char*KeyData, int Length, KSection Section ) const; virtual int rfind( const char*, int Length, int Pos = -1 ) const; -/* virtual int find( const QString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */ +/* virtual int find( const TQString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */ public: void setReadOnly( bool RO = true ); diff --git a/khexedit/lib/khechar.h b/khexedit/lib/khechar.h index 4f51e9e..04b4016 100644 --- a/khexedit/lib/khechar.h +++ b/khexedit/lib/khechar.h @@ -18,7 +18,7 @@ #define KHE_KHECHAR_H // qt specific -#include <qstring.h> +#include <tqstring.h> namespace KHE { @@ -26,8 +26,8 @@ namespace KHE class KHEChar : public QChar { public: - KHEChar( QChar C ); - KHEChar( QChar C, bool U ); + KHEChar( TQChar C ); + KHEChar( TQChar C, bool U ); public: bool isUndefined() const; protected: @@ -35,8 +35,8 @@ class KHEChar : public QChar bool IsUndefined:1; }; -inline KHEChar::KHEChar( QChar C ) : QChar( C ), IsUndefined( false ) {} -inline KHEChar::KHEChar( QChar C, bool U ) : QChar( C ), IsUndefined( U ) {} +inline KHEChar::KHEChar( TQChar C ) : TQChar( C ), IsUndefined( false ) {} +inline KHEChar::KHEChar( TQChar C, bool U ) : TQChar( C ), IsUndefined( U ) {} inline bool KHEChar::isUndefined() const { return IsUndefined; } } diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp index 85478e5..a7a27c5 100644 --- a/khexedit/lib/khexedit.cpp +++ b/khexedit/lib/khexedit.cpp @@ -23,11 +23,11 @@ // c++ specific //#include <limits> // qt specific -#include <qstyle.h> -#include <qpainter.h> -#include <qtimer.h> -#include <qcursor.h> -#include <qapplication.h> +#include <tqstyle.h> +#include <tqpainter.h> +#include <tqtimer.h> +#include <tqcursor.h> +#include <tqapplication.h> // kde specific #ifndef QT_ONLY #include <kglobalsettings.h> @@ -66,16 +66,16 @@ static const int InsertCursorWidth = 2; -KHexEdit::KHexEdit( KDataBuffer *Buffer, QWidget *Parent, const char *Name, WFlags Flags ) +KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFlags Flags ) : KColumnsView( Parent, Name, Flags ), DataBuffer( Buffer ), BufferLayout( new KBufferLayout(DefaultNoOfBytesPerLine,DefaultStartOffset,0) ), BufferCursor( new KBufferCursor(BufferLayout) ), BufferRanges( new KBufferRanges(BufferLayout) ), - CursorBlinkTimer( new QTimer(this) ), - ScrollTimer( new QTimer(this) ), - DragStartTimer( new QTimer(this) ), - TrippleClickTimer( new QTimer(this) ), + CursorBlinkTimer( new TQTimer(this) ), + ScrollTimer( new TQTimer(this) ), + DragStartTimer( new TQTimer(this) ), + TrippleClickTimer( new TQTimer(this) ), CursorPixmaps( new KCursor() ), Codec( 0 ), ClipboardMode( QClipboard::Clipboard ), @@ -124,7 +124,7 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, QWidget *Parent, const char *Name, WFla Controller = Navigator; #ifdef QT_ONLY - QFont FixedFont( "fixed", 10 ); + TQFont FixedFont( "fixed", 10 ); FixedFont.setFixedPitch( true ); setFont( FixedFont ); #else @@ -138,9 +138,9 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, QWidget *Parent, const char *Name, WFla viewport()->installEventFilter( this ); installEventFilter( this ); - connect( CursorBlinkTimer, SIGNAL(timeout()), this, SLOT(blinkCursor()) ); - connect( ScrollTimer, SIGNAL(timeout()), this, SLOT(autoScrollTimerDone()) ); - connect( DragStartTimer, SIGNAL(timeout()), this, SLOT(startDrag()) ); + 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()) ); viewport()->setAcceptDrops( true ); } @@ -170,10 +170,10 @@ bool KHexEdit::isReadOnly() const { return ReadOnly; } bool KHexEdit::isModified() const { return DataBuffer->isModified(); } bool KHexEdit::tabChangesFocus() const { return TabController->tabChangesFocus(); } bool KHexEdit::showUnprintable() const { return charColumn().showUnprintable(); } -QChar KHexEdit::substituteChar() const { return charColumn().substituteChar(); } -QChar KHexEdit::undefinedChar() const { return charColumn().undefinedChar(); } +TQChar KHexEdit::substituteChar() const { return charColumn().substituteChar(); } +TQChar KHexEdit::undefinedChar() const { return charColumn().undefinedChar(); } KHexEdit::KEncoding KHexEdit::encoding() const { return (KHexEdit::KEncoding)Encoding; } -const QString &KHexEdit::encodingName() const { return Codec->name(); } +const TQString &KHexEdit::encodingName() const { return Codec->name(); } KSection KHexEdit::selection() const { return BufferRanges->selection(); } int KHexEdit::cursorPosition() const { return BufferCursor->index(); } @@ -347,7 +347,7 @@ void KHexEdit::setBinaryGapWidth( int/*KPixelX*/ BGW ) } -void KHexEdit::setSubstituteChar( QChar SC ) +void KHexEdit::setSubstituteChar( TQChar SC ) { if( !charColumn().setSubstituteChar(SC) ) return; @@ -356,7 +356,7 @@ void KHexEdit::setSubstituteChar( QChar SC ) unpauseCursor(); } -void KHexEdit::setUndefinedChar( QChar UC ) +void KHexEdit::setUndefinedChar( TQChar UC ) { if( !charColumn().setUndefinedChar(UC) ) return; @@ -398,7 +398,7 @@ void KHexEdit::setEncoding( KEncoding C ) } // TODO: join with function above! -void KHexEdit::setEncoding( const QString& EncodingName ) +void KHexEdit::setEncoding( const TQString& EncodingName ) { if( EncodingName == Codec->name() ) return; @@ -421,15 +421,15 @@ void KHexEdit::setEncoding( const QString& EncodingName ) } -void KHexEdit::fontChange( const QFont &OldFont ) +void KHexEdit::fontChange( const TQFont &OldFont ) { - QScrollView::fontChange( OldFont ); + TQScrollView::fontChange( OldFont ); if( !InZooming ) DefaultFontSize = font().pointSize(); // get new values - QFontMetrics FM( fontMetrics() ); + TQFontMetrics FM( fontMetrics() ); KPixelX DigitWidth = FM.maxWidth(); KPixelY DigitBaseLine = FM.ascent(); @@ -468,8 +468,8 @@ void KHexEdit::zoomOut() { zoomOut( DefaultZoomStep ); } void KHexEdit::zoomIn( int PointInc ) { InZooming = true; - QFont F( font() ); - F.setPointSize( QFontInfo(F).pointSize() + PointInc ); + TQFont F( font() ); + F.setPointSize( TQFontInfo(F).pointSize() + PointInc ); setFont( F ); InZooming = false; } @@ -477,8 +477,8 @@ void KHexEdit::zoomIn( int PointInc ) void KHexEdit::zoomOut( int PointDec ) { InZooming = true; - QFont F( font() ); - F.setPointSize( QMAX( 1, QFontInfo(F).pointSize() - PointDec ) ); + TQFont F( font() ); + F.setPointSize( QMAX( 1, TQFontInfo(F).pointSize() - PointDec ) ); setFont( F ); InZooming = false; } @@ -487,7 +487,7 @@ void KHexEdit::zoomOut( int PointDec ) void KHexEdit::zoomTo( int PointSize ) { InZooming = true; - QFont F( font() ); + TQFont F( font() ); F.setPointSize( PointSize ); setFont( F ); InZooming = false; @@ -548,21 +548,21 @@ void KHexEdit::toggleOffsetColumn( bool Visible ) } -QSize KHexEdit::sizeHint() const +TQSize KHexEdit::sizeHint() const { - return QSize( totalWidth(), totalHeight() ); + return TQSize( totalWidth(), totalHeight() ); } -QSize KHexEdit::minimumSizeHint() const +TQSize KHexEdit::minimumSizeHint() const { // TODO: better minimal width (visibility!) - return QSize( OffsetColumn->visibleWidth()+FirstBorderColumn->visibleWidth()+SecondBorderColumn->visibleWidth()+valueColumn().byteWidth()+charColumn().byteWidth(), - lineHeight() + noOfLines()>1? style().pixelMetric(QStyle::PM_ScrollBarExtent):0 ); + return TQSize( OffsetColumn->visibleWidth()+FirstBorderColumn->visibleWidth()+SecondBorderColumn->visibleWidth()+valueColumn().byteWidth()+charColumn().byteWidth(), + lineHeight() + noOfLines()>1? style().pixelMetric(TQStyle::PM_ScrollBarExtent):0 ); } -void KHexEdit::resizeEvent( QResizeEvent *ResizeEvent ) +void KHexEdit::resizeEvent( TQResizeEvent *ResizeEvent ) { if( ResizeStyle != NoResize ) { @@ -576,13 +576,13 @@ void KHexEdit::resizeEvent( QResizeEvent *ResizeEvent ) } } - QScrollView::resizeEvent( ResizeEvent ); + TQScrollView::resizeEvent( ResizeEvent ); BufferLayout->setNoOfLinesPerPage( noOfLinesPerPage() ); // TODO: doesn't work with the new size!!! } -int KHexEdit::fittingBytesPerLine( const QSize &NewSize ) const +int KHexEdit::fittingBytesPerLine( const TQSize &NewSize ) const { KPixelX ReservedWidth = OffsetColumn->visibleWidth() + FirstBorderColumn->visibleWidth() + SecondBorderColumn->visibleWidth(); @@ -598,7 +598,7 @@ int KHexEdit::fittingBytesPerLine( const QSize &NewSize ) const // check influence of dis-/appearing of the vertical scrollbar bool VerticalScrollbarIsVisible = verticalScrollBar()->isVisible(); - KPixelX ScrollbarExtent = style().pixelMetric( QStyle::PM_ScrollBarExtent );//verticalScrollBar()->width(); + KPixelX ScrollbarExtent = style().pixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width(); KPixelX AvailableWidth = FullWidth; if( VerticalScrollbarIsVisible ) @@ -798,19 +798,19 @@ bool KHexEdit::hasSelectedData() const } -QByteArray KHexEdit::selectedData() const +TQByteArray KHexEdit::selectedData() const { if( !BufferRanges->hasSelection() ) - return QByteArray(); + return TQByteArray(); KSection Selection = BufferRanges->selection(); - QByteArray SD( Selection.width() ); + TQByteArray SD( Selection.width() ); DataBuffer->copyTo( SD.data(), Selection.start(), Selection.width() ); return SD; } -KBufferDrag *KHexEdit::dragObject( QWidget *Parent ) const +KBufferDrag *KHexEdit::dragObject( TQWidget *Parent ) const { if( !BufferRanges->hasSelection() ) return 0; @@ -850,7 +850,7 @@ void KHexEdit::cut() if( !Drag ) return; - QApplication::clipboard()->setData( Drag, ClipboardMode ); + TQApplication::clipboard()->setData( Drag, ClipboardMode ); removeSelectedData(); } @@ -862,7 +862,7 @@ void KHexEdit::copy() if( !Drag ) return; - QApplication::clipboard()->setData( Drag, ClipboardMode ); + TQApplication::clipboard()->setData( Drag, ClipboardMode ); } @@ -871,17 +871,17 @@ void KHexEdit::paste() if( isReadOnly() ) return; - QMimeSource *Source = QApplication::clipboard()->data( ClipboardMode ); + TQMimeSource *Source = TQApplication::clipboard()->data( ClipboardMode ); pasteFromSource( Source ); } -void KHexEdit::pasteFromSource( QMimeSource *Source ) +void KHexEdit::pasteFromSource( TQMimeSource *Source ) { if( !Source || !KBufferDrag::canDecode(Source) ) return; - QByteArray Data; + TQByteArray Data; if( !KBufferDrag::decode(Source,Data) ) return; @@ -890,7 +890,7 @@ void KHexEdit::pasteFromSource( QMimeSource *Source ) } -void KHexEdit::insert( const QByteArray &D ) +void KHexEdit::insert( const TQByteArray &D ) { pauseCursor( true ); @@ -1017,7 +1017,7 @@ KSection KHexEdit::removeData( KSection Indizes ) // if( !undoRedoInfo.valid() ) // { // doc->selectionStart( selNum, undoRedoInfo.id, undoRedoInfo.index ); -// undoRedoInfo.d->text = QString::null; +// undoRedoInfo.d->text = TQString::null; // } // readFormats( c1, c2, undoRedoInfo.d->text, TRUE ); // } @@ -1042,7 +1042,7 @@ void KHexEdit::updateLength() void KHexEdit::clipboardChanged() { // don't listen to selection changes - disconnect( QApplication::clipboard(), SIGNAL(selectionChanged()), this, 0 ); + disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0 ); selectAll( false ); } @@ -1130,7 +1130,7 @@ void KHexEdit::setCursorColumn( KBufferColumnId CC ) } -void KHexEdit::placeCursor( const QPoint &Point ) +void KHexEdit::placeCursor( const TQPoint &Point ) { resetInputContext(); @@ -1155,7 +1155,7 @@ void KHexEdit::placeCursor( const QPoint &Point ) } -int KHexEdit::indexByPoint( const QPoint &Point ) const +int KHexEdit::indexByPoint( const TQPoint &Point ) const { const KBufferColumn *C; if( charColumn().isVisible() && Point.x() >= charColumn().x() ) @@ -1169,34 +1169,34 @@ int KHexEdit::indexByPoint( const QPoint &Point ) const } -void KHexEdit::showEvent( QShowEvent *e ) +void KHexEdit::showEvent( TQShowEvent *e ) { KColumnsView::showEvent( e ); BufferLayout->setNoOfLinesPerPage( noOfLinesPerPage() ); } -bool KHexEdit::eventFilter( QObject *O, QEvent *E ) +bool KHexEdit::eventFilter( TQObject *O, TQEvent *E ) { if( O == this || O == viewport() ) { - if( E->type() == QEvent::FocusIn ) + if( E->type() == TQEvent::FocusIn ) { startCursor(); } - else if( E->type() == QEvent::FocusOut ) + else if( E->type() == TQEvent::FocusOut ) { stopCursor(); } } -// if( O == this && E->type() == QEvent::PaletteChange ) +// if( O == this && E->type() == TQEvent::PaletteChange ) // { -// QColor old( viewport()->colorGroup().color(QColorGroup::Text) ); +// TQColor old( viewport()->colorGroup().color(TQColorGroup::Text) ); // -// if( old != colorGroup().color(QColorGroup::Text) ) +// if( old != colorGroup().color(TQColorGroup::Text) ) // { -// QColor c( colorGroup().color(QColorGroup::Text) ); +// TQColor c( colorGroup().color(TQColorGroup::Text) ); // doc->setMinimumWidth( -1 ); // doc->setDefaultFormat( doc->formatCollection()->defaultFormat()->font(), c ); // lastFormatted = doc->firstParagraph(); @@ -1205,7 +1205,7 @@ bool KHexEdit::eventFilter( QObject *O, QEvent *E ) // } // } - return QScrollView::eventFilter( O, E ); + return TQScrollView::eventFilter( O, E ); } @@ -1226,7 +1226,7 @@ void KHexEdit::startCursor() updateCursor(); - CursorBlinkTimer->start( QApplication::cursorFlashTime()/2 ); + CursorBlinkTimer->start( TQApplication::cursorFlashTime()/2 ); } @@ -1274,7 +1274,7 @@ void KHexEdit::createCursorPixmaps() int Index = BufferCursor->validIndex(); - QPainter Paint; + TQPainter Paint; Paint.begin( &CursorPixmaps->offPixmap(), this ); activeColumn().paintByte( &Paint, Index ); Paint.end(); @@ -1300,7 +1300,7 @@ void KHexEdit::createCursorPixmaps() } -void KHexEdit::pointPainterToCursor( QPainter &Painter, const KBufferColumn &Column ) const +void KHexEdit::pointPainterToCursor( TQPainter &Painter, const KBufferColumn &Column ) const { int x = Column.xOfPos( BufferCursor->pos() ) - contentsX(); int y = LineHeight * BufferCursor->line() - contentsY(); @@ -1317,7 +1317,7 @@ void KHexEdit::paintActiveCursor( bool CursorOn ) || (CursorOn && !hasFocus() && !viewport()->hasFocus() && !InDnD ) ) return; - QPainter Painter; + TQPainter Painter; pointPainterToCursor( Painter, activeColumn() ); // paint edited byte? @@ -1353,7 +1353,7 @@ void KHexEdit::paintInactiveCursor( bool CursorOn ) int Index = BufferCursor->validIndex(); - QPainter Painter; + TQPainter Painter; pointPainterToCursor( Painter, inactiveColumn() ); if( CursorOn ) { @@ -1368,7 +1368,7 @@ void KHexEdit::paintInactiveCursor( bool CursorOn ) } -void KHexEdit::drawContents( QPainter *P, int cx, int cy, int cw, int ch ) +void KHexEdit::drawContents( TQPainter *P, int cx, int cy, int cw, int ch ) { KColumnsView::drawContents( P, cx, cy, cw, ch ); // TODO: update non blinking cursors. Should this perhaps be done in the buffercolumn? @@ -1390,7 +1390,7 @@ void KHexEdit::updateColumn( KColumn &Column ) } -void KHexEdit::keyPressEvent( QKeyEvent *KeyEvent ) +void KHexEdit::keyPressEvent( TQKeyEvent *KeyEvent ) { if( !Controller->handleKeyPress( KeyEvent ) ) KeyEvent->ignore(); @@ -1408,7 +1408,7 @@ void KHexEdit::repaintChanged() KPixelXs Xs( contentsX(), visibleWidth(), true ); // collect affected buffer columns - QPtrList<KBufferColumn> RepaintColumns; + TQPtrList<KBufferColumn> RepaintColumns; KBufferColumn *C = ValueColumn; while( true ) @@ -1497,7 +1497,7 @@ void KHexEdit::paintLine( KBufferColumn *C, int Line, KSection Positions ) KPixelY cy = Line * LineHeight; // to avoid flickers we first paint to the linebuffer - QPainter Paint; + TQPainter Paint; Paint.begin( &LineBuffer, this ); Paint.translate( C->x(), 0 ); @@ -1542,7 +1542,7 @@ void KHexEdit::ensureCursorVisible() -void KHexEdit::contentsMousePressEvent( QMouseEvent *e ) +void KHexEdit::contentsMousePressEvent( TQMouseEvent *e ) { // clearUndoRedo(); pauseCursor( true ); @@ -1554,7 +1554,7 @@ void KHexEdit::contentsMousePressEvent( QMouseEvent *e ) // select whole line? if( TrippleClickTimer->isActive() - && (e->globalPos()-DoubleClickPoint).manhattanLength() < QApplication::startDragDistance() ) + && (e->globalPos()-DoubleClickPoint).manhattanLength() < TQApplication::startDragDistance() ) { BufferRanges->setSelectionStart( BufferLayout->indexAtLineStart(DoubleClickLine) ); BufferCursor->gotoLineEnd(); @@ -1565,7 +1565,7 @@ void KHexEdit::contentsMousePressEvent( QMouseEvent *e ) return; } - QPoint MousePoint = e->pos(); + TQPoint MousePoint = e->pos(); placeCursor( MousePoint ); ensureCursorVisible(); @@ -1573,7 +1573,7 @@ void KHexEdit::contentsMousePressEvent( QMouseEvent *e ) if( BufferRanges->selectionIncludes(BufferCursor->index()) ) { DragStartPossible = true; - DragStartTimer->start( QApplication::startDragTime(), true ); + DragStartTimer->start( TQApplication::startDragTime(), true ); DragStartPoint = MousePoint; unpauseCursor(); @@ -1614,7 +1614,7 @@ void KHexEdit::contentsMousePressEvent( QMouseEvent *e ) } -void KHexEdit::contentsMouseMoveEvent( QMouseEvent *e ) +void KHexEdit::contentsMouseMoveEvent( TQMouseEvent *e ) { if( MousePressed ) { @@ -1622,14 +1622,14 @@ void KHexEdit::contentsMouseMoveEvent( QMouseEvent *e ) { DragStartTimer->stop(); // moved enough for a drag? - if( (e->pos()-DragStartPoint).manhattanLength() > QApplication::startDragDistance() ) + if( (e->pos()-DragStartPoint).manhattanLength() > TQApplication::startDragDistance() ) startDrag(); if( !isReadOnly() ) viewport()->setCursor( ibeamCursor ); return; } // selecting - QPoint MousePoint = e->pos(); + TQPoint MousePoint = e->pos(); handleMouseMove( MousePoint ); } else if( !isReadOnly() ) @@ -1641,7 +1641,7 @@ void KHexEdit::contentsMouseMoveEvent( QMouseEvent *e ) } -void KHexEdit::contentsMouseReleaseEvent( QMouseEvent *e ) +void KHexEdit::contentsMouseReleaseEvent( TQMouseEvent *e ) { // this is not the release of a doubleclick so we need to process it? if( !InDoubleClick ) @@ -1671,14 +1671,14 @@ void KHexEdit::contentsMouseReleaseEvent( QMouseEvent *e ) // was end of selection operation? else if( BufferRanges->hasSelection() ) { - if( QApplication::clipboard()->supportsSelection() ) + if( TQApplication::clipboard()->supportsSelection() ) { ClipboardMode = QClipboard::Selection; - disconnect( QApplication::clipboard(), SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); copy(); - connect( QApplication::clipboard(), SIGNAL(selectionChanged()), this, SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); ClipboardMode = QClipboard::Clipboard; } } @@ -1720,7 +1720,7 @@ void KHexEdit::contentsMouseReleaseEvent( QMouseEvent *e ) // gets called after press and release instead of a plain press event (?) -void KHexEdit::contentsMouseDoubleClickEvent( QMouseEvent *e ) +void KHexEdit::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { // we are only interested in LMB doubleclicks if( e->button() != Qt::LeftButton ) @@ -1754,11 +1754,11 @@ void KHexEdit::contentsMouseDoubleClickEvent( QMouseEvent *e ) void KHexEdit::autoScrollTimerDone() { if( MousePressed ) - handleMouseMove( viewportToContents(viewport()->mapFromGlobal( QCursor::pos() )) ); + handleMouseMove( viewportToContents(viewport()->mapFromGlobal( TQCursor::pos() )) ); } -void KHexEdit::handleMouseMove( const QPoint& Point ) // handles the move of the mouse with pressed buttons +void KHexEdit::handleMouseMove( const TQPoint& Point ) // handles the move of the mouse with pressed buttons { // no scrolltimer and outside of viewport? if( !ScrollTimer->isActive() && Point.y() < contentsY() || Point.y() > contentsY() + visibleHeight() ) @@ -1817,7 +1817,7 @@ void KHexEdit::startDrag() DragStartPossible = false; // create data - QDragObject *Drag = dragObject( viewport() ); + TQDragObject *Drag = dragObject( viewport() ); if( !Drag ) return; @@ -1827,12 +1827,12 @@ void KHexEdit::startDrag() // or is this left to the user and he choose to move? else if( Drag->drag() ) // Not inside this widget itself? - if( QDragObject::target() != this && QDragObject::target() != viewport() ) + if( TQDragObject::target() != this && TQDragObject::target() != viewport() ) removeSelectedData(); } -void KHexEdit::contentsDragEnterEvent( QDragEnterEvent *e ) +void KHexEdit::contentsDragEnterEvent( TQDragEnterEvent *e ) { // interesting for this widget? if( isReadOnly() || !KBufferDrag::canDecode(e) ) @@ -1846,7 +1846,7 @@ void KHexEdit::contentsDragEnterEvent( QDragEnterEvent *e ) } -void KHexEdit::contentsDragMoveEvent( QDragMoveEvent *e ) +void KHexEdit::contentsDragMoveEvent( TQDragMoveEvent *e ) { // is this content still interesting for us? if( isReadOnly() || !KBufferDrag::canDecode(e) ) @@ -1864,7 +1864,7 @@ void KHexEdit::contentsDragMoveEvent( QDragMoveEvent *e ) } -void KHexEdit::contentsDragLeaveEvent( QDragLeaveEvent * ) +void KHexEdit::contentsDragLeaveEvent( TQDragLeaveEvent * ) { // bye... and thanks for all the cursor movement... InDnD = false; @@ -1872,7 +1872,7 @@ void KHexEdit::contentsDragLeaveEvent( QDragLeaveEvent * ) -void KHexEdit::contentsDropEvent( QDropEvent *e ) +void KHexEdit::contentsDropEvent( TQDropEvent *e ) { // after drag enter and move check one more time if( isReadOnly() ) @@ -1896,7 +1896,7 @@ void KHexEdit::contentsDropEvent( QDropEvent *e ) } -void KHexEdit::handleInternalDrag( QDropEvent *e ) +void KHexEdit::handleInternalDrag( TQDropEvent *e ) { KSection ChangedRange; @@ -1908,7 +1908,7 @@ void KHexEdit::handleInternalDrag( QDropEvent *e ) int InsertIndex = BufferCursor->realIndex(); // is this a move? - if( e->action() == QDropEvent::Move ) + if( e->action() == TQDropEvent::Move ) { // ignore the copy hold in the event but only move int NewIndex = DataBuffer->move( InsertIndex, Selection ); @@ -1922,7 +1922,7 @@ void KHexEdit::handleInternalDrag( QDropEvent *e ) else { // get data - QByteArray Data; + TQByteArray Data; if( KBufferDrag::decode(e,Data) && !Data.isEmpty() ) { if( OverWrite ) @@ -1966,7 +1966,7 @@ void KHexEdit::handleInternalDrag( QDropEvent *e ) } -void KHexEdit::contentsWheelEvent( QWheelEvent *e ) +void KHexEdit::contentsWheelEvent( TQWheelEvent *e ) { if( isReadOnly() ) { @@ -1979,19 +1979,19 @@ void KHexEdit::contentsWheelEvent( QWheelEvent *e ) return; } } - QScrollView::contentsWheelEvent( e ); + TQScrollView::contentsWheelEvent( e ); } #if 0 -void KHexEdit::contentsContextMenuEvent( QContextMenuEvent *e ) +void KHexEdit::contentsContextMenuEvent( TQContextMenuEvent *e ) { // clearUndoRedo(); MousePressed = false; e->accept(); - QPopupMenu *PopupMenu = createPopupMenu( e->pos() ); + TQPopupMenu *PopupMenu = createPopupMenu( e->pos() ); if( !PopupMenu ) PopupMenu = createPopupMenu(); if( !PopupMenu ) @@ -2005,14 +2005,14 @@ void KHexEdit::contentsContextMenuEvent( QContextMenuEvent *e ) { selectAll(); // if the clipboard support selections, put the newly selected text into the clipboard - if( QApplication::clipboard()->supportsSelection() ) + if( TQApplication::clipboard()->supportsSelection() ) { ClipboardMode = QClipboard::Selection; - disconnect( QApplication::clipboard(), SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); copy(); - connect( QApplication::clipboard(), SIGNAL(selectionChanged()), this, SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); ClipboardMode = QClipboard::Clipboard; } } diff --git a/khexedit/lib/khexedit.h b/khexedit/lib/khexedit.h index 66059c8..38bb53e 100644 --- a/khexedit/lib/khexedit.h +++ b/khexedit/lib/khexedit.h @@ -19,7 +19,7 @@ #define KHE_KHEXEDIT_H // qt specific -#include <qclipboard.h> +#include <tqclipboard.h> // lib specific // #include "khe.h" #include "khexedit_export.h" @@ -91,7 +91,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView Q_PROPERTY( bool TabChangesFocus READ tabChangesFocus WRITE setTabChangesFocus ) //Q_PROPERTY( bool hasSelectedData READ hasSelectedData ) - //Q_PROPERTY( QByteArray SelectedData READ selectedData ) + //Q_PROPERTY( TQByteArray SelectedData READ selectedData ) Q_PROPERTY( KResizeStyle ResizeStyle READ resizeStyle WRITE setResizeStyle ) Q_PROPERTY( int StartOffset READ startOffset WRITE setStartOffset ) Q_PROPERTY( int FirstLineOffset READ firstLineOffset WRITE setFirstLineOffset ) @@ -105,7 +105,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView Q_PROPERTY( int BinaryGapWidth READ binaryGapWidth WRITE setBinaryGapWidth ) // char column Q_PROPERTY( bool ShowUnprintable READ showUnprintable WRITE setShowUnprintable ) - Q_PROPERTY( QChar SubstituteChar READ substituteChar WRITE setSubstituteChar ) + Q_PROPERTY( TQChar SubstituteChar READ substituteChar WRITE setSubstituteChar ) public: enum KResizeStyle { NoResize=0, LockGrouping=1, FullSizeUsage=2, MaxResizeStyleId=0xFF }; @@ -117,20 +117,20 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView public: - KHexEdit( KDataBuffer *Buffer = 0, QWidget *Parent = 0, const char *Name = 0, WFlags F = 0 ); + KHexEdit( KDataBuffer *Buffer = 0, TQWidget *Parent = 0, const char *Name = 0, WFlags F = 0 ); virtual ~KHexEdit(); public: // KColumnsView API - virtual void drawContents( QPainter *p, int cx, int cy, int cw, int ch ); + virtual void drawContents( TQPainter *p, int cx, int cy, int cw, int ch ); - public: // QWidget API -// void focusInEvent( QFocusEvent *FocusEvent ); // TODO: why don't these work? -// void focusOutEvent( QFocusEvent *FocusEvent ); - virtual bool eventFilter( QObject *O, QEvent *E ); + public: // TQWidget API +// void focusInEvent( TQFocusEvent *FocusEvent ); // TODO: why don't these work? +// void focusOutEvent( TQFocusEvent *FocusEvent ); + virtual bool eventFilter( TQObject *O, TQEvent *E ); - virtual QSize sizeHint() const; - virtual QSize minimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; public: // value access @@ -171,9 +171,9 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView /** gives the used substitute character for "unprintable" chars, default is '.' * @return substitute character */ - QChar substituteChar() const; + TQChar substituteChar() const; /** returns the actually used undefined character for "undefined" chars, default is '?' */ - QChar undefinedChar() const; + TQChar undefinedChar() const; /** * @return encoding used in the char column */ @@ -181,7 +181,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView /** * @return name of the encoding used in the char column */ - const QString &encodingName() const; + const TQString &encodingName() const; public: // logic value service /** calculates the number of bytes per line that fit into a widget with the given size @@ -190,12 +190,12 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView * @param TestSize Size the widget might have * @return number of bytes per line that fit into a widget with the given size */ - int fittingBytesPerLine( const QSize &TestSize ) const; + int fittingBytesPerLine( const TQSize &TestSize ) const; /** detects the index of the byte at the given point * @param Point in viewport coordinate system * @return index of the byte that covers the point */ - int indexByPoint(const QPoint &Point ) const; + int indexByPoint(const TQPoint &Point ) const; public: /** returns true if there is a selected range in the array */ @@ -203,7 +203,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView /** * @return deep copy of the selected data */ - QByteArray selectedData() const; + TQByteArray selectedData() const; KSection selection() const; public: // modification access @@ -212,7 +212,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView */ void setCursorPosition( int Index, bool Behind=false ); /** puts the cursor in the column at the pos of Point (in absolute coord), does not handle the drawing */ - void placeCursor( const QPoint &Point ); + void placeCursor( const TQPoint &Point ); /***/ void setCursorColumn( KBufferColumnId ); // void repaintByte( int row, int column, bool Erase = true ); @@ -294,11 +294,11 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView /** sets the substitute character for "unprintable" chars * returns true if there was a change */ - void setSubstituteChar( QChar SC ); + void setSubstituteChar( TQChar SC ); /** sets the undefined character for "undefined" chars * returns true if there was a change */ - void setUndefinedChar( QChar UC ); + void setUndefinedChar( TQChar UC ); /** sets the encoding of the char column. Default is KHE::LocalEncoding. * If the encoding is not available the format will not be changed. */ void setEncoding( KEncoding C ); @@ -306,7 +306,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView * If the encoding is not available the format will not be changed. * @param Encoding name of the encoding */ - void setEncoding( const QString& Encoding ); + void setEncoding( const TQString& Encoding ); // interaction /** de-/selects all data */ @@ -318,7 +318,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView /** removes the selected data, takes care of the cursor */ virtual void removeSelectedData(); /** inserts */ - virtual void insert( const QByteArray &D ); + virtual void insert( const TQByteArray &D ); // clipboard interaction virtual void copy(); @@ -361,22 +361,22 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView void bufferChanged( int StartIndex, int EndIndex ); - protected: // QWidget API - virtual void keyPressEvent( QKeyEvent *KeyEvent ); - virtual void resizeEvent( QResizeEvent *ResizeEvent ); - virtual void showEvent( QShowEvent *e ); + protected: // TQWidget API + virtual void keyPressEvent( TQKeyEvent *KeyEvent ); + virtual void resizeEvent( TQResizeEvent *ResizeEvent ); + virtual void showEvent( TQShowEvent *e ); - protected: // QScrollView API - virtual void contentsMousePressEvent( QMouseEvent *e ); - virtual void contentsMouseReleaseEvent( QMouseEvent * e ); - virtual void contentsMouseMoveEvent( QMouseEvent *e ); - virtual void contentsMouseDoubleClickEvent( QMouseEvent * e ); - virtual void contentsDragEnterEvent( QDragEnterEvent *e ); - virtual void contentsDragMoveEvent( QDragMoveEvent *e ); - virtual void contentsDragLeaveEvent( QDragLeaveEvent * ); - virtual void contentsDropEvent( QDropEvent *e ); - virtual void contentsWheelEvent( QWheelEvent *e ); -// virtual void contentsContextMenuEvent( QContextMenuEvent *e ); + protected: // TQScrollView API + virtual void contentsMousePressEvent( TQMouseEvent *e ); + virtual void contentsMouseReleaseEvent( TQMouseEvent * e ); + virtual void contentsMouseMoveEvent( TQMouseEvent *e ); + virtual void contentsMouseDoubleClickEvent( TQMouseEvent * e ); + virtual void contentsDragEnterEvent( TQDragEnterEvent *e ); + virtual void contentsDragMoveEvent( TQDragMoveEvent *e ); + virtual void contentsDragLeaveEvent( TQDragLeaveEvent * ); + virtual void contentsDropEvent( TQDropEvent *e ); + virtual void contentsWheelEvent( TQWheelEvent *e ); +// virtual void contentsContextMenuEvent( TQContextMenuEvent *e ); protected: // KColumnsView API virtual void setNoOfLines( int NewNoOfLines ); @@ -403,23 +403,23 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView /** recreates the cursor pixmaps and paints active and inactive cursors if doable */ void updateCursor(); void createCursorPixmaps(); - void pointPainterToCursor( QPainter &Painter, const KBufferColumn &Column ) const; + void pointPainterToCursor( TQPainter &Painter, const KBufferColumn &Column ) const; /** draws the blinking cursor or removes it */ void paintActiveCursor( bool CursorOn ); void paintInactiveCursor( bool CursorOn ); void paintLine( KBufferColumn *C, int Line, KSection Positions ); protected: // partial operations - void handleMouseMove( const QPoint& Point ); - KBufferDrag *dragObject( QWidget *Parent = 0 ) const; - void pasteFromSource( QMimeSource *Source ); + void handleMouseMove( const TQPoint& Point ); + KBufferDrag *dragObject( TQWidget *Parent = 0 ) const; + void pasteFromSource( TQMimeSource *Source ); /** removes the section from the databuffer and updates all affected values */ KSection removeData( KSection Indizes ); /** sets ChangedRange to the range of VisibleRange that is actually changed * @return true if there was a change within the visible range */ bool hasChanged( const KCoordRange &VisibleRange, KCoordRange *ChangedRange ) const; - void handleInternalDrag( QDropEvent *e ); + void handleInternalDrag( TQDropEvent *e ); protected: /** recalcs all dependant values with the actual NoOfBytesPerLine */ @@ -443,8 +443,8 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView /** */ void startDrag(); - protected slots: // QWidget API - virtual void fontChange( const QFont &OldFont ); + protected slots: // TQWidget API + virtual void fontChange( const TQFont &OldFont ); protected: @@ -484,14 +484,14 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView protected: /** Timer that controls the blinking of the cursor */ - QTimer *CursorBlinkTimer; + TQTimer *CursorBlinkTimer; /** Timer that triggers ensureCursorVisible function calls */ - QTimer *ScrollTimer; -/* QTimer *ChangeIntervalTimer, */ + TQTimer *ScrollTimer; +/* TQTimer *ChangeIntervalTimer, */ /** Timer to start a drag */ - QTimer *DragStartTimer; + TQTimer *DragStartTimer; /** timer to measure whether the time between a double click and the following counts for a tripleclick */ - QTimer *TrippleClickTimer; + TQTimer *TrippleClickTimer; /** object to store the blinking cursor pixmaps */ KCursor *CursorPixmaps; @@ -500,11 +500,11 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView protected: /** point at which the current double click happended (used by TrippleClick) */ - QPoint DoubleClickPoint; + TQPoint DoubleClickPoint; /** line in which the current double click happended (used by TrippleClick) */ int DoubleClickLine; /** point at which the current dragging started */ - QPoint DragStartPoint; + TQPoint DragStartPoint; /** */ QClipboard::Mode ClipboardMode; /** font size as set by user (used for zooming) */ diff --git a/khexedit/lib/koffsetcoltextexport.cpp b/khexedit/lib/koffsetcoltextexport.cpp index c5644df..bce1fa6 100644 --- a/khexedit/lib/koffsetcoltextexport.cpp +++ b/khexedit/lib/koffsetcoltextexport.cpp @@ -16,7 +16,7 @@ // qt specific -#include <qstring.h> +#include <tqstring.h> // lib specific #include "koffsetcolumn.h" #include "koffsetcoltextexport.h" @@ -38,18 +38,18 @@ int KOffsetColTextExport::charsPerLine() const } -void KOffsetColTextExport::printFirstLine( QString &T, int Line ) const +void KOffsetColTextExport::printFirstLine( TQString &T, int Line ) const { PrintLine = Line; print( T ); } -void KOffsetColTextExport::printNextLine( QString &T ) const +void KOffsetColTextExport::printNextLine( TQString &T ) const { print( T ); } -void KOffsetColTextExport::print( QString &T ) const +void KOffsetColTextExport::print( TQString &T ) const { // TODO: fix me (no more printFunction) char *B = new char[CodingWidth+1]; diff --git a/khexedit/lib/koffsetcoltextexport.h b/khexedit/lib/koffsetcoltextexport.h index e07e659..cfc9adb 100644 --- a/khexedit/lib/koffsetcoltextexport.h +++ b/khexedit/lib/koffsetcoltextexport.h @@ -34,13 +34,13 @@ class KOffsetColTextExport : public KColTextExport KOffsetColTextExport( const KOffsetColumn *OC ); public: // KColTextExport API - void printFirstLine( QString &T, int Line ) const; - void printNextLine( QString &T ) const; + void printFirstLine( TQString &T, int Line ) const; + void printNextLine( TQString &T ) const; /** tells how much chars per line are needed */ int charsPerLine() const; protected: - void print( QString &T ) const; + void print( TQString &T ) const; protected: const int CodingWidth; diff --git a/khexedit/lib/koffsetcolumn.cpp b/khexedit/lib/koffsetcolumn.cpp index 6bd6d09..fb8e694 100644 --- a/khexedit/lib/koffsetcolumn.cpp +++ b/khexedit/lib/koffsetcolumn.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ // qt specific -#include "qpainter.h" +#include "tqpainter.h" // lib specific #include "kcolumnsview.h" #include "koffsetcolumn.h" @@ -40,36 +40,36 @@ KOffsetColumn::~KOffsetColumn() } -void KOffsetColumn::paintLine( QPainter *P, int Line ) +void KOffsetColumn::paintLine( TQPainter *P, int Line ) { - const QColor &ButtonColor = View->colorGroup().button(); - P->fillRect( 0,0,width(),LineHeight, QBrush(ButtonColor,Qt::SolidPattern) ); + const TQColor &ButtonColor = View->colorGroup().button(); + P->fillRect( 0,0,width(),LineHeight, TQBrush(ButtonColor,Qt::SolidPattern) ); printFunction()( CodedOffset,FirstLineOffset+Delta*Line ); - P->drawText( 0, DigitBaseLine, QString().append(CodedOffset) ); + P->drawText( 0, DigitBaseLine, TQString().append(CodedOffset) ); } -void KOffsetColumn::paintFirstLine( QPainter *P, KPixelXs, int FirstLine ) +void KOffsetColumn::paintFirstLine( TQPainter *P, KPixelXs, int FirstLine ) { PaintLine = FirstLine; paintLine( P, PaintLine++ ); } -void KOffsetColumn::paintNextLine( QPainter *P ) +void KOffsetColumn::paintNextLine( TQPainter *P ) { paintLine( P, PaintLine++ ); } -void KOffsetColumn::paintEmptyColumn( QPainter *P, KPixelXs Xs, KPixelYs Ys ) +void KOffsetColumn::paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys ) { Xs.restrictTo( XSpan ); - const QColor &ButtonColor = View->colorGroup().button(); - P->fillRect( Xs.start(), Ys.start(), Xs.width(), Ys.width(), QBrush(ButtonColor,Qt::SolidPattern) ); + const TQColor &ButtonColor = View->colorGroup().button(); + P->fillRect( Xs.start(), Ys.start(), Xs.width(), Ys.width(), TQBrush(ButtonColor,Qt::SolidPattern) ); } void KOffsetColumn::setFormat( KOffsetFormat::KFormat F ) diff --git a/khexedit/lib/koffsetcolumn.h b/khexedit/lib/koffsetcolumn.h index ae182f9..497d7ef 100644 --- a/khexedit/lib/koffsetcolumn.h +++ b/khexedit/lib/koffsetcolumn.h @@ -36,9 +36,9 @@ class KOffsetColumn : public KColumn virtual ~KOffsetColumn(); public: // KColumn API - virtual void paintFirstLine( QPainter *P, KPixelXs Xs, int FirstLine ); - virtual void paintNextLine( QPainter *P ); - virtual void paintEmptyColumn( QPainter *P, KPixelXs Xs, KPixelYs Ys ); + virtual void paintFirstLine( TQPainter *P, KPixelXs Xs, int FirstLine ); + virtual void paintNextLine( TQPainter *P ); + virtual void paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys ); public: @@ -62,7 +62,7 @@ class KOffsetColumn : public KColumn /** recalculates all x values */ void recalcX(); /** paints full line */ - void paintLine( QPainter *P, int Line ); + void paintLine( TQPainter *P, int Line ); protected: // user settings diff --git a/khexedit/lib/kplainbuffer.cpp b/khexedit/lib/kplainbuffer.cpp index 63c1db7..02b9d70 100644 --- a/khexedit/lib/kplainbuffer.cpp +++ b/khexedit/lib/kplainbuffer.cpp @@ -72,7 +72,7 @@ int KPlainBuffer::insert( int Pos, const char* D, int Length ) // check all parameters if( Length == 0 ) return 0; - //kdDebug() << QString("before: Size: %1, RawSize: %2").arg(Size).arg(RawSize) << endl; + //kdDebug() << TQString("before: Size: %1, RawSize: %2").arg(Size).arg(RawSize) << endl; // correct for appending if( Pos > (int)Size ) Pos = Size; @@ -82,7 +82,7 @@ int KPlainBuffer::insert( int Pos, const char* D, int Length ) // copy new data to its place memcpy( &Data[Pos], D, Length ); - //kdDebug() << QString("after: Size: %1, RawSize: %2").arg(Size).arg(RawSize) << endl; + //kdDebug() << TQString("after: Size: %1, RawSize: %2").arg(Size).arg(RawSize) << endl; Modified = true; return Length; diff --git a/khexedit/lib/kplainbuffer.h b/khexedit/lib/kplainbuffer.h index 27bbbad..31851ae 100644 --- a/khexedit/lib/kplainbuffer.h +++ b/khexedit/lib/kplainbuffer.h @@ -65,7 +65,7 @@ class KPlainBuffer : public KDataBuffer virtual int find( const char*KeyData, int Length, KSection Section ) const; virtual int rfind( const char*, int Length, int Pos = -1 ) const; -/* virtual int find( const QString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */ +/* virtual int find( const TQString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */ public: void setReadOnly( bool RO = true ); diff --git a/khexedit/lib/ksectionlist.h b/khexedit/lib/ksectionlist.h index 7328e42..1acdf5c 100644 --- a/khexedit/lib/ksectionlist.h +++ b/khexedit/lib/ksectionlist.h @@ -19,13 +19,13 @@ #define KHE_KSECTIONLIST_H // qt specific -#include <qvaluelist.h> +#include <tqvaluelist.h> // lib specific #include "ksection.h" namespace KHE { -typedef QValueList<KSection> KSectionBasicList; +typedef TQValueList<KSection> KSectionBasicList; /** @author Friedrich W. H. Kossebau */ diff --git a/khexedit/lib/kvaluecoltextexport.cpp b/khexedit/lib/kvaluecoltextexport.cpp index 009ad54..190018f 100644 --- a/khexedit/lib/kvaluecoltextexport.cpp +++ b/khexedit/lib/kvaluecoltextexport.cpp @@ -38,7 +38,7 @@ KValueColTextExport::~KValueColTextExport() -void KValueColTextExport::print( QString &T ) const +void KValueColTextExport::print( TQString &T ) const { int p = 0; int pEnd = NoOfBytesPerLine; @@ -48,7 +48,7 @@ void KValueColTextExport::print( QString &T ) const if( PrintLine == CoordRange.end().line() ) pEnd = CoordRange.end().pos()+1; - QString E; + TQString E; E.setLength( ByteCodec->encodingWidth() ); // draw individual chars uint e = 0; diff --git a/khexedit/lib/kvaluecoltextexport.h b/khexedit/lib/kvaluecoltextexport.h index be6bab4..c1987de 100644 --- a/khexedit/lib/kvaluecoltextexport.h +++ b/khexedit/lib/kvaluecoltextexport.h @@ -35,7 +35,7 @@ class KValueColTextExport : public KBufferColTextExport virtual ~KValueColTextExport(); protected: - virtual void print( QString &T ) const; + virtual void print( TQString &T ) const; protected: diff --git a/khexedit/lib/kvaluecolumn.cpp b/khexedit/lib/kvaluecolumn.cpp index 82da795..62d36c0 100644 --- a/khexedit/lib/kvaluecolumn.cpp +++ b/khexedit/lib/kvaluecolumn.cpp @@ -16,7 +16,7 @@ // qt specific -#include <qpainter.h> +#include <tqpainter.h> // lib specific #include "kcolumnsview.h" #include "kbuffercursor.h" @@ -101,26 +101,26 @@ void KValueColumn::recalcByteWidth() // perhaps sometimes there will be a grammar -void KValueColumn::paintEditedByte( QPainter *P, char Byte, const QString &EditBuffer ) +void KValueColumn::paintEditedByte( TQPainter *P, char Byte, const TQString &EditBuffer ) { KHEChar B = Codec->decode( Byte ); - const QColorGroup &CG = View->colorGroup(); + const TQColorGroup &CG = View->colorGroup(); - P->fillRect( 0,0,ByteWidth,LineHeight, QBrush(colorForChar(B),Qt::SolidPattern) ); + P->fillRect( 0,0,ByteWidth,LineHeight, TQBrush(colorForChar(B),Qt::SolidPattern) ); drawCode( P, EditBuffer, CG.base() ); } -void KValueColumn::drawByte( QPainter *P, char Byte, KHEChar /*B*/, const QColor &Color ) const +void KValueColumn::drawByte( TQPainter *P, char Byte, KHEChar /*B*/, const TQColor &Color ) const { ByteCodec->encode( CodedByte, 0, Byte ); drawCode( P, CodedByte, Color ); } -void KValueColumn::drawCode( QPainter *P, const QString &Code, const QColor &Color ) const +void KValueColumn::drawCode( TQPainter *P, const TQString &Code, const TQColor &Color ) const { P->setPen( Color ); if( Coding == BinaryCoding ) diff --git a/khexedit/lib/kvaluecolumn.h b/khexedit/lib/kvaluecolumn.h index cc25929..7aa287e 100644 --- a/khexedit/lib/kvaluecolumn.h +++ b/khexedit/lib/kvaluecolumn.h @@ -40,7 +40,7 @@ class KValueColumn : public KBufferColumn virtual ~KValueColumn(); public: - void paintEditedByte( QPainter *P, char Byte, const QString &EditBuffer ); + void paintEditedByte( TQPainter *P, char Byte, const TQString &EditBuffer ); public: // modification access /** @@ -61,11 +61,11 @@ class KValueColumn : public KBufferColumn protected: // KBufferColumn API - virtual void drawByte( QPainter *P, char Byte, KHEChar B, const QColor &Color ) const; + virtual void drawByte( TQPainter *P, char Byte, KHEChar B, const TQColor &Color ) const; virtual void recalcByteWidth(); protected: - void drawCode( QPainter *P, const QString &Code, const QColor &Color ) const; + void drawCode( TQPainter *P, const TQString &Code, const TQColor &Color ) const; protected: // set data /** */ @@ -77,7 +77,7 @@ class KValueColumn : public KBufferColumn protected: // buffered data /** buffer to hold the formatted coding */ - mutable QString CodedByte; + mutable TQString CodedByte; /** calculated: Offset in pixels of the second half of the binary */ KPixelX BinaryHalfOffset; }; diff --git a/khexedit/listview.cc b/khexedit/listview.cc index 50de78a..e02e1c7 100644 --- a/khexedit/listview.cc +++ b/khexedit/listview.cc @@ -18,13 +18,13 @@ * */ -#include <qheader.h> +#include <tqheader.h> #include "listview.h" -CListView::CListView( QWidget *parent, const char *name, int visibleItem ) +CListView::CListView( TQWidget *parent, const char *name, int visibleItem ) :KListView( parent, name ), mVisibleItem(QMAX( 1, visibleItem )) { setVisibleItem(visibleItem); @@ -35,15 +35,15 @@ void CListView::setVisibleItem( int visibleItem, bool updateSize ) mVisibleItem = QMAX( 1, visibleItem ); if( updateSize == true ) { - QSize s = sizeHint(); + TQSize s = sizeHint(); setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() + lineWidth() * 2, s.height() ); } } -QSize CListView::sizeHint( void ) const +TQSize CListView::sizeHint( void ) const { - QSize s = QListView::sizeHint(); + TQSize s = TQListView::sizeHint(); int h = fontMetrics().height() + 2*itemMargin(); if( h % 2 > 0 ) { h++; } diff --git a/khexedit/listview.h b/khexedit/listview.h index 253fce9..e87a17d 100644 --- a/khexedit/listview.h +++ b/khexedit/listview.h @@ -28,10 +28,10 @@ class CListView : public KListView Q_OBJECT public: - CListView( QWidget *parent=0, const char *name=0, int visibleItem=10 ); + CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 ); void setVisibleItem( int visibleItem, bool updateSize=true ); - virtual QSize sizeHint( void ) const; + virtual TQSize sizeHint( void ) const; private: int mVisibleItem; diff --git a/khexedit/main.cc b/khexedit/main.cc index 525868f..fae17fe 100644 --- a/khexedit/main.cc +++ b/khexedit/main.cc @@ -91,7 +91,7 @@ int main( int argc, char **argv ) if (args->isSet("offset")) { - QCString offsetStr = args->getOption("offset"); + TQCString offsetStr = args->getOption("offset"); uint _offset = parseDecimalOrHexadecimal(offsetStr.data() ); hexEdit->setStartupOffset( _offset ); } diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc index 2038b2d..c1bbb39 100644 --- a/khexedit/optiondialog.cc +++ b/khexedit/optiondialog.cc @@ -20,16 +20,16 @@ #include <limits.h> -#include <qvbox.h> -#include <qvbuttongroup.h> -#include <qpainter.h> +#include <tqvbox.h> +#include <tqvbuttongroup.h> +#include <tqpainter.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qradiobutton.h> -#include <qspinbox.h> -#include <qwhatsthis.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqradiobutton.h> +#include <tqspinbox.h> +#include <tqwhatsthis.h> #include <kcolordialog.h> #include <kcolordrag.h> @@ -39,22 +39,22 @@ #include <kglobalsettings.h> #include "optiondialog.h" -#include <qpushbutton.h> -#include <qcombobox.h> +#include <tqpushbutton.h> +#include <tqcombobox.h> #if 0 -#include <qobjectlist.h> -static void enableWidget( QWidget *w, bool state ) +#include <tqobjectlist.h> +static void enableWidget( TQWidget *w, bool state ) { if( w->children() ) { - QObjectList *l = (QObjectList*)w->children(); // silence please + TQObjectList *l = (TQObjectList*)w->children(); // silence please for( uint i=0; i < l->count(); i++ ) { - QObject *o = l->at(i); + TQObject *o = l->at(i); if( o->isWidgetType() ) { - enableWidget( (QWidget*)o, state ); + enableWidget( (TQWidget*)o, state ); } } } @@ -64,11 +64,11 @@ static void enableWidget( QWidget *w, bool state ) -COptionDialog::COptionDialog( QWidget *parent, char *name, bool modal ) +COptionDialog::COptionDialog( TQWidget *parent, char *name, bool modal ) :KDialogBase( IconList, i18n("Configure"), Help|Default|Apply|Ok|Cancel, Ok, parent, name, modal, true ) { - setHelp( "khexedit/khexedit.html", QString::null ); + setHelp( "khexedit/khexedit.html", TQString::null ); setupLayoutPage(); setupCursorPage(); @@ -91,7 +91,7 @@ void COptionDialog::slotChanged() configChanged = true; } -void COptionDialog::showEvent( QShowEvent *e ) +void COptionDialog::showEvent( TQShowEvent *e ) { KDialogBase::showEvent(e); showPage(0); @@ -101,148 +101,148 @@ void COptionDialog::showEvent( QShowEvent *e ) void COptionDialog::setupLayoutPage( void ) { - QString text; - QFrame *page = addPage( i18n("Layout"), i18n("Data Layout in Editor"), + TQString text; + TQFrame *page = addPage( i18n("Layout"), i18n("Data Layout in Editor"), BarIcon("khexedit", KIcon::SizeMedium ) ); - QGridLayout *gbox = new QGridLayout( page, 15, 2, 0, spacingHint() ); + TQGridLayout *gbox = new TQGridLayout( page, 15, 2, 0, spacingHint() ); gbox->setColStretch( 1, 10 ); - mLayout.formatCombo = new QComboBox( false, page ); - QStringList modeList; + mLayout.formatCombo = new TQComboBox( false, page ); + TQStringList modeList; modeList.append( i18n("Hexadecimal Mode") ); modeList.append( i18n("Decimal Mode") ); modeList.append( i18n("Octal Mode") ); modeList.append( i18n("Binary Mode") ); modeList.append( i18n("Text Only Mode") ); mLayout.formatCombo->insertStringList( modeList ); - connect( mLayout.formatCombo, SIGNAL(activated(int)), - SLOT(slotModeSelectorChanged(int)) ); - connect( mLayout.formatCombo, SIGNAL(activated(int)), - SLOT(slotChanged()) ); + connect( mLayout.formatCombo, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotModeSelectorChanged(int)) ); + connect( mLayout.formatCombo, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotChanged()) ); gbox->addWidget( mLayout.formatCombo, 0, 1 ); // // I am setting the min. width for one widget in the second column // This widtk will be used by every widget in this column. // - mLayout.lineSizeSpin = new QSpinBox( page ); + mLayout.lineSizeSpin = new TQSpinBox( page ); mLayout.lineSizeSpin->setMinimumWidth( fontMetrics().width("M") * 10 ); mLayout.lineSizeSpin->setRange( 1, 10000 ); - connect( mLayout.lineSizeSpin, SIGNAL(valueChanged(int)), - SLOT(slotLineSizeChanged(int) ) ); - connect( mLayout.lineSizeSpin, SIGNAL(valueChanged(int)), - SLOT(slotChanged()) ); + connect( mLayout.lineSizeSpin, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(slotLineSizeChanged(int) ) ); + connect( mLayout.lineSizeSpin, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(slotChanged()) ); gbox->addWidget( mLayout.lineSizeSpin, 1, 1 ); - mLayout.columnSizeSpin = new QSpinBox( page ); + mLayout.columnSizeSpin = new TQSpinBox( page ); mLayout.columnSizeSpin->setRange( 1, 10000 ); - connect( mLayout.columnSizeSpin, SIGNAL(valueChanged(int)), - SLOT(slotColumnSizeChanged(int) ) ); - connect( mLayout.columnSizeSpin, SIGNAL(valueChanged(int)), - SLOT(slotChanged() ) ); + connect( mLayout.columnSizeSpin, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(slotColumnSizeChanged(int) ) ); + connect( mLayout.columnSizeSpin, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(slotChanged() ) ); gbox->addWidget( mLayout.columnSizeSpin, 2, 1 ); text = i18n("Default l&ine size [bytes]:"); - QLabel *label = new QLabel( mLayout.lineSizeSpin, text, page ); + TQLabel *label = new TQLabel( mLayout.lineSizeSpin, text, page ); gbox->addWidget( label, 1, 0 ); text = i18n("Colu&mn size [bytes]:"); - label = new QLabel( mLayout.columnSizeSpin, text, page ); + label = new TQLabel( mLayout.columnSizeSpin, text, page ); gbox->addWidget( label, 2, 0 ); - QFrame *hline = new QFrame( page ); - hline->setFrameStyle( QFrame::Sunken | QFrame::HLine ); + TQFrame *hline = new TQFrame( page ); + hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); gbox->addMultiCellWidget( hline, 3, 3, 0, 1 ); text = i18n("Line size is &fixed (use scrollbar when required)"); - mLayout.lockLineCheck = new QCheckBox( text, page ); + mLayout.lockLineCheck = new TQCheckBox( text, page ); gbox->addMultiCellWidget( mLayout.lockLineCheck, 4, 4, 0, 1, AlignLeft ); - connect( mLayout.lockLineCheck, SIGNAL(toggled(bool)), - SLOT(slotChanged()) ); + connect( mLayout.lockLineCheck, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(slotChanged()) ); text = i18n("Loc&k column at end of line (when column size>1)"); - mLayout.lockColumnCheck = new QCheckBox( text, page ); + mLayout.lockColumnCheck = new TQCheckBox( text, page ); gbox->addMultiCellWidget( mLayout.lockColumnCheck, 5, 5, 0, 1 ); - connect( mLayout.lockColumnCheck, SIGNAL(toggled(bool)), - SLOT(slotChanged()) ); + connect( mLayout.lockColumnCheck, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(slotChanged()) ); - hline = new QFrame( page ); - hline->setFrameStyle( QFrame::Sunken | QFrame::HLine ); + hline = new TQFrame( page ); + hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); gbox->addMultiCellWidget( hline, 6, 6, 0, 1 ); - QStringList gridList; + TQStringList gridList; gridList.append( i18n("None") ); gridList.append( i18n("Vertical Only") ); gridList.append( i18n("Horizontal Only") ); gridList.append( i18n("Both Directions") ); - mLayout.gridCombo = new QComboBox( false, page ); + mLayout.gridCombo = new TQComboBox( false, page ); mLayout.gridCombo->insertStringList( gridList ); - connect( mLayout.gridCombo, SIGNAL(activated(int)), - SLOT(slotChanged()) ); + connect( mLayout.gridCombo, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotChanged()) ); text = i18n("&Gridlines between text:"); - label = new QLabel( mLayout.gridCombo, text, page ); + label = new TQLabel( mLayout.gridCombo, text, page ); gbox->addWidget( label, 7, 0 ); gbox->addWidget( mLayout.gridCombo, 7, 1 ); - mLayout.leftSepWidthSpin = new QSpinBox( page ); + mLayout.leftSepWidthSpin = new TQSpinBox( page ); mLayout.leftSepWidthSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.leftSepWidthSpin, 8, 1 ); - connect( mLayout.leftSepWidthSpin, SIGNAL(valueChanged(int)), - SLOT(slotChanged()) ); + connect( mLayout.leftSepWidthSpin, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(slotChanged()) ); - mLayout.rightSepWidthSpin = new QSpinBox( page ); + mLayout.rightSepWidthSpin = new TQSpinBox( page ); mLayout.rightSepWidthSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.rightSepWidthSpin, 9, 1 ); - connect( mLayout.rightSepWidthSpin, SIGNAL(valueChanged(int)), - SLOT(slotChanged()) ); + connect( mLayout.rightSepWidthSpin, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(slotChanged()) ); text = i18n("&Left separator width [pixels]:"); - mLayout.leftSepLabel = new QLabel( mLayout.leftSepWidthSpin, text, page ); + mLayout.leftSepLabel = new TQLabel( mLayout.leftSepWidthSpin, text, page ); gbox->addWidget( mLayout.leftSepLabel, 8, 0 ); text = i18n("&Right separator width [pixels]:"); - mLayout.rightSepLabel = new QLabel( mLayout.rightSepWidthSpin, text, page ); + mLayout.rightSepLabel = new TQLabel( mLayout.rightSepWidthSpin, text, page ); gbox->addWidget( mLayout.rightSepLabel, 9, 0 ); - mLayout.separatorSpin = new QSpinBox( page ); + mLayout.separatorSpin = new TQSpinBox( page ); mLayout.separatorSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.separatorSpin, 10, 1 ); - connect( mLayout.separatorSpin, SIGNAL(valueChanged(int)), - SLOT(slotChanged()) ); + connect( mLayout.separatorSpin, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(slotChanged()) ); - mLayout.edgeSpin = new QSpinBox( page ); + mLayout.edgeSpin = new TQSpinBox( page ); mLayout.edgeSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.edgeSpin, 11, 1 ); - connect( mLayout.edgeSpin, SIGNAL(valueChanged(int)), - SLOT(slotChanged()) ); + connect( mLayout.edgeSpin, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(slotChanged()) ); text = i18n("&Separator margin width [pixels]:"); - label = new QLabel( mLayout.separatorSpin, text, page ); + label = new TQLabel( mLayout.separatorSpin, text, page ); gbox->addWidget( label, 10, 0 ); text = i18n("&Edge margin width [pixels]:"); - label = new QLabel( mLayout.edgeSpin, text, page ); + label = new TQLabel( mLayout.edgeSpin, text, page ); gbox->addWidget( label, 11, 0 ); text = i18n("Column separation is e&qual to one character"); - mLayout.columnCheck = new QCheckBox( text, page ); + mLayout.columnCheck = new TQCheckBox( text, page ); gbox->addMultiCellWidget( mLayout.columnCheck, 12, 12, 0, 1, AlignLeft ); - connect( mLayout.columnCheck, SIGNAL(toggled(bool)), - SLOT( slotColumnSepCheck(bool))); - connect( mLayout.columnCheck, SIGNAL(toggled(bool)), - SLOT( slotChanged())); + connect( mLayout.columnCheck, TQT_SIGNAL(toggled(bool)), + TQT_SLOT( slotColumnSepCheck(bool))); + connect( mLayout.columnCheck, TQT_SIGNAL(toggled(bool)), + TQT_SLOT( slotChanged())); - mLayout.columnSepSpin = new QSpinBox( page ); + mLayout.columnSepSpin = new TQSpinBox( page ); mLayout.columnSepSpin->setRange( 1, 100 ); - connect( mLayout.columnSepSpin, SIGNAL(valueChanged(int)), - SLOT(slotChanged()) ); + connect( mLayout.columnSepSpin, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(slotChanged()) ); text = i18n("Column separa&tion [pixels]:"); - mLayout.columnSepLabel = new QLabel( mLayout.columnSepSpin, text, page ); + mLayout.columnSepLabel = new TQLabel( mLayout.columnSepSpin, text, page ); gbox->addWidget( mLayout.columnSepLabel, 13, 0 ); gbox->addWidget( mLayout.columnSepSpin, 13, 1 ); @@ -253,65 +253,65 @@ void COptionDialog::setupLayoutPage( void ) void COptionDialog::setupCursorPage( void ) { - QString text; - QFrame *page = addPage( i18n("Cursor"), + TQString text; + TQFrame *page = addPage( i18n("Cursor"), i18n("Cursor Behavior (only valid for editor)"), BarIcon("mouse", KIcon::SizeMedium ) ); - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); - QVButtonGroup *group = new QVButtonGroup( i18n("Blinking"), page ); + TQVButtonGroup *group = new TQVButtonGroup( i18n("Blinking"), page ); group->layout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("Do not b&link"); - mCursor.blinkCheck = new QCheckBox( i18n("Do not b&link"), group ); - connect( mCursor.blinkCheck, SIGNAL(toggled(bool)), - SLOT( slotBlinkIntervalCheck(bool))); - connect( mCursor.blinkCheck, SIGNAL(toggled(bool)), - SLOT( slotChanged())); - - QHBox *hbox = new QHBox( group ); - mCursor.blinkLabel = new QLabel( i18n("&Blink interval [ms]:" ), hbox ); - mCursor.blinkSpin = new QSpinBox( hbox ); + 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())); + + TQHBox *hbox = new TQHBox( group ); + mCursor.blinkLabel = new TQLabel( i18n("&Blink interval [ms]:" ), hbox ); + mCursor.blinkSpin = new TQSpinBox( hbox ); mCursor.blinkSpin->setMinimumWidth( fontMetrics().width("M") * 10 ); mCursor.blinkSpin->setRange( 100, 1000 ); mCursor.blinkSpin->setSteps( 100, 100 ); mCursor.blinkSpin->setValue( 500 ); mCursor.blinkLabel->setBuddy(mCursor.blinkSpin); - connect( mCursor.blinkSpin, SIGNAL(valueChanged(int)), - SLOT( slotChanged())); + connect( mCursor.blinkSpin, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT( slotChanged())); - group = new QVButtonGroup( i18n("Shape"), page ); + group = new TQVButtonGroup( i18n("Shape"), page ); group->layout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("Always &use block (rectangular) cursor"); - mCursor.blockCheck = new QCheckBox( text, group ); - connect( mCursor.blockCheck, SIGNAL(toggled(bool)), - SLOT( slotBlockCursorCheck(bool))); - connect( mCursor.blockCheck, SIGNAL(toggled(bool)), - SLOT( slotChanged())); + 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())); text = i18n("Use &thick cursor in insert mode"); - mCursor.thickCheck = new QCheckBox( text, group ); - connect( mCursor.thickCheck, SIGNAL(toggled(bool)), - SLOT( slotChanged())); + mCursor.thickCheck = new TQCheckBox( text, group ); + connect( mCursor.thickCheck, TQT_SIGNAL(toggled(bool)), + TQT_SLOT( slotChanged())); text = i18n("Cursor Behavior When Editor Loses Focus"); - group = new QVButtonGroup( text, page ); + group = new TQVButtonGroup( text, page ); group->layout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("&Stop blinking (if blinking is enabled)"); - mCursor.stopRadio = new QRadioButton( text, group, "radio1" ); - mCursor.hideRadio = new QRadioButton( i18n("H&ide"), group, "radio2" ); + mCursor.stopRadio = new TQRadioButton( text, group, "radio1" ); + mCursor.hideRadio = new TQRadioButton( i18n("H&ide"), group, "radio2" ); text = i18n("Do ¬hing"); - mCursor.nothingRadio = new QRadioButton( text, group, "radio3" ); - connect( mCursor.stopRadio, SIGNAL(toggled(bool)), - SLOT( slotChanged())); - connect( mCursor.hideRadio, SIGNAL(toggled(bool)), - SLOT( slotChanged())); - connect( mCursor.nothingRadio, SIGNAL(toggled(bool)), - SLOT( slotChanged())); + 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())); topLayout->addStretch(10); } @@ -319,26 +319,26 @@ void COptionDialog::setupCursorPage( void ) void COptionDialog::setupColorPage( void ) { - QString text; - QFrame *page = addPage( i18n("Colors"), + TQString text; + TQFrame *page = addPage( i18n("Colors"), i18n("Editor Colors (system selection color is always used)"), BarIcon("colorize", KIcon::SizeMedium ) ); - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); text = i18n("&Use system colors (as chosen in Control Center)"); - mColor.checkSystem = new QCheckBox( text, page ); - connect( mColor.checkSystem, SIGNAL(toggled(bool)), - SLOT( slotColorSystem(bool))); - connect( mColor.checkSystem, SIGNAL(toggled(bool)), - SLOT( slotChanged())); + 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())); topLayout->addWidget( mColor.checkSystem ); - QFrame *hline = new QFrame( page ); - hline->setFrameStyle( QFrame::Sunken | QFrame::HLine ); + TQFrame *hline = new TQFrame( page ); + hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); topLayout->addWidget( hline ); - QStringList modeList; + TQStringList modeList; modeList.append( i18n("First, Third ... Line Background") ); modeList.append( i18n("Second, Fourth ... Line Background") ); modeList.append( i18n("Offset Background") ); @@ -365,54 +365,54 @@ void COptionDialog::setupColorPage( void ) mColor.colorList->insertItem( listItem ); } mColor.colorList->setCurrentItem(0); - connect( mColor.colorList, SIGNAL( dataChanged() ), this, SLOT( slotChanged() ) ); + connect( mColor.colorList, TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( slotChanged() ) ); } void COptionDialog::setupFontPage( void ) { - QString text; - QFrame *page = addPage( i18n("Font"), + TQString text; + TQFrame *page = addPage( i18n("Font"), i18n("Font Selection (editor can only use a fixed font)"), BarIcon("fonts", KIcon::SizeMedium ) ); - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); text = i18n("&Use system font (as chosen in Control Center)"); - mFont.checkSystem = new QCheckBox( text, page ); - connect( mFont.checkSystem, SIGNAL(toggled(bool)), - this, SLOT( slotFontSystem(bool))); - connect( mFont.checkSystem, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + 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())); topLayout->addWidget( mFont.checkSystem ); - QFrame *hline = new QFrame( page ); - hline->setFrameStyle( QFrame::Sunken | QFrame::HLine ); + TQFrame *hline = new TQFrame( page ); + hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); topLayout->addWidget( hline ); - mFont.chooser = new KFontChooser( page, "font", true, QStringList(), false, 4 ); + mFont.chooser = new KFontChooser( page, "font", true, TQStringList(), false, 4 ); topLayout->addWidget( mFont.chooser ); - QFont fixFont( KGlobalSettings::fixedFont() ); + TQFont fixFont( KGlobalSettings::fixedFont() ); fixFont.setBold(true); mFont.chooser->setFont( fixFont, true ); mFont.chooser->setSampleText( i18n("KHexEdit editor font") ); - connect( mFont.chooser, SIGNAL(fontSelected(const QFont &)), - this, SLOT( slotChanged())); + connect( mFont.chooser, TQT_SIGNAL(fontSelected(const TQFont &)), + this, TQT_SLOT( slotChanged())); - hline = new QFrame( page ); - hline->setFrameStyle( QFrame::Sunken | QFrame::HLine ); + hline = new TQFrame( page ); + hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); topLayout->addWidget( hline ); - QHBoxLayout *hbox = new QHBoxLayout(); + TQHBoxLayout *hbox = new TQHBoxLayout(); topLayout->addLayout( hbox ); - mFont.nonPrintInput = new QLineEdit( page ); + mFont.nonPrintInput = new TQLineEdit( page ); mFont.nonPrintInput->setMaxLength( 1 ); - connect( mFont.nonPrintInput, SIGNAL(textChanged(const QString &)), - this, SLOT( slotChanged())); + connect( mFont.nonPrintInput, TQT_SIGNAL(textChanged(const TQString &)), + this, TQT_SLOT( slotChanged())); text = i18n("&Map non printable characters to:"); - QLabel *nonPrintLabel = new QLabel( mFont.nonPrintInput, text, page ); + TQLabel *nonPrintLabel = new TQLabel( mFont.nonPrintInput, text, page ); hbox->addWidget( nonPrintLabel, 0, AlignLeft ); hbox->addSpacing( spacingHint() ); @@ -424,88 +424,88 @@ void COptionDialog::setupFontPage( void ) void COptionDialog::setupFilePage( void ) { - QString text; - QFrame *page = addPage( i18n("Files"), i18n("File Management"), + TQString text; + TQFrame *page = addPage( i18n("Files"), i18n("File Management"), BarIcon("kmultiple", KIcon::SizeMedium ) ); - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); - QGridLayout *gbox = new QGridLayout( 2, 2, spacingHint() ); + TQGridLayout *gbox = new TQGridLayout( 2, 2, spacingHint() ); topLayout->addLayout( gbox ); - mFile.openCombo = new QComboBox( false, page ); - QStringList modeList; + mFile.openCombo = new TQComboBox( false, page ); + TQStringList modeList; modeList.append( i18n("None") ); modeList.append( i18n("Most Recent Document") ); modeList.append( i18n("All Recent Documents") ); mFile.openCombo->insertStringList( modeList ); mFile.openCombo->setMinimumWidth( mFile.openCombo->sizeHint().width() ); - connect( mFile.openCombo, SIGNAL(activated(int)), - this, SLOT( slotChanged())); + connect( mFile.openCombo, TQT_SIGNAL(activated(int)), + this, TQT_SLOT( slotChanged())); text = i18n("Open doc&uments on startup:"); - QLabel *label = new QLabel( mFile.openCombo, text, page ); + TQLabel *label = new TQLabel( mFile.openCombo, text, page ); gbox->addWidget( label, 0, 0 ); gbox->addWidget( mFile.openCombo, 0, 1 ); text = i18n("&Jump to previous cursor position on startup"); - mFile.gotoOffsetCheck = new QCheckBox( text, page ); + mFile.gotoOffsetCheck = new TQCheckBox( text, page ); // ### TODO: this is currently not available. mFile.gotoOffsetCheck->setChecked( false ); mFile.gotoOffsetCheck->setEnabled( false ); // ### END topLayout->addWidget( mFile.gotoOffsetCheck, 0, AlignLeft ); - connect( mFile.gotoOffsetCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + connect( mFile.gotoOffsetCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT( slotChanged())); - QFrame *hline = new QFrame( page ); - hline->setFrameStyle( QFrame::Sunken | QFrame::HLine ); + TQFrame *hline = new TQFrame( page ); + hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); topLayout->addWidget( hline ); text = i18n("Open document with &write protection enabled"); - mFile.writeProtectCheck = new QCheckBox( text, page ); + mFile.writeProtectCheck = new TQCheckBox( text, page ); topLayout->addWidget( mFile.writeProtectCheck, 0, AlignLeft ); - connect( mFile.writeProtectCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + connect( mFile.writeProtectCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT( slotChanged())); text = i18n("&Keep cursor position after reloading document"); - mFile.reloadOffsetCheck = new QCheckBox( text, page ); + mFile.reloadOffsetCheck = new TQCheckBox( text, page ); topLayout->addWidget( mFile.reloadOffsetCheck, 0, AlignLeft ); - connect( mFile.reloadOffsetCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + connect( mFile.reloadOffsetCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT( slotChanged())); text = i18n("&Make a backup when saving document"); - mFile.backupCheck = new QCheckBox( text, page ); + mFile.backupCheck = new TQCheckBox( text, page ); topLayout->addWidget( mFile.backupCheck, 0, AlignLeft ); - connect( mFile.backupCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + connect( mFile.backupCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT( slotChanged())); - hline = new QFrame( page ); - hline->setFrameStyle( QFrame::Sunken | QFrame::HLine ); + hline = new TQFrame( page ); + hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); topLayout->addWidget( hline ); text = i18n("Don't &save \"Recent\" document list on exit"); - mFile.discardRecentCheck = new QCheckBox( text, page ); + mFile.discardRecentCheck = new TQCheckBox( text, page ); topLayout->addWidget( mFile.discardRecentCheck, 0, AlignLeft ); - QWhatsThis::add( mFile.discardRecentCheck, + TQWhatsThis::add( mFile.discardRecentCheck, i18n( "Clicking this check box makes KHexEdit forget his recent document list " "when the program is closed.\n" "Note: it will not erase any document of the recent document list " "created by KDE." ) ); - connect( mFile.discardRecentCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + connect( mFile.discardRecentCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT( slotChanged())); text = i18n("Cl&ear \"Recent\" Document List"); - QPushButton *discardRecentButton = new QPushButton( page ); + TQPushButton *discardRecentButton = new TQPushButton( page ); discardRecentButton->setText( text ); - QWhatsThis::add( discardRecentButton, + TQWhatsThis::add( discardRecentButton, i18n( "Clicking this button makes KHexEdit forget his recent document list.\n" "Note: it will not erase any document of the recent document list " "created by KDE." ) ); topLayout->addWidget( discardRecentButton, 0, AlignCenter ); - connect( discardRecentButton, SIGNAL(clicked()), - SIGNAL(removeRecentFiles()) ); + connect( discardRecentButton, TQT_SIGNAL(clicked()), + TQT_SIGNAL(removeRecentFiles()) ); topLayout->addStretch(10); } @@ -514,101 +514,101 @@ void COptionDialog::setupFilePage( void ) void COptionDialog::setupMiscPage( void ) { - QString text; - QLabel *label; + TQString text; + TQLabel *label; - QFrame *page = addPage( i18n("Miscellaneous"), i18n("Various Properties"), + TQFrame *page = addPage( i18n("Miscellaneous"), i18n("Various Properties"), BarIcon("gear", KIcon::SizeMedium ) ); - QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); + TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); text = i18n("Auto&matic copy to clipboard when selection is ready"); - mMisc.autoCheck = new QCheckBox( text, page ); + mMisc.autoCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.autoCheck, 0, AlignLeft ); - connect( mMisc.autoCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + connect( mMisc.autoCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT( slotChanged())); text = i18n("&Editor starts in \"insert\" mode" ); - mMisc.insertCheck = new QCheckBox( text, page ); + mMisc.insertCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.insertCheck, 0, AlignLeft ); - connect( mMisc.insertCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + connect( mMisc.insertCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT( slotChanged())); text = i18n("Confirm &wrapping (to beginning or end) during search"); - mMisc.confirmWrapCheck = new QCheckBox( text, page ); + mMisc.confirmWrapCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.confirmWrapCheck, 0, AlignLeft ); - connect( mMisc.confirmWrapCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + connect( mMisc.confirmWrapCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT( slotChanged())); text = i18n("Cursor jumps to &nearest byte when moved"); - mMisc.cursorJumpCheck = new QCheckBox( text, page ); + mMisc.cursorJumpCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.cursorJumpCheck, 0, AlignLeft ); - connect( mMisc.cursorJumpCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + connect( mMisc.cursorJumpCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT( slotChanged())); - QVButtonGroup *group = new QVButtonGroup( i18n("Sounds"), page ); + 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 QCheckBox( text, group ); - connect( mMisc.inputCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + mMisc.inputCheck = new TQCheckBox( text, group ); + connect( mMisc.inputCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT( slotChanged())); text = i18n("Make sound on &fatal failure"); - mMisc.fatalCheck = new QCheckBox( text, group ); - connect( mMisc.fatalCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + mMisc.fatalCheck = new TQCheckBox( text, group ); + connect( mMisc.fatalCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT( slotChanged())); - group = new QVButtonGroup( i18n("Bookmark Visibility"), page ); + 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 QCheckBox( text, group ); - connect( mMisc.bookmarkColumnCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + mMisc.bookmarkColumnCheck = new TQCheckBox( text, group ); + connect( mMisc.bookmarkColumnCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT( slotChanged())); text = i18n("Use visible bookmarks in the editor fields"); - mMisc.bookmarkEditorCheck = new QCheckBox( text, group ); - connect( mMisc.bookmarkEditorCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + mMisc.bookmarkEditorCheck = new TQCheckBox( text, group ); + connect( mMisc.bookmarkEditorCheck, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT( slotChanged())); text = i18n("Confirm when number of printed pages will e&xceed limit"); - mMisc.thresholdCheck = new QCheckBox( text, page ); - connect( mMisc.thresholdCheck, SIGNAL(clicked()), - SLOT( slotThresholdConfirm())); - connect( mMisc.thresholdCheck, SIGNAL(toggled(bool)), - this, SLOT( slotChanged())); + 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())); topLayout->addWidget( mMisc.thresholdCheck, 0, AlignLeft ); - QGridLayout *glay = new QGridLayout( 3, 3 ); + TQGridLayout *glay = new TQGridLayout( 3, 3 ); glay->setColStretch(2,10); topLayout->addLayout( glay ); - mMisc.thresholdSpin = new QSpinBox( page ); + mMisc.thresholdSpin = new TQSpinBox( page ); mMisc.thresholdSpin->setMinimumWidth( fontMetrics().width("M") * 10 ); mMisc.thresholdSpin->setRange( 5, INT_MAX ); mMisc.thresholdSpin->setSteps( 5, 5 ); mMisc.thresholdSpin->setValue( 5 ); - connect( mMisc.thresholdSpin, SIGNAL(valueChanged(int)), - this, SLOT( slotChanged())); + connect( mMisc.thresholdSpin, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT( slotChanged())); text = i18n("&Threshold [pages]:" ); - mMisc.thresholdLabel = new QLabel( mMisc.thresholdSpin, text, page ); + mMisc.thresholdLabel = new TQLabel( mMisc.thresholdSpin, text, page ); glay->addWidget( mMisc.thresholdLabel, 0, 0 ); glay->addWidget( mMisc.thresholdSpin, 0, 1 ); - QFrame *hline = new QFrame( page ); - hline->setFrameStyle( QFrame::Sunken | QFrame::HLine ); + TQFrame *hline = new TQFrame( page ); + hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); glay->addMultiCellWidget( hline, 1, 1, 0, 2 ); - mMisc.undoSpin = new QSpinBox( page ); + mMisc.undoSpin = new TQSpinBox( page ); mMisc.undoSpin->setRange( 10, 10000 ); mMisc.undoSpin->setSteps( 5, 5 ); mMisc.undoSpin->setValue( 50 ); - connect( mMisc.undoSpin, SIGNAL(valueChanged(int)), - this, SLOT( slotChanged())); + connect( mMisc.undoSpin, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT( slotChanged())); - label = new QLabel( mMisc.undoSpin, i18n("&Undo limit:"), page ); + label = new TQLabel( mMisc.undoSpin, i18n("&Undo limit:"), page ); glay->addWidget( label, 2, 0 ); glay->addWidget( mMisc.undoSpin, 2, 1 ); @@ -838,7 +838,7 @@ void COptionDialog::slotApply( void ) f.useSystemFont = mFont.checkSystem->isChecked(); f.localFont = mFont.chooser->font(); - QString nonPrintText = mFont.nonPrintInput->text(); + TQString nonPrintText = mFont.nonPrintInput->text(); if( nonPrintText.isEmpty() ) { f.nonPrintChar = ' '; @@ -965,7 +965,7 @@ void COptionDialog::setFont( SDisplayFont &font ) mFont.checkSystem->setChecked( font.useSystemFont ); mFont.chooser->setFont( font.localFont, true ); - QString buf = font.nonPrintChar; + TQString buf = font.nonPrintChar; mFont.nonPrintInput->setText( buf ); } @@ -1050,10 +1050,10 @@ SDisplayCursor::EFocusMode COptionDialog::cursorFocusMode( void ) -CColorListBox::CColorListBox( QWidget *parent, const char *name, WFlags f ) +CColorListBox::CColorListBox( TQWidget *parent, const char *name, WFlags f ) :KListBox( parent, name, f ), mCurrentOnDragEnter(-1) { - connect( this, SIGNAL(selected(int)), this, SLOT(newColor(int)) ); + connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); setAcceptDrops( true); } @@ -1065,7 +1065,7 @@ void CColorListBox::setEnabled( bool state ) return; } - QListBox::setEnabled( state ); + TQListBox::setEnabled( state ); for( uint i=0; i<count(); i++ ) { updateItem( i ); @@ -1073,7 +1073,7 @@ void CColorListBox::setEnabled( bool state ) } -void CColorListBox::setColor( uint index, const QColor &color ) +void CColorListBox::setColor( uint index, const TQColor &color ) { if( index < count() ) { @@ -1084,7 +1084,7 @@ void CColorListBox::setColor( uint index, const QColor &color ) } -const QColor CColorListBox::color( uint index ) +const TQColor CColorListBox::color( uint index ) { if( index < count() ) { @@ -1107,8 +1107,8 @@ void CColorListBox::newColor( int index ) if( (uint)index < count() ) { - QColor c = color( index ); - if( KColorDialog::getColor( c, this ) != QDialog::Rejected ) + TQColor c = color( index ); + if( KColorDialog::getColor( c, this ) != TQDialog::Rejected ) { setColor( index, c ); emit dataChanged(); @@ -1117,7 +1117,7 @@ void CColorListBox::newColor( int index ) } -void CColorListBox::dragEnterEvent( QDragEnterEvent *e ) +void CColorListBox::dragEnterEvent( TQDragEnterEvent *e ) { if( KColorDrag::canDecode(e) && isEnabled() ) { @@ -1132,7 +1132,7 @@ void CColorListBox::dragEnterEvent( QDragEnterEvent *e ) } -void CColorListBox::dragLeaveEvent( QDragLeaveEvent * ) +void CColorListBox::dragLeaveEvent( TQDragLeaveEvent * ) { if( mCurrentOnDragEnter != -1 ) { @@ -1142,7 +1142,7 @@ void CColorListBox::dragLeaveEvent( QDragLeaveEvent * ) } -void CColorListBox::dragMoveEvent( QDragMoveEvent *e ) +void CColorListBox::dragMoveEvent( TQDragMoveEvent *e ) { if( KColorDrag::canDecode(e) && isEnabled() ) { @@ -1155,9 +1155,9 @@ void CColorListBox::dragMoveEvent( QDragMoveEvent *e ) } -void CColorListBox::dropEvent( QDropEvent *e ) +void CColorListBox::dropEvent( TQDropEvent *e ) { - QColor color; + TQColor color; if( KColorDrag::decode( e, color ) ) { int index = currentItem(); @@ -1173,28 +1173,28 @@ void CColorListBox::dropEvent( QDropEvent *e ) -CColorListItem::CColorListItem( const QString &text, const QColor &color ) - : QListBoxItem(), mColor( color ), mBoxWidth( 30 ) +CColorListItem::CColorListItem( const TQString &text, const TQColor &color ) + : TQListBoxItem(), mColor( color ), mBoxWidth( 30 ) { setText( text ); } -const QColor &CColorListItem::color( void ) +const TQColor &CColorListItem::color( void ) { return( mColor ); } -void CColorListItem::setColor( const QColor &color ) +void CColorListItem::setColor( const TQColor &color ) { mColor = color; } -void CColorListItem::paint( QPainter *p ) +void CColorListItem::paint( TQPainter *p ) { - QFontMetrics fm = p->fontMetrics(); + TQFontMetrics fm = p->fontMetrics(); int h = fm.height(); p->drawText( mBoxWidth+3*2, fm.ascent() + fm.leading()/2, text() ); @@ -1205,13 +1205,13 @@ void CColorListItem::paint( QPainter *p ) } -int CColorListItem::height(const QListBox *lb ) const +int CColorListItem::height(const TQListBox *lb ) const { return( lb->fontMetrics().lineSpacing()+1 ); } -int CColorListItem::width(const QListBox *lb ) const +int CColorListItem::width(const TQListBox *lb ) const { return( mBoxWidth + lb->fontMetrics().width( text() ) + 6 ); } diff --git a/khexedit/optiondialog.h b/khexedit/optiondialog.h index ba62f62..72ffc4a 100644 --- a/khexedit/optiondialog.h +++ b/khexedit/optiondialog.h @@ -45,18 +45,18 @@ class CColorListBox : public KListBox Q_OBJECT public: - CColorListBox( QWidget *parent=0, const char * name=0, WFlags f=0 ); - void setColor( uint index, const QColor &color ); - const QColor color( uint index ); + CColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 ); + void setColor( uint index, const TQColor &color ); + const TQColor color( uint index ); public slots: virtual void setEnabled( bool state ); protected: - void dragEnterEvent( QDragEnterEvent *e ); - void dragLeaveEvent( QDragLeaveEvent *e ); - void dragMoveEvent( QDragMoveEvent *e ); - void dropEvent( QDropEvent *e ); + void dragEnterEvent( TQDragEnterEvent *e ); + void dragLeaveEvent( TQDragLeaveEvent *e ); + void dragMoveEvent( TQDragMoveEvent *e ); + void dropEvent( TQDropEvent *e ); private slots: void newColor( int index ); @@ -72,17 +72,17 @@ class CColorListBox : public KListBox class CColorListItem : public QListBoxItem { public: - CColorListItem( const QString &text, const QColor &color=Qt::black ); - const QColor &color( void ); - void setColor( const QColor &color ); + CColorListItem( const TQString &text, const TQColor &color=Qt::black ); + const TQColor &color( void ); + void setColor( const TQColor &color ); protected: - virtual void paint( QPainter * ); - virtual int height( const QListBox * ) const; - virtual int width( const QListBox * ) const; + virtual void paint( TQPainter * ); + virtual int height( const TQListBox * ) const; + virtual int width( const TQListBox * ) const; private: - QColor mColor; + TQColor mColor; int mBoxWidth; }; @@ -105,7 +105,7 @@ class COptionDialog : public KDialogBase page_max }; - COptionDialog( QWidget *parent = 0, char *name = 0, bool modal = false ); + COptionDialog( TQWidget *parent = 0, char *name = 0, bool modal = false ); ~COptionDialog( void ); void setLayout( SDisplayLayout &layout, SDisplayLine &line ); @@ -117,7 +117,7 @@ class COptionDialog : public KDialogBase void setState( SDisplayState &state ); protected: - virtual void showEvent( QShowEvent *e ); + virtual void showEvent( TQShowEvent *e ); protected slots: void slotModeSelectorChanged( int index ); @@ -138,33 +138,33 @@ class COptionDialog : public KDialogBase private: struct SLayoutWidgets { - QComboBox *formatCombo; - QSpinBox *lineSizeSpin; - QSpinBox *columnSizeSpin; - QCheckBox *lockLineCheck; - QCheckBox *lockColumnCheck; - QCheckBox *columnCheck; - QComboBox *gridCombo; - QLabel *leftSepLabel; - QLabel *rightSepLabel; - QSpinBox *leftSepWidthSpin; - QSpinBox *rightSepWidthSpin; - QSpinBox *separatorSpin; - QSpinBox *edgeSpin; - QLabel *columnSepLabel; - QSpinBox *columnSepSpin; + TQComboBox *formatCombo; + TQSpinBox *lineSizeSpin; + TQSpinBox *columnSizeSpin; + TQCheckBox *lockLineCheck; + TQCheckBox *lockColumnCheck; + TQCheckBox *columnCheck; + TQComboBox *gridCombo; + TQLabel *leftSepLabel; + TQLabel *rightSepLabel; + TQSpinBox *leftSepWidthSpin; + TQSpinBox *rightSepWidthSpin; + TQSpinBox *separatorSpin; + TQSpinBox *edgeSpin; + TQLabel *columnSepLabel; + TQSpinBox *columnSepSpin; }; struct SCursorWidgets { - QCheckBox *blinkCheck; - QSpinBox *blinkSpin; - QLabel *blinkLabel; - QCheckBox *blockCheck; - QCheckBox *thickCheck; - QRadioButton *stopRadio; - QRadioButton *hideRadio; - QRadioButton *nothingRadio; + TQCheckBox *blinkCheck; + TQSpinBox *blinkSpin; + TQLabel *blinkLabel; + TQCheckBox *blockCheck; + TQCheckBox *thickCheck; + TQRadioButton *stopRadio; + TQRadioButton *hideRadio; + TQRadioButton *nothingRadio; }; struct SColorWidgets { @@ -190,38 +190,38 @@ class COptionDialog : public KDialogBase MAX_COLOR }; - QCheckBox *checkSystem; + TQCheckBox *checkSystem; CColorListBox *colorList; }; struct SFontWidgets { - QCheckBox *checkSystem; + TQCheckBox *checkSystem; KFontChooser *chooser; - QLineEdit *nonPrintInput; + TQLineEdit *nonPrintInput; }; struct SFileWidgets { - QComboBox *openCombo; - QCheckBox *gotoOffsetCheck; - QCheckBox *reloadOffsetCheck; - QCheckBox *writeProtectCheck; - QCheckBox *backupCheck; - QCheckBox *discardRecentCheck; + TQComboBox *openCombo; + TQCheckBox *gotoOffsetCheck; + TQCheckBox *reloadOffsetCheck; + TQCheckBox *writeProtectCheck; + TQCheckBox *backupCheck; + TQCheckBox *discardRecentCheck; }; struct SMiscWidgets { - QSpinBox *undoSpin; - QCheckBox *inputCheck; - QCheckBox *fatalCheck; - QCheckBox *autoCheck; - QCheckBox *insertCheck; - QCheckBox *confirmWrapCheck; - QCheckBox *cursorJumpCheck; - QCheckBox *thresholdCheck; - QCheckBox *bookmarkColumnCheck; - QCheckBox *bookmarkEditorCheck; - QLabel *thresholdLabel; - QSpinBox *thresholdSpin; + TQSpinBox *undoSpin; + TQCheckBox *inputCheck; + TQCheckBox *fatalCheck; + TQCheckBox *autoCheck; + TQCheckBox *insertCheck; + TQCheckBox *confirmWrapCheck; + TQCheckBox *cursorJumpCheck; + TQCheckBox *thresholdCheck; + TQCheckBox *bookmarkColumnCheck; + TQCheckBox *bookmarkEditorCheck; + TQLabel *thresholdLabel; + TQSpinBox *thresholdSpin; }; private: diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp index 4cc91ab..cb2b549 100644 --- a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp +++ b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp @@ -16,7 +16,7 @@ // qt specific -#include <qlayout.h> +#include <tqlayout.h> // kde specific #include <klocale.h> #include <kgenericfactory.h> @@ -26,14 +26,14 @@ #include "kbyteseditwidget.h" -KBytesEditWidget::KBytesEditWidget( QWidget *parent, const char *name, const QStringList & ) - : QWidget( parent, name) +KBytesEditWidget::KBytesEditWidget( TQWidget *parent, const char *name, const TQStringList & ) + : TQWidget( parent, name) { - QHBoxLayout* Layout = new QHBoxLayout( this ); + TQHBoxLayout* Layout = new TQHBoxLayout( this ); BytesEdit = new KHE::KBytesEdit( this, "BytesEdit" ); Layout->addWidget( BytesEdit ); -// connect( _editor, SIGNAL( canUndo(bool) ), this, SIGNAL( canUndo(bool) ) ); - connect( BytesEdit, SIGNAL(copyAvailable( bool )), this, SIGNAL(copyAvailable( bool )) ); +// connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); + connect( BytesEdit, TQT_SIGNAL(copyAvailable( bool )), this, TQT_SIGNAL(copyAvailable( bool )) ); } @@ -144,7 +144,7 @@ void KBytesEditWidget::setShowUnprintable( bool SU ) BytesEdit->setShowUnprintable( SU ); } -void KBytesEditWidget::setSubstituteChar( QChar SC ) +void KBytesEditWidget::setSubstituteChar( TQChar SC ) { BytesEdit->setSubstituteChar( SC ); } @@ -230,7 +230,7 @@ bool KBytesEditWidget::showUnprintable() const return BytesEdit->showUnprintable(); } -QChar KBytesEditWidget::substituteChar() const +TQChar KBytesEditWidget::substituteChar() const { return BytesEdit->substituteChar(); } @@ -253,7 +253,7 @@ void KBytesEditWidget::repaintRange( int i1, int i2 ) } -void KBytesEditWidget::insert( const QByteArray &D ) +void KBytesEditWidget::insert( const TQByteArray &D ) { BytesEdit->insert( D ); } diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.h b/khexedit/parts/kbytesedit/kbyteseditwidget.h index 78e4dba..72bfeb6 100644 --- a/khexedit/parts/kbytesedit/kbyteseditwidget.h +++ b/khexedit/parts/kbytesedit/kbyteseditwidget.h @@ -19,7 +19,7 @@ #define KBYTESEDITWIDGET_H // qt specific -#include <qwidget.h> +#include <tqwidget.h> // kde specific #include <khexedit/byteseditinterface.h> #include <khexedit/valuecolumninterface.h> @@ -38,7 +38,7 @@ class KBytesEdit; @author Friedrich W. H. Kossebau <Friedrich.W.H@Kossebau.de> @version 0.1 **/ -class KBytesEditWidget : public QWidget, public KHE::BytesEditInterface, +class KBytesEditWidget : public TQWidget, public KHE::BytesEditInterface, public KHE::ValueColumnInterface, public KHE::CharColumnInterface, public KHE::ZoomInterface, public KHE::ClipboardInterface { @@ -46,7 +46,7 @@ class KBytesEditWidget : public QWidget, public KHE::BytesEditInterface, public: /** constructor API as demanded by KGenericFactory */ - KBytesEditWidget( QWidget *parent, const char *name, const QStringList & = QStringList() ); + KBytesEditWidget( TQWidget *parent, const char *name, const TQStringList & = TQStringList() ); public: // bytesedit interface /** hands over to the editor a new byte array. @@ -133,7 +133,7 @@ class KBytesEditWidget : public QWidget, public KHE::BytesEditInterface, /** sets the substitute character for "unprintable" chars * returns true if there was a change */ - virtual void setSubstituteChar( QChar SC ); + virtual void setSubstituteChar( TQChar SC ); /** sets the encoding of the char column. Default is KHE::LocalEncoding. * If the encoding is not available the format will not be changed. */ virtual void setEncoding( KEncoding C ); @@ -142,13 +142,13 @@ class KBytesEditWidget : public QWidget, public KHE::BytesEditInterface, */ virtual bool showUnprintable() const; /** returns the actually used substitute character for "unprintable" chars, default is '.' */ - virtual QChar substituteChar() const; + virtual TQChar substituteChar() const; /** */ virtual KEncoding encoding() const; public: // edit interface /** */ - virtual void insert( const QByteArray &D ); + virtual void insert( const TQByteArray &D ); /** de-/selects all data */ virtual void selectAll( bool select ); /** returns true if there is a selected range in the array */ diff --git a/khexedit/parts/kpart/khebrowserextension.cpp b/khexedit/parts/kpart/khebrowserextension.cpp index d4fc3f3..a08aa0d 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, SIGNAL( selectionChanged() ), this, SLOT( slotSelectionChanged() ) ); + connect( HexEditPart->HexEdit, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotSelectionChanged() ) ); } void KHexEditBrowserExtension::copy() @@ -44,7 +44,7 @@ void KHexEditBrowserExtension::slotSelectionChanged() } -void KHexEditBrowserExtension::saveState( QDataStream &stream ) +void KHexEditBrowserExtension::saveState( TQDataStream &stream ) { KParts::BrowserExtension::saveState( stream ); @@ -59,7 +59,7 @@ void KHexEditBrowserExtension::saveState( QDataStream &stream ) } -void KHexEditBrowserExtension::restoreState( QDataStream &stream ) +void KHexEditBrowserExtension::restoreState( TQDataStream &stream ) { KParts::BrowserExtension::restoreState( stream ); @@ -67,7 +67,7 @@ void KHexEditBrowserExtension::restoreState( QDataStream &stream ) int VisibleBufferColumns; int ResizeStyle; int Coding; - QString EncodingName; + TQString EncodingName; int ShowUnprintable; int x, y; int Position; diff --git a/khexedit/parts/kpart/khebrowserextension.h b/khexedit/parts/kpart/khebrowserextension.h index 4638944..67a6d45 100644 --- a/khexedit/parts/kpart/khebrowserextension.h +++ b/khexedit/parts/kpart/khebrowserextension.h @@ -39,8 +39,8 @@ class KHexEditBrowserExtension : public KParts::BrowserExtension KHexEditBrowserExtension( KHexEditPart *P ); public: // KParts::BrowserExtension API - virtual void saveState( QDataStream &stream ); - virtual void restoreState( QDataStream &stream ); + virtual void saveState( TQDataStream &stream ); + virtual void restoreState( TQDataStream &stream ); public slots: /** copy text to clipboard */ diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp index e9b9ed5..1fa95fb 100644 --- a/khexedit/parts/kpart/khepart.cpp +++ b/khexedit/parts/kpart/khepart.cpp @@ -32,8 +32,8 @@ using namespace KHE; static const char RCFileName[] = "khexedit2partui.rc"; -KHexEditPart::KHexEditPart( QWidget *ParentWidget, const char *WidgetName, - QObject *Parent, const char *Name, +KHexEditPart::KHexEditPart( TQWidget *ParentWidget, const char *WidgetName, + TQObject *Parent, const char *Name, bool BrowserViewWanted ) : KParts::ReadOnlyPart( Parent, Name ) { @@ -51,8 +51,8 @@ KHexEditPart::KHexEditPart( QWidget *ParentWidget, const char *WidgetName, if( CopyAction ) { - connect( HexEdit, SIGNAL(copyAvailable(bool)), CopyAction,SLOT(setEnabled(bool)) ); - connect( HexEdit, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()) ); + connect( HexEdit, TQT_SIGNAL(copyAvailable(bool)), CopyAction,TQT_SLOT(setEnabled(bool)) ); + connect( HexEdit, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); CopyAction->setEnabled( false ); } @@ -83,30 +83,30 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) { KActionCollection *AC = actionCollection(); // create our actions - CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( HexEdit, SLOT(copy()), AC ); + CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( HexEdit, TQT_SLOT(copy()), AC ); - KStdAction::selectAll( this, SLOT(slotSelectAll()), AC ); - KStdAction::deselect( this, SLOT(slotUnselect()), AC ); + KStdAction::selectAll( this, TQT_SLOT(slotSelectAll()), AC ); + KStdAction::deselect( this, TQT_SLOT(slotUnselect()), AC ); // value encoding CodingAction = new KSelectAction( i18n("&Value Coding"), 0, AC, "view_valuecoding" ); - QStringList List; + TQStringList List; List.append( i18n("&Hexadecimal") ); List.append( i18n("&Decimal") ); List.append( i18n("&Octal") ); List.append( i18n("&Binary") ); CodingAction->setItems( List ); - connect( CodingAction, SIGNAL(activated(int)), this, SLOT(slotSetCoding(int)) ); + connect( CodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetCoding(int)) ); // document encoding EncodingAction = new KSelectAction( i18n("&Char Encoding"), 0, AC, "view_charencoding" ); EncodingAction->setItems( KCharCodec::codecNames() ); - connect( EncodingAction, SIGNAL(activated(int)), this, SLOT(slotSetEncoding(int)) ); + connect( EncodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetEncoding(int)) ); - ShowUnprintableAction = new KToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" ); + ShowUnprintableAction = new KToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQT_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" ); - KStdAction::zoomIn( HexEdit, SLOT(zoomIn()), actionCollection() ); - KStdAction::zoomOut( HexEdit, SLOT(zoomOut()), actionCollection() ); + KStdAction::zoomIn( HexEdit, TQT_SLOT(zoomIn()), actionCollection() ); + KStdAction::zoomOut( HexEdit, TQT_SLOT(zoomOut()), actionCollection() ); // resize style ResizeStyleAction = new KSelectAction( 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, SIGNAL(activated(int)), this, SLOT(slotSetResizeStyle(int)) ); + connect( ResizeStyleAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetResizeStyle(int)) ); - ShowOffsetColumnAction = new KToggleAction( i18n("&Line Offset"), Key_F11, this, SLOT(slotToggleOffsetColumn()), AC, "view_lineoffset" ); + ShowOffsetColumnAction = new KToggleAction( i18n("&Line Offset"), Key_F11, this, TQT_SLOT(slotToggleOffsetColumn()), AC, "view_lineoffset" ); // show buffer columns ToggleColumnsAction = new KSelectAction( 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, SIGNAL(activated(int)), this, SLOT(slotToggleValueCharColumns(int)) ); + connect( ToggleColumnsAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleValueCharColumns(int)) ); fitActionSettings(); diff --git a/khexedit/parts/kpart/khepart.h b/khexedit/parts/kpart/khepart.h index 54befa0..0526462 100644 --- a/khexedit/parts/kpart/khepart.h +++ b/khexedit/parts/kpart/khepart.h @@ -49,7 +49,7 @@ class KHexEditPart : public KParts::ReadOnlyPart friend class KHexEditBrowserExtension; public: - KHexEditPart( QWidget *ParentWidget, const char *WidgetName, QObject *Parent, const char *Name, + KHexEditPart( TQWidget *ParentWidget, const char *WidgetName, TQObject *Parent, const char *Name, bool BrowserViewWanted ); virtual ~KHexEditPart(); diff --git a/khexedit/parts/kpart/khepartfactory.cpp b/khexedit/parts/kpart/khepartfactory.cpp index f85d8a9..d3bac6c 100644 --- a/khexedit/parts/kpart/khepartfactory.cpp +++ b/khexedit/parts/kpart/khepartfactory.cpp @@ -57,11 +57,11 @@ KHexEditPartFactory::~KHexEditPartFactory() } -KParts::Part* KHexEditPartFactory::createPartObject( QWidget *ParentWidget, const char *WidgetName, - QObject *Parent, const char *Name, - const char *CN, const QStringList &/*args*/ ) +KParts::Part* KHexEditPartFactory::createPartObject( TQWidget *ParentWidget, const char *WidgetName, + TQObject *Parent, const char *Name, + const char *CN, const TQStringList &/*args*/ ) { - QCString Classname( CN ); + TQCString Classname( CN ); bool BrowserViewWanted = ( Classname == "Browser/View" ); //bool ReadOnlyWanted = (BrowserViewWanted || ( Classname == "KParts::ReadOnlyPart" )); diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h index 7cd6c7e..15a1cee 100644 --- a/khexedit/parts/kpart/khepartfactory.h +++ b/khexedit/parts/kpart/khepartfactory.h @@ -33,9 +33,9 @@ class KHexEditPartFactory : public KParts::Factory virtual ~KHexEditPartFactory(); public: - virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *classname, const QStringList &args ); + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, + const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/khexedit/printdialogpage.cc b/khexedit/printdialogpage.cc index ecc0a90..2677ac4 100644 --- a/khexedit/printdialogpage.cc +++ b/khexedit/printdialogpage.cc @@ -18,20 +18,20 @@ * */ -#include <qlayout.h> -#include <qbuttongroup.h> -#include <qspinbox.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qstringlist.h> -#include <qcombobox.h> +#include <tqlayout.h> +#include <tqbuttongroup.h> +#include <tqspinbox.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqstringlist.h> +#include <tqcombobox.h> #include <klocale.h> #include "printdialogpage.h" -LayoutDialogPage::LayoutDialogPage( QWidget *parent, const char *name ) +LayoutDialogPage::LayoutDialogPage( TQWidget *parent, const char *name ) : KPrintDialogPage( parent, name ) { mConfig = 0; @@ -52,21 +52,21 @@ LayoutDialogPage::~LayoutDialogPage( void ) void LayoutDialogPage::setupLayoutPage( void ) { - QString text; - QVBoxLayout *topLayout = new QVBoxLayout( this, 0, 6 /*KDialog::mSpacingSize*/ ); + TQString text; + TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, 6 /*KDialog::mSpacingSize*/ ); if( topLayout == 0 ) { return; } text = i18n("Margins [millimeter]"); - QButtonGroup *group = new QButtonGroup( text, this ); + TQButtonGroup *group = new TQButtonGroup( text, this ); if( group == 0 ) { return; } topLayout->addWidget( group ); - QGridLayout *gbox = new QGridLayout( group, 3, 6, 6 /*KDialog::mSpacingSize*/ ); + TQGridLayout *gbox = new TQGridLayout( group, 3, 6, 6 /*KDialog::mSpacingSize*/ ); if( gbox == 0 ) { return; } gbox->addRowSpacing( 0, group->fontMetrics().height() ); gbox->setColStretch( 5, 10 ); - QString name[4]; + TQString name[4]; int i; name[0] = i18n("&Top:"); @@ -76,14 +76,14 @@ void LayoutDialogPage::setupLayoutPage( void ) for( i=0; i<4; i++ ) { - mLayout.marginSpin[i] = new QSpinBox( group ); + mLayout.marginSpin[i] = new TQSpinBox( group ); mLayout.marginSpin[i]->setFixedHeight( mLayout.marginSpin[i]->sizeHint().height() ); mLayout.marginSpin[i]->setMinimumWidth( mLayout.marginSpin[i]->fontMetrics().width("M")*10 ); mLayout.marginSpin[i]->setRange( 0, INT_MAX ); - QLabel *label = new QLabel( mLayout.marginSpin[i], name[i], group ); + TQLabel *label = new TQLabel( mLayout.marginSpin[i], name[i], group ); label->setFixedHeight( mLayout.marginSpin[i]->sizeHint().height() ); label->setFixedWidth( label->sizeHint().width() ); @@ -100,13 +100,13 @@ void LayoutDialogPage::setupLayoutPage( void ) } text = i18n("Draw h&eader above text"); - mLayout.headerCheck = new QCheckBox( text, this ); + mLayout.headerCheck = new TQCheckBox( text, this ); mLayout.headerCheck->setFixedSize( mLayout.headerCheck->sizeHint() ); - connect( mLayout.headerCheck, SIGNAL( toggled(bool)), - SLOT( slotDrawHeader(bool))); + connect( mLayout.headerCheck, TQT_SIGNAL( toggled(bool)), + TQT_SLOT( slotDrawHeader(bool))); topLayout->addWidget( mLayout.headerCheck, 0, AlignLeft ); - gbox = new QGridLayout( 5, 6, 0 ); + gbox = new TQGridLayout( 5, 6, 0 ); if( gbox == 0 ) { return; } topLayout->addLayout( gbox ); @@ -120,26 +120,26 @@ void LayoutDialogPage::setupLayoutPage( void ) name[2] = i18n("Right:"); name[3] = i18n("Border:"); - QStringList textList; + TQStringList textList; textList.append(i18n("None")); textList.append(i18n("Date & Time")); textList.append(i18n("Page Number")); textList.append(i18n("Filename")); - QStringList lineList; + TQStringList lineList; lineList.append(i18n("None")); lineList.append(i18n("Single Line")); lineList.append(i18n("Rectangle")); for( i=0; i<4; i++ ) { - mLayout.headerCombo[i] = new QComboBox( false, this ); + mLayout.headerCombo[i] = new TQComboBox( false, this ); mLayout.headerCombo[i]->setFixedHeight( mLayout.headerCombo[i]->sizeHint().height() ); mLayout.headerCombo[i]->setMinimumWidth( mLayout.headerCombo[i]->fontMetrics().width("M")*10 ); - mLayout.headerLabel[i] = new QLabel( mLayout.headerCombo[i], name[i], + mLayout.headerLabel[i] = new TQLabel( mLayout.headerCombo[i], name[i], this ); mLayout.headerLabel[i]->setFixedHeight( mLayout.headerLabel[i]->sizeHint().height() ); @@ -162,13 +162,13 @@ void LayoutDialogPage::setupLayoutPage( void ) text = i18n("Draw &footer below text"); - mLayout.footerCheck = new QCheckBox( text, this ); + mLayout.footerCheck = new TQCheckBox( text, this ); mLayout.footerCheck->setFixedSize( mLayout.footerCheck->sizeHint() ); - connect( mLayout.footerCheck, SIGNAL( toggled(bool)), - SLOT( slotDrawFooter(bool))); + connect( mLayout.footerCheck, TQT_SIGNAL( toggled(bool)), + TQT_SLOT( slotDrawFooter(bool))); topLayout->addWidget( mLayout.footerCheck, 0, AlignLeft ); - gbox = new QGridLayout( 5, 6, 0 ); + gbox = new TQGridLayout( 5, 6, 0 ); if( gbox == 0 ) { return; } topLayout->addLayout( gbox ); @@ -179,13 +179,13 @@ void LayoutDialogPage::setupLayoutPage( void ) for( i=0; i<4; i++ ) { - mLayout.footerCombo[i] = new QComboBox( false, this ); + mLayout.footerCombo[i] = new TQComboBox( false, this ); mLayout.footerCombo[i]->setFixedHeight( mLayout.footerCombo[i]->sizeHint().height() ); mLayout.footerCombo[i]->setMinimumWidth( mLayout.footerCombo[i]->fontMetrics().width("M")*10 ); - mLayout.footerLabel[i] = new QLabel( mLayout.footerCombo[i], name[i], + mLayout.footerLabel[i] = new TQLabel( mLayout.footerCombo[i], name[i], this ); mLayout.footerLabel[i]->setFixedHeight( mLayout.footerLabel[i]->sizeHint().height() ); @@ -223,7 +223,7 @@ void LayoutDialogPage::readConfiguration( void ) { if( mConfig != 0 ) { return; } - mConfig = new KSimpleConfig( QString("hexprinter") ); + mConfig = new KSimpleConfig( TQString("hexprinter") ); if( mConfig == 0 ) { return; } mConfig->setGroup( "PageLayout" ); @@ -300,16 +300,16 @@ void LayoutDialogPage::writeConfiguration( void ) } -QString LayoutDialogPage::headerText( uint index ) +TQString LayoutDialogPage::headerText( uint index ) { - static const QString text[4] = {"None","DateTime","PageNumber","FileName"}; + static const TQString text[4] = {"None","DateTime","PageNumber","FileName"}; return( text[ index > 3 ? 0 : index ] ); } -int LayoutDialogPage::headerTextIndex( const QString & headerText ) +int LayoutDialogPage::headerTextIndex( const TQString & headerText ) { - static const QString text[4] = {"None","DateTime","PageNumber","FileName"}; + static const TQString text[4] = {"None","DateTime","PageNumber","FileName"}; if( headerText != 0 ) { for( int i=0; i<4; i++ ) @@ -321,16 +321,16 @@ int LayoutDialogPage::headerTextIndex( const QString & headerText ) } -QString LayoutDialogPage::headerLine( uint index ) +TQString LayoutDialogPage::headerLine( uint index ) { - static const QString text[3] = {"None","SingleLine","Rectangle"}; + static const TQString text[3] = {"None","SingleLine","Rectangle"}; return( text[ index > 2 ? 0 : index ] ); } -int LayoutDialogPage::headerLineIndex( const QString & headerLine ) +int LayoutDialogPage::headerLineIndex( const TQString & headerLine ) { - static const QString text[3] = {"None","SingleLine","Rectangle"}; + static const TQString text[3] = {"None","SingleLine","Rectangle"}; if( headerLine != 0 ) { for( int i=0; i<3; i++ ) @@ -362,24 +362,24 @@ void LayoutDialogPage::slotDrawFooter( bool state ) } -void LayoutDialogPage::getOptions( QMap<QString,QString>& opts, bool /*incldef*/ ) +void LayoutDialogPage::getOptions( TQMap<TQString,TQString>& opts, bool /*incldef*/ ) { - opts[ "kde-khexedit-topmarginmm" ] = QString::number( mLayout.marginSpin[0]->value() ); - opts[ "kde-khexedit-bottommarginmm" ] = QString::number( mLayout.marginSpin[1]->value() ); - opts[ "kde-khexedit-leftmarginmm" ] = QString::number( mLayout.marginSpin[2]->value() ); - opts[ "kde-khexedit-rightmarginmm" ] = QString::number( mLayout.marginSpin[3]->value() ); + opts[ "kde-khexedit-topmarginmm" ] = TQString::number( mLayout.marginSpin[0]->value() ); + opts[ "kde-khexedit-bottommarginmm" ] = TQString::number( mLayout.marginSpin[1]->value() ); + opts[ "kde-khexedit-leftmarginmm" ] = TQString::number( mLayout.marginSpin[2]->value() ); + opts[ "kde-khexedit-rightmarginmm" ] = TQString::number( mLayout.marginSpin[3]->value() ); opts[ "kde-khexedit-headercheck" ] = (mLayout.headerCheck->isChecked() ? "true" : "false"); - opts[ "kde-khexedit-headercombo0" ] = QString::number( mLayout.headerCombo[0]->currentItem() ); - opts[ "kde-khexedit-headercombo1" ] = QString::number( mLayout.headerCombo[1]->currentItem() ); - opts[ "kde-khexedit-headercombo2" ] = QString::number( mLayout.headerCombo[2]->currentItem() ); - opts[ "kde-khexedit-headercombo3" ] = QString::number( mLayout.headerCombo[3]->currentItem() ); + opts[ "kde-khexedit-headercombo0" ] = TQString::number( mLayout.headerCombo[0]->currentItem() ); + opts[ "kde-khexedit-headercombo1" ] = TQString::number( mLayout.headerCombo[1]->currentItem() ); + opts[ "kde-khexedit-headercombo2" ] = TQString::number( mLayout.headerCombo[2]->currentItem() ); + opts[ "kde-khexedit-headercombo3" ] = TQString::number( mLayout.headerCombo[3]->currentItem() ); opts[ "kde-khexedit-footercheck" ] = (mLayout.footerCheck->isChecked() ? "true" : "false"); - opts[ "kde-khexedit-footercombo0" ] = QString::number( mLayout.footerCombo[0]->currentItem() ); - opts[ "kde-khexedit-footercombo1" ] = QString::number( mLayout.footerCombo[1]->currentItem() ); - opts[ "kde-khexedit-footercombo2" ] = QString::number( mLayout.footerCombo[2]->currentItem() ); - opts[ "kde-khexedit-footercombo3" ] = QString::number( mLayout.footerCombo[3]->currentItem() ); + opts[ "kde-khexedit-footercombo0" ] = TQString::number( mLayout.footerCombo[0]->currentItem() ); + opts[ "kde-khexedit-footercombo1" ] = TQString::number( mLayout.footerCombo[1]->currentItem() ); + opts[ "kde-khexedit-footercombo2" ] = TQString::number( mLayout.footerCombo[2]->currentItem() ); + opts[ "kde-khexedit-footercombo3" ] = TQString::number( mLayout.footerCombo[3]->currentItem() ); } diff --git a/khexedit/printdialogpage.h b/khexedit/printdialogpage.h index bdc58f6..d25fd48 100644 --- a/khexedit/printdialogpage.h +++ b/khexedit/printdialogpage.h @@ -35,10 +35,10 @@ class LayoutDialogPage : public KPrintDialogPage Q_OBJECT public: - LayoutDialogPage( QWidget *parent = 0, const char *name = 0 ); + LayoutDialogPage( TQWidget *parent = 0, const char *name = 0 ); ~LayoutDialogPage( void ); - void getOptions( QMap<QString,QString>& opts, bool incldef = false ); + void getOptions( TQMap<TQString,TQString>& opts, bool incldef = false ); private slots: void slotDrawHeader( bool state ); @@ -50,20 +50,20 @@ class LayoutDialogPage : public KPrintDialogPage void readConfiguration( void ); void writeConfiguration( void ); - QString headerText( uint index ); - QString headerLine( uint index ); - int headerTextIndex( const QString & headerText ); - int headerLineIndex( const QString & headerLine ); + TQString headerText( uint index ); + TQString headerLine( uint index ); + int headerTextIndex( const TQString & headerText ); + int headerLineIndex( const TQString & headerLine ); struct SLayoutWidgets { - QSpinBox *marginSpin[4]; - QCheckBox *headerCheck; - QCheckBox *footerCheck; - QLabel *headerLabel[4]; - QComboBox *headerCombo[4]; - QLabel *footerLabel[4]; - QComboBox *footerCombo[4]; + TQSpinBox *marginSpin[4]; + TQCheckBox *headerCheck; + TQCheckBox *footerCheck; + TQLabel *headerLabel[4]; + TQComboBox *headerCombo[4]; + TQLabel *footerLabel[4]; + TQComboBox *footerCombo[4]; }; KSimpleConfig *mConfig; diff --git a/khexedit/progress.h b/khexedit/progress.h index fa6e8a3..421637f 100644 --- a/khexedit/progress.h +++ b/khexedit/progress.h @@ -22,7 +22,7 @@ #ifndef _PROGRESS_H_ #define _PROGRESS_H_ -#include <qdatetime.h> +#include <tqdatetime.h> #include "hexerror.h" @@ -122,7 +122,7 @@ class CProgress private: ProgressFunc mProgressFunc; void *mClientData; - QTime mInterruptTimer; + TQTime mInterruptTimer; }; #endif diff --git a/khexedit/searchbar.cc b/khexedit/searchbar.cc index 44d4944..73baba6 100644 --- a/khexedit/searchbar.cc +++ b/khexedit/searchbar.cc @@ -24,7 +24,7 @@ #include "dialog.h" #include "hexvalidator.h" #include "searchbar.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> // crappy X11 headers #undef KeyPress @@ -51,43 +51,43 @@ static const char * close_xpm[] = { " ", " "}; -CSearchBar::CSearchBar( QWidget *parent, const char *name, WFlags f ) - :QFrame( parent, name, f ) +CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f ) + :TQFrame( parent, name, f ) { - setFrameStyle( QFrame::Panel | QFrame::Raised ); + setFrameStyle( TQFrame::Panel | TQFrame::Raised ); setLineWidth( 1 ); - mTypeCombo = new QComboBox( this ); - connect( mTypeCombo, SIGNAL(activated(int)), SLOT(selectorChanged(int)) ); - QStringList list; + mTypeCombo = new TQComboBox( this ); + connect( mTypeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(selectorChanged(int)) ); + TQStringList list; list << i18n("Hex") << i18n("Dec") << i18n("Oct") << i18n("Bin") << i18n("Txt"); mTypeCombo->insertStringList( list ); - mInputEdit = new QLineEdit( this ); - connect( mInputEdit, SIGNAL(textChanged(const QString&)), - SLOT(textChanged(const QString&)) ); + mInputEdit = new TQLineEdit( this ); + connect( mInputEdit, TQT_SIGNAL(textChanged(const TQString&)), + TQT_SLOT(textChanged(const TQString&)) ); mValidator = new CHexValidator( this, CHexValidator::regularText ); mInputEdit->setValidator( mValidator ); - mFindButton = new QPushButton( i18n("Find"), this ); + mFindButton = new TQPushButton( i18n("Find"), this ); mFindButton->setAutoDefault(false); - connect( mFindButton, SIGNAL(clicked()), this, SLOT(start()) ); - connect(mInputEdit,SIGNAL(returnPressed()),mFindButton,SLOT(animateClick())); + connect( mFindButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(start()) ); + connect(mInputEdit,TQT_SIGNAL(returnPressed()),mFindButton,TQT_SLOT(animateClick())); mFindButton->setFixedHeight( mTypeCombo->sizeHint().height() ); - mBackwards = new QCheckBox( i18n("Backwards"), this ); - mIgnoreCase = new QCheckBox( i18n("Ignore case"), this ); + mBackwards = new TQCheckBox( i18n("Backwards"), this ); + mIgnoreCase = new TQCheckBox( i18n("Ignore case"), this ); - mCloseButton = new QPushButton( this ); + mCloseButton = new TQPushButton( this ); mCloseButton->setAutoDefault(false); - mCloseButton->setPixmap( QPixmap( close_xpm ) ); - connect( mCloseButton, SIGNAL(clicked()), this, SLOT(hideWidget()) ); + mCloseButton->setPixmap( TQPixmap( close_xpm ) ); + connect( mCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideWidget()) ); // // Make layout // - QHBoxLayout *hlay = new QHBoxLayout( this, 4, 6 ); + TQHBoxLayout *hlay = new TQHBoxLayout( this, 4, 6 ); hlay->addWidget( mTypeCombo ); hlay->addWidget( mInputEdit ); hlay->addWidget( mFindButton ); @@ -105,21 +105,21 @@ CSearchBar::CSearchBar( QWidget *parent, const char *name, WFlags f ) // // Espen 2000-04-21 -// Qt 2.1: Seems like the QLineEdit::returnPressed() does not work when +// Qt 2.1: Seems like the TQLineEdit::returnPressed() does not work when // I install a validator. So I catch the event manually // -bool CSearchBar::eventFilter( QObject *o, QEvent *e ) +bool CSearchBar::eventFilter( TQObject *o, TQEvent *e ) { - if( o == mInputEdit && e->type() == QEvent::KeyPress ) + if( o == mInputEdit && e->type() == TQEvent::KeyPress ) { - QKeyEvent *ke = (QKeyEvent*)e; + TQKeyEvent *ke = (TQKeyEvent*)e; if( ke->key() == Key_Return ) { mFindButton->animateClick(); return true; } } - return QFrame::eventFilter( o, e ); + return TQFrame::eventFilter( o, e ); } // @@ -143,7 +143,7 @@ void CSearchBar::selectorChanged( int index ) } -void CSearchBar::textChanged( const QString &text ) +void CSearchBar::textChanged( const TQString &text ) { mFindString[ mTypeCombo->currentItem() ] = text; mValidator->convert( mFindData, mFindString[ mTypeCombo->currentItem() ] ); @@ -162,7 +162,7 @@ void CSearchBar::start( void ) { if( mFindData.isEmpty() == true ) { - showEntryFailure( this, QString("") ); + showEntryFailure( this, TQString("") ); return; } @@ -178,9 +178,9 @@ void CSearchBar::start( void ) } -void CSearchBar::showEvent( QShowEvent *e ) +void CSearchBar::showEvent( TQShowEvent *e ) { - QFrame::showEvent(e); + TQFrame::showEvent(e); mInputEdit->setFocus(); } diff --git a/khexedit/searchbar.h b/khexedit/searchbar.h index c11f652..1434ec1 100644 --- a/khexedit/searchbar.h +++ b/khexedit/searchbar.h @@ -20,7 +20,7 @@ #ifndef _SEARCHBAR_H_ #define _SEARCHBAR_H_ -#include <qframe.h> +#include <tqframe.h> #include "hexbuffer.h" @@ -35,19 +35,19 @@ class CSearchBar : public QFrame Q_OBJECT public: - CSearchBar( QWidget *parent=0, const char *name=0, WFlags f=0 ); - virtual bool eventFilter( QObject *o, QEvent *e ); + CSearchBar( TQWidget *parent=0, const char *name=0, WFlags f=0 ); + virtual bool eventFilter( TQObject *o, TQEvent *e ); public slots: void cursorMoved(); protected: - virtual void showEvent( QShowEvent * ); + virtual void showEvent( TQShowEvent * ); private slots: void hideWidget(); void selectorChanged( int index ); - void textChanged( const QString &text ); + void textChanged( const TQString &text ); void start(); signals: @@ -55,15 +55,15 @@ class CSearchBar : public QFrame void findData( SSearchControl &sc, uint mode, bool navigator ); private: - QPushButton *mCloseButton; - QPushButton *mFindButton; - QComboBox *mTypeCombo; - QLineEdit *mInputEdit; - QCheckBox *mBackwards; - QCheckBox *mIgnoreCase; + TQPushButton *mCloseButton; + TQPushButton *mFindButton; + TQComboBox *mTypeCombo; + TQLineEdit *mInputEdit; + TQCheckBox *mBackwards; + TQCheckBox *mIgnoreCase; - QString mFindString[5]; - QByteArray mFindData; + TQString mFindString[5]; + TQByteArray mFindData; CHexValidator *mValidator; uint mSearchMode; }; diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cc index 6e45cf2..872698e 100644 --- a/khexedit/statusbarprogress.cc +++ b/khexedit/statusbarprogress.cc @@ -21,23 +21,23 @@ #include "statusbarprogress.h" -#include <qpainter.h> +#include <tqpainter.h> #include <kapplication.h> #include <kglobalsettings.h> #include <klocale.h> -#include <qstyle.h> +#include <tqstyle.h> -CStatusBarProgress::CStatusBarProgress( QWidget *parent, const char *name ) - : QFrame(parent, name), QRangeControl(0, 100, 1, 10, 0), +CStatusBarProgress::CStatusBarProgress( TQWidget *parent, const char *name ) + : TQFrame(parent, name), TQRangeControl(0, 100, 1, 10, 0), mOrientation( Horizontal ) { initialize(); } CStatusBarProgress::CStatusBarProgress( Orientation orientation, - QWidget *parent, const char *name ) - : QFrame(parent, name), QRangeControl(0, 100, 1, 10, 0), + TQWidget *parent, const char *name ) + : TQFrame(parent, name), TQRangeControl(0, 100, 1, 10, 0), mOrientation( orientation ) { initialize(); @@ -45,8 +45,8 @@ CStatusBarProgress::CStatusBarProgress( Orientation orientation, CStatusBarProgress::CStatusBarProgress( int minValue, int maxValue, int value, Orientation orientation, - QWidget *parent, const char *name ) - : QFrame(parent, name), QRangeControl(minValue, maxValue, 1, 10, value), + TQWidget *parent, const char *name ) + : TQFrame(parent, name), TQRangeControl(minValue, maxValue, 1, 10, value), mOrientation(orientation) { initialize(); @@ -72,7 +72,7 @@ void CStatusBarProgress::initialize( void ) mTextColor = palette().active().text(); setBackgroundColor( palette().active().background() ); - QFont font( KGlobalSettings::generalFont() ); + TQFont font( KGlobalSettings::generalFont() ); font.setBold( true ); setFont( font ); @@ -81,7 +81,7 @@ void CStatusBarProgress::initialize( void ) } -void CStatusBarProgress::setBarPixmap( const QPixmap &pixmap ) +void CStatusBarProgress::setBarPixmap( const TQPixmap &pixmap ) { if( pixmap.isNull() == true ) { @@ -89,10 +89,10 @@ void CStatusBarProgress::setBarPixmap( const QPixmap &pixmap ) } delete mBarPixmap; - mBarPixmap = new QPixmap( pixmap ); + mBarPixmap = new TQPixmap( pixmap ); } -void CStatusBarProgress::setBarColor( const QColor &color ) +void CStatusBarProgress::setBarColor( const TQColor &color ) { mBarColor = color; delete mBarPixmap; @@ -120,7 +120,7 @@ void CStatusBarProgress::setOrientation( Orientation orientation ) void CStatusBarProgress::setValue(int value) { mCurPage = mMaxPage = -1; - QRangeControl::setValue(value); + TQRangeControl::setValue(value); } void CStatusBarProgress::setValue( int curPage, int maxPage ) @@ -128,14 +128,14 @@ void CStatusBarProgress::setValue( int curPage, int maxPage ) if( curPage <= 0 || maxPage <= 0 || curPage > maxPage ) { mCurPage = mMaxPage = -1; - QRangeControl::setValue(0); + TQRangeControl::setValue(0); } else { mCurPage = curPage; mMaxPage = maxPage; float fraction = (float)curPage/(float)maxPage; - QRangeControl::setValue( (int)(fraction*100.0) ); + TQRangeControl::setValue( (int)(fraction*100.0) ); } } @@ -149,7 +149,7 @@ void CStatusBarProgress::setTextEnabled( bool state ) } } -void CStatusBarProgress::setText( const QString &msg ) +void CStatusBarProgress::setText( const TQString &msg ) { mMsg = msg; if( mTextEnabled == true ) @@ -161,12 +161,12 @@ void CStatusBarProgress::setText( const QString &msg ) -const QColor & CStatusBarProgress::barColor( void ) const +const TQColor & CStatusBarProgress::barColor( void ) const { return( mBarColor ); } -const QPixmap * CStatusBarProgress::barPixmap( void ) const +const TQPixmap * CStatusBarProgress::barPixmap( void ) const { return( mBarPixmap ); } @@ -176,9 +176,9 @@ bool CStatusBarProgress::textEnabled( void ) const return( mTextEnabled ); } -QSize CStatusBarProgress::sizeHint( void ) const +TQSize CStatusBarProgress::sizeHint( void ) const { - QSize s( size() ); + TQSize s( size() ); if( orientation() == CStatusBarProgress::Vertical ) { @@ -232,19 +232,19 @@ void CStatusBarProgress::adjustStyle( void ) switch( style().SH_GUIStyle) { case WindowsStyle: - setFrameStyle( QFrame::NoFrame ); + setFrameStyle( TQFrame::NoFrame ); break; case MotifStyle: default: - setFrameStyle( QFrame::Panel|QFrame::Sunken ); + setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); setLineWidth( 1 ); break; } update(); } -void CStatusBarProgress::paletteChange( const QPalette & ) +void CStatusBarProgress::paletteChange( const TQPalette & ) { mBarColor = palette().active().highlight(); mBarTextColor = palette().active().highlightedText(); @@ -252,14 +252,14 @@ void CStatusBarProgress::paletteChange( const QPalette & ) setBackgroundColor( palette().active().background() ); } -void CStatusBarProgress::drawText( QPainter *p ) +void CStatusBarProgress::drawText( TQPainter *p ) { - QRect r(contentsRect()); - QString s; + TQRect r(contentsRect()); + TQString s; if( mMsg.isEmpty() == true ) { - s = QString("%1%").arg(recalcValue(100)); + s = TQString("%1%").arg(recalcValue(100)); } else { @@ -280,11 +280,11 @@ void CStatusBarProgress::drawText( QPainter *p ) p->drawText( r, AlignCenter, s ); } -void CStatusBarProgress::drawContents(QPainter *p) +void CStatusBarProgress::drawContents(TQPainter *p) { - QRect cr = contentsRect(), er = cr; + TQRect cr = contentsRect(), er = cr; fr = cr; - QBrush fb(mBarColor), eb(backgroundColor() ); + TQBrush fb(mBarColor), eb(backgroundColor() ); if( mBarPixmap != 0 ) { @@ -323,7 +323,7 @@ void CStatusBarProgress::drawContents(QPainter *p) { fr.setHeight(cr.height() - 2 * margin); fr.setWidth((int)(0.67 * fr.height())); - fr.moveTopLeft(QPoint(cr.left() + margin, cr.top() + margin)); + fr.moveTopLeft(TQPoint(cr.left() + margin, cr.top() + margin)); dx = fr.width() + margin; dy = 0; max = (cr.width() - margin) / (fr.width() + margin) + 1; @@ -333,7 +333,7 @@ void CStatusBarProgress::drawContents(QPainter *p) { fr.setWidth(cr.width() - 2 * margin); fr.setHeight((int)(0.67 * fr.width())); - fr.moveBottomLeft(QPoint(cr.left() + margin, cr.bottom() - margin)); + fr.moveBottomLeft(TQPoint(cr.left() + margin, cr.bottom() - margin)); dx = 0; dy = - (fr.height() + margin); max = (cr.height() - margin) / (fr.height() + margin) + 1; @@ -366,7 +366,7 @@ void CStatusBarProgress::drawContents(QPainter *p) } -void CStatusBarProgress::mousePressEvent( QMouseEvent */*e*/ ) +void CStatusBarProgress::mousePressEvent( TQMouseEvent */*e*/ ) { emit pressed(); } diff --git a/khexedit/statusbarprogress.h b/khexedit/statusbarprogress.h index ca605f3..de93b5a 100644 --- a/khexedit/statusbarprogress.h +++ b/khexedit/statusbarprogress.h @@ -22,10 +22,10 @@ #ifndef _STATUSBAR_PROGRESS_H_ #define _STATUSBAR_PROGRESS_H_ -#include <qframe.h> -#include <qrangecontrol.h> +#include <tqframe.h> +#include <tqrangecontrol.h> -class CStatusBarProgress : public QFrame, public QRangeControl +class CStatusBarProgress : public TQFrame, public TQRangeControl { Q_OBJECT @@ -46,18 +46,18 @@ class CStatusBarProgress : public QFrame, public QRangeControl /** * Construct a default progress bar. Orientation is horizontal. */ - CStatusBarProgress(QWidget *parent=0, const char *name=0); + CStatusBarProgress(TQWidget *parent=0, const char *name=0); /** * Construct a KProgress bar with an orientation. */ - CStatusBarProgress(Orientation, QWidget *parent=0, const char *name=0); + CStatusBarProgress(Orientation, TQWidget *parent=0, const char *name=0); /** * Construct a KProgress bar with minimum, maximum and initial value. */ CStatusBarProgress(int minValue, int maxValue, int value, Orientation, - QWidget *parent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); /** * Destructor @@ -72,12 +72,12 @@ class CStatusBarProgress : public QFrame, public QRangeControl /** * Set the color of the progress bar. */ - void setBarColor(const QColor &); + void setBarColor(const TQColor &); /** * Set a pixmap to be shown in the progress bar. */ - void setBarPixmap(const QPixmap &); + void setBarPixmap(const TQPixmap &); /** * Set the orientation of the progress bar. @@ -93,12 +93,12 @@ class CStatusBarProgress : public QFrame, public QRangeControl /** * Retrieve the bar color. */ - const QColor &barColor() const; + const TQColor &barColor() const; /** * Retrieve the bar pixmap. */ - const QPixmap *barPixmap() const; + const TQPixmap *barPixmap() const; /** * Retrieve the orientation. @@ -114,7 +114,7 @@ class CStatusBarProgress : public QFrame, public QRangeControl * Returns the recommended width for vertical progress bars or * the recommended height for vertical progress bars */ - virtual QSize sizeHint() const; + virtual TQSize sizeHint() const; public slots: @@ -122,7 +122,7 @@ class CStatusBarProgress : public QFrame, public QRangeControl void setValue( int, int); void advance( int ); void setTextEnabled( bool state ); - void setText( const QString &msg ); + void setText( const TQString &msg ); signals: void percentageChanged(int); @@ -132,26 +132,26 @@ class CStatusBarProgress : public QFrame, public QRangeControl void valueChange(); void rangeChange(); void styleChange( GUIStyle ); - void paletteChange( const QPalette & ); - void drawContents( QPainter * ); - void mousePressEvent( QMouseEvent *e ); + void paletteChange( const TQPalette & ); + void drawContents( TQPainter * ); + void mousePressEvent( TQMouseEvent *e ); private: - QPixmap *mBarPixmap; + TQPixmap *mBarPixmap; QColor mBarColor; QColor mBarTextColor; QColor mTextColor; - QRect fr; + TQRect fr; BarStyle mBarStyle; Orientation mOrientation; bool mTextEnabled; - QString mMsg; + TQString mMsg; int mCurPage; int mMaxPage; void initialize( void ); int recalcValue( int ); - void drawText( QPainter * ); + void drawText( TQPainter * ); void adjustStyle( void ); }; diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cc index dff774c..5e93f28 100644 --- a/khexedit/stringdialog.cc +++ b/khexedit/stringdialog.cc @@ -18,11 +18,11 @@ * */ -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qspinbox.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqspinbox.h> #include <kconfig.h> #include <kglobalsettings.h> @@ -31,58 +31,58 @@ #include "listview.h" #include "stringdialog.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> -CStringDialog::CStringDialog( QWidget *parent, const char *name, bool modal ) +CStringDialog::CStringDialog( TQWidget *parent, const char *name, bool modal ) : KDialogBase( Plain, i18n("Extract Strings"), Help|User1|Cancel, User1, parent, name, modal, true, i18n("&Update") ), mMaxLength(0), mBusy(false), mDirty(false) { - setHelp( "khexedit/khexedit.html", QString::null ); + setHelp( "khexedit/khexedit.html", TQString::null ); - QString text; - QVBoxLayout *topLayout = new QVBoxLayout( plainPage(), 0, spacingHint() ); + TQString text; + TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - QGridLayout *glay = new QGridLayout( 3, 3, spacingHint() ); + TQGridLayout *glay = new TQGridLayout( 3, 3, spacingHint() ); topLayout->addLayout( glay ); glay->setColStretch( 1, 10 ); - mLengthSpin = new QSpinBox( plainPage() ); + mLengthSpin = new TQSpinBox( plainPage() ); mLengthSpin->setMinimumWidth( fontMetrics().maxWidth()*17 ); mLengthSpin->setRange( 1, 1000000 ); mLengthSpin->setValue( 4 ); glay->addMultiCellWidget( mLengthSpin, 0, 0, 1, 2 ); text = i18n("&Minimum length:"); - QLabel *label = new QLabel( mLengthSpin, text, plainPage() ); + TQLabel *label = new TQLabel( mLengthSpin, text, plainPage() ); glay->addWidget( label, 0, 0, AlignRight ); - mFilter = new QLineEdit( plainPage() ); + mFilter = new TQLineEdit( plainPage() ); mFilter->setMinimumWidth( fontMetrics().maxWidth()*17 ); mFilter->setText("*"); glay->addWidget( mFilter, 1, 1 ); text = i18n("&Filter:"); - label = new QLabel( mFilter, text, plainPage() ); + label = new TQLabel( mFilter, text, plainPage() ); glay->addWidget( label, 1, 0, AlignRight ); - QPushButton *useButton = new QPushButton( plainPage(), "use" ); + TQPushButton *useButton = new TQPushButton( plainPage(), "use" ); useButton->setText( i18n("&Use") ); useButton->setAutoDefault( false ); - connect( useButton, SIGNAL(clicked()),this,SLOT(slotUser1()) ); + connect( useButton, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotUser1()) ); glay->addWidget( useButton, 1, 2 ); - QWidget *helper = new QWidget( plainPage() ); + TQWidget *helper = new TQWidget( plainPage() ); glay->addMultiCellWidget( helper, 2, 2, 1, 2 ); - QHBoxLayout *hlay = new QHBoxLayout( helper, 0, spacingHint() ); + TQHBoxLayout *hlay = new TQHBoxLayout( helper, 0, spacingHint() ); text = i18n("&Ignore case"); - mIgnoreCaseCheck = new QCheckBox( text, helper ); + mIgnoreCaseCheck = new TQCheckBox( text, helper ); hlay->addWidget( mIgnoreCaseCheck ); text = i18n("Show offset as &decimal"); - mOffsetDecimalCheck = new QCheckBox( text, helper ); + mOffsetDecimalCheck = new TQCheckBox( text, helper ); hlay->addWidget( mOffsetDecimalCheck ); hlay->addStretch(10); @@ -95,33 +95,33 @@ CStringDialog::CStringDialog( QWidget *parent, const char *name, bool modal ) mStringList->addColumn( i18n("Offset") ); mStringList->addColumn( i18n("String") ); mStringList->setAllColumnsShowFocus( true ); - mStringList->setFrameStyle( QFrame::WinPanel + QFrame::Sunken ); + mStringList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken ); - connect( mStringList, SIGNAL(selectionChanged()), - SLOT(selectionChanged())); + connect( mStringList, TQT_SIGNAL(selectionChanged()), + TQT_SLOT(selectionChanged())); topLayout->addWidget( mStringList, 10 ); - hlay = new QHBoxLayout( topLayout ); + hlay = new TQHBoxLayout( topLayout ); text = i18n("Number of strings:"); - label = new QLabel( text, plainPage() ); + label = new TQLabel( text, plainPage() ); hlay->addWidget( label, AlignLeft ); - mListSizeLabel = new QLabel( QString(), plainPage() ); + mListSizeLabel = new TQLabel( TQString(), plainPage() ); mListSizeLabel->setFixedWidth( fontMetrics().maxWidth()*10 ); hlay->addWidget( mListSizeLabel, AlignLeft|AlignHCenter ); text = i18n("Displayed:"); - label = new QLabel( text, plainPage() ); + label = new TQLabel( text, plainPage() ); hlay->addWidget( label, AlignLeft ); - mDisplaySizeLabel = new QLabel( QString(""), plainPage() ); + mDisplaySizeLabel = new TQLabel( TQString(""), plainPage() ); mDisplaySizeLabel->setFixedWidth( fontMetrics().maxWidth()*10 ); hlay->addWidget( mDisplaySizeLabel, AlignLeft|AlignHCenter); hlay->addStretch( 10 ); - mDirtyLabel = new QLabel( plainPage() ); + mDirtyLabel = new TQLabel( plainPage() ); topLayout->addWidget( mDirtyLabel ); readConfiguration(); @@ -141,7 +141,7 @@ CStringDialog::~CStringDialog( void ) } -void CStringDialog::showEvent( QShowEvent *e ) +void CStringDialog::showEvent( TQShowEvent *e ) { KDialogBase::showEvent(e); mLengthSpin->setFocus(); @@ -194,7 +194,7 @@ void CStringDialog::slotUser1( void ) // Start if( mRegExp.isValid() == false ) { - QString msg = i18n("" + TQString msg = i18n("" "The filter expression you have specified is illegal. " "You must specify a valid regular expression.\n" "Continue without filter?"); @@ -218,10 +218,10 @@ void CStringDialog::slotUser1( void ) // Start } -void CStringDialog::startGoto( QListViewItem *item ) +void CStringDialog::startGoto( TQListViewItem *item ) { - QString str_offset = item->text(0); - QString string = item->text(1); + TQString str_offset = item->text(0); + TQString string = item->text(1); uint offset; if( stringData().decimalOffset == true ) @@ -275,11 +275,11 @@ void CStringDialog::selectionChanged() } -void CStringDialog::timerEvent( QTimerEvent * ) +void CStringDialog::timerEvent( TQTimerEvent * ) { killTimers(); - QListViewItem *item = mStringList->currentItem(); + TQListViewItem *item = mStringList->currentItem(); if( item == 0 ) { slotUser1(); @@ -289,7 +289,7 @@ void CStringDialog::timerEvent( QTimerEvent * ) } -void CStringDialog::resizeEvent( QResizeEvent * ) +void CStringDialog::resizeEvent( TQResizeEvent * ) { setColumnWidth(); } @@ -303,8 +303,8 @@ int CStringDialog::updateList( CProgress &p ) int offsetLen = stringData().offsetLen(); - QPtrList<QString> &list = stringData().list(); - for( const QString *str = list.first(); str != 0; str = list.next() ) + TQPtrList<TQString> &list = stringData().list(); + for( const TQString *str = list.first(); str != 0; str = list.next() ) { appendListItem( *str, offsetLen ); mMaxLength = QMAX( mMaxLength, str->length() ); @@ -361,19 +361,19 @@ void CStringDialog::enableList( bool state ) } -void CStringDialog::appendListItem( const QString &str, uint offsetLen ) +void CStringDialog::appendListItem( const TQString &str, uint offsetLen ) { if( mRegExp.search ( str, offsetLen ) != -1 ) { - new QListViewItem( mStringList, str.left(offsetLen), str.mid(offsetLen) ); + new TQListViewItem( mStringList, str.left(offsetLen), str.mid(offsetLen) ); } } void CStringDialog::updateListInfo( void ) { - mListSizeLabel->setText( QString("%1").arg(mStringData.count()) ); - mDisplaySizeLabel->setText( QString("%1").arg(mStringList->childCount()) ); + mListSizeLabel->setText( TQString("%1").arg(mStringData.count()) ); + mDisplaySizeLabel->setText( TQString("%1").arg(mStringList->childCount()) ); setColumnWidth(); } @@ -381,7 +381,7 @@ void CStringDialog::updateListInfo( void ) void CStringDialog::setColumnWidth( void ) { - const QFontMetrics &fm = mStringList->fontMetrics(); + const TQFontMetrics &fm = mStringList->fontMetrics(); if( mStringData.count() == 0 ) { diff --git a/khexedit/stringdialog.h b/khexedit/stringdialog.h index ec731e4..23bb051 100644 --- a/khexedit/stringdialog.h +++ b/khexedit/stringdialog.h @@ -31,7 +31,7 @@ class QLineEdit; class QListView; class QSpinBox; -#include <qregexp.h> +#include <tqregexp.h> #include <kdialogbase.h> class CListView; @@ -43,7 +43,7 @@ class CStringDialog : public KDialogBase Q_OBJECT public: - CStringDialog( QWidget *parent=0, const char *name = 0, bool modal=false ); + CStringDialog( TQWidget *parent=0, const char *name = 0, bool modal=false ); ~CStringDialog( void ); int updateList( CProgress &p ); @@ -61,17 +61,17 @@ class CStringDialog : public KDialogBase protected slots: virtual void slotUser1( void ); - virtual void startGoto( QListViewItem * ); + virtual void startGoto( TQListViewItem * ); virtual void selectionChanged( ); protected: - virtual void timerEvent( QTimerEvent *e ); - virtual void resizeEvent( QResizeEvent *e ); - virtual void showEvent( QShowEvent *e ); + virtual void timerEvent( TQTimerEvent *e ); + virtual void resizeEvent( TQResizeEvent *e ); + virtual void showEvent( TQShowEvent *e ); private: void enableList( bool state ); - void appendListItem( const QString &str, uint offsetSize ); + void appendListItem( const TQString &str, uint offsetSize ); void updateListInfo( void ); void setColumnWidth( void ); void readConfiguration( void ); @@ -79,19 +79,19 @@ class CStringDialog : public KDialogBase private: CStringCollectControl mStringData; - QRegExp mRegExp; + TQRegExp mRegExp; uint mMaxLength; bool mBusy; bool mDirty; - QSpinBox *mLengthSpin; - QLineEdit *mFilter; - QCheckBox *mIgnoreCaseCheck; - QCheckBox *mOffsetDecimalCheck; + TQSpinBox *mLengthSpin; + TQLineEdit *mFilter; + TQCheckBox *mIgnoreCaseCheck; + TQCheckBox *mOffsetDecimalCheck; CListView *mStringList; - QLabel *mListSizeLabel; - QLabel *mDisplaySizeLabel; - QLabel *mDirtyLabel; + TQLabel *mListSizeLabel; + TQLabel *mDisplaySizeLabel; + TQLabel *mDirtyLabel; }; diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc index 733173e..3d65820 100644 --- a/khexedit/toplevel.cc +++ b/khexedit/toplevel.cc @@ -20,10 +20,10 @@ // kate: space-indent on; indent-width 2; replace-tabs on; -#include <qptrlist.h> -#include <qsignalmapper.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqptrlist.h> +#include <tqsignalmapper.h> +#include <tqtimer.h> +#include <tqtooltip.h> #include <kaction.h> #include <kiconloader.h> @@ -43,7 +43,7 @@ #include "toplevel.h" -QPtrList<KHexEdit> KHexEdit::mWindowList; +TQPtrList<KHexEdit> KHexEdit::mWindowList; KHexEdit::KHexEdit( void ) : KMainWindow(0, "toplevel"), mStartupOffset(0), @@ -60,7 +60,7 @@ KHexEdit::KHexEdit( void ) // // I use an eventfilter to catch all drag/drop events for the // area outside the editor window. It will only accept KURLDrag. - // (The editor window will catch KURLDrag, QTextDrag and CHexDrag) + // (The editor window will catch KURLDrag, TQTextDrag and CHexDrag) // installEventFilter( this ); setAcceptDrops(true); @@ -68,43 +68,43 @@ KHexEdit::KHexEdit( void ) // // Prepare menus and status bar // - mAction.bookmarkMapper = new QSignalMapper(this); - connect(mAction.bookmarkMapper, SIGNAL(mapped(int)), editor(), SLOT(gotoBookmark(int))); + mAction.bookmarkMapper = new TQSignalMapper(this); + connect(mAction.bookmarkMapper, TQT_SIGNAL(mapped(int)), editor(), TQT_SLOT(gotoBookmark(int))); setupActions(); setupStatusBar(); - connect( hexView(), SIGNAL( cursorChanged( SCursorState & ) ), - this, SLOT( cursorChanged( SCursorState & ) ) ); - connect( hexView(), SIGNAL( editMode( CHexBuffer::EEditMode ) ), - this, SLOT( editMode( CHexBuffer::EEditMode ) ) ); - connect( hexView(), SIGNAL( encodingChanged( const SEncodeState &)), - this, SLOT( encodingChanged( const SEncodeState & )) ); - connect( hexView(), SIGNAL( textWidth( uint ) ), - this, SLOT( textWidth( uint ) ) ); - connect( hexView(), SIGNAL( fileState( SFileState & ) ), - this, SLOT( fileState( SFileState & ) ) ); - connect( hexView(), SIGNAL( layoutChanged( const SDisplayLayout & ) ), - this, SLOT( layoutChanged( const SDisplayLayout & ) ) ); - connect( hexView(), SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), - this, SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); - connect( hexView(), SIGNAL( bookmarkChanged( QPtrList<SCursorOffset> &)), - this, SLOT( bookmarkChanged( QPtrList<SCursorOffset> & ) ) ); - connect( hexView(), SIGNAL( fileName( const QString &, bool ) ), - this, SLOT( fileActive( const QString &, bool ) ) ); - connect( hexView(), SIGNAL( fileRename( const QString &, const QString & )), - this, SLOT( fileRename( const QString &, const QString & ) ) ); - connect( hexView(), SIGNAL( fileClosed( const QString & ) ), - this, SLOT( fileClosed( const QString & ) ) ); - connect( editor(), SIGNAL( errorLoadFile( const QString & ) ), - this, SLOT( removeRecentFile( const QString & ) ) ); - connect( editor(), SIGNAL( operationChanged( bool ) ), - this, SLOT( operationChanged( bool ) ) ); - connect( editor(), SIGNAL( removeRecentFiles() ), - this, SLOT( removeRecentFiles() ) ); - connect( mManager, SIGNAL( conversionClosed() ), - this, SLOT(conversionClosed()) ); - connect( mManager, SIGNAL( searchBarClosed() ), - this, SLOT(searchBarClosed()) ); + 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()) ); // // Read configuration from file and set the default editor size. @@ -125,68 +125,68 @@ KHexEdit::~KHexEdit( void ) void KHexEdit::setupActions( void ) { - KStdAction::openNew( editor(), SLOT(newFile()), actionCollection() ); - KStdAction::open( editor(), SLOT(open()), actionCollection() ); - KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), + KStdAction::openNew( editor(), TQT_SLOT(newFile()), actionCollection() ); + KStdAction::open( editor(), TQT_SLOT(open()), actionCollection() ); + KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); mAction.insert = new KAction( i18n("&Insert..."), CTRL+Key_I, - editor(), SLOT(insertFile()), actionCollection(), "insert_file" ); - mAction.openRecent = KStdAction::openRecent( this, SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); - mAction.save = KStdAction::save( editor(), SLOT(save()), actionCollection() ); - mAction.saveAs = KStdAction::saveAs( editor(), SLOT(saveAs()), actionCollection() ); - mAction.revert = KStdAction::revert( editor(), SLOT(reload()), actionCollection() ); - //mAction.revert = KStdAction::revert( this, SLOT(resizeTest()), actionCollection() ); - - mAction.close = KStdAction::close( editor(), SLOT(close()), actionCollection() ); - mAction.print = KStdAction::print( editor(), SLOT(print()), actionCollection() ); + editor(), TQT_SLOT(insertFile()), actionCollection(), "insert_file" ); + mAction.openRecent = KStdAction::openRecent( this, TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); + mAction.save = KStdAction::save( editor(), TQT_SLOT(save()), actionCollection() ); + mAction.saveAs = KStdAction::saveAs( editor(), TQT_SLOT(saveAs()), actionCollection() ); + mAction.revert = KStdAction::revert( editor(), TQT_SLOT(reload()), actionCollection() ); + //mAction.revert = KStdAction::revert( this, TQT_SLOT(resizeTest()), actionCollection() ); + + mAction.close = KStdAction::close( editor(), TQT_SLOT(close()), actionCollection() ); + mAction.print = KStdAction::print( editor(), TQT_SLOT(print()), actionCollection() ); mAction.exportData = new KAction( i18n("E&xport..."), 0, - editor(), SLOT(exportDialog()), actionCollection(), "export" ); + editor(), TQT_SLOT(exportDialog()), actionCollection(), "export" ); mAction.cancel = new KAction( i18n("&Cancel Operation"), - "stop", 0, editor(), SLOT(stop()), actionCollection(), "cancel" ); + "stop", 0, editor(), TQT_SLOT(stop()), actionCollection(), "cancel" ); mAction.readOnly = new KToggleAction( i18n("&Read Only"), - 0, editor(), SLOT(toggleWriteProtection()),actionCollection(), "read_only" ); + 0, editor(), TQT_SLOT(toggleWriteProtection()),actionCollection(), "read_only" ); mAction.resizeLock = new KToggleAction( i18n("&Allow Resize"), - 0, editor(), SLOT(toggleResizeLock()),actionCollection(), "resize_lock" ); + 0, editor(), TQT_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" ); mAction.newWindow = new KAction( i18n("N&ew Window"), - 0, this, SLOT(newWindow()),actionCollection(), "new_window" ); + 0, this, TQT_SLOT(newWindow()),actionCollection(), "new_window" ); mAction.closeWindow= new KAction( i18n("Close &Window"), - 0, this, SLOT(closeWindow()),actionCollection(), "close_window" ); - mAction.quit = KStdAction::quit( this, SLOT(closeProgram()), actionCollection() ); - - mAction.undo = KStdAction::undo( editor(), SLOT(undo()), actionCollection() ); - mAction.redo = KStdAction::redo( editor(), SLOT(redo()), actionCollection() ); - mAction.cut = KStdAction::cut( editor(), SLOT(cut()), actionCollection() ); - mAction.copy = KStdAction::copy( editor(), SLOT(copy()), actionCollection() ); - mAction.paste = KStdAction::paste( editor(), SLOT(paste()), actionCollection() ); - mAction.selectAll = KStdAction::selectAll(editor(), SLOT(selectAll()),actionCollection() ); - mAction.unselect = KStdAction::deselect(editor(), SLOT(unselect()), actionCollection()); - mAction.find = KStdAction::find( editor(), SLOT(find()), actionCollection() ); - mAction.findNext = KStdAction::findNext(editor(), SLOT(findNext()), actionCollection() ); - mAction.findPrev = KStdAction::findPrev(editor(),SLOT(findPrevious()),actionCollection() ); - mAction.replace = KStdAction::replace( editor(), SLOT(replace()), actionCollection() ); + 0, this, TQT_SLOT(closeWindow()),actionCollection(), "close_window" ); + mAction.quit = KStdAction::quit( this, TQT_SLOT(closeProgram()), actionCollection() ); + + mAction.undo = KStdAction::undo( editor(), TQT_SLOT(undo()), actionCollection() ); + mAction.redo = KStdAction::redo( editor(), TQT_SLOT(redo()), actionCollection() ); + mAction.cut = KStdAction::cut( editor(), TQT_SLOT(cut()), actionCollection() ); + mAction.copy = KStdAction::copy( editor(), TQT_SLOT(copy()), actionCollection() ); + mAction.paste = KStdAction::paste( editor(), TQT_SLOT(paste()), actionCollection() ); + mAction.selectAll = KStdAction::selectAll(editor(), TQT_SLOT(selectAll()),actionCollection() ); + mAction.unselect = KStdAction::deselect(editor(), TQT_SLOT(unselect()), actionCollection()); + mAction.find = KStdAction::find( editor(), TQT_SLOT(find()), actionCollection() ); + mAction.findNext = KStdAction::findNext(editor(), TQT_SLOT(findNext()), actionCollection() ); + mAction.findPrev = KStdAction::findPrev(editor(),TQT_SLOT(findPrevious()),actionCollection() ); + mAction.replace = KStdAction::replace( editor(), TQT_SLOT(replace()), actionCollection() ); mAction.gotoOffset = new KAction( i18n("&Goto Offset..."), CTRL+Key_G, - editor(), SLOT(gotoOffset()),actionCollection(), "goto_offset" ); + editor(), TQT_SLOT(gotoOffset()),actionCollection(), "goto_offset" ); mAction.insertPattern = new KAction( i18n("&Insert Pattern..."), CTRL+Key_Insert, - editor(), SLOT(insertPattern()), actionCollection(), "insert_pattern" ); + editor(), TQT_SLOT(insertPattern()), actionCollection(), "insert_pattern" ); mAction.copyAsText = new KAction( i18n("Copy as &Text"), 0, - editor(), SLOT(copyText()), actionCollection(), "copy_as_text" ); + editor(), TQT_SLOT(copyText()), actionCollection(), "copy_as_text" ); mAction.pasteToNewFile = new KAction( i18n("Paste into New &File"), 0, - editor(), SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" ); + editor(), TQT_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" ); mAction.pasteToNewWindow = new KAction( i18n("Paste into New &Window"), 0, - this, SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" ); + this, TQT_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" ); mAction.hexadecimal = new KRadioAction( i18n("&Hexadecimal"), - 0, this, SLOT(setDisplayMode()), actionCollection(), "mode_hex" ); + 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_hex" ); mAction.decimal = new KRadioAction( i18n("&Decimal"), - 0, this, SLOT(setDisplayMode()), actionCollection(), "mode_dec" ); + 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_dec" ); mAction.octal = new KRadioAction( i18n("&Octal"), - 0, this, SLOT(setDisplayMode()), actionCollection(), "mode_oct" ); + 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_oct" ); mAction.binary = new KRadioAction( i18n("&Binary"), - 0, this, SLOT(setDisplayMode()), actionCollection(), "mode_bin" ); + 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_bin" ); mAction.textOnly = new KRadioAction( i18n("&Text"), - 0, this, SLOT(setDisplayMode()), actionCollection(), "mode_text" ); + 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_text" ); mAction.hexadecimal->setExclusiveGroup( "displayMode" ); mAction.decimal->setExclusiveGroup( "displayMode" ); mAction.octal->setExclusiveGroup( "displayMode" ); @@ -194,120 +194,120 @@ actionCollection()); mAction.textOnly->setExclusiveGroup( "displayMode" ); mAction.showOffsetColumn = new KToggleAction( i18n("Show O&ffset Column"), - 0, editor(), SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" ); + 0, editor(), TQT_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" ); mAction.showTextColumn = new KToggleAction( i18n("Show Te&xt Field"), - 0, editor(), SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" ); + 0, editor(), TQT_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" ); mAction.offsetAsDecimal = new KToggleAction( i18n("Off&set as Decimal"), - 0, editor(), SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" ); + 0, editor(), TQT_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" ); mAction.dataUppercase = new KToggleAction( i18n("&Upper Case (Data)"), - 0, editor(), SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" ); + 0, editor(), TQT_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" ); mAction.offsetUppercase = new KToggleAction( i18n("Upper &Case (Offset)"), - 0, editor(), SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" ); + 0, editor(), TQT_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" ); mAction.defaultEncoding = new KRadioAction( i18n("&Default encoding", "&Default"), - 0, this, SLOT( setEncoding()), actionCollection(), "enc_default" ); + 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_default" ); mAction.usAsciiEncoding = new KRadioAction( i18n("US-&ASCII (7 bit)"), - 0, this, SLOT( setEncoding()), actionCollection(), "enc_ascii"); + 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_ascii"); mAction.ebcdicEncoding = new KRadioAction( i18n("&EBCDIC"), - 0, this, SLOT( setEncoding()), actionCollection(), "enc_ebcdic" ); + 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" ); // mAction.customEncoding = new KAction( i18n("&Custom..."), -// 0, editor(), SLOT( encoding()), actionCollection(), "enc_custom" ); +// 0, editor(), TQT_SLOT( encoding()), actionCollection(), "enc_custom" ); mAction.defaultEncoding->setExclusiveGroup( "encodingMode" ); mAction.usAsciiEncoding->setExclusiveGroup( "encodingMode" ); mAction.ebcdicEncoding->setExclusiveGroup( "encodingMode" ); mAction.strings = new KAction( i18n("&Extract Strings..."), 0, - editor(), SLOT(strings()), actionCollection(), "extract_strings" ); + editor(), TQT_SLOT(strings()), actionCollection(), "extract_strings" ); // mAction.recordViewer = new KAction( i18n("&Record Viewer"), 0, -// editor(), SLOT(recordView()), actionCollection(), "record_viewer" ); +// editor(), TQT_SLOT(recordView()), actionCollection(), "record_viewer" ); mAction.filter = new KAction( i18n("&Binary Filter..."), 0, - editor(), SLOT(filter()), actionCollection(), "binary_filter" ); + editor(), TQT_SLOT(filter()), actionCollection(), "binary_filter" ); mAction.characterTable = new KAction( i18n("&Character Table"), 0, - editor(), SLOT(chart()), actionCollection(), "char_table" ); + editor(), TQT_SLOT(chart()), actionCollection(), "char_table" ); mAction.converter = new KAction( i18n("C&onverter"), 0, - editor(), SLOT(converter()), actionCollection(), "converter" ); + editor(), TQT_SLOT(converter()), actionCollection(), "converter" ); mAction.statistics = new KAction( i18n("&Statistics"), 0, - editor(), SLOT(statistics()), actionCollection(), "statistics" ); + editor(), TQT_SLOT(statistics()), actionCollection(), "statistics" ); mAction.addBookmark = KStdAction::addBookmark( editor(), - SLOT(addBookmark()), actionCollection() ); + TQT_SLOT(addBookmark()), actionCollection() ); mAction.replaceBookmark = new KAction( i18n("&Replace Bookmark"), CTRL+Key_E, - editor(), SLOT(replaceBookmark()), actionCollection(), "replace_bookmark"); + editor(), TQT_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark"); mAction.removeBookmark = new KAction( i18n("R&emove Bookmark"), CTRL+Key_U, - editor(), SLOT(removeBookmark()), actionCollection(), "remove_bookmark" ); + editor(), TQT_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" ); mAction.removeAllBookmark = new KAction( i18n("Re&move All"), 0, - editor(), SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" ); + editor(), TQT_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" ); mAction.nextBookmark = new KAction( i18n("Goto &Next Bookmark"), ALT+Key_Down, editor(), - SLOT(gotoNextBookmark()), actionCollection(), "next_bookmark" ); + TQT_SLOT(gotoNextBookmark()), actionCollection(), "next_bookmark" ); mAction.prevBookmark = new KAction( i18n("Goto &Previous Bookmark"), ALT+Key_Up, editor(), - SLOT(gotoPrevBookmark()), actionCollection(), "prev_bookmark" ); + TQT_SLOT(gotoPrevBookmark()), actionCollection(), "prev_bookmark" ); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); mAction.showFullPath = new KToggleAction( i18n("Show F&ull Path"), - 0, this, SLOT(showFullPath()), actionCollection(), "show_full_path" ); + 0, this, TQT_SLOT(showFullPath()), actionCollection(), "show_full_path" ); mAction.tabHide = new KRadioAction( i18n("&Hide"), - 0, this, SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" ); + 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" ); mAction.tabShowAboveEditor = new KRadioAction( i18n("&Above Editor"), - 0, this, SLOT(showDocumentTabs()), actionCollection(), "doctab_above" ); + 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" ); mAction.tabShowBelowEditor = new KRadioAction( i18n("&Below Editor"), - 0, this, SLOT(showDocumentTabs()), actionCollection(), "doctab_below" ); + 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" ); mAction.tabHide->setExclusiveGroup( "editorTab" ); mAction.tabShowAboveEditor->setExclusiveGroup( "editorTab" ); mAction.tabShowBelowEditor->setExclusiveGroup( "editorTab" ); mAction.conversionHide = new KRadioAction( i18n("&Hide"), - 0, this, SLOT(showConversionField()), actionCollection(), "conversion_field_hide"); + 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_hide"); mAction.conversionFloat = new KRadioAction( i18n("&Floating"), - 0, this, SLOT(showConversionField()), actionCollection(), "conversion_field_float"); + 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_float"); mAction.conversionEmbed = new KRadioAction( i18n("&Embed in Main Window"), - 0, this, SLOT(showConversionField()), actionCollection(), "conversion_field_embed"); + 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_embed"); mAction.conversionHide->setExclusiveGroup( "conversionField" ); mAction.conversionFloat->setExclusiveGroup( "conversionField" ); mAction.conversionEmbed->setExclusiveGroup( "conversionField" ); mAction.searchHide = new KRadioAction( i18n("&Hide"), - 0, this, SLOT(showSearchBar()), actionCollection(), "searchbar_hide" ); + 0, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" ); mAction.searchShowAboveEditor = new KRadioAction( i18n("&Above Editor"), - Key_F5, this, SLOT(showSearchBar()), actionCollection(), "searchbar_above" ); + Key_F5, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_above" ); mAction.searchShowBelowEditor = new KRadioAction( i18n("&Below Editor"), - Key_F6, this, SLOT(showSearchBar()), actionCollection(), "searchbar_below" ); + Key_F6, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_below" ); mAction.searchHide->setExclusiveGroup( "searchBar" ); mAction.searchShowAboveEditor->setExclusiveGroup( "searchBar" ); mAction.searchShowBelowEditor->setExclusiveGroup( "searchBar" ); - KStdAction::saveOptions(this, SLOT(writeConfiguration()), actionCollection()); - KStdAction::preferences(editor(),SLOT(options()),actionCollection() ); + KStdAction::saveOptions(this, TQT_SLOT(writeConfiguration()), actionCollection()); + KStdAction::preferences(editor(),TQT_SLOT(options()),actionCollection() ); // mAction.favorites = new KAction( i18n("P&rofiles..."), 0, -// editor(), SLOT(favorites()), actionCollection(), "favorites" ); +// editor(), TQT_SLOT(favorites()), actionCollection(), "favorites" ); - KStdAction::help( this, SLOT(appHelpActivated()), actionCollection() ); + KStdAction::help( this, TQT_SLOT(appHelpActivated()), actionCollection() ); mDragLabel = new CDragLabel(this); mDragLabel->setPixmap( UserIcon( "hexdrag" ) ); mDragLabel->setDragMask( UserIcon( "hexmask" ) ); mDragLabel->setEnabled( false ); // Enabled once we open a document - QToolTip::add( mDragLabel, i18n("Drag document") ); - (void) new KWidgetAction(mDragLabel, i18n("Drag Document"), 0, editor(), SLOT(options()), actionCollection(), "drag_document"); + TQToolTip::add( mDragLabel, i18n("Drag document") ); + (void) new KWidgetAction(mDragLabel, i18n("Drag Document"), 0, editor(), TQT_SLOT(options()), actionCollection(), "drag_document"); createGUI("khexeditui.rc", false); - QPopupMenu *popup = (QPopupMenu *)factory()->container("editor_popup", this); + TQPopupMenu *popup = (TQPopupMenu *)factory()->container("editor_popup", this); hexView()->setPopupMenu( popup ); int id = 100; - toolBar(0)->insertButton( MainBarIcon("lock"), id, SIGNAL(clicked()), - editor(), SLOT(toggleWriteProtection()), true, + toolBar(0)->insertButton( MainBarIcon("lock"), id, TQT_SIGNAL(clicked()), + editor(), TQT_SLOT(toggleWriteProtection()), true, i18n("Toggle write protection") ); toolBar(0)->alignItemRight( id ); mWriteProtectButton = toolBar(0)->getButton(id); - QPopupMenu *documentMenu = (QPopupMenu *)factory()->container("documents", this); + TQPopupMenu *documentMenu = (TQPopupMenu *)factory()->container("documents", this); hexView()->setDocumentMenu(documentMenu); - connect(documentMenu, SIGNAL(activated(int)), SLOT(documentMenuCB(int))); + connect(documentMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(documentMenuCB(int))); } @@ -316,15 +316,15 @@ void KHexEdit::setupStatusBar( void ) { CStatusBarProgress *progess = new CStatusBarProgress( statusBar() ); statusBar()->addWidget( progess, 10 ); - connect( progess, SIGNAL(pressed()), editor(), SLOT(stop()) ); - connect( editor(), SIGNAL( setProgress( int ) ), - progess, SLOT( setValue( int ) ) ); - connect( editor(), SIGNAL( setProgress( int, int ) ), - progess, SLOT( setValue( int, int ) ) ); - connect( editor(), SIGNAL( enableProgressText( bool ) ), - progess, SLOT( setTextEnabled( bool ) ) ); - connect( editor(), SIGNAL( setProgressText( const QString & ) ), - progess, SLOT( setText( const QString & ) ) ); + 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 & ) ) ); statusBar()->insertFixedItem( i18n("Selection: 0000:0000 0000:0000"), status_Selection ); @@ -347,7 +347,7 @@ void KHexEdit::setupStatusBar( void ) statusBar()->changeItem( i18n("Size:"), status_Size ); statusBar()->changeItem( "", status_Modified ); statusBar()->changeItem( "", status_Selection ); - connect( statusBar(),SIGNAL(pressed(int)),this,SLOT(statusBarPressed(int)) ); + connect( statusBar(),TQT_SIGNAL(pressed(int)),this,TQT_SLOT(statusBarPressed(int)) ); } @@ -380,9 +380,9 @@ void KHexEdit::initialize( bool openFiles ) KConfig* config = kapp->config(); - const QString oldGroup = config->group(); + const TQString oldGroup = config->group(); - const QString groupname = "RecentFiles"; + const TQString groupname = "RecentFiles"; config->setGroup( groupname ); // read file list @@ -391,8 +391,8 @@ void KHexEdit::initialize( bool openFiles ) maxItems = 1; for( unsigned int i = 1 ; i <= maxItems ; i++ ) { - const QString key = QString( "File%1" ).arg( i ); - const QString value = config->readPathEntry( key ); + const TQString key = TQString( "File%1" ).arg( i ); + const TQString value = config->readPathEntry( key ); if (!value.isEmpty()) { @@ -411,7 +411,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. // - QTimer::singleShot( 100, this, SLOT(delayedStartupOpen()) ); + TQTimer::singleShot( 100, this, TQT_SLOT(delayedStartupOpen()) ); } @@ -450,7 +450,7 @@ void KHexEdit::statusBarPressed( int id ) -void KHexEdit::open( QStringList &fileList, QStringList &offsetList ) +void KHexEdit::open( TQStringList &fileList, TQStringList &offsetList ) { // // We load in reverse to allow the first document in @@ -472,7 +472,7 @@ void KHexEdit::open( QStringList &fileList, QStringList &offsetList ) } } -void KHexEdit::addRecentFile( const QString &fileName ) +void KHexEdit::addRecentFile( const TQString &fileName ) { if( fileName.isEmpty() == true ) { @@ -491,7 +491,7 @@ void KHexEdit::addRecentFile( const QString &fileName ) } -void KHexEdit::removeRecentFile( const QString &fileName ) +void KHexEdit::removeRecentFile( const TQString &fileName ) { if( fileName.isEmpty() == true ) { @@ -509,7 +509,7 @@ void KHexEdit::removeRecentFile( const QString &fileName ) } -void KHexEdit::renameRecentFile(const QString &curName, const QString &newName) +void KHexEdit::renameRecentFile(const TQString &curName, const TQString &newName) { if( curName.contains( i18n( "Untitled" ), false ) ) { @@ -543,7 +543,7 @@ KHexEdit *KHexEdit::newWindow( void ) KHexEdit *hexEdit = new KHexEdit; if( hexEdit == 0 ) { - QString msg = i18n( "Can not create new window.\n" ); + TQString msg = i18n( "Can not create new window.\n" ); msg += hexError( Err_NoMemory ); KMessageBox::error( topLevelWidget(), msg ); return(0); @@ -579,10 +579,10 @@ void KHexEdit::closeProgram( void ) { if( w->editor()->modified() == true ) { - QString msg = i18n("" + TQString msg = i18n("" "There are windows with unsaved modified documents. " "If you quit now, these modifications will be lost."); - int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg, QString::null, KStdGuiItem::quit() ); + int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg, TQString::null, KStdGuiItem::quit() ); if( reply == KMessageBox::Continue ) { break; @@ -747,7 +747,7 @@ void KHexEdit::operationChanged( bool state ) void KHexEdit::cursorChanged( SCursorState &state ) { - QString offset( i18n("Offset:") ); + TQString offset( i18n("Offset:") ); if( state.valid == false ) { @@ -761,18 +761,18 @@ void KHexEdit::cursorChanged( SCursorState &state ) { if( layout.offsetUpperCase == false ) { - offset += QString().sprintf( " %04x:%04x-%u", state.offset>>16, + offset += TQString().sprintf( " %04x:%04x-%u", state.offset>>16, state.offset&0x0000FFFF, state.cell ); } else { - offset += QString().sprintf( " %04X:%04X-%u", state.offset>>16, + offset += TQString().sprintf( " %04X:%04X-%u", state.offset>>16, state.offset&0x0000FFFF, state.cell ); } } else { - offset += QString().sprintf( " %010u-%u", state.offset, state.cell ); + offset += TQString().sprintf( " %010u-%u", state.offset, state.cell ); } statusBar()->changeItem( offset, status_Offset ); } @@ -903,7 +903,7 @@ void KHexEdit::inputModeChanged( const SDisplayInputMode &mode ) } -void KHexEdit::bookmarkChanged( QPtrList<SCursorOffset> &list ) +void KHexEdit::bookmarkChanged( TQPtrList<SCursorOffset> &list ) { unplugActionList("bookmark_list"); mAction.bookmarkList.setAutoDelete(true); @@ -916,14 +916,14 @@ void KHexEdit::bookmarkChanged( QPtrList<SCursorOffset> &list ) mAction.bookmarkList.append(new KActionSeparator()); - QString text, offset; + TQString text, offset; int i=0; for( SCursorOffset *p=list.first(); p!=0; p=list.next(), i++ ) { offset.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF ); text = i18n("Offset: %1").arg(offset); - KAction *action = new KAction(text, 0, mAction.bookmarkMapper, SLOT(map()), this, text.latin1()); + KAction *action = new KAction(text, 0, mAction.bookmarkMapper, TQT_SLOT(map()), this, text.latin1()); int key = acceleratorNumKey( i ); if( key > 0 ) { @@ -936,7 +936,7 @@ void KHexEdit::bookmarkChanged( QPtrList<SCursorOffset> &list ) } -void KHexEdit::setupCaption( const QString &url ) +void KHexEdit::setupCaption( const TQString &url ) { KURL u(url); if( mShowFullPath == true ) @@ -950,7 +950,7 @@ void KHexEdit::setupCaption( const QString &url ) } -void KHexEdit::fileActive( const QString &url, bool onDisk ) +void KHexEdit::fileActive( const TQString &url, bool onDisk ) { setupCaption( url ); mDragLabel->setUrl( url ); @@ -967,7 +967,7 @@ void KHexEdit::fileActive( const QString &url, bool onDisk ) } -void KHexEdit::fileRename( const QString &curName, const QString &newName ) +void KHexEdit::fileRename( const TQString &curName, const TQString &newName ) { if( newName.isNull() == true ) { @@ -981,7 +981,7 @@ void KHexEdit::fileRename( const QString &curName, const QString &newName ) } -void KHexEdit::fileClosed( const QString &url ) +void KHexEdit::fileClosed( const TQString &url ) { removeDocument( url ); } @@ -1169,16 +1169,16 @@ void KHexEdit::setSelectionText( uint selectionOffset, uint selectionSize ) { if( selectionSize > 0 ) { - QString selection = i18n("Selection:"); + TQString selection = i18n("Selection:"); if( mSelectionAsHexadecimal == true ) { - selection += QString().sprintf( " %04x:%04x %04x:%04x", + selection += TQString().sprintf( " %04x:%04x %04x:%04x", selectionOffset>>16, selectionOffset&0x0000FFFF, selectionSize>>16, selectionSize&0x0000FFFF ); } else { - selection += QString().sprintf( " %08u %08u", + selection += TQString().sprintf( " %08u %08u", selectionOffset, selectionSize); } statusBar()->changeItem( selection, status_Selection ); @@ -1200,7 +1200,7 @@ void KHexEdit::documentMenuCB( int index ) } -void KHexEdit::addDocument( const QString &fileName ) +void KHexEdit::addDocument( const TQString &fileName ) { uint documentCount = mDocumentList.count(); for( uint i=0; i < documentCount; i++ ) @@ -1213,7 +1213,7 @@ void KHexEdit::addDocument( const QString &fileName ) mDocumentList.append( fileName ); - QPopupMenu *documentMenu = (QPopupMenu *)factory()->container("documents", this); + TQPopupMenu *documentMenu = (TQPopupMenu *)factory()->container("documents", this); documentMenu->insertItem( fileName, documentCount, documentCount ); int key = acceleratorNumKey( documentCount ); if( key > 0 ) @@ -1223,14 +1223,14 @@ void KHexEdit::addDocument( const QString &fileName ) } -void KHexEdit::removeDocument( const QString &fileName ) +void KHexEdit::removeDocument( const TQString &fileName ) { - QStringList::Iterator it; + TQStringList::Iterator it; for( it = mDocumentList.begin(); it != mDocumentList.end(); it++ ) { if( *it == fileName ) { - QPopupMenu *documentMenu = (QPopupMenu *)factory()->container("documents", this); + TQPopupMenu *documentMenu = (TQPopupMenu *)factory()->container("documents", this); documentMenu->removeItemAt( mDocumentList.findIndex(*it) ); mDocumentList.remove( it ); @@ -1251,14 +1251,14 @@ void KHexEdit::removeDocument( const QString &fileName ) } -void KHexEdit::renameDocument( const QString &curName, const QString &newName ) +void KHexEdit::renameDocument( const TQString &curName, const TQString &newName ) { - QStringList::Iterator it; + TQStringList::Iterator it; for( it = mDocumentList.begin(); it != mDocumentList.end(); it++ ) { if( *it == curName ) { - QPopupMenu *documentMenu = (QPopupMenu *)factory()->container("documents", this); + TQPopupMenu *documentMenu = (TQPopupMenu *)factory()->container("documents", this); documentMenu->changeItem( newName, mDocumentList.findIndex(*it) ); mDocumentList.insert( it, newName ); mDocumentList.remove( it ); @@ -1268,10 +1268,10 @@ void KHexEdit::renameDocument( const QString &curName, const QString &newName ) } -void KHexEdit::setTickedDocument( const QString &fileName ) +void KHexEdit::setTickedDocument( const TQString &fileName ) { uint documentCount = mDocumentList.count(); - QPopupMenu *documentMenu = (QPopupMenu *)factory()->container("documents", this); + TQPopupMenu *documentMenu = (TQPopupMenu *)factory()->container("documents", this); for( uint i=0; i < documentCount; i++ ) { documentMenu->setItemChecked( i, fileName == mDocumentList[i] ); @@ -1291,11 +1291,11 @@ void KHexEdit::searchBarClosed( void ) } -bool KHexEdit::eventFilter( QObject *o, QEvent *event ) +bool KHexEdit::eventFilter( TQObject *o, TQEvent *event ) { - if( event->type() == QEvent::DragEnter ) + if( event->type() == TQEvent::DragEnter ) { - QDragEnterEvent *e = (QDragEnterEvent*)event; + TQDragEnterEvent *e = (TQDragEnterEvent*)event; if( KURLDrag::canDecode(e) ) { e->accept(); @@ -1303,22 +1303,22 @@ bool KHexEdit::eventFilter( QObject *o, QEvent *event ) } return( true ); } - else if( event->type() == QEvent::Drop ) + else if( event->type() == TQEvent::Drop ) { - QMimeSource &m = *(QDropEvent*)event; + TQMimeSource &m = *(TQDropEvent*)event; hexView()->setDropHighlight( false ); KURL::List list; if( KURLDrag::decode( &m, list ) == true ) { - QStringList offset; - QStringList urlList = list.toStringList(); + TQStringList offset; + TQStringList urlList = list.toStringList(); open( urlList, offset ); return( true ); } return( true ); } - else if( event->type() == QEvent::DragLeave ) + else if( event->type() == TQEvent::DragLeave ) { hexView()->setDropHighlight( false ); return( true ); diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h index fbacca1..4043cd2 100644 --- a/khexedit/toplevel.h +++ b/khexedit/toplevel.h @@ -25,7 +25,7 @@ #include <config.h> #endif -#include <qptrlist.h> +#include <tqptrlist.h> #include <kapplication.h> #include <kstdaccel.h> #include <kmainwindow.h> @@ -135,15 +135,15 @@ class KHexEdit : public KMainWindow // KAction *favorites; - QPtrList< KAction > bookmarkList; - QSignalMapper *bookmarkMapper; + TQPtrList< KAction > bookmarkList; + TQSignalMapper *bookmarkMapper; }; public: KHexEdit( void ); ~KHexEdit( void ); - inline void addStartupFile( const QString &fileName ); + inline void addStartupFile( const TQString &fileName ); inline void setStartupOffset( uint offset ); public slots: @@ -158,14 +158,14 @@ class KHexEdit : public KMainWindow void fileState( SFileState &state ); void layoutChanged( const SDisplayLayout &layout ); void inputModeChanged( const SDisplayInputMode &mode ); - void bookmarkChanged( QPtrList<SCursorOffset> &list ); - void removeRecentFile( const QString &fileName ); - void renameRecentFile( const QString &curName, const QString &newName ); - - void setupCaption( const QString &url ); - void fileActive( const QString &url, bool onDisk ); - void fileRename( const QString &curName, const QString &newName ); - void fileClosed( const QString &url ); + void bookmarkChanged( TQPtrList<SCursorOffset> &list ); + void removeRecentFile( const TQString &fileName ); + void renameRecentFile( const TQString &curName, const TQString &newName ); + + void setupCaption( const TQString &url ); + void fileActive( const TQString &url, bool onDisk ); + void fileRename( const TQString &curName, const TQString &newName ); + void fileClosed( const TQString &url ); void readConfiguration( void ); void writeConfiguration( void ); void editMode( CHexBuffer::EEditMode editMode ); @@ -200,21 +200,21 @@ protected: private: void setupActions( void ); void setupStatusBar( void ); - void open( QStringList &fileList, QStringList &offsetList ); + void open( TQStringList &fileList, TQStringList &offsetList ); void initialize( bool openFiles ); - void addRecentFile( const QString &fileName ); + void addRecentFile( const TQString &fileName ); bool closeAllWindow( void ); void setUndoState( uint undoState ); void setSelectionState( uint selectionOffset, uint selectionSize ); void setSelectionText( uint selectionOffset, uint selectionSize ); - void addDocument( const QString &fileName ); - void removeDocument( const QString &fileName ); - void renameDocument( const QString &curName, const QString &newName ); - void setTickedDocument( const QString &fileName ); + void addDocument( const TQString &fileName ); + void removeDocument( const TQString &fileName ); + void renameDocument( const TQString &curName, const TQString &newName ); + void setTickedDocument( const TQString &fileName ); void writeConfiguration( KConfig &config ); void readConfiguration( KConfig &config ); - bool eventFilter( QObject *obj, QEvent *event ); + bool eventFilter( TQObject *obj, TQEvent *event ); int acceleratorNumKey( uint index ); inline CHexEditorWidget *editor( void ); @@ -222,12 +222,12 @@ protected: inline CHexViewWidget *hexView( void ); private: - static QPtrList<KHexEdit> mWindowList; + static TQPtrList<KHexEdit> mWindowList; CHexManagerWidget *mManager; - QStringList mDocumentList; + TQStringList mDocumentList; - QStringList mStartupFileList; ///< Files to automatically open on startup - QStringList mStartupOffsetList; ///< Start offset for those files. + TQStringList mStartupFileList; ///< Files to automatically open on startup + TQStringList mStartupOffsetList; ///< Start offset for those files. uint mStartupOffset; ///< Value read from the command line SActionList mAction; @@ -245,10 +245,10 @@ protected: }; -inline void KHexEdit::addStartupFile( const QString &fileName ) +inline void KHexEdit::addStartupFile( const TQString &fileName ) { mStartupFileList.prepend( fileName ); - mStartupOffsetList.prepend( QString("%1").arg(mStartupOffset,0,16) ); + mStartupOffsetList.prepend( TQString("%1").arg(mStartupOffset,0,16) ); mStartupOffset = 0; } |