summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-01 13:33:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-01 13:33:40 -0600
commit4fb897b216c41c13f128c71bcc66f60e2dc601c4 (patch)
tree2891b54cd6ec39db133da0110028ec93fc006751 /tdecore
parent8fc8811ef6079a15decd33f1ea5d95dd718e4557 (diff)
downloadtdelibs-4fb897b216c41c13f128c71bcc66f60e2dc601c4.tar.gz
tdelibs-4fb897b216c41c13f128c71bcc66f60e2dc601c4.zip
Rename additional global TQt functions
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/DESIGN.iconloading2
-rw-r--r--tdecore/kaboutdata.cpp4
-rw-r--r--tdecore/kallocator.cpp10
-rw-r--r--tdecore/kclipboard.cpp6
-rw-r--r--tdecore/kcmdlineargs.cpp6
-rw-r--r--tdecore/kcompletion.cpp2
-rw-r--r--tdecore/kconfigbackend.cpp6
-rw-r--r--tdecore/kcrash.h4
-rw-r--r--tdecore/kdebug.cpp4
-rw-r--r--tdecore/kglobal.cpp2
-rw-r--r--tdecore/kglobal.h4
-rw-r--r--tdecore/kiconloader.cpp2
-rw-r--r--tdecore/kinstance.cpp2
-rw-r--r--tdecore/kkeyserver_x11.cpp4
-rw-r--r--tdecore/klockfile.cpp6
-rw-r--r--tdecore/kmacroexpander.cpp4
-rw-r--r--tdecore/kstandarddirs.cpp4
-rw-r--r--tdecore/ksycoca.cpp6
-rw-r--r--tdecore/ksycocadict.cpp2
-rw-r--r--tdecore/ktempdir.cpp2
-rw-r--r--tdecore/kxerrorhandler.cpp4
-rw-r--r--tdecore/libqt-mt.nmcheck12
-rw-r--r--tdecore/network/khttpproxysocketdevice.cpp8
-rw-r--r--tdecore/network/kresolvermanager.cpp18
-rw-r--r--tdecore/network/kresolverstandardworkers.cpp16
-rw-r--r--tdecore/tests/KIDLTest.cpp8
-rw-r--r--tdecore/tests/KIDLTestClient.cpp2
-rw-r--r--tdecore/tests/cplusplustest.cpp10
-rw-r--r--tdecore/tests/kapptest.cpp4
-rw-r--r--tdecore/tests/kconfigtest.cpp4
-rw-r--r--tdecore/tests/klocaletest.cpp2
-rw-r--r--tdecore/tests/ksocktest.cpp4
-rw-r--r--tdecore/tests/ksortablevaluelisttest.cpp12
-rw-r--r--tdecore/tests/kuniqueapptest.cpp2
-rw-r--r--tdecore/tests/testqtargs.cpp10
35 files changed, 99 insertions, 99 deletions
diff --git a/tdecore/DESIGN.iconloading b/tdecore/DESIGN.iconloading
index ceb2ffbce..bcfb13c95 100644
--- a/tdecore/DESIGN.iconloading
+++ b/tdecore/DESIGN.iconloading
@@ -45,7 +45,7 @@ Server can publish an icon (test.png) like this:
QImage i("test.png");
QPixmap p;
p.convertFromImage(i);
- qWarning("Handle = %08x", p.handle());
+ tqWarning("Handle = %08x", p.handle());
Now, if Handle is e.g. 0x06c0000b, the following code (in another process)
can copy this pixmap:
diff --git a/tdecore/kaboutdata.cpp b/tdecore/kaboutdata.cpp
index d408fbfc3..00d75225b 100644
--- a/tdecore/kaboutdata.cpp
+++ b/tdecore/kaboutdata.cpp
@@ -168,7 +168,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;
}
@@ -275,7 +275,7 @@ KAboutData::translateInternalProgramName() const
delete[] d->mTranslatedProgramName;
d->mTranslatedProgramName = 0;
if( KGlobal::locale() )
- d->mTranslatedProgramName = qstrdup( programName().utf8());
+ d->mTranslatedProgramName = tqstrdup( programName().utf8());
}
TQImage
diff --git a/tdecore/kallocator.cpp b/tdecore/kallocator.cpp
index c02bbf3ff..e8d2e8692 100644
--- a/tdecore/kallocator.cpp
+++ b/tdecore/kallocator.cpp
@@ -76,7 +76,7 @@ KZoneAllocator::~KZoneAllocator()
#ifndef NDEBUG // as this is called quite late in the app, we don't care
// to use kdDebug
if (count > 1)
- qDebug("zone still contained %d blocks", count);
+ tqDebug("zone still contained %d blocks", count);
#endif
}
@@ -190,12 +190,12 @@ KZoneAllocator::allocate(size_t _size)
if ((unsigned long) _size + blockOffset > blockSize)
{
if (_size > blockSize) {
- qDebug("KZoneAllocator: allocating more than %lu bytes", blockSize);
+ tqDebug("KZoneAllocator: allocating more than %lu bytes", blockSize);
return 0;
}
addBlock(new MemBlock(blockSize));
blockOffset = 0;
- //qDebug ("Allocating block #%d (%x)\n", num_blocks, currentBlock->begin);
+ //tqDebug ("Allocating block #%d (%x)\n", num_blocks, currentBlock->begin);
}
void *result = (void *)(currentBlock->begin+blockOffset);
currentBlock->ref++;
@@ -214,7 +214,7 @@ KZoneAllocator::deallocate(void *ptr)
if (!list) {
/* Can happen with certain usage pattern of intermixed free_since()
and deallocate(). */
- //qDebug("Uhoh");
+ //tqDebug("Uhoh");
return;
}
TQValueList<MemBlock*>::ConstIterator it = list->begin();
@@ -233,7 +233,7 @@ KZoneAllocator::deallocate(void *ptr)
}
/* Can happen with certain usage pattern of intermixed free_since()
and deallocate(). */
- //qDebug("Uhoh2");
+ //tqDebug("Uhoh2");
}
void
diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp
index 48b76f7ce..1e3cafbae 100644
--- a/tdecore/kclipboard.cpp
+++ b/tdecore/kclipboard.cpp
@@ -137,7 +137,7 @@ void KClipboardSynchronizer::slotSelectionChanged()
{
TQClipboard *clip = TQApplication::clipboard();
-// qDebug("*** sel changed: %i", s_blocked);
+// tqDebug("*** sel changed: %i", s_blocked);
if ( s_blocked || !clip->ownsSelection() )
return;
@@ -149,7 +149,7 @@ void KClipboardSynchronizer::slotClipboardChanged()
{
TQClipboard *clip = TQApplication::clipboard();
-// qDebug("*** clip changed : %i (implicit: %i, ownz: clip: %i, selection: %i)", s_blocked, s_implicitSelection, clip->ownsClipboard(), clip->ownsSelection());
+// tqDebug("*** clip changed : %i (implicit: %i, ownz: clip: %i, selection: %i)", s_blocked, s_implicitSelection, clip->ownsClipboard(), clip->ownsSelection());
if ( s_blocked || !clip->ownsClipboard() )
return;
@@ -159,7 +159,7 @@ void KClipboardSynchronizer::slotClipboardChanged()
void KClipboardSynchronizer::setClipboard( TQMimeSource *data, TQClipboard::Mode mode )
{
-// qDebug("---> setting clipboard: %p", data);
+// tqDebug("---> setting clipboard: %p", data);
TQClipboard *clip = TQApplication::clipboard();
diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp
index 0e1dc7ea9..c070c048d 100644
--- a/tdecore/kcmdlineargs.cpp
+++ b/tdecore/kcmdlineargs.cpp
@@ -593,7 +593,7 @@ KCmdLineArgs::parseAllArgs()
else if ( (::qstrcmp(option, "version") == 0) ||
(::qstrcmp(option, "v") == 0))
{
- printQ( TQString("Qt: %1\n").arg(qVersion()));
+ printQ( TQString("Qt: %1\n").arg(tqVersion()));
printQ( TQString("TDE: %1\n").arg(TDE_VERSION_STRING));
printQ( TQString("%1: %2\n").
arg(about->programName()).arg(about->version()));
@@ -728,11 +728,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/tdecore/kcompletion.cpp b/tdecore/kcompletion.cpp
index 84a4cfca2..f74c0460c 100644
--- a/tdecore/kcompletion.cpp
+++ b/tdecore/kcompletion.cpp
@@ -136,7 +136,7 @@ void KCompletion::addItem( const TQString& item, uint weight )
node = node->insert( 0x0, true );
if ( weighted )
node->confirm( weight -1 );
-// qDebug("*** added: %s (%i)", item.latin1(), node->weight());
+// tqDebug("*** added: %s (%i)", item.latin1(), node->weight());
}
void KCompletion::addWeightedItem( const TQString& item )
diff --git a/tdecore/kconfigbackend.cpp b/tdecore/kconfigbackend.cpp
index fe4dfda8e..966c8c219 100644
--- a/tdecore/kconfigbackend.cpp
+++ b/tdecore/kconfigbackend.cpp
@@ -456,7 +456,7 @@ void KConfigINIBackEnd::parseSingleConfigFile(TQFile &rFile,
//using kdDebug() here leads to an infinite loop
//remove this for the release, aleXXX
- //qWarning("Parsing %s, global = %s default = %s",
+ //tqWarning("Parsing %s, global = %s default = %s",
// rFile.name().latin1(), bGlobal ? "true" : "false", bDefault ? "true" : "false");
TQCString aCurrentGroup("<default>");
@@ -486,7 +486,7 @@ void KConfigINIBackEnd::parseSingleConfigFile(TQFile &rFile,
if (sigsetjmp (mmap_jmpbuf, 1))
{
-qWarning("SIGBUS while reading %s", rFile.name().latin1());
+tqWarning("SIGBUS while reading %s", rFile.name().latin1());
munmap(( char* )map, rFile.size());
sigaction (SIGBUS, &mmap_old_sigact, 0);
return;
@@ -696,7 +696,7 @@ qWarning("SIGBUS while reading %s", rFile.name().latin1());
// insert the key/value line
TQCString key(startLine, endOfKey - startLine + 2);
TQCString val = printableToString(st, s - st);
- //qDebug("found key '%s' with value '%s'", key.data(), val.data());
+ //tqDebug("found key '%s' with value '%s'", key.data(), val.data());
if (TQString(key.data()) == "X-Ubuntu-Gettext-Domain") {
gettextDomain = val.data();
diff --git a/tdecore/kcrash.h b/tdecore/kcrash.h
index 790c5fd38..d6941b825 100644
--- a/tdecore/kcrash.h
+++ b/tdecore/kcrash.h
@@ -97,7 +97,7 @@ class TDECORE_EXPORT KCrash
* Dr. Konqi, our nice crash display application.
* @param path the application path.
*/
- static void setApplicationPath (TQString path) { appPath = qstrdup(path.local8Bit().data()); }
+ static void setApplicationPath (TQString path) { appPath = tqstrdup(path.local8Bit().data()); }
/* KDE 4: Make it const TQString & */
/**
@@ -105,7 +105,7 @@ class TDECORE_EXPORT KCrash
* Dr. Konqi, our nice crash display application.
* @param name the name of the application, as shown in Dr. Konqi
*/
- static void setApplicationName (TQString name) { appName = qstrdup(name.local8Bit().data()); }
+ static void setApplicationName (TQString name) { appName = tqstrdup(name.local8Bit().data()); }
/* KDE 4: Make it const TQString & */
protected:
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index 05ee2c0e7..9f2d1458c 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -99,7 +99,7 @@ static TQCString getDescrFromNum(unsigned int _num)
TQFile file(filename);
if (!file.open(IO_ReadOnly)) {
- qWarning("Couldn't open %s", filename.local8Bit().data());
+ tqWarning("Couldn't open %s", filename.local8Bit().data());
file.close();
return TQCString();
}
@@ -121,7 +121,7 @@ static TQCString getDescrFromNum(unsigned int _num)
continue; // We have an eof, a comment or an empty line
if (ch < '0' && ch > '9') {
- qWarning("Syntax error: no number (line %u)",lineNumber);
+ tqWarning("Syntax error: no number (line %u)",lineNumber);
continue;
}
diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp
index b886d8d7f..6a4702853 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/kglobal.cpp
@@ -42,7 +42,7 @@
#ifndef NDEBUG
#define MYASSERT(x) if (!x) \
- qFatal("Fatal error: you need to have a KInstance object before\n" \
+ tqFatal("Fatal error: you need to have a KInstance object before\n" \
"you do anything that requires it! Examples of this are config\n" \
"objects, standard directories or translations.");
#else
diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h
index ca0101149..cd433d530 100644
--- a/tdecore/kglobal.h
+++ b/tdecore/kglobal.h
@@ -211,9 +211,9 @@ inline const T& kClamp( const T& x, const T& low, const T& high )
}
/**
- * Locale-independent qstricmp. Use this for comparing ascii keywords
+ * Locale-independent tqstricmp. Use this for comparing ascii keywords
* in a case-insensitive way.
- * qstricmp fails with e.g. the Turkish locale where 'I'.lower() != 'i'
+ * tqstricmp fails with e.g. the Turkish locale where 'I'.lower() != 'i'
* @since 3.4
*/
int TDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 );
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index 9b95084a0..61e0a496b 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -1173,7 +1173,7 @@ TQIconSet KIconLoader::loadIconSet( const TQString& name, KIcon::Group g, int s,
if (g < -1 || g > 6) {
kdDebug() << "KIconLoader::loadIconSet " << name << " " << (int)g << " " << s << endl;
- qDebug("%s", kdBacktrace().latin1());
+ tqDebug("%s", kdBacktrace().latin1());
abort();
}
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index 2a579de0a..d0f4ffcbb 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -40,7 +40,7 @@
static TQPtrDict<TQCString> *allOldInstances = 0;
#define DEBUG_ADD do { if (!allInstances) { allInstances = new TQPtrList<KInstance>(); allOldInstances = new TQPtrDict<TQCString>(); } allInstances->append(this); allOldInstances->insert( this, new TQCString( _name)); } while (false);
#define DEBUG_REMOVE do { allInstances->removeRef(this); } while (false);
- #define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((KInstance*)this)) { TQCString *old = allOldInstances->find((KInstance*)this); qWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false);
+ #define DEBUG_CHECK_ALIVE do { if (!allInstances->contains((KInstance*)this)) { TQCString *old = allOldInstances->find((KInstance*)this); tqWarning("ACCESSING DELETED KINSTANCE! (%s)", old ? old->data() : "<unknown>"); assert(false); } } while (false);
#else
#define DEBUG_ADD
#define DEBUG_REMOVE
diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp
index 54df04e60..49a523346 100644
--- a/tdecore/kkeyserver_x11.cpp
+++ b/tdecore/kkeyserver_x11.cpp
@@ -442,7 +442,7 @@ bool Sym::init( const TQString& s )
// Look up in special names list
for( int i = 0; g_rgSymNames[i].sym != 0; i++ ) {
- if( qstricmp( s.latin1(), g_rgSymNames[i].psName ) == 0 ) {
+ if( tqstricmp( s.latin1(), g_rgSymNames[i].psName ) == 0 ) {
m_sym = g_rgSymNames[i].sym;
return true;
}
@@ -451,7 +451,7 @@ bool Sym::init( const TQString& s )
#ifdef Q_WS_WIN
// search for name in KKeys array
for ( KKeys const *pKey = kde_KKEYS; pKey->code != 0xffff; pKey++) {
- if( qstricmp( s.latin1(), pKey->name ) == 0 ) {
+ if( tqstricmp( s.latin1(), pKey->name ) == 0 ) {
m_sym = pKey->code;
return true;
}
diff --git a/tdecore/klockfile.cpp b/tdecore/klockfile.cpp
index 3bd6edb30..bc2175d0d 100644
--- a/tdecore/klockfile.cpp
+++ b/tdecore/klockfile.cpp
@@ -206,7 +206,7 @@ static KLockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struc
if ((KDE_lstat(lckFile, &st_buf2) == 0) && statResultIsEqual(st_buf1, st_buf2))
{
// - - if yes, delete lock file, delete temp file, retry lock
- qWarning("WARNING: deleting stale lockfile %s", lckFile.data());
+ tqWarning("WARNING: deleting stale lockfile %s", lckFile.data());
::unlink(lckFile);
::unlink(tmpFile);
return KLockFile::LockOK;
@@ -224,14 +224,14 @@ static KLockFile::LockResult deleteStaleLock(const TQString &lockFile, KDE_struc
statResultIsEqual(st_buf, st_buf2))
{
// Without support for link counts we will have a little race condition
- qWarning("WARNING: deleting stale lockfile %s", lckFile.data());
+ tqWarning("WARNING: deleting stale lockfile %s", lckFile.data());
::unlink(lckFile);
::unlink(tmpFile);
return KLockFile::LockOK;
}
// Failed to delete stale lock file
- qWarning("WARNING: Problem deleting stale lockfile %s", lckFile.data());
+ tqWarning("WARNING: Problem deleting stale lockfile %s", lckFile.data());
::unlink(tmpFile);
return KLockFile::LockFail;
}
diff --git a/tdecore/kmacroexpander.cpp b/tdecore/kmacroexpander.cpp
index 2a997deaa..9cfddcc63 100644
--- a/tdecore/kmacroexpander.cpp
+++ b/tdecore/kmacroexpander.cpp
@@ -285,10 +285,10 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str )
}
int KMacroExpanderBase::expandPlainMacro( const TQString &, uint, TQStringList & )
-{ qFatal( "KMacroExpanderBase::expandPlainMacro called!" ); return 0; }
+{ tqFatal( "KMacroExpanderBase::expandPlainMacro called!" ); return 0; }
int KMacroExpanderBase::expandEscapedMacro( const TQString &, uint, TQStringList & )
-{ qFatal( "KMacroExpanderBase::expandEscapedMacro called!" ); return 0; }
+{ tqFatal( "KMacroExpanderBase::expandEscapedMacro called!" ); return 0; }
//////////////////////////////////////////////////
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index 55a3b5e8c..8b936aa8e 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -1083,7 +1083,7 @@ TQString KStandardDirs::kde_default(const char *type) {
return "share/emoticons";
- qFatal("unknown resource type %s", type);
+ tqFatal("unknown resource type %s", type);
return TQString::null;
}
@@ -1118,7 +1118,7 @@ TQString KStandardDirs::saveLocation(const char *type,
else {
dirs = absolutes.find(type);
if (!dirs)
- qFatal("KStandardDirs: The resource type %s is not registered", type);
+ tqFatal("KStandardDirs: The resource type %s is not registered", type);
pPath = new TQString(realPath(dirs->last()));
}
diff --git a/tdecore/ksycoca.cpp b/tdecore/ksycoca.cpp
index 441f6d530..b7763f699 100644
--- a/tdecore/ksycoca.cpp
+++ b/tdecore/ksycoca.cpp
@@ -213,7 +213,7 @@ static void delete_ksycoca_self() {
KSycoca * KSycoca::self()
{
if (!_self) {
- qAddPostRoutine(delete_ksycoca_self);
+ tqAddPostRoutine(delete_ksycoca_self);
_self = new KSycoca();
}
return _self;
@@ -443,7 +443,7 @@ KSycoca * KSycoca::_self = 0L;
void KSycoca::flagError()
{
- qWarning("ERROR: KSycoca database corruption!");
+ tqWarning("ERROR: KSycoca database corruption!");
if (_self)
{
if (_self->d->readError)
@@ -451,7 +451,7 @@ void KSycoca::flagError()
_self->d->readError = true;
if (_self->d->autoRebuild)
if(system("kbuildsycoca") < 0) // Rebuild the damned thing.
- qWarning("ERROR: Running KSycoca failed.");
+ tqWarning("ERROR: Running KSycoca failed.");
}
}
diff --git a/tdecore/ksycocadict.cpp b/tdecore/ksycocadict.cpp
index d1deb609b..d8dcf3a24 100644
--- a/tdecore/ksycocadict.cpp
+++ b/tdecore/ksycocadict.cpp
@@ -348,7 +348,7 @@ KSycocaDict::save(TQDataStream &str)
if (maxDiv <= lastDiv)
break;
- // qWarning("Max Div = %d at pos %d", maxDiv, maxPos);
+ // tqWarning("Max Div = %d at pos %d", maxDiv, maxPos);
lastDiv = maxDiv;
addDiversity(d, maxPos);
mHashList.append(maxPos);
diff --git a/tdecore/ktempdir.cpp b/tdecore/ktempdir.cpp
index dc443b3d5..c134914c1 100644
--- a/tdecore/ktempdir.cpp
+++ b/tdecore/ktempdir.cpp
@@ -80,7 +80,7 @@ KTempDir::create(const TQString &directoryPrefix, int mode)
{
// Recreate it for the warning, mkdtemps emptied it
TQCString nme = TQFile::encodeName(directoryPrefix) + "XXXXXX";
- qWarning("KTempDir: Error trying to create %s: %s", nme.data(), strerror(errno));
+ tqWarning("KTempDir: Error trying to create %s: %s", nme.data(), strerror(errno));
mError = errno;
mTmpName = TQString::null;
return false;
diff --git a/tdecore/kxerrorhandler.cpp b/tdecore/kxerrorhandler.cpp
index 43a05f42e..3a8524bed 100644
--- a/tdecore/kxerrorhandler.cpp
+++ b/tdecore/kxerrorhandler.cpp
@@ -105,7 +105,7 @@ int KXErrorHandler::handle( Display* dpy, XErrorEvent* e )
// e->serial >= first_request , compare like X timestamps to handle wrapping
&& NET::timestampCompare( e->serial, first_request ) >= 0 )
{ // it's for us
- //qDebug( "Handling: %p", static_cast< void* >( this ));
+ //tqDebug( "Handling: %p", static_cast< void* >( this ));
if( user_handler1 != NULL && user_handler1( e->request_code, e->error_code, e->resourceid ))
was_error = true;
if( user_handler2 != NULL && user_handler2( dpy, e ) != 0 )
@@ -114,7 +114,7 @@ int KXErrorHandler::handle( Display* dpy, XErrorEvent* e )
was_error = true;
return 0;
}
- //qDebug( "Going deeper: %p", static_cast< void* >( this ));
+ //tqDebug( "Going deeper: %p", static_cast< void* >( this ));
return old_handler( dpy, e );
}
diff --git a/tdecore/libqt-mt.nmcheck b/tdecore/libqt-mt.nmcheck
index 017dc25d5..e18ee438f 100644
--- a/tdecore/libqt-mt.nmcheck
+++ b/tdecore/libqt-mt.nmcheck
@@ -5,14 +5,14 @@ Q*::*
qt_*
# these should preferably go in some namespace in Qt4
-qDebug
-qFatal
-qWarning
+tqDebug
+tqFatal
+tqWarning
tqApp
tqAppName
-qVersion
-qSysInfo
-qObsolete
+tqVersion
+tqSysInfo
+tqObsolete
bitBlt
static_QUType_*
TID_QUType_*
diff --git a/tdecore/network/khttpproxysocketdevice.cpp b/tdecore/network/khttpproxysocketdevice.cpp
index 15a7482ad..42d65326b 100644
--- a/tdecore/network/khttpproxysocketdevice.cpp
+++ b/tdecore/network/khttpproxysocketdevice.cpp
@@ -182,12 +182,12 @@ bool KHttpProxySocketDevice::parseServerReply()
TQ_LONG written = tqwriteBlock(d->request, d->request.length());
if (written < 0)
{
- qDebug("KHttpProxySocketDevice: would block writing request!");
+ tqDebug("KHttpProxySocketDevice: would block writing request!");
if (error() == WouldBlock)
setError(IO_ConnectError, InProgress);
return error() == WouldBlock; // error
}
- qDebug("KHttpProxySocketDevice: request written");
+ tqDebug("KHttpProxySocketDevice: request written");
d->request.remove(0, written);
@@ -206,7 +206,7 @@ bool KHttpProxySocketDevice::parseServerReply()
if (!blocking())
{
TQ_LONG avail = bytesAvailable();
- qDebug("KHttpProxySocketDevice: %ld bytes available", avail);
+ tqDebug("KHttpProxySocketDevice: %ld bytes available", avail);
setState(0);
if (avail == 0)
{
@@ -264,7 +264,7 @@ bool KHttpProxySocketDevice::parseServerReply()
}
// now really parse the reply
- qDebug("KHttpProxySocketDevice: get reply: %s\n",
+ tqDebug("KHttpProxySocketDevice: get reply: %s\n",
d->reply.left(d->reply.find('\r')).data());
if (d->reply.left(7) != "HTTP/1." ||
(index = d->reply.find(' ')) == -1 ||
diff --git a/tdecore/network/kresolvermanager.cpp b/tdecore/network/kresolvermanager.cpp
index b3c7172ae..7801a4295 100644
--- a/tdecore/network/kresolvermanager.cpp
+++ b/tdecore/network/kresolvermanager.cpp
@@ -207,7 +207,7 @@ public:
// other threads are already using the API, so wait till
// it's all clear
// the thread that emits this condition will also call res_init
- //qDebug("ResInitUsage: waiting for libresolv to be clear");
+ //tqDebug("ResInitUsage: waiting for libresolv to be clear");
cond.wait(&mutex);
}
else
@@ -264,12 +264,12 @@ void KResolverThread::run()
// initialisation
// enter the loop already
- //qDebug("KResolverThread(thread %u/%p): started", pid, (void*)TQThread::currentThread());
+ //tqDebug("KResolverThread(thread %u/%p): started", pid, (void*)TQThread::currentThread());
KResolverManager::manager()->registerThread(this);
while (true)
{
data = KResolverManager::manager()->requestData(this, ::maxThreadWaitTime);
- //qDebug("KResolverThread(thread %u/%p) got data %p", KResolverManager::pid,
+ //tqDebug("KResolverThread(thread %u/%p) got data %p", KResolverManager::pid,
// (void*)TQThread::currentThread(), (void*)data);
if (data)
{
@@ -292,7 +292,7 @@ void KResolverThread::run()
}
KResolverManager::manager()->unregisterThread(this);
- //qDebug("KResolverThread(thread %u/%p): exiting", pid, (void*)TQThread::currentThread());
+ //tqDebug("KResolverThread(thread %u/%p): exiting", pid, (void*)TQThread::currentThread());
}
bool KResolverThread::checkResolver()
@@ -415,7 +415,7 @@ void KResolverManager::releaseData(KResolverThread *, RequestData* data)
// This function is called in a worker thread!!
/////
- //qDebug("KResolverManager::releaseData(%u/%p): %p has been released", pid,
+ //tqDebug("KResolverManager::releaseData(%u/%p): %p has been released", pid,
// (void*)TQThread::currentThread(), (void*)data);
if (data->obj)
@@ -460,7 +460,7 @@ void KResolverManager::handleFinished()
curr = currentRequests.prev();
}
- //qDebug("KResolverManager::handleFinished(%u): %d requests to notify", pid, doneRequests.count());
+ //tqDebug("KResolverManager::handleFinished(%u): %d requests to notify", pid, doneRequests.count());
while (RequestData *d = doneRequests.dequeue())
doNotifying(d);
@@ -468,7 +468,7 @@ void KResolverManager::handleFinished()
if (redo)
{
- //qDebug("KResolverManager::handleFinished(%u): restarting processing to catch requestor",
+ //tqDebug("KResolverManager::handleFinished(%u): restarting processing to catch requestor",
// pid);
handleFinished();
}
@@ -490,7 +490,7 @@ bool KResolverManager::handleFinishedItem(RequestData* curr)
if (curr->requestor)
--curr->requestor->nRequests;
- //qDebug("KResolverManager::handleFinishedItem(%u): removing %p since it's done",
+ //tqDebug("KResolverManager::handleFinishedItem(%u): removing %p since it's done",
// pid, (void*)curr);
return true;
}
@@ -600,7 +600,7 @@ void KResolverManager::doNotifying(RequestData *p)
// reset address
r.setAddress(p->input->node, p->input->service);
- //qDebug("KResolverManager::doNotifying(%u/%p): for %p whose status is %d and has %d results",
+ //tqDebug("KResolverManager::doNotifying(%u/%p): for %p whose status is %d and has %d results",
//pid, (void*)TQThread::currentThread(), (void*)p, p->obj->status, r.count());
p->obj->errorcode = r.error();
diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp
index a295335b5..5f0229969 100644
--- a/tdecore/network/kresolverstandardworkers.cpp
+++ b/tdecore/network/kresolverstandardworkers.cpp
@@ -240,7 +240,7 @@ namespace
int my_h_errno;
char *buf = 0L;
- // qDebug("ResolveThread::run(): started threaded gethostbyname for %s (af = %d)",
+ // tqDebug("ResolveThread::run(): started threaded gethostbyname for %s (af = %d)",
// m_hostname.data(), m_af);
ResolverLocker resLock( this );
@@ -287,7 +287,7 @@ namespace
if (resultptr != 0L)
my_h_errno = 0;
- // qDebug("GetHostByNameThread::run(): gethostbyname for %s (af = %d) returned: %d",
+ // tqDebug("GetHostByNameThread::run(): gethostbyname for %s (af = %d) returned: %d",
// m_hostname.data(), m_af, my_h_errno);
if (res == ERANGE)
@@ -317,7 +317,7 @@ namespace
{
if (herrno)
{
- qDebug("KStandardWorker::processResults: got error %d", herrno);
+ tqDebug("KStandardWorker::processResults: got error %d", herrno);
switch (herrno)
{
case HOST_NOT_FOUND:
@@ -368,9 +368,9 @@ namespace
{
sa.setHost(KIpAddress(he->h_addr_list[i], he->h_addrtype == AF_INET ? 4 : 6));
results.prepend(KResolverEntry(sa, socktype, proto, canon, m_hostname));
- // qDebug("KStandardWorker::processResults: adding %s", sa.toString().latin1());
+ // tqDebug("KStandardWorker::processResults: adding %s", sa.toString().latin1());
}
- // qDebug("KStandardWorker::processResults: added %d entries", i);
+ // tqDebug("KStandardWorker::processResults: added %d entries", i);
}
#else // HAVE_GETADDRINFO
@@ -559,12 +559,12 @@ bool KStandardWorker::sanityCheck()
if (m_encodedName.isNull())
{
- qDebug("could not encode hostname '%s' (UTF-8)", node.utf8().data());
+ tqDebug("could not encode hostname '%s' (UTF-8)", node.utf8().data());
setError(KResolver::NoName);
return false; // invalid hostname!
}
- // qDebug("Using encoded hostname '%s' for '%s' (UTF-8)", m_encodedName.data(),
+ // tqDebug("Using encoded hostname '%s' for '%s' (UTF-8)", m_encodedName.data(),
// node.utf8().data());
}
}
@@ -679,7 +679,7 @@ KResolver::ErrorCodes KStandardWorker::addUnix()
// put it in /tmp
pathname.prepend("/tmp/");
- // qDebug("QNoResolveWorker::addUnix(): adding Unix socket for %s", pathname.local8Bit().data());
+ // tqDebug("QNoResolveWorker::addUnix(): adding Unix socket for %s", pathname.local8Bit().data());
KUnixSocketAddress sa(pathname);
int socktype = socketType();
if (socktype == 0)
diff --git a/tdecore/tests/KIDLTest.cpp b/tdecore/tests/KIDLTest.cpp
index a763f85c8..e714bc52f 100644
--- a/tdecore/tests/KIDLTest.cpp
+++ b/tdecore/tests/KIDLTest.cpp
@@ -10,8 +10,8 @@ KIDLTest::KIDLTest( const TQCString& id )
TQString KIDLTest::hello( const TQString& name )
{
- qDebug("Du heter %s", name.latin1() );
- qDebug("Ha det %s", name.latin1() );
+ tqDebug("Du heter %s", name.latin1() );
+ tqDebug("Ha det %s", name.latin1() );
return TQString("Jeg heter KIDLTest");
}
@@ -23,11 +23,11 @@ int main( int argc, char** argv )
app.dcopClient()->attach();
app.dcopClient()->registerAs( "kidlservertest" );
- qDebug("Server process started...");
+ tqDebug("Server process started...");
(void) new KIDLTest( "Hello" );
- qDebug("Server listening ...");
+ tqDebug("Server listening ...");
return app.exec();
}
diff --git a/tdecore/tests/KIDLTestClient.cpp b/tdecore/tests/KIDLTestClient.cpp
index 21125bff5..87884c05a 100644
--- a/tdecore/tests/KIDLTestClient.cpp
+++ b/tdecore/tests/KIDLTestClient.cpp
@@ -13,5 +13,5 @@ int main( int argc, char** argv )
KIDLTest_stub* t = new KIDLTest_stub( "kidlservertest", "Hello" );
TQString ret = t->hello("Torben");
- qDebug("Server says: %s", ret.latin1() );
+ tqDebug("Server says: %s", ret.latin1() );
}
diff --git a/tdecore/tests/cplusplustest.cpp b/tdecore/tests/cplusplustest.cpp
index 1f789fea7..288263256 100644
--- a/tdecore/tests/cplusplustest.cpp
+++ b/tdecore/tests/cplusplustest.cpp
@@ -32,13 +32,13 @@ int main(int , char *[])
A *pA = &obj;
B *pB = &obj;
C *pC = &obj;
-qWarning("pA = %p, pB = %p, pC = %p", pA, pB, pC);
- if (pA == pC) qWarning("pA == pC");
- if (pB == pC) qWarning("pB == pC");
+tqWarning("pA = %p, pB = %p, pC = %p", pA, pB, pC);
+ if (pA == pC) tqWarning("pA == pC");
+ if (pB == pC) tqWarning("pB == pC");
dictA.insert("hello", pC);
dictB.insert("hello", pC);
- if (dictA["hello"] == pC) qWarning("dictA['hello'] == pC");
- if (dictB["hello"] == pC) qWarning("dictB['hello'] == pC");
+ if (dictA["hello"] == pC) tqWarning("dictA['hello'] == pC");
+ if (dictB["hello"] == pC) tqWarning("dictB['hello'] == pC");
}
diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp
index 4a6465099..7e3b47f43 100644
--- a/tdecore/tests/kapptest.cpp
+++ b/tdecore/tests/kapptest.cpp
@@ -35,6 +35,6 @@ main(int argc, char *argv[])
KSycoca *s = KSycoca::self();
- qWarning("s->language() %s", s->language().latin1());
- qWarning("Offset of aIconName: %ld", (long) &(static_cast<KApplication *>(0)->aIconName));
+ tqWarning("s->language() %s", s->language().latin1());
+ tqWarning("Offset of aIconName: %ld", (long) &(static_cast<KApplication *>(0)->aIconName));
}
diff --git a/tdecore/tests/kconfigtest.cpp b/tdecore/tests/kconfigtest.cpp
index 1842b5036..384a328cc 100644
--- a/tdecore/tests/kconfigtest.cpp
+++ b/tdecore/tests/kconfigtest.cpp
@@ -88,7 +88,7 @@ void KConfigTest::writeConfigFile()
// ### TODO: call this, and test the state of things afterwards
void KConfigTest::revertEntries()
{
- qWarning("Reverting entries");
+ tqWarning("Reverting entries");
KConfig sc( "kconfigtest" );
sc.setGroup("Hello");
@@ -115,7 +115,7 @@ void KConfigTest::allTests()
bool bImmutable = sc3.entryIsImmutable("stringEntry1");
CHECK( bImmutable, false );
- //qWarning("sc3.entryIsImmutable() 1: %s", bImmutable ? "true" : "false");
+ //tqWarning("sc3.entryIsImmutable() 1: %s", bImmutable ? "true" : "false");
sc2.setGroup("AAA");
CHECK( sc2.hasKey( "stringEntry1" ), true );
diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp
index 7323df34c..f752467d6 100644
--- a/tdecore/tests/klocaletest.cpp
+++ b/tdecore/tests/klocaletest.cpp
@@ -139,7 +139,7 @@ int main( int argc, char ** argv )
num = KGlobal::locale()->readNumber( "12,0000000", &ok ); check("readNumber(12,0000000)",ok?"yes":"no","no");
num = KGlobal::locale()->readNumber( "12,146,131.12", &ok ); check("readNumber(12,146,131.12)",ok?"yes":"no","yes");
num = KGlobal::locale()->readNumber( "1.12345678912", &ok );
- qDebug( "%s", TQString::number( num, 'g', 12 ).latin1() ); // warning this is the only way to see all decimals
+ tqDebug( "%s", TQString::number( num, 'g', 12 ).latin1() ); // warning this is the only way to see all decimals
check("readNumber(1.12345678912)",ok && num==1.12345678912?"yes":"no","yes");
// bug 95511
KLocale locale(*KGlobal::locale());
diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp
index 042701c93..fe33ec771 100644
--- a/tdecore/tests/ksocktest.cpp
+++ b/tdecore/tests/ksocktest.cpp
@@ -77,7 +77,7 @@ main(int argc, char *argv[])
list = KExtendedSocket::lookup("www.kde.org", "http", KExtendedSocket::inetSocket);
for(KAddressInfo *info = list.first(); info; info = list.next())
{
- qWarning("Lookup: %s %s %s", info->address()->pretty().latin1(),
+ tqWarning("Lookup: %s %s %s", info->address()->pretty().latin1(),
info->address()->isEqual(KInetSocketAddress("213.203.58.36", 80)) ?
"is equal to" : "is NOT equal to",
"213.203.58.36 port 80");
@@ -91,7 +91,7 @@ main(int argc, char *argv[])
TQPtrList<KAddressInfo> cns = KExtendedSocket::lookup("www.kde.org", 0, KExtendedSocket::canonName, &err);
for (KAddressInfo *x = cns.first(); x; x = cns.next()) {
const char *canon = x->canonname();
- qWarning( "Lookup: %s", canon ? canon : "<Null>");
+ tqWarning( "Lookup: %s", canon ? canon : "<Null>");
}
check("KExtendedSocket::lookup() canonical", cns.first()->canonname(), "www.kde.org");
diff --git a/tdecore/tests/ksortablevaluelisttest.cpp b/tdecore/tests/ksortablevaluelisttest.cpp
index 301054045..09f39b933 100644
--- a/tdecore/tests/ksortablevaluelisttest.cpp
+++ b/tdecore/tests/ksortablevaluelisttest.cpp
@@ -14,19 +14,19 @@ int main( int argc, char **argv )
TQValueListIterator<KSortableItem<TQString> > it = list.begin();
- qDebug("Insertion order:");
- qDebug("================");
+ tqDebug("Insertion order:");
+ tqDebug("================");
for ( ; it != list.end(); ++it )
- qDebug( "%i: %s", (*it).index(), (*it).value().latin1() );
+ tqDebug( "%i: %s", (*it).index(), (*it).value().latin1() );
list.sort();
- qDebug("\nSorted:");
- qDebug("=======");
+ tqDebug("\nSorted:");
+ tqDebug("=======");
it = list.begin();
for ( ; it != list.end(); ++it )
- qDebug( "%i: %s", (*it).index(), (*it).value().latin1() );
+ tqDebug( "%i: %s", (*it).index(), (*it).value().latin1() );
return 0;
}
diff --git a/tdecore/tests/kuniqueapptest.cpp b/tdecore/tests/kuniqueapptest.cpp
index 699c99539..b1d700c8b 100644
--- a/tdecore/tests/kuniqueapptest.cpp
+++ b/tdecore/tests/kuniqueapptest.cpp
@@ -36,7 +36,7 @@ public:
int
TestApp::newInstance( )
{
- qWarning("NewInstance");
+ tqWarning("NewInstance");
return 0;
}
diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp
index 0bbb0436b..661af6ad5 100644
--- a/tdecore/tests/testqtargs.cpp
+++ b/tdecore/tests/testqtargs.cpp
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
{
for (int i = 0; i < argc; i++)
{
- qDebug("argv[%d] = %s", i, argv[i]);
+ tqDebug("argv[%d] = %s", i, argv[i]);
}
KAboutData aboutData( "testqtargs", I18N_NOOP("testqtargs"),
"1.0", I18N_NOOP("testqtargs"), KAboutData::License_GPL,
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt");
for (int i = 0; i < qtargs->count(); i++)
{
- qDebug("qt arg[%d] = %s", i, qtargs->arg(i));
+ tqDebug("qt arg[%d] = %s", i, qtargs->arg(i));
}
KApplication app;
@@ -81,17 +81,17 @@ int main(int argc, char *argv[])
// An arg set by Qt
if(qtargs->isSet("background"))
{
- qDebug("arg bg = %s", (const char*)qtargs->getOption("background"));
+ tqDebug("arg bg = %s", (const char*)qtargs->getOption("background"));
}
// An arg set by KDE
if(kdeargs->isSet("caption"))
{
- qDebug("arg caption = %s", (const char*)kdeargs->getOption("caption"));
+ tqDebug("arg caption = %s", (const char*)kdeargs->getOption("caption"));
}
// An arg set by us.
if(args->isSet("hello"))
{
- qDebug("arg hello = %s", (const char*)args->getOption("hello"));
+ tqDebug("arg hello = %s", (const char*)args->getOption("hello"));
}
args->clear();