From 7cc4356bc2eceb5a66c2263bff44aa472d2ca290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 29 Oct 2018 18:21:41 +0100 Subject: Fix build with a clean TQt namespace. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- src/modules/objects/class_pixmap.cpp | 2 +- src/modules/objects/class_socket.cpp | 28 ++++++++++++++-------------- src/modules/objects/class_wrapper.cpp | 8 ++++---- src/modules/objects/class_xmlreader.cpp | 2 +- src/modules/objects/libkviobjects.cpp | 16 ++++++++-------- 5 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/modules/objects') diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index 30018f8a..47523e63 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -306,7 +306,7 @@ TQImage * KviKvsObject_pixmap::getImage() { if (bPixmapModified) { *m_pImage=m_pPixmap->convertToImage(); - //debug ("image info2 %d and %d",test.width(),test.height()); + //tqDebug ("image info2 %d and %d",test.width(),test.height()); bPixmapModified=false; } diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 5b52ad4c..841a1f0f 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -583,7 +583,7 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("remote_ip",KVS_PT_STRING,0,m_szRemoteIp) KVSO_PARAMETER("remote_port",KVS_PT_UNSIGNEDINTEGER,0,m_uRemotePort) KVSO_PARAMETERS_END(c) - debug ("Function connect"); + tqDebug ("Function connect"); if (m_uRemotePort>65535) @@ -605,13 +605,13 @@ bool KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c) if(kvi_isValidStringIp(m_szRemoteIp)) #endif { - debug ("ok connecting"); - debug ("connectinhg on ip %s ",m_szRemoteIp.latin1()); - debug ("non so ip"); + tqDebug ("ok connecting"); + tqDebug ("connectinhg on ip %s ",m_szRemoteIp.latin1()); + tqDebug ("non so ip"); m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTING; delayedConnect(); } else { - debug ("connectinhg on ip %s port %d",m_szRemoteIp.latin1(),m_uRemotePort); + tqDebug ("connectinhg on ip %s port %d",m_szRemoteIp.latin1(),m_uRemotePort); m_iStatus = KVI_SCRIPT_SOCKET_STATUS_DNS; delayedLookupRemoteIp(); } @@ -863,7 +863,7 @@ void KviKvsObject_socket::delayedConnect() void KviKvsObject_socket::doConnect() { - debug ("doConnect function"); + tqDebug ("doConnect function"); if(m_pDelayTimer)delete m_pDelayTimer; m_pDelayTimer = 0; @@ -888,7 +888,7 @@ void KviKvsObject_socket::doConnect() // else it has already been called! return; } -debug ("Socket created"); +tqDebug ("Socket created"); // create the socket #ifdef COMPILE_IPV6_SUPPORT @@ -908,7 +908,7 @@ debug ("Socket created"); // else it has already been called! return; } - debug ("Valid socket"); + tqDebug ("Valid socket"); if(!kvi_socket_setNonBlocking(m_sock)) { @@ -949,7 +949,7 @@ debug ("Socket created"); return; } } - debug ("Socket connected"); + tqDebug ("Socket connected"); m_pDelayTimer = new TQTimer(); connect(m_pDelayTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectTimeout())); m_pDelayTimer->start(m_uConnectTimeout,true); @@ -979,7 +979,7 @@ void KviKvsObject_socket::delayedLookupRemoteIp() void KviKvsObject_socket::lookupRemoteIp() { - debug ("Resolve dns"); + tqDebug ("Resolve dns"); if(m_pDelayTimer)delete m_pDelayTimer; m_pDelayTimer = 0; if(m_pDns)delete m_pDns; @@ -1011,7 +1011,7 @@ void KviKvsObject_socket::lookupDone(KviDns *pDns) return; } m_szRemoteIp = pDns->firstIpAddress(); - debug ("Dns resolved in %s",m_szRemoteIp.latin1()); + tqDebug ("Dns resolved in %s",m_szRemoteIp.latin1()); delete m_pDns; m_pDns = 0; @@ -1020,7 +1020,7 @@ void KviKvsObject_socket::lookupDone(KviDns *pDns) void KviKvsObject_socket::writeNotifierFired(int) { - debug ("Here in the writeNotifierFired"); + tqDebug ("Here in the writeNotifierFired"); if(m_pSn) { delete m_pSn; @@ -1039,7 +1039,7 @@ void KviKvsObject_socket::writeNotifierFired(int) //sockError = 0; if(sockError != 0) { - //debug("Failed here %d",sockError); + //tqDebug("Failed here %d",sockError); //failed if(sockError > 0)sockError = KviError::translateSystemError(sockError); else sockError = KviError_unknownError; //Error 0 ? @@ -1077,7 +1077,7 @@ void KviKvsObject_socket::writeNotifierFired(int) void KviKvsObject_socket::readNotifierFired(int) { - debug ("here in the readNotifierFired"); + tqDebug ("here in the readNotifierFired"); //read data if((m_uInBufferLen - m_uInDataLen) < KVI_READ_CHUNK) { diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 38901ed1..57a2ef59 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -121,7 +121,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis { if( !pParams ) return false; - debug ("ci sono i parametri"); + tqDebug ("ci sono i parametri"); TQWidget *pWidget = 0; int i=0; while(i!=pParams->count()) @@ -140,9 +140,9 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis szClass = s; szName = ""; } - debug ("szClass %s",szClass.latin1()); - debug ("szName %s",szName.latin1()); - debug ("s %s",s.latin1()); + tqDebug ("szClass %s",szClass.latin1()); + tqDebug ("szName %s",szName.latin1()); + tqDebug ("s %s",s.latin1()); if(KviTQString::equalCI(szClass,"WinId")) { diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index 243a0b79..dfeea0c5 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -325,7 +325,7 @@ bool KviKvsObject_xmlreader::function_parse(KviKvsObjectFunctionCall *c) TQByteArray data = utf8data; data.truncate(utf8data.length()); // don't include the null terminator in data source.setData(data); - //debug("PARSING(%s) LEN(%d)",szString.utf8().data(),szString.utf8().length()); + //tqDebug("PARSING(%s) LEN(%d)",szString.utf8().data(),szString.utf8().length()); TQXmlSimpleReader reader; reader.setContentHandler(&handler); reader.setErrorHandler(&handler); diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 2a4dc9de..7276dd5c 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -853,9 +853,9 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd) KviKvsVariant v; v.setString(szTemp); n->set(idx,new KviKvsVariant(v)); - debug ("string %s",szTemp.latin1()); - debug ("class %s",szClass.latin1()); - debug ("Obj %s",szObj.latin1()); + tqDebug ("string %s",szTemp.latin1()); + tqDebug ("class %s",szClass.latin1()); + tqDebug ("Obj %s",szObj.latin1()); idx++; @@ -892,9 +892,9 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd) KviKvsVariant v; v.setString(szTemp); n->set(idx,new KviKvsVariant(v)); - debug ("string %s",szTemp.latin1()); - debug ("class %s",szClass.latin1()); - debug ("Obj %s",szObj.latin1()); + tqDebug ("string %s",szTemp.latin1()); + tqDebug ("class %s",szClass.latin1()); + tqDebug ("Obj %s",szObj.latin1()); idx++; @@ -935,7 +935,7 @@ static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spac KviKvsVariant v; v.setString(szTemp); n->set(idx,new KviKvsVariant(v)); - debug ("string %s",szTemp.latin1()); + tqDebug ("string %s",szTemp.latin1()); idx++; dumpChildObjects(pWnd, list.at(i), sp, bFlag, n, idx ); } @@ -965,7 +965,7 @@ static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spac KviKvsVariant v; v.setString(szTemp); n->set(idx,new KviKvsVariant(v)); - debug ("string %s",szTemp.latin1()); + tqDebug ("string %s",szTemp.latin1()); idx++; dumpChildObjects(pWnd, it.current(), sp, bFlag, n, idx ); } -- cgit v1.2.1