diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-30 00:15:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-30 00:15:53 +0000 |
| commit | 0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 (patch) | |
| tree | b95c0ca86c4876dd139af376b9f4afd8917cf0cd /src/devices/base/generic_memory.cpp | |
| parent | b79a2c28534cf09987eeeba3077fff9236df182a (diff) | |
| download | piklab-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/devices/base/generic_memory.cpp')
| -rw-r--r-- | src/devices/base/generic_memory.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/base/generic_memory.cpp b/src/devices/base/generic_memory.cpp index 78c4dd6..54190f5 100644 --- a/src/devices/base/generic_memory.cpp +++ b/src/devices/base/generic_memory.cpp @@ -8,8 +8,8 @@ ***************************************************************************/ #include "generic_memory.h" -bool Device::Memory::load(QTextStream &stream, QStringList &errors, - WarningTypes &warningTypes, QStringList &warnings) +bool Device::Memory::load(TQTextStream &stream, TQStringList &errors, + WarningTypes &warningTypes, TQStringList &warnings) { HexBuffer hb; if ( !hb.load(stream, errors) ) return false; @@ -17,12 +17,12 @@ bool Device::Memory::load(QTextStream &stream, QStringList &errors, return true; } -Device::Memory::WarningTypes Device::Memory::fromHexBuffer(const HexBuffer &hb, QStringList &warnings) +Device::Memory::WarningTypes Device::Memory::fromHexBuffer(const HexBuffer &hb, TQStringList &warnings) { clear(); WarningTypes result = NoWarning; warnings.clear(); - QMap<uint, bool> inRange; + TQMap<uint, bool> inRange; fromHexBuffer(hb, result, warnings, inRange); // check that all values in FragBuffer are within memory ranges @@ -31,7 +31,7 @@ Device::Memory::WarningTypes Device::Memory::fromHexBuffer(const HexBuffer &hb, if ( !it.data().isInitialized() || inRange[it.key()] ) continue; if ( !(result & ValueOutsideRange) ) { result |= ValueOutsideRange; - warnings += i18n("At least one value (at address %1) is defined outside memory ranges.").arg(toHexLabel(it.key(), 8)); + warnings += i18n("At least one value (at address %1) is defined outside memory ranges.").tqarg(toHexLabel(it.key(), 8)); } break; } @@ -39,7 +39,7 @@ Device::Memory::WarningTypes Device::Memory::fromHexBuffer(const HexBuffer &hb, return result; } -bool Device::Memory::save(QTextStream &stream, HexBuffer::Format format) const +bool Device::Memory::save(TQTextStream &stream, HexBuffer::Format format) const { savePartial(stream, format); HexBuffer hb; |