summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
commit49eda0ff225683b7bfc3f73b2fce3b11ebb1f327 (patch)
tree23c58f1fecfb3f954bf4b5907df11ba83ef60f70
parentbd18f7704ecc1c1a82bf3dae64639c9ec5371b18 (diff)
downloadkpicosim-49eda0ff225683b7bfc3f73b2fce3b11ebb1f327.tar.gz
kpicosim-49eda0ff225683b7bfc3f73b2fce3b11ebb1f327.zip
Fix a number of accidental tqStatus string conversions
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpicosim@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rwxr-xr-xsrc/kpicosim.cpp6
-rwxr-xr-xsrc/kserialview.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/kpicosim.cpp b/src/kpicosim.cpp
index 5765ddb..0f75111 100755
--- a/src/kpicosim.cpp
+++ b/src/kpicosim.cpp
@@ -158,7 +158,7 @@ KPicoSim::KPicoSim() : KMainWindow( 0, "KPicoSim" )
m_serialView = NULL ;
statusBar()->insertItem( TQString( "Mode: Edit" ), 0 ) ;
- statusBar()->insertItem( TQString( "tqStatus: Stopped" ), 1 ) ;
+ statusBar()->insertItem( TQString( "Status: Stopped" ), 1 ) ;
statusBar()->insertItem( TQString( "Instructions: 0" ), 2 ) ;
m_templateFile = "" ;
@@ -424,14 +424,14 @@ void KPicoSim::startStop()
m_debugMenu->changeItem( RUN_ID, "Stop" ) ;
m_editor->clearExecutionMarker() ;
m_simulator->run() ;
- statusBar()->changeItem( TQString( "tqStatus: Running" ), 1 ) ;
+ statusBar()->changeItem( TQString( "Status: Running" ), 1 ) ;
m_debugBar->setButton( RUN_ID, true ) ;
} else {
m_simulator->stop() ;
updateViews() ;
m_debugMenu->changeItem( RUN_ID, "Continue" ) ;
m_editor->setExecutionMarker( m_simulator->getNextSourceLine() ) ;
- statusBar()->changeItem( TQString( "tqStatus: Stopped" ), 1 ) ;
+ statusBar()->changeItem( TQString( "Status: Stopped" ), 1 ) ;
TQString str ;
str.sprintf( "Instructions: %u", m_nrInstructions ) ;
statusBar()->changeItem( str, 2 ) ;
diff --git a/src/kserialview.cpp b/src/kserialview.cpp
index cd679f9..579313c 100755
--- a/src/kserialview.cpp
+++ b/src/kserialview.cpp
@@ -59,7 +59,7 @@ KSerialView::KSerialView( CPicoBlaze *cpu, TQWidget * parent ) : TQWidget( paren
label->setFixedSize( 55, 18 ) ;
label = new TQLabel( groupBox ) ;
- label->setText( "tqStatus" ) ;
+ label->setText( "Status" ) ;
label->move( 5, 55 ) ;
label->setFixedSize( 55, 18 ) ;
@@ -87,7 +87,7 @@ KSerialView::KSerialView( CPicoBlaze *cpu, TQWidget * parent ) : TQWidget( paren
connect( rxPortID, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( updateRxId( const TQString & ) ) ) ;
connect( statusPortID, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( updateStatusId( const TQString & ) ) ) ;
- groupBox = new TQGroupBox( "tqStatus Register", settings ) ;
+ groupBox = new TQGroupBox( "Status Register", settings ) ;
groupBox->setFixedSize( 200, 80 ) ;
groupBox->move( 250, 0 ) ;