summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/common/bitvalue.cpp2
-rw-r--r--src/common/common/misc.cpp2
-rw-r--r--src/common/common/number.cpp4
-rw-r--r--src/common/global/generic_config.cpp2
-rw-r--r--src/common/global/progress_monitor.cpp2
-rw-r--r--src/common/global/purl.cpp4
-rw-r--r--src/common/gui/list_view.cpp8
-rw-r--r--src/common/nokde/nokde_kaboutdata.cpp2
-rw-r--r--src/common/nokde/nokde_kcmdlineargs.cpp6
-rw-r--r--src/common/port/port_base.cpp14
-rw-r--r--src/common/port/port_base.h4
-rw-r--r--src/common/port/usb_port.cpp24
12 files changed, 37 insertions, 37 deletions
diff --git a/src/common/common/bitvalue.cpp b/src/common/common/bitvalue.cpp
index 16d5ef0..b0a7a30 100644
--- a/src/common/common/bitvalue.cpp
+++ b/src/common/common/bitvalue.cpp
@@ -17,7 +17,7 @@ BitValue BitValue::XORn(uint n) const
uint res = 0x0;
for (uint i=0; i<nb; i +=n) {
res ^= (_value >> i) & mask;
- //qDebug("%i %s %s", i, toHexLabel((value>>i) & mask, 4).latin1(), toHexLabel(res, 4).latin1());
+ //tqDebug("%i %s %s", i, toHexLabel((value>>i) & mask, 4).latin1(), toHexLabel(res, 4).latin1());
}
return res;
}
diff --git a/src/common/common/misc.cpp b/src/common/common/misc.cpp
index 1c22b4e..0e8b86a 100644
--- a/src/common/common/misc.cpp
+++ b/src/common/common/misc.cpp
@@ -48,7 +48,7 @@ TQString htmlTableRow(const TQString &title, const TQString &value)
void crash(const char *assert, const char *file, int line)
{
- qDebug("CRASH_ASSERT: \"%s\" in %s (%d)", assert, file, line);
+ tqDebug("CRASH_ASSERT: \"%s\" in %s (%d)", assert, file, line);
int * ptr = 0;
(*ptr)++;
}
diff --git a/src/common/common/number.cpp b/src/common/common/number.cpp
index 01fa4eb..e0b5b0a 100644
--- a/src/common/common/number.cpp
+++ b/src/common/common/number.cpp
@@ -26,7 +26,7 @@ const NumberBase::Data NumberBase::DATA[Nb_Types] = {
char toChar(NumberBase base, uint value)
{
Q_ASSERT( value<base.data().base );
- if ( value>=base.data().base ) qDebug("toChar %u (%u)", value, base.data().base);
+ if ( value>=base.data().base ) tqDebug("toChar %u (%u)", value, base.data().base);
if ( base==NumberBase::String ) {
if ( !isprint(value) ) return '.';
return value;
@@ -45,7 +45,7 @@ TQString toString(NumberBase base, ulong value, uint nbChars)
value /= base.data().base;
}
Q_ASSERT( value==0 );
- if ( value!=0 ) qDebug("toString %s nbChars=%u", toLabel(base, tmp, ::nbChars(base, tmp)).latin1(), nbChars);
+ if ( value!=0 ) tqDebug("toString %s nbChars=%u", toLabel(base, tmp, ::nbChars(base, tmp)).latin1(), nbChars);
return s;
}
diff --git a/src/common/global/generic_config.cpp b/src/common/global/generic_config.cpp
index 6ddf44c..6b50ff0 100644
--- a/src/common/global/generic_config.cpp
+++ b/src/common/global/generic_config.cpp
@@ -51,7 +51,7 @@ GenericConfig::~GenericConfig()
void GenericConfig::rollback()
{
#if defined(NO_KDE)
- qWarning("Config rollback not supported");
+ tqWarning("Config rollback not supported");
#else
_d->config().rollback();
#endif
diff --git a/src/common/global/progress_monitor.cpp b/src/common/global/progress_monitor.cpp
index 0b3044d..bcb75a1 100644
--- a/src/common/global/progress_monitor.cpp
+++ b/src/common/global/progress_monitor.cpp
@@ -78,7 +78,7 @@ void ProgressMonitor::addTaskProgress(uint nbSteps)
if ( _current==_tasks.end() ) return;
uint nb = (*_current).nbDoneSteps + nbSteps;
Q_ASSERT( nb<=(*_current).nbSteps );
- if ( nb>(*_current).nbSteps ) qDebug("%s %i+%i > %i", (*_current).label.latin1(), (*_current).nbDoneSteps, nbSteps, (*_current).nbSteps);
+ if ( nb>(*_current).nbSteps ) tqDebug("%s %i+%i > %i", (*_current).label.latin1(), (*_current).nbDoneSteps, nbSteps, (*_current).nbSteps);
(*_current).nbDoneSteps = TQMIN(nb, (*_current).nbSteps);
update();
}
diff --git a/src/common/global/purl.cpp b/src/common/global/purl.cpp
index d0b5498..c9ff16d 100644
--- a/src/common/global/purl.cpp
+++ b/src/common/global/purl.cpp
@@ -62,7 +62,7 @@ TQString PURL::Private::getWindowsDrivePath(char drive)
::Process::StringOutput process;
process.setup("winepath", args, false);
::Process::State state = ::Process::runSynchronously(process, ::Process::Start, 3000);
- if ( state!=::Process::Exited ) qWarning("Error running \"winepath\" with \"%s\" (%i)", args.join(" ").latin1(), state);
+ if ( state!=::Process::Exited ) tqWarning("Error running \"winepath\" with \"%s\" (%i)", args.join(" ").latin1(), state);
s = process.sout() + process.serr();
TQDir dir(s.stripWhiteSpace());
_winDrives[drive] = dir.canonicalPath();
@@ -250,7 +250,7 @@ bool PURL::Base::isInto(const Directory &dir) const
bool PURL::Base::httpUrlExists(bool *ok) const
{
- qInitNetworkProtocols();
+ tqInitNetworkProtocols();
if (ok) *ok = false;
Http http(_url.host());
Synchronous sync(500);
diff --git a/src/common/gui/list_view.cpp b/src/common/gui/list_view.cpp
index 1e0cb66..9bce72c 100644
--- a/src/common/gui/list_view.cpp
+++ b/src/common/gui/list_view.cpp
@@ -46,7 +46,7 @@ bool ListView::eventFilter(TQObject *o, TQEvent *e)
for (it=_editItems.begin(); it!=_editItems.end(); ++it) {
for (uint i=0; i<(*it)->_editWidgets.count(); i++) {
if ( TQT_BASE_OBJECT((*it)->_editWidgets[i])==TQT_BASE_OBJECT(o) ) {
- //qDebug("event %i", e->type());
+ //tqDebug("event %i", e->type());
switch (e->type()) {
case TQEvent::KeyPress: {
TQKeyEvent *ke = TQT_TQKEYEVENT(e);
@@ -62,9 +62,9 @@ bool ListView::eventFilter(TQObject *o, TQEvent *e)
break;
}
case TQEvent::FocusOut: {
- //qDebug("focus out %i %i=%i", tqApp->focusWidget(), focusWidget(), (*it)->_editWidgets[i]);
+ //tqDebug("focus out %i %i=%i", tqApp->focusWidget(), focusWidget(), (*it)->_editWidgets[i]);
if ( tqApp->focusWidget() && focusWidget()==(*it)->_editWidgets[i] ) break;
- //qDebug("ext");
+ //tqDebug("ext");
TQCustomEvent *e = new TQCustomEvent(9999);
TQApplication::postEvent(o, e);
return true;
@@ -73,7 +73,7 @@ bool ListView::eventFilter(TQObject *o, TQEvent *e)
(*it)->renameDone(false);
return true;
default:
- //qDebug(" ignored");
+ //tqDebug(" ignored");
break;
}
}
diff --git a/src/common/nokde/nokde_kaboutdata.cpp b/src/common/nokde/nokde_kaboutdata.cpp
index 85edf3c..e0c4963 100644
--- a/src/common/nokde/nokde_kaboutdata.cpp
+++ b/src/common/nokde/nokde_kaboutdata.cpp
@@ -165,7 +165,7 @@ KAboutData::setLicenseText( const char *licenseText )
void
KAboutData::setLicenseTextFile( const TQString &file )
{
- mLicenseText = qstrdup(TQFile::encodeName(file));
+ mLicenseText = tqstrdup(TQFile::encodeName(file));
mLicenseKey = License_File;
}
diff --git a/src/common/nokde/nokde_kcmdlineargs.cpp b/src/common/nokde/nokde_kcmdlineargs.cpp
index 42dc5c1..6c34b0b 100644
--- a/src/common/nokde/nokde_kcmdlineargs.cpp
+++ b/src/common/nokde/nokde_kcmdlineargs.cpp
@@ -618,7 +618,7 @@ KCmdLineArgs::parseAllArgs()
else if ( (::qstrcmp(option, "version") == 0) ||
(::qstrcmp(option, "v") == 0))
{
- printQ( TQString("TQt: %1\n").arg(qVersion()));
+ printQ( TQString("TQt: %1\n").arg(tqVersion()));
// printQ( TQString("KDE: %1\n").arg(TDE_VERSION_STRING));
printQ( TQString("%1: %2\n").
arg(about->programName()).arg(about->version()));
@@ -742,11 +742,11 @@ KCmdLineArgs::qt_argv()
}
qt_argv = new char*[ args->count() + 2 ];
- qt_argv[ 0 ] = qstrdup( appName());
+ qt_argv[ 0 ] = tqstrdup( appName());
int i = 0;
for(; i < args->count(); i++)
{
- qt_argv[i+1] = qstrdup((char *) args->arg(i));
+ qt_argv[i+1] = tqstrdup((char *) args->arg(i));
}
qt_argv[i+1] = 0;
diff --git a/src/common/port/port_base.cpp b/src/common/port/port_base.cpp
index 63e820e..249db1a 100644
--- a/src/common/port/port_base.cpp
+++ b/src/common/port/port_base.cpp
@@ -58,32 +58,32 @@ bool Port::Base::receiveChar(char &c, uint timeout)
bool Port::Base::setPinOn(uint, bool, LogicType)
{
- qFatal("setPinOn not implemented");
+ tqFatal("setPinOn not implemented");
return false;
}
bool Port::Base::readPin(uint, LogicType, bool &)
{
- qFatal("readPin not implemented");
+ tqFatal("readPin not implemented");
return 0;
}
TQValueVector<Port::PinData> Port::Base::pinData(IODir) const
{
- qFatal("pinData not implemented");
+ tqFatal("pinData not implemented");
return TQValueVector<PinData>();
}
bool Port::Base::isGroundPin(uint) const
{
- qFatal("isGroundPin not implemented");
+ tqFatal("isGroundPin not implemented");
return false;
}
uint Port::Base::groundPin() const
{
- qFatal("groundPin not implemented");
+ tqFatal("groundPin not implemented");
return 0;
}
Port::IODir Port::Base::ioDir(uint) const
{
- qFatal("ioType not implemented");
+ tqFatal("ioType not implemented");
return NoIO;
}
@@ -121,7 +121,7 @@ void Port::Base::logData(const TQString &)
}
}
}
- qDebug("%s", vs.latin1());
+ tqDebug("%s", vs.latin1());
*/
//log(Log::Debug, vs);
}
diff --git a/src/common/port/port_base.h b/src/common/port/port_base.h
index c48fed6..5e3ff27 100644
--- a/src/common/port/port_base.h
+++ b/src/common/port/port_base.h
@@ -46,8 +46,8 @@ public:
protected:
virtual bool internalOpen() = 0;
virtual void internalClose() = 0;
- virtual bool internalSend(const char *, uint, uint) { qFatal("Not implemented"); return false; }
- virtual bool internalReceive(uint, char *, uint) { qFatal("Not implemented"); return false; }
+ virtual bool internalSend(const char *, uint, uint) { tqFatal("Not implemented"); return false; }
+ virtual bool internalReceive(uint, char *, uint) { tqFatal("Not implemented"); return false; }
virtual void setSystemError(const TQString &message) = 0;
private:
diff --git a/src/common/port/usb_port.cpp b/src/common/port/usb_port.cpp
index 76fa5b0..8ef4168 100644
--- a/src/common/port/usb_port.cpp
+++ b/src/common/port/usb_port.cpp
@@ -39,7 +39,7 @@ void Port::USB::initialize()
usb_init();
VersionData vd = VersionData::fromString(LIBUSB_VERSION);
TQString s = TQString("libusb %1").arg(vd.pretty());
- if ( vd<VersionData(0, 1, 8) ) qWarning("%s: may be too old (you need at least version 0.1.8)", s.latin1());
+ if ( vd<VersionData(0, 1, 8) ) tqWarning("%s: may be too old (you need at least version 0.1.8)", s.latin1());
#endif
}
@@ -71,13 +71,13 @@ bool Port::USB::findBulk(const struct usb_device *dev)
#ifdef HAVE_USB
int configuration = -1, interface = -1, altsetting = -1, bulk_endpoint = -1;
// walk through the possible configs, etc.
- qDebug("This device has %d possible configuration(s).", dev->descriptor.bNumConfigurations);
+ tqDebug("This device has %d possible configuration(s).", dev->descriptor.bNumConfigurations);
for (int c=0; c<dev->descriptor.bNumConfigurations; c++) {
- qDebug("Looking at configuration %d...This configuration has %d interfaces.", c, dev->config[c].bNumInterfaces);
+ tqDebug("Looking at configuration %d...This configuration has %d interfaces.", c, dev->config[c].bNumInterfaces);
for(int i=0; i<dev->config[c].bNumInterfaces; i++) {
- qDebug(" Looking at interface %d...This interface has %d altsettings.", i, dev->config[c].interface[i].num_altsetting);
+ tqDebug(" Looking at interface %d...This interface has %d altsettings.", i, dev->config[c].interface[i].num_altsetting);
for (int a=0; a < dev->config[c].interface[i].num_altsetting; a++) {
- qDebug(" Looking at altsetting %d...This altsetting has %d endpoints.", a, dev->config[c].interface[i].altsetting[a].bNumEndpoints);
+ tqDebug(" Looking at altsetting %d...This altsetting has %d endpoints.", a, dev->config[c].interface[i].altsetting[a].bNumEndpoints);
for (int e=0; e < dev->config[c].interface[i].altsetting[a].bNumEndpoints; e++) {
TQString s;
s.sprintf(" Endpoint %d: Address %02xh, attributes %02xh ", e, dev->config[c].interface[i].altsetting[a].endpoint[e].bEndpointAddress, dev->config[c].interface[i].altsetting[a].endpoint[e].bmAttributes);
@@ -109,13 +109,13 @@ bool Port::USB::findBulk(const struct usb_device *dev)
default: s += "ERROR! Got an illegal value in endpoint bEndpointAddress";
}
}
- qDebug("%s", s.latin1());
+ tqDebug("%s", s.latin1());
}
}
}
}
if (bulk_endpoint<0) {
- qDebug("No valid interface found!");
+ tqDebug("No valid interface found!");
return false;
}
#endif
@@ -151,7 +151,7 @@ struct usb_device *Port::USB::findDevice(uint vendorId, uint productId)
}
#else
Q_UNUSED(vendorId); Q_UNUSED(productId);
- qDebug("USB support disabled");
+ tqDebug("USB support disabled");
#endif
return 0;
}
@@ -350,10 +350,10 @@ bool Port::USB::write(uint ep, const char *data, uint size)
int todo = size;
for (;;) {
int res = 0;
- //qDebug("write ep=%i todo=%i/%i", ep, todo, size);
+ //tqDebug("write ep=%i todo=%i/%i", ep, todo, size);
if ( mode==Interrupt ) res = usb_interrupt_write(_handle, ep, (char *)data + size - todo, todo, timeout(todo));
else res = usb_bulk_write(_handle, ep, (char *)data + size - todo, todo, timeout(todo));
- //qDebug("res: %i", res);
+ //tqDebug("res: %i", res);
if ( res==todo ) break;
if ( uint(time.elapsed())>3000 ) { // 3 s
if ( res<0 ) setSystemError(i18n("Error sending data (ep=%1 res=%2)").arg(toHexLabel(ep, 2)).arg(res));
@@ -384,10 +384,10 @@ bool Port::USB::read(uint ep, char *data, uint size, bool *poll)
int todo = size;
for (;;) {
int res = 0;
- //qDebug("read ep=%i size=%i", ep, todo);
+ //tqDebug("read ep=%i size=%i", ep, todo);
if ( mode==Interrupt ) res = usb_interrupt_read(_handle, ep, data + size - todo, todo, timeout(todo));
else res = usb_bulk_read(_handle, ep, data + size - todo, todo, timeout(todo));
- //qDebug("res: %i", res);
+ //tqDebug("res: %i", res);
if ( res==todo ) break;
if ( uint(time.elapsed())>3000 ) { // 3 s: seems to help icd2 in some case (?)
if ( res<0 ) setSystemError(i18n("Error receiving data (ep=%1 res=%2)").arg(toHexLabel(ep, 2)).arg(res));
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-20 09:22:51 +0000