From 6efceb1cf68e8a942d28bba4be8fa65b2e8f3c71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:34:45 -0600 Subject: [PATCH] Rename additional global TQt functions --- kdict/dict.cpp | 4 +-- kget/kget_plug_in/links.cpp | 2 +- kopete/libkopete/kautoconfig.cpp | 4 +-- .../groupwise/libgroupwise/client.cpp | 2 +- .../groupwise/libgroupwise/coreprotocol.cpp | 2 +- .../libgroupwise/inputprotocolbase.cpp | 4 +-- .../groupwise/libgroupwise/securestream.cpp | 2 +- .../libgroupwise/tests/clientstream_test.cpp | 18 +++++----- .../libgroupwise/userdetailsmanager.cpp | 4 +-- .../jabber/jabbercapabilitiesmanager.cpp | 2 +- .../jabber/jingle/jinglevoicecaller.cpp | 34 +++++++++---------- .../jabber/jingle/jinglevoicesession.cpp | 4 +-- .../jabber/libiris/cutestuff/util/sha1.cpp | 2 +- .../jabber/libiris/iris/xmpp-core/hash.cpp | 2 +- .../libiris/iris/xmpp-im/xmpp_vcard.cpp | 2 +- kopete/protocols/msn/sha1.cpp | 2 +- kopete/protocols/oscar/liboscar/client.cpp | 2 +- .../oscar/liboscar/inputprotocolbase.cpp | 6 ++-- .../oscar/liboscar/oscarclientstream.cpp | 6 ++-- kopete/protocols/oscar/liboscar/task.cpp | 6 ++-- .../liboscar/tests/clientstream_test.cpp | 4 +-- .../oscar/liboscar/tests/logintest.cpp | 4 +-- .../oscar/liboscar/tests/ssigrouptest.cpp | 8 ++--- .../oscar/liboscar/tests/ssitest.cpp | 26 +++++++------- .../oscar/liboscar/tests/userinfotest.cpp | 6 ++-- kopete/protocols/yahoo/libkyahoo/client.cpp | 2 +- .../yahoo/libkyahoo/coreprotocol.cpp | 4 +-- .../yahoo/libkyahoo/inputprotocolbase.cpp | 6 ++-- kopete/protocols/yahoo/libkyahoo/task.cpp | 4 +-- .../yahoo/libkyahoo/yahooclientstream.cpp | 6 ++-- kpf/src/WebServer.cpp | 2 +- kppp/ruleset.cpp | 2 +- kppp/runtests.cpp | 2 +- krdc/rdp/krdpview.cpp | 2 +- krdc/rdp/rdpprefs.ui.h | 2 +- ksirc/KSPrefs/page_servchan.cpp | 4 +-- ksirc/baserules.cpp | 2 +- ksirc/chanparser.cpp | 6 ++-- ksirc/iocontroller.cpp | 4 +-- ksirc/ksircprocess.cpp | 4 +-- ksirc/kstextview.cpp | 18 +++++----- ksirc/objFinder.cpp | 2 +- ksirc/puke/controller.cpp | 8 ++--- ksirc/puke/playout.cpp | 4 +-- ksirc/puke/pobject.cpp | 2 +- ksirc/puke/pobjfinder.cpp | 4 +-- ksirc/puke/ppopmenu.cpp | 2 +- ksirc/puke/pprogress.cpp | 2 +- ksirc/puke/ptabdialog.cpp | 2 +- ksirc/puke/ptablevw.cpp | 2 +- ksirc/puke/pwidget.cpp | 2 +- ktalkd/ktalkd/readcfg++.cpp | 24 ++++++------- 52 files changed, 141 insertions(+), 141 deletions(-) diff --git a/kdict/dict.cpp b/kdict/dict.cpp index a58af6f6..04c0643c 100644 --- a/kdict/dict.cpp +++ b/kdict/dict.cpp @@ -73,9 +73,9 @@ void* DictAsyncClient::startThread(void* pseudoThis) DictAsyncClient* newthis = (DictAsyncClient*) (pseudoThis); if (0!=pthread_setcanceltype(PTHREAD_CANCEL_ENABLE,NULL)) - qWarning("pthread_setcanceltype failed!"); + tqWarning("pthread_setcanceltype failed!"); if (0!= pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS,NULL)) - qWarning("pthread_setcanceltype failed!"); + tqWarning("pthread_setcanceltype failed!"); signal(SIGPIPE,SIG_IGN); // ignore sigpipe diff --git a/kget/kget_plug_in/links.cpp b/kget/kget_plug_in/links.cpp index 38392ea0..a3ee5c58 100644 --- a/kget/kget_plug_in/links.cpp +++ b/kget/kget_plug_in/links.cpp @@ -12,7 +12,7 @@ LinkItem::LinkItem( DOM::Element link ) DOM::NamedNodeMap attrs = link.attributes(); DOM::Node href = attrs.getNamedItem( "href" ); - // qDebug("*** href: %s", href.nodeValue().string().latin1() ); + // tqDebug("*** href: %s", href.nodeValue().string().latin1() ); TQString urlString = link.ownerDocument().completeURL( href.nodeValue() ).string(); if ( urlString.isEmpty() ) diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index c94b197d..c1347d75 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -292,7 +292,7 @@ bool KAutoConfig::isDefault() const { TQVariant defaultValue = d->defaultValues[groupWidget]; TQVariant currentValue = propertyMap->property(groupWidget); if(currentValue != defaultValue){ - //qDebug("groupWidget %s, has changed: default: %s new: %s", groupWidget->name(), defaultValue.toString().latin1(), currentValue.toString().latin1()); + //tqDebug("groupWidget %s, has changed: default: %s new: %s", groupWidget->name(), defaultValue.toString().latin1(), currentValue.toString().latin1()); return false; } } @@ -396,7 +396,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, { // FOR THOSE WHO ARE LOOKING // Here is the code were the widget is actually marked to watch. - //qDebug("KAutoConfig: Adding widget(%s)",childWidget->name()); + //tqDebug("KAutoConfig: Adding widget(%s)",childWidget->name()); currentGroup.append(childWidget); d->defaultValues.insert(childWidget, defaultSetting); } diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp index 5df0d1de..21c1b1d0 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.cpp +++ b/kopete/protocols/groupwise/libgroupwise/client.cpp @@ -468,7 +468,7 @@ void Client::debug( const TQString &str ) #ifdef LIBGW_USE_KDEBUG kdDebug( GROUPWISE_DEBUG_LIBGW ) << "debug: " << str << endl; #else - qDebug( "CLIENT: %s\n", str.ascii() ); + tqDebug( "CLIENT: %s\n", str.ascii() ); #endif } diff --git a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp index 449adfe0..1041fb9c 100644 --- a/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp +++ b/kopete/protocols/groupwise/libgroupwise/coreprotocol.cpp @@ -122,7 +122,7 @@ void CoreProtocol::debug( const TQString &str ) #ifdef LIBGW_USE_KDEBUG kdDebug( 14191 ) << "debug: " << str << endl; #else - qDebug( "GW RAW PROTO: %s\n", str.ascii() ); + tqDebug( "GW RAW PROTO: %s\n", str.ascii() ); #endif } diff --git a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp index 415905bf..d2ff9756 100644 --- a/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp +++ b/kopete/protocols/groupwise/libgroupwise/inputprotocolbase.cpp @@ -38,7 +38,7 @@ void InputProtocolBase::debug( const TQString &str ) #ifdef LIBGW_USE_KDEBUG kdDebug( 14191 ) << "debug: " << str << endl; #else - qDebug( "GW RAW PROTO: %s\n", str.ascii() ); + tqDebug( "GW RAW PROTO: %s\n", str.ascii() ); #endif } @@ -83,7 +83,7 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) m_bytes += sizeof( TQ_UINT32 ); if ( val > NMFIELD_MAX_STR_LENGTH ) return false; - //qDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val ); + //tqDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val ); TQCString temp( val ); if ( val != 0 ) { diff --git a/kopete/protocols/groupwise/libgroupwise/securestream.cpp b/kopete/protocols/groupwise/libgroupwise/securestream.cpp index 6898c18e..569090c0 100644 --- a/kopete/protocols/groupwise/libgroupwise/securestream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/securestream.cpp @@ -533,7 +533,7 @@ void SecureStream::writeRawData(const TQByteArray &a) void SecureStream::incomingData(const TQByteArray &a) { appendRead(a); - //qDebug( "SecureStream::incomingData() got %i bytes ", a.size() ); + //tqDebug( "SecureStream::incomingData() got %i bytes ", a.size() ); if(bytesAvailable()) readyRead(); diff --git a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp index 4272d956..7a0c039b 100644 --- a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp @@ -37,26 +37,26 @@ void ClientStreamTest::slotDoTest() dn.dn = "maeuschen"; dn.server = "reiser.suse.de"; // connect to server - qDebug( "connecting to server "); + tqDebug( "connecting to server "); myTestObject->connectToServer( dn, true ); // fine up to here... } void ClientStreamTest::slotConnected() { - qDebug( "connection is up"); + tqDebug( "connection is up"); } void ClientStreamTest::slotWarning(int warning) { - qDebug( "warning: %i", warning); + tqDebug( "warning: %i", warning); } void ClientStreamTest::slotsend(int layer) { - qDebug( "security layer is up: %i", layer); + tqDebug( "security layer is up: %i", layer); RequestFactory testFactory; // we're not connecting... - qDebug( "sending request" ); + tqDebug( "sending request" ); // send a request TQCString command("login"); Request * firstRequest = testFactory.request( command ); @@ -68,23 +68,23 @@ void ClientStreamTest::slotsend(int layer) lst.append( new Field::SingleField( NM_A_IP_ADDRESS, 0, NMFIELD_TYPE_UTF8, "10.10.11.103" ) ); firstRequest->setFields( lst ); myTestObject->write( firstRequest ); - qDebug( "done"); + tqDebug( "done"); } void ClientStreamTest::slotTLSHandshaken() { - qDebug( "TLS handshake complete" ); + tqDebug( "TLS handshake complete" ); int validityResult = myTLS->certificateValidityResult (); if( validityResult == QCA::TLS::Valid ) { - qDebug( "Certificate is valid, continuing."); + tqDebug( "Certificate is valid, continuing."); // valid certificate, continue myTLSHandler->continueAfterHandshake (); } else { - qDebug( "Certificate is not valid, continuing" ); + tqDebug( "Certificate is not valid, continuing" ); // certificate is not valid, query the user /* if(handleTLSWarning (validityResult, server (), myself()->contactId ()) == KMessageBox::Continue) {*/ diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp index ceb29632..d0605239 100644 --- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp @@ -59,11 +59,11 @@ TQStringList UserDetailsManager::knownDNs() void UserDetailsManager::addDetails( const ContactDetails & details ) { - //qDebug( "UserDetailsManager::addContact, got %s, we now know: ", details.dn.ascii() ); + //tqDebug( "UserDetailsManager::addContact, got %s, we now know: ", details.dn.ascii() ); m_detailsMap.insert( details.dn, details ); /* TQStringList keys = m_detailsMap.keys(); dump( keys ); - qDebug( "UserDetailsManager::addContact, pending: " ); + tqDebug( "UserDetailsManager::addContact, pending: " ); dump( m_pendingDNs );*/ } diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp index 3688565a..c1affb1e 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp @@ -208,7 +208,7 @@ TQPair JabberCapabilitiesManager::CapabilitiesInformation::n } else if( (*it).second->isConnected() ) { - //qDebug("caps.cpp: Account isn't active"); + //tqDebug("caps.cpp: Account isn't active"); kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Account isn't connected." << endl; return TQPair( (*it).first,(*it).second ); diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp index f6911a3b..e25c7c3c 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp @@ -36,8 +36,8 @@ #include "jabberaccount.h" #include -#define qDebug( X ) kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << X << endl -#define qWarning( X ) kdWarning() <sessions()[0]->remote_address().c_str()); if (voiceCaller_->calling(jid)) { - qDebug(TQString("Removing unterminated call to %1").arg(jid.full())); + tqDebug(TQString("Removing unterminated call to %1").arg(jid.full())); voiceCaller_->removeCall(jid); emit voiceCaller_->terminated(jid); } @@ -138,7 +138,7 @@ void JingleClientSlots::requestSignaling() void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *session, cricket::Session::State state) { - qDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").arg(state)); + tqDebug(TQString("jinglevoicecaller.cpp: State changed (%1)").arg(state)); // Why is c_str() stuff needed to make it compile on OS X ? Jid jid(session->remote_address().c_str()); @@ -156,7 +156,7 @@ void JingleClientSlots::stateChanged(cricket::Call *call, cricket::Session *sess } else if (state == cricket::Session::STATE_SENTMODIFY) { } else if (state == cricket::Session::STATE_RECEIVEDMODIFY) { - qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); + tqWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); } else if (state == cricket::Session::STATE_SENTREJECT) { } else if (state == cricket::Session::STATE_RECEIVEDREJECT) { @@ -195,9 +195,9 @@ void JingleVoiceCaller::initialize() return; TQString jid = ((ClientStream&) account()->client()->client()->stream()).jid().full(); - qDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").arg(jid)); + tqDebug(TQString("jinglevoicecaller.cpp: Creating new caller for %1").arg(jid)); if (jid.isEmpty()) { - qWarning("jinglevoicecaller.cpp: Empty JID"); + tqWarning("jinglevoicecaller.cpp: Empty JID"); return; } @@ -271,7 +271,7 @@ bool JingleVoiceCaller::calling(const Jid& jid) void JingleVoiceCaller::call(const Jid& jid) { - qDebug(TQString("jinglevoicecaller.cpp: Calling %1").arg(jid.full())); + tqDebug(TQString("jinglevoicecaller.cpp: Calling %1").arg(jid.full())); cricket::Call *c = ((cricket::PhoneSessionClient*)(phone_client_))->CreateCall(); c->InitiateSession(buzz::Jid(jid.full().ascii())); phone_client_->SetFocus(c); @@ -279,7 +279,7 @@ void JingleVoiceCaller::call(const Jid& jid) void JingleVoiceCaller::accept(const Jid& j) { - qDebug("jinglevoicecaller.cpp: Accepting call"); + tqDebug("jinglevoicecaller.cpp: Accepting call"); cricket::Call* call = calls_[j.full()]; if (call != NULL) { call->AcceptSession(call->sessions()[0]); @@ -289,7 +289,7 @@ void JingleVoiceCaller::accept(const Jid& j) void JingleVoiceCaller::reject(const Jid& j) { - qDebug("jinglevoicecaller.cpp: Rejecting call"); + tqDebug("jinglevoicecaller.cpp: Rejecting call"); cricket::Call* call = calls_[j.full()]; if (call != NULL) { call->RejectSession(call->sessions()[0]); @@ -299,7 +299,7 @@ void JingleVoiceCaller::reject(const Jid& j) void JingleVoiceCaller::terminate(const Jid& j) { - qDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").arg(j.full())); + tqDebug(TQString("jinglevoicecaller.cpp: Terminating call to %1").arg(j.full())); cricket::Call* call = calls_[j.full()]; if (call != NULL) { call->Terminate(); @@ -314,20 +314,20 @@ void JingleVoiceCaller::sendStanza(const char* stanza) void JingleVoiceCaller::registerCall(const Jid& jid, cricket::Call* call) { - qDebug("jinglevoicecaller.cpp: Registering call\n"); + tqDebug("jinglevoicecaller.cpp: Registering call\n"); kdDebug(14000) << k_funcinfo << jid.full() << endl; if (!calls_.contains(jid.full())) { calls_[jid.full()] = call; } // else { -// qWarning("jinglevoicecaller.cpp: Auto-rejecting call because another call is currently open"); +// tqWarning("jinglevoicecaller.cpp: Auto-rejecting call because another call is currently open"); // call->RejectSession(call->sessions()[0]); // } } void JingleVoiceCaller::removeCall(const Jid& j) { - qDebug(TQString("JingleVoiceCaller: Removing call to %1").arg(j.full())); + tqDebug(TQString("JingleVoiceCaller: Removing call to %1").arg(j.full())); calls_.remove(j.full()); } @@ -341,7 +341,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza) Jid from = Jid(doc.documentElement().attribute("from")); TQString type = doc.documentElement().attribute("type"); if (type == "unavailable" && calls_.contains(from.full())) { - qDebug("JingleVoiceCaller: User went offline without closing a call."); + tqDebug("JingleVoiceCaller: User went offline without closing a call."); removeCall(from); emit terminated(from); } @@ -363,7 +363,7 @@ void JingleVoiceCaller::receiveStanza(const TQString& stanza) // Spread the word if (ok) { - qDebug(TQString("jinglevoicecaller.cpp: Handing down %1").arg(stanza)); + tqDebug(TQString("jinglevoicecaller.cpp: Handing down %1").arg(stanza)); buzz::XmlElement *e = buzz::XmlElement::ForStr(stanza.ascii()); phone_client_->OnIncomingStanza(e); } diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp index daa0d7c0..8a6331d6 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp @@ -115,7 +115,7 @@ public: {} else if (state == cricket::Session::STATE_RECEIVEDMODIFY) { - //qWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); + //tqWarning(TQString("jinglevoicecaller.cpp: RECEIVEDMODIFY not implemented yet (was from %1)").arg(jid.full())); } else if (state == cricket::Session::STATE_SENTREJECT) {} @@ -299,7 +299,7 @@ void JingleVoiceSession::receiveStanza(const TQString &stanza) TQString type = doc.documentElement().attribute("type"); if( type == "unavailable" && hasPeer(peers(), from) ) { - //qDebug("JingleVoiceCaller: User went offline without closing a call."); + //tqDebug("JingleVoiceCaller: User went offline without closing a call."); kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "User went offline without closing a call." << endl; emit terminated(); } diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp index f7b3c3a9..0fefd995 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp @@ -41,7 +41,7 @@ SHA1::SHA1() { int wordSize; - qSysInfo(&wordSize, &bigEndian); + tqSysInfo(&wordSize, &bigEndian); } unsigned long SHA1::blk0(TQ_UINT32 i) diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp index 1b1dc1c7..d4509def 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp @@ -31,7 +31,7 @@ static void ensureEndian() if(!haveEndian) { haveEndian = true; int wordSize; - qSysInfo(&wordSize, &bigEndian); + tqSysInfo(&wordSize, &bigEndian); } } diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp index 009f0136..2f242bcb 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_vcard.cpp @@ -111,7 +111,7 @@ static TQString image2type(const TQByteArray &ba) if ( format == "JPEG" ) return "image/jpeg"; - qWarning("WARNING! VCard::image2type: unknown format = '%s'", format.latin1()); + tqWarning("WARNING! VCard::image2type: unknown format = '%s'", format.latin1()); return "image/unknown"; } diff --git a/kopete/protocols/msn/sha1.cpp b/kopete/protocols/msn/sha1.cpp index d7c6549b..c8609209 100644 --- a/kopete/protocols/msn/sha1.cpp +++ b/kopete/protocols/msn/sha1.cpp @@ -39,7 +39,7 @@ SHA1::SHA1() { int wordSize; - qSysInfo(&wordSize, &bigEndian); + tqSysInfo(&wordSize, &bigEndian); } unsigned long SHA1::blk0(TQ_UINT32 i) diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp index 28f841c2..f0073b47 100644 --- a/kopete/protocols/oscar/liboscar/client.cpp +++ b/kopete/protocols/oscar/liboscar/client.cpp @@ -608,7 +608,7 @@ void Client::setIsIcq( bool isIcq ) void Client::debug( const TQString& str ) { Q_UNUSED(str); -// qDebug( "CLIENT: %s", str.ascii() ); +// tqDebug( "CLIENT: %s", str.ascii() ); } void Client::initializeStaticTasks() diff --git a/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp b/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp index 4b27166b..296a4bca 100644 --- a/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp +++ b/kopete/protocols/oscar/liboscar/inputprotocolbase.cpp @@ -53,7 +53,7 @@ bool InputProtocolBase::okToProceed() if ( m_din->atEnd() ) { m_state = NeedMore; - qDebug( "InputProtocol::okToProceed() - Server message ended prematurely!" ); + tqDebug( "InputProtocol::okToProceed() - Server message ended prematurely!" ); } else return true; @@ -71,7 +71,7 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) m_bytes += sizeof( TQ_UINT32 ); if ( val > 1024 ) return false; - //qDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val ); + //tqDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val ); TQCString temp( val ); if ( val != 0 ) { @@ -86,7 +86,7 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) // if ( (TQ_UINT8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == 0xFF ) if ( temp.length() < ( val - 1 ) ) { - qDebug( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %i bytes out of %i", temp.length(), val ); + tqDebug( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %i bytes out of %i", temp.length(), val ); m_state = NeedMore; return false; } diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp index 22c68df6..1872f378 100644 --- a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp @@ -107,7 +107,7 @@ public: ClientStream::ClientStream(Connector *conn, TQObject *parent) :Stream(parent) { - //qDebug("CLIENTSTREAM::ClientStream"); + //tqDebug("CLIENTSTREAM::ClientStream"); d = new Private; d->mode = ClientMode; @@ -266,7 +266,7 @@ void ClientStream::write( Transfer *request ) void cs_dump( const TQByteArray &bytes ) { #if 0 - qDebug( "contains: %i bytes ", bytes.count() ); + tqDebug( "contains: %i bytes ", bytes.count() ); uint count = 0; while ( count < bytes.count() ) { @@ -373,7 +373,7 @@ void ClientStream::bs_error(int) void ClientStream::bs_readyRead() { TQByteArray a; - //qDebug( "size of storage for incoming data is %i bytes.", a.size() ); + //tqDebug( "size of storage for incoming data is %i bytes.", a.size() ); a = d->bs->read(); #if LIBOSCAR_DEBUG diff --git a/kopete/protocols/oscar/liboscar/task.cpp b/kopete/protocols/oscar/liboscar/task.cpp index d797031d..80e63bea 100644 --- a/kopete/protocols/oscar/liboscar/task.cpp +++ b/kopete/protocols/oscar/liboscar/task.cpp @@ -140,11 +140,11 @@ bool Task::take( Transfer * transfer) if(t->take( transfer )) { - //qDebug( "Transfer ACCEPTED by: %s", t->className() ); + //tqDebug( "Transfer ACCEPTED by: %s", t->className() ); return true; } //else - //qDebug( "Transfer refused by: %s", t->className() ); + //tqDebug( "Transfer refused by: %s", t->className() ); } return false; @@ -162,7 +162,7 @@ void Task::safeDelete() void Task::onGo() { - qDebug( "ERROR: calling default NULL onGo() for this task, you should reimplement this!"); + tqDebug( "ERROR: calling default NULL onGo() for this task, you should reimplement this!"); } void Task::onDisconnect() diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp index a7c16cea..77563c05 100644 --- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp +++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp @@ -29,13 +29,13 @@ void ClientStreamTest::slotDoTest() { TQString server = TQString::fromLatin1("login.oscar.aol.com"); // connect to server - qDebug( "connecting to server "); + tqDebug( "connecting to server "); myTestObject->connectToServer( server, true ); // fine up to here... } void ClientStreamTest::slotConnected() { - qDebug( "connection is up"); + tqDebug( "connection is up"); connected = true; } diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.cpp b/kopete/protocols/oscar/liboscar/tests/logintest.cpp index 1d3728aa..d1025059 100644 --- a/kopete/protocols/oscar/liboscar/tests/logintest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/logintest.cpp @@ -31,7 +31,7 @@ void LoginTest::slotDoTest() { TQString server = TQString::fromLatin1("login.oscar.aol.com"); // connect to server - qDebug( "connecting to server "); + tqDebug( "connecting to server "); myClient->setIsIcq( true ); myClient->start( server, 5190, "userid", "password" ); @@ -41,7 +41,7 @@ void LoginTest::slotDoTest() void LoginTest::slotConnected() { - qDebug( "connection is up"); + tqDebug( "connection is up"); connected = true; } diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp index 6ca733cc..410b6021 100644 --- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp @@ -31,7 +31,7 @@ void LoginTest::slotDoTest() { TQString server = TQString::fromLatin1("login.oscar.aol.com"); // connect to server - qDebug( "connecting to server "); + tqDebug( "connecting to server "); myClient->setIsIcq( true ); myClient->start( server, 5190, "userid", "password" ); @@ -42,7 +42,7 @@ void LoginTest::slotDoTest() void LoginTest::slotConnected() { - qDebug( "connection is up"); + tqDebug( "connection is up"); connected = true; } @@ -56,7 +56,7 @@ int main(int argc, char ** argv) void LoginTest::runAddGroupTest() { - qDebug( "running ssi group add test" ); + tqDebug( "running ssi group add test" ); TQString group = TQString::fromLatin1( "dummygroup" ); myClient->addGroup( group ); TQTimer::singleShot( 5000, this, TQT_SLOT( runDelGroupTest() ) ); @@ -64,7 +64,7 @@ void LoginTest::runAddGroupTest() void LoginTest::runDelGroupTest() { - qDebug( "running ssi group del test" ); + tqDebug( "running ssi group del test" ); TQString group = TQString::fromLatin1( "dummygroup" ); myClient->removeGroup( group ); } diff --git a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp index 7669a945..3e4592ad 100644 --- a/kopete/protocols/oscar/liboscar/tests/ssitest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/ssitest.cpp @@ -53,49 +53,49 @@ void SSITest::testIt() //try to find a group by name ssi = m_manager->findGroup("SecondGroup"); if ( ssi ) - qDebug( TQString("Found group SecondGroup with gid=%1").arg( ssi->gid() ).latin1()); + tqDebug( TQString("Found group SecondGroup with gid=%1").arg( ssi->gid() ).latin1()); else - qDebug( "Oops, group SecondGroup not found" ); + tqDebug( "Oops, group SecondGroup not found" ); //try to find a group by gid ssi = m_manager->findGroup( 3 ); if ( ssi ) - qDebug( TQString("Found group 3 with name=%1").arg( ssi->name() ).latin1() ); + tqDebug( TQString("Found group 3 with name=%1").arg( ssi->name() ).latin1() ); else - qDebug( "Oops, group 3 not found" ); + tqDebug( "Oops, group 3 not found" ); //try to find a contact by name ssi = m_manager->findContact("ThirdContact"); if ( ssi ) - qDebug( TQString( "Found contact ThirdContact with gid=%1" ).arg( ssi->gid() ).latin1() ); + tqDebug( TQString( "Found contact ThirdContact with gid=%1" ).arg( ssi->gid() ).latin1() ); else - qDebug( "Oops, contact ThirdContact not found" ); + tqDebug( "Oops, contact ThirdContact not found" ); //try to find a contact using the name and the group name ssi = m_manager->findContact("FourthContact","SecondGroup"); if ( ssi ) - qDebug( TQString("Found contact FourthContact with bid=%1").arg( ssi->bid() ).latin1() ); + tqDebug( TQString("Found contact FourthContact with bid=%1").arg( ssi->bid() ).latin1() ); else - qDebug( "Oops, contact FourthContact not found" ); + tqDebug( "Oops, contact FourthContact not found" ); //try to find an invalid group ssi = m_manager->findGroup("InvalidGroup"); if ( !ssi ) - qDebug( "Good! It has detected the group is invalid :)" ); + tqDebug( "Good! It has detected the group is invalid :)" ); //contacts from a group TQValueList list = m_manager->contactsFromGroup("FirstGroup"); TQValueList::iterator it; - qDebug( "Contacts from group FirtsGroup:" ); + tqDebug( "Contacts from group FirtsGroup:" ); for ( it = list.begin(); it != list.end(); ++it) - qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() ); + tqDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() ); //the group list TQValueList list2 = m_manager->groupList(); - qDebug( "Group list:" ); + tqDebug( "Group list:" ); for ( it = list2.begin(); it != list2.end(); ++it) - qDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() ); + tqDebug( TQString(" name=%1").arg( (*it)->name() ).latin1() ); //remove a group - this shouldn't report any debug line m_manager->removeGroup( "SecondGroup" ); diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp index fb346d26..8d75b79d 100644 --- a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp @@ -31,7 +31,7 @@ void LoginTest::slotDoTest() { TQString server = TQString::fromLatin1("login.oscar.aol.com"); // connect to server - qDebug( "connecting to server "); + tqDebug( "connecting to server "); myClient->setIsIcq( true ); myClient->start( server, 5190, "userid", "password" ); @@ -43,7 +43,7 @@ void LoginTest::slotDoTest() void LoginTest::slotConnected() { - qDebug( "connection is up"); + tqDebug( "connection is up"); connected = true; } @@ -57,7 +57,7 @@ int main(int argc, char ** argv) void LoginTest::runUserInfoTest() { - qDebug( "running user info test" ); + tqDebug( "running user info test" ); TQString contact = TQString::fromLatin1( "userid" ); myClient->requestFullInfo( contact ); diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp index 77252ac1..d293f646 100644 --- a/kopete/protocols/yahoo/libkyahoo/client.cpp +++ b/kopete/protocols/yahoo/libkyahoo/client.cpp @@ -825,7 +825,7 @@ void Client::send( Transfer* request ) void Client::debug(const TQString &str) { - qDebug( "CLIENT: %s", str.ascii() ); + tqDebug( "CLIENT: %s", str.ascii() ); } Task * Client::rootTask() diff --git a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp index 573c5ccf..12b9561c 100644 --- a/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp +++ b/kopete/protocols/yahoo/libkyahoo/coreprotocol.cpp @@ -87,7 +87,7 @@ void CoreProtocol::addIncomingData( const TQByteArray & incomingBytes ) /* if ( m_eventProtocol->state() == EventProtocol::OutOfSync ) { - qDebug( " - protocol thinks it's out of sync, discarding the rest of the buffer and hoping the server regains sync soon..." ); + tqDebug( " - protocol thinks it's out of sync, discarding the rest of the buffer and hoping the server regains sync soon..." ); m_in.truncate( 0 ); } */ @@ -219,7 +219,7 @@ void CoreProtocol::reset() void CoreProtocol::slotOutgoingData( const TQByteArray &out ) { - qDebug( "%s", out.data() ); + tqDebug( "%s", out.data() ); } bool CoreProtocol::okToProceed( TQDataStream &din) diff --git a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp index 5ef1047d..41fbb0a7 100644 --- a/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp +++ b/kopete/protocols/yahoo/libkyahoo/inputprotocolbase.cpp @@ -52,7 +52,7 @@ bool InputProtocolBase::okToProceed() if ( m_din->atEnd() ) { m_state = NeedMore; - qDebug( "InputProtocol::okToProceed() - Server message ended prematurely!" ); + tqDebug( "InputProtocol::okToProceed() - Server message ended prematurely!" ); } else return true; @@ -71,7 +71,7 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) m_bytes += sizeof( TQ_UINT32 ); if ( val > 1024 ) return false; - //qDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val ); + //tqDebug( "EventProtocol::safeReadBytes() - expecting %i bytes", val ); TQCString temp( val ); if ( val != 0 ) { @@ -86,7 +86,7 @@ bool InputProtocolBase::safeReadBytes( TQCString & data, uint & len ) // if ( (quint8)( * ( temp.data() + ( temp.length() - 1 ) ) ) == 0xFF ) if ( temp.length() < static_cast( val - 1 ) ) { - qDebug( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %i bytes out of %i", temp.length(), val ); + tqDebug( "InputProtocol::safeReadBytes() - string broke, giving up, only got: %i bytes out of %i", temp.length(), val ); m_state = NeedMore; return false; } diff --git a/kopete/protocols/yahoo/libkyahoo/task.cpp b/kopete/protocols/yahoo/libkyahoo/task.cpp index ccebaef3..9ae7861b 100644 --- a/kopete/protocols/yahoo/libkyahoo/task.cpp +++ b/kopete/protocols/yahoo/libkyahoo/task.cpp @@ -141,7 +141,7 @@ bool Task::take( Transfer * transfer) if(t->take( transfer )) { - qDebug( "Transfer ACCEPTED by: %s", t->className() ); + tqDebug( "Transfer ACCEPTED by: %s", t->className() ); return true; } } @@ -161,7 +161,7 @@ void Task::safeDelete() void Task::onGo() { - qDebug( "ERROR: calling default NULL onGo() for this task, you should reimplement this!"); + tqDebug( "ERROR: calling default NULL onGo() for this task, you should reimplement this!"); } void Task::onDisconnect() diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp index 0d05d853..c5427d3e 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp @@ -256,7 +256,7 @@ void ClientStream::write( Transfer *request ) void cs_dump( const TQByteArray &bytes ) { #if 0 - qDebug( "contains: %i bytes ", bytes.count() ); + tqDebug( "contains: %i bytes ", bytes.count() ); uint count = 0; while ( count < bytes.count() ) { @@ -369,11 +369,11 @@ void ClientStream::bs_readyRead() { // kdDebug(YAHOO_RAW_DEBUG) ; TQByteArray a; - //qDebug( "size of storage for incoming data is %i bytes.", a.size() ); + //tqDebug( "size of storage for incoming data is %i bytes.", a.size() ); a = d->bs->read(); //TQCString cs(a.data(), a.size()+1); - //qDebug("ClientStream: recv: %d [%s]\n", a.size(), cs.data()); + //tqDebug("ClientStream: recv: %d [%s]\n", a.size(), cs.data()); //kdDebug(YAHOO_RAW_DEBUG) << " recv: " << a.size() <<" bytes"; //cs_dump( a ); diff --git a/kpf/src/WebServer.cpp b/kpf/src/WebServer.cpp index fa4cceb7..0e7e20e3 100644 --- a/kpf/src/WebServer.cpp +++ b/kpf/src/WebServer.cpp @@ -184,7 +184,7 @@ namespace KPF { if (0 != d->socket) { - qWarning("Uhhh, socket isn't 0, but I'm told to bind ?"); + tqWarning("Uhhh, socket isn't 0, but I'm told to bind ?"); return; } diff --git a/kppp/ruleset.cpp b/kppp/ruleset.cpp index 723d5f2b..e60e4be1 100644 --- a/kppp/ruleset.cpp +++ b/kppp/ruleset.cpp @@ -80,7 +80,7 @@ int RuleSet::dayNameToInt(const char *s) { "sunday", NULL}; for(int i = 0; name[i] != NULL; i++) - if(qstricmp(name[i], s) == 0) + if(tqstricmp(name[i], s) == 0) return i; return -1; diff --git a/kppp/runtests.cpp b/kppp/runtests.cpp index a520d116..6e3f8f21 100644 --- a/kppp/runtests.cpp +++ b/kppp/runtests.cpp @@ -62,7 +62,7 @@ extern const char* pppdPath(); static void decode_version (const char *_buf, int *version, int *modification, int *patch) { - char *buffer = qstrdup(_buf); + char *buffer = tqstrdup(_buf); char *buf = buffer; *version = (int) strtoul (buf, &buf, 10); *modification = 0; diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp index 14f5cabc..73ea3753 100644 --- a/krdc/rdp/krdpview.cpp +++ b/krdc/rdp/krdpview.cpp @@ -295,7 +295,7 @@ bool KRdpView::start() connect(m_process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(receivedStderr(KProcess *, char *, int))); connect(m_container, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(connectionClosed())); connect(m_container, TQT_SIGNAL(newEmbeddedWindow(WId)), TQT_SLOT(connectionOpened(WId))); - qDebug("Color depth: %d", hp->colorDepth()); + tqDebug("Color depth: %d", hp->colorDepth()); if(!m_process->start(KProcess::NotifyOnExit, KProcess::Stderr)) { KMessageBox::error(0, i18n("Could not start rdesktop; make sure rdesktop is properly installed."), diff --git a/krdc/rdp/rdpprefs.ui.h b/krdc/rdp/rdpprefs.ui.h index 8e091cf8..f6fb7998 100644 --- a/krdc/rdp/rdpprefs.ui.h +++ b/krdc/rdp/rdpprefs.ui.h @@ -73,7 +73,7 @@ int RdpPrefs::rdpHeight() int RdpPrefs::colorDepth() { - qDebug("current depth: %i", cmbColorDepth->currentItem() ); + tqDebug("current depth: %i", cmbColorDepth->currentItem() ); switch (cmbColorDepth->currentItem()) { case 0: diff --git a/ksirc/KSPrefs/page_servchan.cpp b/ksirc/KSPrefs/page_servchan.cpp index f7587947..b3a87284 100644 --- a/ksirc/KSPrefs/page_servchan.cpp +++ b/ksirc/KSPrefs/page_servchan.cpp @@ -83,7 +83,7 @@ void PageServChan::addPressedSL() { for(i = 0; i < serverLB->count(); i++){ if(txt == serverLB->text(i)){ - qWarning("Server already in the list!"); + tqWarning("Server already in the list!"); return; } } @@ -115,7 +115,7 @@ void PageServChan::addPressedCL() { for(i = 0; i < channelLB->count(); i++){ if(txt == channelLB->text(i)){ - qWarning("Server already in the list!"); + tqWarning("Server already in the list!"); return; } } diff --git a/ksirc/baserules.cpp b/ksirc/baserules.cpp index 9ea568f3..e6b1f896 100644 --- a/ksirc/baserules.cpp +++ b/ksirc/baserules.cpp @@ -85,7 +85,7 @@ filterRuleList *KSMBaseRules::defaultRules() TQString nick = ksircProcess()->getNick(); if ( !nick.isEmpty() ) { if(nick.length() > 83){ - qDebug("Nick too long"); + tqDebug("Nick too long"); nick.truncate( 83 ); } /* diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp index 32f2d670..aafaf395 100644 --- a/ksirc/chanparser.cpp +++ b/ksirc/chanparser.cpp @@ -866,7 +866,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) top->channelButtons->setButtonsEnabled(mi->op()); if(mi->arg().length() == 0){ - qWarning("Invalid nick in +/- o mode change"); + tqWarning("Invalid nick in +/- o mode change"); continue; } @@ -910,7 +910,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) voice = FALSE; if(mi->arg().length() == 0){ - qWarning("Invalid nick in +-v mode change"); + tqWarning("Invalid nick in +-v mode change"); continue; } @@ -934,7 +934,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string) else if(mi->mode() == 'k'){ if(mi->op()){ if(mi->arg().length() == 0){ - qWarning("Invalid +k mode set, no argument!"); + tqWarning("Invalid +k mode set, no argument!"); continue; } top->m_channelInfo.setKey(mi->arg()); diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp index d16f798a..9835a960 100644 --- a/ksirc/iocontroller.cpp +++ b/ksirc/iocontroller.cpp @@ -247,7 +247,7 @@ void KSircIOController::stdout_read(KProcess *, char *_buffer, int buflen) TQTextCodec *qtc = KGlobal::charsets()->codecForName( enc ); TQString qsname = qtc->toUnicode(name); /* - char *b = qstrdup(line); + char *b = tqstrdup(line); kdDebug(5008) << "----------------------------------------" << endl; kdDebug(5008) << "Line: " << b << endl; fprintf(stderr, "My_print: " ); my_print(b); @@ -318,7 +318,7 @@ void KSircIOController::stdin_write(TQCString s) if(proc_CTS == TRUE){ int len = buffer.length(); if(send_buf != 0x0){ - qWarning("KProcess barfed in all clear signal again"); + tqWarning("KProcess barfed in all clear signal again"); delete[] send_buf; } send_buf = new char[len]; diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp index 26dbc8c7..8d2a0f0c 100644 --- a/ksirc/ksircprocess.cpp +++ b/ksirc/ksircprocess.cpp @@ -128,7 +128,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa proc->setRunPrivileged(true); /* make ksirc run under gdb as a user */ #endif - //server = qstrdup(kss.server()); + //server = tqstrdup(kss.server()); TQDict nTopList(17, FALSE); TopList = nTopList; @@ -470,7 +470,7 @@ void KSircProcess::close_toplevel(KSircTopLevel *wm, TQString name) void KSircProcess::clean_toplevel(TQObject *clean){ if(!clean){ - qWarning("Passed null to cleaner!!"); + tqWarning("Passed null to cleaner!!"); return; } bool cont = FALSE; diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index 7189a23a..1817c4e8 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -54,7 +54,7 @@ TQPixmap ksTextViewLoadPixmap( const TQString &icon ) { ksTextViewPixmapDict = new TQDict; ksTextViewPixmapDict->setAutoDelete( true ); - qAddPostRoutine( cleanupKSTextViewPixmapDict ); + tqAddPostRoutine( cleanupKSTextViewPixmapDict ); } TQPixmap *pix = ksTextViewPixmapDict->find( icon ); @@ -536,14 +536,14 @@ Tokenizer::Tokenizer( PString &text ) : m_text( text.data ), m_tags( text.tags ), m_textBeforeFirstTagProcessed( false ), m_done( false ) { - //qDebug( "Tokenizer::Tokenizer( %s )", m_text.ascii() ); + //tqDebug( "Tokenizer::Tokenizer( %s )", m_text.ascii() ); m_lastTag = m_tags.begin(); if ( !m_tags.isEmpty() ) { if ( ( *m_tags.begin() ).type != TagIndex::Open ) { - qDebug( "something went awfully wrong! bailing out with an assertion" ); - qDebug( "text input was: %s", text.data.ascii() ); + tqDebug( "something went awfully wrong! bailing out with an assertion" ); + tqDebug( "text input was: %s", text.data.ascii() ); } assert( ( *m_tags.begin() ).type == TagIndex::Open ); } @@ -620,7 +620,7 @@ bool Tokenizer::parseNextToken( Token &tok ) { if ( m_done ) { - //qDebug( "Tokenizer: premature end" ); + //tqDebug( "Tokenizer: premature end" ); return false; } @@ -706,7 +706,7 @@ bool Tokenizer::parseNextToken( Token &tok ) return true; } else { - qDebug( "EEK, this should never happen. input text was: %s", m_text.ascii() ); + tqDebug( "EEK, this should never happen. input text was: %s", m_text.ascii() ); assert( false ); } @@ -851,14 +851,14 @@ void Tokenizer::parseTag( const StringPtr &text, { if ( ch == '=' ) // eh? { - qDebug( "EH?" ); + tqDebug( "EH?" ); ++p; continue; } if ( key.isNull() ) { - qDebug( "Tokenizer: Error, attribute value without key." ); + tqDebug( "Tokenizer: Error, attribute value without key." ); // reset state = ScanForName; ++p; @@ -884,7 +884,7 @@ void Tokenizer::parseTag( const StringPtr &text, if(start == 0x0) { state = ScanForName; - qDebug( "Never found start \" in tag." ); + tqDebug( "Never found start \" in tag." ); ++p; continue; } diff --git a/ksirc/objFinder.cpp b/ksirc/objFinder.cpp index bb4fe5dc..4c986e49 100644 --- a/ksirc/objFinder.cpp +++ b/ksirc/objFinder.cpp @@ -29,7 +29,7 @@ void objFinder::insert(TQObject *obj, const char *key){ TQString name; if(obj == 0x0){ - qWarning("objFinder: Passed Null Object"); + tqWarning("objFinder: Passed Null Object"); return; } diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp index 5a646973..a7c95091 100644 --- a/ksirc/puke/controller.cpp +++ b/ksirc/puke/controller.cpp @@ -310,7 +310,7 @@ void PukeController::Traffic(int fd) } #endif /* DEBUG */ if(pm.iHeader != iPukeHeader){ - qWarning("Invalid packet received, discarding!"); + tqWarning("Invalid packet received, discarding!"); return; } if(pm.iTextSize > 0){ @@ -527,7 +527,7 @@ void PukeController::hdlrPukeSetup(int fd, PukeMessage *pm) pmOut.iArg = 1; if((strlen(pm->cArg) > 0) && (this->qidConnectFd[fd] != NULL)){ - this->qidConnectFd[fd]->server = qstrdup(pm->cArg); + this->qidConnectFd[fd]->server = tqstrdup(pm->cArg); pmOut.iWinId = pm->iWinId; pmOut.iArg = sizeof(PukeMessage) - sizeof(char *); } @@ -651,13 +651,13 @@ void PukeController::hdlrPukeDeleteWidget(int fd, PukeMessage *pm) pmRet.iCommand = PUKE_WIDGET_DELETE_ACK; } else { - qWarning("WidgetRunner: no such widget: %d", wI.iWinId); + tqWarning("WidgetRunner: no such widget: %d", wI.iWinId); throw(errorCommandFailed(PUKE_INVALID, INVALID_DEL_NO_SUCH_WIDGET)); } */ if(checkWidgetId(&wI) == FALSE){ - qWarning("WidgetRunner: no such widget: %d", wI.iWinId); + tqWarning("WidgetRunner: no such widget: %d", wI.iWinId); throw(errorCommandFailed(PUKE_INVALID, INVALID_DEL_NO_SUCH_WIDGET)); } diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp index a2b6fbae..f57bacc9 100644 --- a/ksirc/puke/playout.cpp +++ b/ksirc/puke/playout.cpp @@ -55,7 +55,7 @@ void PLayout::messageHandler(int fd, PukeMessage *pm) if(pm->iCommand == PUKE_LAYOUT_ADDWIDGET){ if(pm->iTextSize != 2*sizeof(char)){ - qWarning("PLayout/addwidget: incorrent cArg size, bailing out. Needed: %u wanted: %d\n", sizeof(int), pm->iTextSize); + tqWarning("PLayout/addwidget: incorrent cArg size, bailing out. Needed: %u wanted: %d\n", sizeof(int), pm->iTextSize); pmRet.iCommand = PUKE_LAYOUT_ADDWIDGET_ACK; // ack the add widget pmRet.iWinId = pm->iWinId; pmRet.iArg = 1; @@ -78,7 +78,7 @@ void PLayout::messageHandler(int fd, PukeMessage *pm) } else if(pm->iCommand == PUKE_LAYOUT_ADDLAYOUT){ if(pm->iTextSize != sizeof(char)){ - qWarning("PLayout: incorrent cArg size, bailing out. Needed: %u wanted: %d\n", sizeof(int), pm->iTextSize); + tqWarning("PLayout: incorrent cArg size, bailing out. Needed: %u wanted: %d\n", sizeof(int), pm->iTextSize); pmRet.iCommand = PUKE_LAYOUT_ADDLAYOUT_ACK; // ack the add widget pmRet.iWinId = pm->iWinId; pmRet.iArg = 1; diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp index 9e46e042..99be1274 100644 --- a/ksirc/puke/pobject.cpp +++ b/ksirc/puke/pobject.cpp @@ -69,7 +69,7 @@ void PObject::messageHandler(int fd, PukeMessage *pm) delete this; } else { - qWarning("PObject: Unkown Command: %d", pm->iCommand); + tqWarning("PObject: Unkown Command: %d", pm->iCommand); pmRet.iCommand = PUKE_INVALID; pmRet.iWinId = pm->iWinId; pmRet.iArg = 0; diff --git a/ksirc/puke/pobjfinder.cpp b/ksirc/puke/pobjfinder.cpp index 6870e142..2931ec77 100644 --- a/ksirc/puke/pobjfinder.cpp +++ b/ksirc/puke/pobjfinder.cpp @@ -43,7 +43,7 @@ void PObjFinder::messageHandler(int fd, PukeMessage *pm) pmRet.iCommand = - pm->iCommand; pmRet.iWinId = pm->iWinId; pmRet.iArg = 0; - pmRet.cArg = qstrdup(qscArg); + pmRet.cArg = tqstrdup(qscArg); pmRet.iTextSize = qscArg.length(); emit outputMessage(fd, &pmRet); delete pmRet.cArg; @@ -77,7 +77,7 @@ void PObjFinder::newObject(TQObject *name){ pmRet.iCommand = - PUKE_OBJFINDER_NEWOBJECT_ACK; pmRet.iWinId = widgetIden().iWinId; pmRet.iArg = 0; - pmRet.cArg = qstrdup(info); + pmRet.cArg = tqstrdup(info); pmRet.iTextSize = info.length(); emit outputMessage(widgetIden().fd, &pmRet); delete pmRet.cArg; diff --git a/ksirc/puke/ppopmenu.cpp b/ksirc/puke/ppopmenu.cpp index 3ed66aa3..02687c2a 100644 --- a/ksirc/puke/ppopmenu.cpp +++ b/ksirc/puke/ppopmenu.cpp @@ -102,7 +102,7 @@ TQPopupMenu *PPopupMenu::widget() } void PPopupMenu::got_activated(int itemId){ - qWarning("Item got activated: %d", itemId); + tqWarning("Item got activated: %d", itemId); widgetId wI; PukeMessage pmRet; diff --git a/ksirc/puke/pprogress.cpp b/ksirc/puke/pprogress.cpp index 09ed39d2..e1a6203c 100644 --- a/ksirc/puke/pprogress.cpp +++ b/ksirc/puke/pprogress.cpp @@ -42,7 +42,7 @@ void PProgress::messageHandler(int fd, PukeMessage *pm) // kdDebug(5008) << "PProgress handler called" << endl; PukeMessage pmRet; if(widget() == 0){ - qWarning("Null widget"); + tqWarning("Null widget"); return; } switch(pm->iCommand){ diff --git a/ksirc/puke/ptabdialog.cpp b/ksirc/puke/ptabdialog.cpp index 30bc3e0a..e4fc8dea 100644 --- a/ksirc/puke/ptabdialog.cpp +++ b/ksirc/puke/ptabdialog.cpp @@ -49,7 +49,7 @@ void PTabDialog::messageHandler(int fd, PukeMessage *pm) if(pm->iCommand == PUKE_TABDIALOG_ADDTAB){ if(!(pm->iTextSize > 0)){ - qWarning("TQTabDialog/addtab: incorrent cArg size, bailing out. Needed: >0 got: %d\n", pm->iTextSize); + tqWarning("TQTabDialog/addtab: incorrent cArg size, bailing out. Needed: >0 got: %d\n", pm->iTextSize); pmRet.iCommand = PUKE_TABDIALOG_ADDTAB_ACK; // ack the add widget pmRet.iWinId = pm->iWinId; pmRet.iArg = 1; diff --git a/ksirc/puke/ptablevw.cpp b/ksirc/puke/ptablevw.cpp index 64c8fa2e..918b0676 100644 --- a/ksirc/puke/ptablevw.cpp +++ b/ksirc/puke/ptablevw.cpp @@ -4,7 +4,7 @@ PObject * PTableView::createWidget(CreateArgs &ca) { - qWarning("Table View is abstract class, cannot create an object from it!!!"); + tqWarning("Table View is abstract class, cannot create an object from it!!!"); PTableView *pt = new PTableView(ca.parent); pt->setWidget(0); pt->setWidgetId(ca.pwI); diff --git a/ksirc/puke/pwidget.cpp b/ksirc/puke/pwidget.cpp index b62f64c1..7bf30cda 100644 --- a/ksirc/puke/pwidget.cpp +++ b/ksirc/puke/pwidget.cpp @@ -248,7 +248,7 @@ void PWidget::messageHandler(int fd, PukeMessage *pm) } int *point_show = (int *) pm->cArg; - qWarning("Recreate: %d %d %d", point_show[0], point_show[1], point_show[3]); + tqWarning("Recreate: %d %d %d", point_show[0], point_show[1], point_show[3]); widget()->reparent(nparent, (WFlags) 0, TQPoint(point_show[0], point_show[1]), point_show[3]); diff --git a/ktalkd/ktalkd/readcfg++.cpp b/ktalkd/ktalkd/readcfg++.cpp index c59cf0ca..0ffe7120 100644 --- a/ktalkd/ktalkd/readcfg++.cpp +++ b/ktalkd/ktalkd/readcfg++.cpp @@ -145,7 +145,7 @@ int read_user_config(const char * key, char * result, int max) TQString Qresult; if ((Qresult = cfg -> readEntry(key, "unset")) != "unset") { - qstrncpy( result, Qresult.ascii(), max); + tqstrncpy( result, Qresult.ascii(), max); if (Options.debug_mode) syslog(LOG_DEBUG,"User option %s : %s", key, result); return 1; @@ -212,28 +212,28 @@ int process_config_file(void) ktalk_debug("Sound : %d",Options.sound); } if (found("SoundFile")) { - qstrncpy(Options.soundfile,TQFile::encodeName(result),S_CFGLINE); + tqstrncpy(Options.soundfile,TQFile::encodeName(result),S_CFGLINE); ktalk_debug("SoundFile = %s",Options.soundfile); } if (found("SoundPlayer")) { - qstrncpy(Options.soundplayer,TQFile::encodeName(result),S_CFGLINE); + tqstrncpy(Options.soundplayer,TQFile::encodeName(result),S_CFGLINE); ktalk_debug("SoundPlayer = %s",Options.soundplayer); } if (found("SoundPlayerOpt")) { - qstrncpy(Options.soundplayeropt,TQFile::encodeName(result),S_CFGLINE); + tqstrncpy(Options.soundplayeropt,TQFile::encodeName(result),S_CFGLINE); ktalk_debug("SoundPlayerOpt = %s",Options.soundplayeropt); } if (found("MailProg")) { - qstrncpy(Options.mailprog,TQFile::encodeName(result),S_CFGLINE); + tqstrncpy(Options.mailprog,TQFile::encodeName(result),S_CFGLINE); ktalk_debug("Mail prog = %s",Options.mailprog); } /* text based announcement */ - if (found("Announce1")) { qstrncpy(Options.announce1,result.local8Bit(),S_CFGLINE); } - if (found("Announce2")) { qstrncpy(Options.announce2,result.local8Bit(),S_CFGLINE); } - if (found("Announce3")) { qstrncpy(Options.announce3,result.local8Bit(),S_CFGLINE); } + if (found("Announce1")) { tqstrncpy(Options.announce1,result.local8Bit(),S_CFGLINE); } + if (found("Announce2")) { tqstrncpy(Options.announce2,result.local8Bit(),S_CFGLINE); } + if (found("Announce3")) { tqstrncpy(Options.announce3,result.local8Bit(),S_CFGLINE); } if (found("NEUUser")) { - qstrncpy(Options.NEU_user,result.local8Bit(),S_CFGLINE); + tqstrncpy(Options.NEU_user,result.local8Bit(),S_CFGLINE); ktalk_debug("NEUUser = %s", Options.NEU_user); } if (found("NEUBehaviour")) { @@ -241,16 +241,16 @@ int process_config_file(void) ktalk_debug("NEUBehaviour : %d",Options.NEU_behaviour); } if (found("NEUForwardMethod")) { - qstrncpy(Options.NEU_forwardmethod,result.ascii(),5); + tqstrncpy(Options.NEU_forwardmethod,result.ascii(),5); ktalk_debug("NEUForwardMethod = %s", Options.NEU_forwardmethod); } if (found("ExtPrg")) { - qstrncpy(Options.extprg,TQFile::encodeName(result),S_CFGLINE); + tqstrncpy(Options.extprg,TQFile::encodeName(result),S_CFGLINE); ktalk_debug("Ext prg = %s",Options.extprg); } else { /* has to work even without config file at all */ KStandardDirs stddirs; - qstrncpy(Options.extprg, TQFile::encodeName(stddirs.findResource("exe","ktalkdlg")), S_CFGLINE-1); + tqstrncpy(Options.extprg, TQFile::encodeName(stddirs.findResource("exe","ktalkdlg")), S_CFGLINE-1); } delete syscfg;