From 87a016680e3677da3993f333561e79eb0cead7d5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 29 Jun 2011 16:05:55 +0000 Subject: TQt4 port ktechlab This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktechlab@1238801 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/gui/symbolviewer.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/gui/symbolviewer.cpp') diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp index 74d54e1..da4d6bd 100644 --- a/src/gui/symbolviewer.cpp +++ b/src/gui/symbolviewer.cpp @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include #include @@ -39,8 +39,8 @@ SymbolViewerItem::SymbolViewerItem( SymbolViewer * symbolViewer, RegisterInfo * // setText( TYPE_COLUMN, RegisterInfo::toString( m_pRegisterInfo->type() ) ); radixChanged(); // force update of displayed string - connect( m_pRegisterInfo, SIGNAL(valueChanged(unsigned)), this, SLOT(valueChanged(unsigned)) ); - connect( m_pSymbolViewer, SIGNAL(valueRadixChanged(SymbolViewer::Radix)), this, SLOT(radixChanged()) ); + connect( m_pRegisterInfo, TQT_SIGNAL(valueChanged(unsigned)), this, TQT_SLOT(valueChanged(unsigned)) ); + connect( m_pSymbolViewer, TQT_SIGNAL(valueRadixChanged(SymbolViewer::Radix)), this, TQT_SLOT(radixChanged()) ); } @@ -61,25 +61,25 @@ void SymbolViewerItem::radixChanged() //BEGIN class SymbolView SymbolViewer * SymbolViewer::m_pSelf = 0l; -SymbolViewer * SymbolViewer::self( KateMDI::ToolView * parent ) +SymbolViewer * SymbolViewer::self( KateMDI::ToolView * tqparent ) { if (!m_pSelf) { - assert (parent); - m_pSelf = new SymbolViewer(parent); + assert (tqparent); + m_pSelf = new SymbolViewer(tqparent); } return m_pSelf; } -SymbolViewer::SymbolViewer( KateMDI::ToolView * parent ) - : QWidget( (QWidget*)parent ) +SymbolViewer::SymbolViewer( KateMDI::ToolView * tqparent ) + : TQWidget( (TQWidget*)tqparent ) { - QGridLayout * grid = new QGridLayout( this, 1, 1, 0, 6 ); + TQGridLayout * grid = new TQGridLayout( this, 1, 1, 0, 6 ); m_pSymbolList = new KListView(this); grid->addMultiCellWidget( m_pSymbolList, 0, 0, 0, 1 ); - grid->addWidget( new QLabel( i18n("Value radix:"), this ), 1, 0 ); + grid->addWidget( new TQLabel( i18n("Value radix:"), this ), 1, 0 ); m_pRadixCombo = new KComboBox( false, this ); grid->addWidget( m_pRadixCombo, 1, 1 ); @@ -89,7 +89,7 @@ SymbolViewer::SymbolViewer( KateMDI::ToolView * parent ) m_pRadixCombo->insertItem( i18n("Hexadecimal") ); m_valueRadix = Decimal; m_pRadixCombo->setCurrentItem(2); - connect( m_pRadixCombo, SIGNAL(activated(int)), this, SLOT(selectRadix(int)) ); + connect( m_pRadixCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectRadix(int)) ); m_pGpsim = 0l; m_pCurrentContext = 0l; @@ -108,7 +108,7 @@ SymbolViewer::~SymbolViewer() void SymbolViewer::saveProperties( KConfig * config ) { - QString oldGroup = config->group(); + TQString oldGroup = config->group(); config->setGroup( "SymbolEditor" ); config->writeEntry( "Radix", m_valueRadix ); @@ -119,7 +119,7 @@ void SymbolViewer::saveProperties( KConfig * config ) void SymbolViewer::readProperties( KConfig * config ) { - QString oldGroup = config->group(); + TQString oldGroup = config->group(); config->setGroup( "SymbolEditor" ); m_valueRadix = (SymbolViewer::Radix)config->readNumEntry( "Radix", Decimal ); @@ -156,7 +156,7 @@ void SymbolViewer::setContext( GpsimProcessor * gpsim ) if (!m_pCurrentContext) return; - connect( gpsim, SIGNAL(destroyed()), m_pSymbolList, SLOT(clear()) ); + connect( gpsim, TQT_SIGNAL(destroyed()), m_pSymbolList, TQT_SLOT(clear()) ); unsigned count = m_pCurrentContext->size(); for ( unsigned i = 0; i < count; ++i ) @@ -192,21 +192,21 @@ void SymbolViewer::selectRadix( int selectIndex ) } -QString SymbolViewer::toDisplayString( unsigned value ) const +TQString SymbolViewer::toDisplayString( unsigned value ) const { switch ( m_valueRadix ) { case Binary: - return QString::number( value, 2 ).rightJustify( 8, '0', false ); + return TQString::number( value, 2 ).rightJustify( 8, '0', false ); case Octal: - return "0" + QString::number( value, 8 ); + return "0" + TQString::number( value, 8 ); case Decimal: - return QString::number( value, 10 ); + return TQString::number( value, 10 ); case Hexadecimal: - return "0x" + QString::number( value, 16 ); + return "0x" + TQString::number( value, 16 ); } return "?"; -- cgit v1.2.3