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/mem24/base | |
| 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/mem24/base')
| -rw-r--r-- | src/devices/mem24/base/mem24.cpp | 4 | ||||
| -rw-r--r-- | src/devices/mem24/base/mem24.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/mem24/base/mem24.cpp b/src/devices/mem24/base/mem24.cpp index 03bffe3..147c199 100644 --- a/src/devices/mem24/base/mem24.cpp +++ b/src/devices/mem24/base/mem24.cpp @@ -8,13 +8,13 @@ ***************************************************************************/ #include "mem24.h" -QDataStream &Mem24::operator <<(QDataStream &s, const Data &data) +TQDataStream &Mem24::operator <<(TQDataStream &s, const Data &data) { s << static_cast<const Device::Data &>(data); s << data._nbBytes << data._nbBlocks << data._nbBytesPage; return s; } -QDataStream &Mem24::operator >>(QDataStream &s, Data &data) +TQDataStream &Mem24::operator >>(TQDataStream &s, Data &data) { s >> static_cast<Device::Data &>(data); s >> data._nbBytes >> data._nbBlocks >> data._nbBytesPage; diff --git a/src/devices/mem24/base/mem24.h b/src/devices/mem24/base/mem24.h index d66ff47..7e0b5e7 100644 --- a/src/devices/mem24/base/mem24.h +++ b/src/devices/mem24/base/mem24.h @@ -22,7 +22,7 @@ class Data : public Device::Data { public: Data() : Device::Data(0) {} - virtual QString listViewGroup() const { return i18n("24 EEPROM"); } + virtual TQString listViewGroup() const { return i18n("24 EEPROM"); } uint nbBytes() const { return _nbBytes; } virtual bool matchId(BitValue, Device::IdData &) const { return false; } virtual uint nbBitsAddress() const { return nbBits(_nbBytes-1); } @@ -35,12 +35,12 @@ private: friend class XmlToData; friend class Group; - friend QDataStream &operator <<(QDataStream &s, const Data &data); - friend QDataStream &operator >>(QDataStream &s, Data &data); + friend TQDataStream &operator <<(TQDataStream &s, const Data &data); + friend TQDataStream &operator >>(TQDataStream &s, Data &data); }; -QDataStream &operator <<(QDataStream &s, const Data &data); -QDataStream &operator >>(QDataStream &s, Data &data); +TQDataStream &operator <<(TQDataStream &s, const Data &data); +TQDataStream &operator >>(TQDataStream &s, Data &data); } // namespace |