summaryrefslogtreecommitdiffstats
path: root/src/progs/base/generic_debug.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-30 00:15:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-30 00:15:53 +0000
commit0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 (patch)
treeb95c0ca86c4876dd139af376b9f4afd8917cf0cd /src/progs/base/generic_debug.cpp
parentb79a2c28534cf09987eeeba3077fff9236df182a (diff)
downloadpiklab-0aaa8e3fc8f8a1481333b564f0922277c8d8ad59.tar.gz
piklab-0aaa8e3fc8f8a1481333b564f0922277c8d8ad59.zip
TQt4 port piklab
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1238822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/progs/base/generic_debug.cpp')
-rw-r--r--src/progs/base/generic_debug.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/progs/base/generic_debug.cpp b/src/progs/base/generic_debug.cpp
index 252d239..46c6597 100644
--- a/src/progs/base/generic_debug.cpp
+++ b/src/progs/base/generic_debug.cpp
@@ -53,7 +53,7 @@ bool Debugger::Base::init()
bool Debugger::Base::update()
{
if ( !updateState() ) return false;
- if ( _programmer.state()==::Programmer::Halted ) return _deviceSpecific->updateStatus();
+ if ( _programmer.state()==::Programmer::Halted ) return _deviceSpecific->updatetqStatus();
return true;
}
@@ -76,7 +76,7 @@ bool Debugger::Base::halt()
if ( !softHalt(success) ) return false;
if ( !success ) return hardHalt();
if ( !update() ) return false;
- log(Log::LineType::Information, QString("Halted at %1").arg(toHexLabel(pc(), _programmer.device()->nbCharsAddress())));
+ log(Log::LineType::Information, TQString("Halted at %1").tqarg(toHexLabel(pc(), _programmer.device()->nbCharsAddress())));
_programmer.setState(::Programmer::Halted);
return true;
}
@@ -87,13 +87,13 @@ bool Debugger::Base::reset()
return update();
}
-QString Debugger::Base::statusString() const
+TQString Debugger::Base::statusString() const
{
- if ( _programmer.state()!=::Programmer::Halted ) return QString::null;
+ if ( _programmer.state()!=::Programmer::Halted ) return TQString();
return _deviceSpecific->statusString();
}
-void Debugger::Base::setupInput(PURL::FileType type, const QString &directory, const QString &filename)
+void Debugger::Base::setupInput(PURL::FileType type, const TQString &directory, const TQString &filename)
{
_inputType = type;
_directory = directory;