From 9abf98be4f3111c54f13dcb44902a275bd2d7169 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:22:13 -0600 Subject: Rename additional global TQt functions --- src/progs/direct/base/direct_18F.cpp | 4 ++-- src/progs/direct/base/direct_pic.cpp | 2 +- src/progs/direct/xml/xml_direct_parser.cpp | 2 +- src/progs/icd1/xml/xml_icd1_parser.cpp | 2 +- src/progs/icd2/base/icd2.cpp | 18 +++++++++--------- src/progs/icd2/xml/xml_icd2_parser.cpp | 4 ++-- .../xml/xml_picdem_bootloader_parser.cpp | 4 ++-- src/progs/pickit1/xml/xml_pickit1_parser.cpp | 4 ++-- src/progs/pickit2/xml/xml_pickit2_parser.cpp | 10 +++++----- .../xml/xml_pickit2_bootloader_parser.cpp | 4 ++-- src/progs/psp/xml/xml_psp_parser.cpp | 6 +++--- .../tbl_bootloader/xml/xml_tbl_bootloader_parser.cpp | 6 +++--- 12 files changed, 33 insertions(+), 33 deletions(-) (limited to 'src/progs') diff --git a/src/progs/direct/base/direct_18F.cpp b/src/progs/direct/base/direct_18F.cpp index 8c2c371..f10916d 100644 --- a/src/progs/direct/base/direct_18F.cpp +++ b/src/progs/direct/base/direct_18F.cpp @@ -83,7 +83,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const } } BitValue mask = device().mask(type); - //qDebug("read %s %i", Pic::MEMORY_RANGE_TYPE_DATA[type].label, device().nbWords(type)); + //tqDebug("read %s %i", Pic::MEMORY_RANGE_TYPE_DATA[type].label, device().nbWords(type)); //pulseEngine("w300000"); // what for ? directAccess(type); switch (type.type()) { @@ -125,7 +125,7 @@ bool Direct::P18F::doRead(Pic::MemoryRangeType type, Device::Array &data, const bool Direct::P18F::doWrite(Pic::MemoryRangeType type, const Device::Array &data, bool force) { uint inc = device().addressIncrement(type); - //qDebug("write %s %i/%i %i", Pic::MEMORY_RANGE_TYPE_DATA[type].label, nbWords, data.count(), inc); + //tqDebug("write %s %i/%i %i", Pic::MEMORY_RANGE_TYPE_DATA[type].label, nbWords, data.count(), inc); //pulseEngine("w300000"); ?? configureSinglePanel(); directAccess(type); diff --git a/src/progs/direct/base/direct_pic.cpp b/src/progs/direct/base/direct_pic.cpp index 19c74b5..2d2b6de 100644 --- a/src/progs/direct/base/direct_pic.cpp +++ b/src/progs/direct/base/direct_pic.cpp @@ -23,7 +23,7 @@ BitValue Direct::PulseEngine::pulseEngine(const TQString &cmd, BitValue value) TQByteArray a = toAscii(cmd); BitValue res = 0; for (const char *ptr=a.data(); (ptr-a.data())=0; k--) { data[i] = data[i] << 8; @@ -366,12 +366,12 @@ bool Icd2::Hardware::readMemory(Pic::MemoryRangeType type, uint wordOffset, Address start = device().range(type).start; // address uint todo = inc * data.count(); // address uint offset = inc * wordOffset; // address - //qDebug("read size=%s div=%i nbBytes=%i", toHex(size, 8).data(), div, nbBytesWord); + //tqDebug("read size=%s div=%i nbBytes=%i", toHex(size, 8).data(), div, nbBytesWord); data.resize(0); do { uint size = TQMIN(todo, uint(0x1000)); // addresses uint nb = size / inc; // word - //qDebug("read %s start=%s size=%s", Pic::MEMORY_RANGE_TYPE_DATA[type].label, toHex(start+offset, 8).data(), toHex(nb, 8).data()); + //tqDebug("read %s start=%s size=%s", Pic::MEMORY_RANGE_TYPE_DATA[type].label, toHex(start+offset, 8).data(), toHex(nb, 8).data()); TQString cmd = r + toHex(start+offset, 8) + toHex(nb/div, 8); if ( !command(cmd, 0) ) return false; Device::Array pdata; @@ -400,7 +400,7 @@ bool Icd2::Hardware::writeBlock(uint nbBytesWord, const Device::Array &data, uin for (uint i=0; i=0; k--) { - //if ( i<10 || i>=nbWords-10 ) qDebug("send: %i-%i %s", i, k, ts.mid(2*k, 2).data()); + //if ( i<10 || i>=nbWords-10 ) tqDebug("send: %i-%i %s", i, k, ts.mid(2*k, 2).data()); s += ts.mid(2*k, 2); chk += ts[2*k].latin1() + ts[2*k+1].latin1(); } @@ -422,13 +422,13 @@ bool Icd2::Hardware::writeBlock(uint nbBytesWord, const Device::Array &data, uin i += size; } - //qDebug("done sending %i words (chk=%s)", nbWords, toHex(chk, 2).data()); + //tqDebug("done sending %i words (chk=%s)", nbWords, toHex(chk, 2).data()); return true; } bool Icd2::Hardware::writeMemory(Pic::MemoryRangeType type, uint wordOffset, const Device::Array &data) { - //qDebug("write memory: offset:%s nbWords:%s (size: %s)", toHex(wordOffset, 4).data(), toHex(nbWords, 4).data(), toHex(data.size(), 4).data()); + //tqDebug("write memory: offset:%s nbWords:%s (size: %s)", toHex(wordOffset, 4).data(), toHex(nbWords, 4).data(), toHex(data.size(), 4).data()); const char *w = writeCommand(type); if ( w==0 ) return true; uint nbBytesWord = device().nbBytesWord(type); @@ -439,11 +439,11 @@ bool Icd2::Hardware::writeMemory(Pic::MemoryRangeType type, uint wordOffset, con uint todo = inc * data.count(); // address uint offset = inc * wordOffset; // address uint index = 0; - //qDebug("write todo=%s div=%i nbBytes=%i dataSize=%i", toHex(todo, 8).data(), div, nbBytesWord, data.size()); + //tqDebug("write todo=%s div=%i nbBytes=%i dataSize=%i", toHex(todo, 8).data(), div, nbBytesWord, data.size()); do { uint size = TQMIN(todo, uint(0x1000)); // address uint nb = size / inc; // word - //qDebug("write %s start=%s nbWords=%s", Pic::MEMORY_RANGE_TYPE_DATA[type].label, toHex(start+offset, 8).data(), toHex(nb, 8).data()); + //tqDebug("write %s start=%s nbWords=%s", Pic::MEMORY_RANGE_TYPE_DATA[type].label, toHex(start+offset, 8).data(), toHex(nb, 8).data()); TQString cmd = w + toHex(start+offset+index, 8) + toHex(nb/div, 8); if ( !command(cmd, 0) ) return false; if ( !writeBlock(nbBytesWord, data, index/inc, nb) ) return false; diff --git a/src/progs/icd2/xml/xml_icd2_parser.cpp b/src/progs/icd2/xml/xml_icd2_parser.cpp index 5cb1196..c2af113 100644 --- a/src/progs/icd2/xml/xml_icd2_parser.cpp +++ b/src/progs/icd2/xml/xml_icd2_parser.cpp @@ -29,7 +29,7 @@ uint Icd2::XmlToData::familyIndex(const TQString &family) const uint i = 0; for (; Icd2::FAMILY_DATA[i].efid!=0; i++) if ( family==Icd2::FAMILY_DATA[i].name ) break; - if ( Icd2::FAMILY_DATA[i].efid==0 ) qFatal(TQString("Family \"%1\" is unknown").arg(family)); + if ( Icd2::FAMILY_DATA[i].efid==0 ) tqFatal(TQString("Family \"%1\" is unknown").arg(family)); return i; } @@ -37,7 +37,7 @@ void Icd2::XmlToData::parseData(TQDomElement element, Data &data) { bool ok; data.famid = fromHexLabel(element.attribute("famid"), 2, &ok); - if ( !ok ) qFatal("Missing or malformed famid attribute"); + if ( !ok ) tqFatal("Missing or malformed famid attribute"); data.debugSupport = extractSupport(element.attribute("debug_support_type")); } diff --git a/src/progs/picdem_bootloader/xml/xml_picdem_bootloader_parser.cpp b/src/progs/picdem_bootloader/xml/xml_picdem_bootloader_parser.cpp index 04c6e17..2562f1d 100644 --- a/src/progs/picdem_bootloader/xml/xml_picdem_bootloader_parser.cpp +++ b/src/progs/picdem_bootloader/xml/xml_picdem_bootloader_parser.cpp @@ -28,9 +28,9 @@ private: void PicdemBootloader::XmlToData::parseData(TQDomElement, Data &) { const Device::Data *ddata = Device::lister().data(currentDevice()); - if ( ddata->group().name()!="pic" ) qFatal("non-pic device not supported"); + if ( ddata->group().name()!="pic" ) tqFatal("non-pic device not supported"); const Pic::Data *pdata = static_cast(ddata); - if ( !pdata->hasFeature(Pic::Feature::USB) ) qFatal("device does not have USB"); + if ( !pdata->hasFeature(Pic::Feature::USB) ) tqFatal("device does not have USB"); } } // namespace diff --git a/src/progs/pickit1/xml/xml_pickit1_parser.cpp b/src/progs/pickit1/xml/xml_pickit1_parser.cpp index 9fbfafc..1fd09cf 100644 --- a/src/progs/pickit1/xml/xml_pickit1_parser.cpp +++ b/src/progs/pickit1/xml/xml_pickit1_parser.cpp @@ -26,12 +26,12 @@ private: void Pickit1::XmlToData::parseData(TQDomElement element, Data &data) { TQString s = element.attribute("entry"); - if ( s.length()!=1 || (s[0]!='O' && s[0]!='P') ) qFatal("Invalid or missing entry mode"); + if ( s.length()!=1 || (s[0]!='O' && s[0]!='P') ) tqFatal("Invalid or missing entry mode"); data.entryMode = s[0].latin1(); s = element.attribute("regen"); if ( s.isEmpty() || s=="false" ) data.regenerateOsccal = false; else if ( s=="true" ) data.regenerateOsccal = true; - else qFatal("Invalid regen value"); + else tqFatal("Invalid regen value"); } void Pickit1::XmlToData::outputData(const Data &data, TQTextStream &s) const diff --git a/src/progs/pickit2/xml/xml_pickit2_parser.cpp b/src/progs/pickit2/xml/xml_pickit2_parser.cpp index 686e4b2e..fb0543a 100644 --- a/src/progs/pickit2/xml/xml_pickit2_parser.cpp +++ b/src/progs/pickit2/xml/xml_pickit2_parser.cpp @@ -26,25 +26,25 @@ private: void Pickit2::XmlToData::parseData(TQDomElement element, Data &data) { TQString s = element.attribute("entry"); - if ( s.length()!=1 || (s[0]!='O' && s[0]!='P') ) qFatal("Invalid or missing entry mode"); + if ( s.length()!=1 || (s[0]!='O' && s[0]!='P') ) tqFatal("Invalid or missing entry mode"); data.entryMode = s[0].latin1(); s = element.attribute("pmode"); if ( s.length()!=1 || (s[0]!='0' && s[0]!='1' && s[0]!='4' && s[0]!='n') ) - qFatal("Invalid or missing program mode"); + tqFatal("Invalid or missing program mode"); data.progMode = s[0].latin1(); s = element.attribute("pwidth"); if ( data.progMode!='n' ) { - if ( s.length()!=0 ) qFatal("Program width should not be defined"); + if ( s.length()!=0 ) tqFatal("Program width should not be defined"); data.progWidth = 0; } else { bool ok; data.progWidth = s.toUInt(&ok); - if ( !ok ) qFatal("Invalid or missing program width"); + if ( !ok ) tqFatal("Invalid or missing program width"); } s = element.attribute("regen"); if ( s.isEmpty() || s=="false" ) data.regenerateOsccal = false; else if ( s=="true" ) data.regenerateOsccal = true; - else qFatal("Invalid regen value"); + else tqFatal("Invalid regen value"); } void Pickit2::XmlToData::outputData(const Data &data, TQTextStream &s) const diff --git a/src/progs/pickit2_bootloader/xml/xml_pickit2_bootloader_parser.cpp b/src/progs/pickit2_bootloader/xml/xml_pickit2_bootloader_parser.cpp index f718c03..00c33ed 100644 --- a/src/progs/pickit2_bootloader/xml/xml_pickit2_bootloader_parser.cpp +++ b/src/progs/pickit2_bootloader/xml/xml_pickit2_bootloader_parser.cpp @@ -28,9 +28,9 @@ private: void Pickit2Bootloader::XmlToData::parseData(TQDomElement, Data &) { const Device::Data *ddata = Device::lister().data(currentDevice()); - if ( ddata->group().name()!="pic" ) qFatal("non-pic device not supported"); + if ( ddata->group().name()!="pic" ) tqFatal("non-pic device not supported"); const Pic::Data *pdata = static_cast(ddata); - if ( !pdata->hasFeature(Pic::Feature::USB) ) qFatal("device does not have USB"); + if ( !pdata->hasFeature(Pic::Feature::USB) ) tqFatal("device does not have USB"); } } // namespace diff --git a/src/progs/psp/xml/xml_psp_parser.cpp b/src/progs/psp/xml/xml_psp_parser.cpp index 8b8875b..d2d4aff 100644 --- a/src/progs/psp/xml/xml_psp_parser.cpp +++ b/src/progs/psp/xml/xml_psp_parser.cpp @@ -27,11 +27,11 @@ void Psp::XmlToData::parseData(TQDomElement element, Data &data) { bool ok; data.algorithm = element.attribute("algorithm").toUInt(&ok); - if ( !ok ) qFatal("Missing or invalid algorithm"); + if ( !ok ) tqFatal("Missing or invalid algorithm"); data.overprogram = element.attribute("overprogram").toUInt(&ok); - if ( !ok ) qFatal("Missing or invalid overprogram"); + if ( !ok ) tqFatal("Missing or invalid overprogram"); data.tries = element.attribute("tries").toUInt(&ok); - if ( !ok ) qFatal("Missing or invalid tries"); + if ( !ok ) tqFatal("Missing or invalid tries"); } void Psp::XmlToData::outputData(const Data &data, TQTextStream &s) const diff --git a/src/progs/tbl_bootloader/xml/xml_tbl_bootloader_parser.cpp b/src/progs/tbl_bootloader/xml/xml_tbl_bootloader_parser.cpp index 0960cd1..eb3087d 100644 --- a/src/progs/tbl_bootloader/xml/xml_tbl_bootloader_parser.cpp +++ b/src/progs/tbl_bootloader/xml/xml_tbl_bootloader_parser.cpp @@ -29,12 +29,12 @@ private: void TinyBootloader::XmlToData::parseData(TQDomElement element, Data &data) { const Device::Data *ddata = Device::lister().data(currentDevice()); - if ( ddata->group().name()!="pic" ) qFatal("non-pic device not supported"); + if ( ddata->group().name()!="pic" ) tqFatal("non-pic device not supported"); const Pic::Data *pdata = static_cast(ddata); - if ( !pdata->hasFeature(Pic::Feature::USART) ) qFatal("device does not have USART"); + if ( !pdata->hasFeature(Pic::Feature::USART) ) tqFatal("device does not have USART"); bool ok; data.id = fromHexLabel(element.attribute("id"), 2, &ok); - if ( !ok ) qFatal("Invalid \"id\" tag"); + if ( !ok ) tqFatal("Invalid \"id\" tag"); } void TinyBootloader::XmlToData::outputData(const Data &data, TQTextStream &s) const -- cgit v1.2.1