summaryrefslogtreecommitdiffstats
path: root/plugins/upnp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/upnp')
-rw-r--r--plugins/upnp/upnpdescriptionparser.cpp2
-rw-r--r--plugins/upnp/upnpmcastsocket.cpp14
-rw-r--r--plugins/upnp/upnpmcastsocket.h2
-rw-r--r--plugins/upnp/upnpplugin.h2
-rw-r--r--plugins/upnp/upnpprefpage.cpp4
-rw-r--r--plugins/upnp/upnpprefwidget.cpp8
-rw-r--r--plugins/upnp/upnpprefwidget.h2
-rw-r--r--plugins/upnp/upnprouter.cpp14
-rw-r--r--plugins/upnp/upnprouter.h2
9 files changed, 25 insertions, 25 deletions
diff --git a/plugins/upnp/upnpdescriptionparser.cpp b/plugins/upnp/upnpdescriptionparser.cpp
index 1e73362..eb9d360 100644
--- a/plugins/upnp/upnpdescriptionparser.cpp
+++ b/plugins/upnp/upnpdescriptionparser.cpp
@@ -73,7 +73,7 @@ namespace kt
if (!fptr.open(IO_ReadOnly))
return false;
- TQXmlInputSource input(TQT_TQIODEVICE(&fptr));
+ TQXmlInputSource input(&fptr);
XMLContentHandler chandler(router);
TQXmlSimpleReader reader;
diff --git a/plugins/upnp/upnpmcastsocket.cpp b/plugins/upnp/upnpmcastsocket.cpp
index 0172ed2..91c9dd9 100644
--- a/plugins/upnp/upnpmcastsocket.cpp
+++ b/plugins/upnp/upnpmcastsocket.cpp
@@ -47,8 +47,8 @@ namespace kt
UPnPMCastSocket::UPnPMCastSocket(bool verbose) : verbose(verbose)
{
routers.setAutoDelete(true);
- TQObject::connect(this,TQT_SIGNAL(readyRead()),this,TQT_SLOT(onReadyRead()));
- TQObject::connect(this,TQT_SIGNAL(gotError(int)),this,TQT_SLOT(onError(int)));
+ TQObject::connect(this,TQ_SIGNAL(readyRead()),this,TQ_SLOT(onReadyRead()));
+ TQObject::connect(this,TQ_SIGNAL(gotError(int)),this,TQ_SLOT(onError(int)));
setAddressReuseable(true);
setFamily(KNetwork::KResolver::IPv4Family);
setBlocking(true);
@@ -67,8 +67,8 @@ namespace kt
UPnPMCastSocket::~UPnPMCastSocket()
{
leaveUPnPMCastGroup();
- TQObject::disconnect(this,TQT_SIGNAL(readyRead()),this,TQT_SLOT(onReadyRead()));
- TQObject::disconnect(this,TQT_SIGNAL(gotError(int)),this,TQT_SLOT(onError(int)));
+ TQObject::disconnect(this,TQ_SIGNAL(readyRead()),this,TQ_SLOT(onReadyRead()));
+ TQObject::disconnect(this,TQ_SIGNAL(gotError(int)),this,TQ_SLOT(onError(int)));
}
void UPnPMCastSocket::discover()
@@ -142,8 +142,8 @@ namespace kt
UPnPRouter* r = parseResponse(p.data());
if (r)
{
- TQObject::connect(r,TQT_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),
- this,TQT_SLOT(onXmlFileDownloaded( UPnPRouter*, bool )));
+ TQObject::connect(r,TQ_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),
+ this,TQ_SLOT(onXmlFileDownloaded( UPnPRouter*, bool )));
// download it's xml file
r->downloadXMLFile();
@@ -269,7 +269,7 @@ namespace kt
{
UPnPRouter* r = new UPnPRouter(server,location);
// download it's xml file
- TQObject::connect(r,TQT_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),this,TQT_SLOT(onXmlFileDownloaded( UPnPRouter*, bool )));
+ TQObject::connect(r,TQ_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),this,TQ_SLOT(onXmlFileDownloaded( UPnPRouter*, bool )));
r->downloadXMLFile();
}
}
diff --git a/plugins/upnp/upnpmcastsocket.h b/plugins/upnp/upnpmcastsocket.h
index f072531..fbd63df 100644
--- a/plugins/upnp/upnpmcastsocket.h
+++ b/plugins/upnp/upnpmcastsocket.h
@@ -39,7 +39,7 @@ namespace kt
*/
class UPnPMCastSocket : public KNetwork::KDatagramSocket
{
- Q_OBJECT
+ TQ_OBJECT
public:
UPnPMCastSocket(bool verbose = false);
diff --git a/plugins/upnp/upnpplugin.h b/plugins/upnp/upnpplugin.h
index a81a51c..5f4700f 100644
--- a/plugins/upnp/upnpplugin.h
+++ b/plugins/upnp/upnpplugin.h
@@ -32,7 +32,7 @@ namespace kt
*/
class UPnPPlugin : public Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
UPnPPlugin(TQObject* parent, const char* name, const TQStringList& args);
diff --git a/plugins/upnp/upnpprefpage.cpp b/plugins/upnp/upnpprefpage.cpp
index 1d3a6da..067cbef 100644
--- a/plugins/upnp/upnpprefpage.cpp
+++ b/plugins/upnp/upnpprefpage.cpp
@@ -46,8 +46,8 @@ namespace kt
void UPnPPrefPage::createWidget(TQWidget* parent)
{
widget = new UPnPPrefWidget(parent);
- TQObject::connect(sock,TQT_SIGNAL(discovered(UPnPRouter* )),widget,TQT_SLOT(addDevice(UPnPRouter* )));
- TQObject::connect(widget,TQT_SIGNAL(rescan()),sock,TQT_SLOT(discover()));
+ TQObject::connect(sock,TQ_SIGNAL(discovered(UPnPRouter* )),widget,TQ_SLOT(addDevice(UPnPRouter* )));
+ TQObject::connect(widget,TQ_SIGNAL(rescan()),sock,TQ_SLOT(discover()));
}
void UPnPPrefPage::deleteWidget()
diff --git a/plugins/upnp/upnpprefwidget.cpp b/plugins/upnp/upnpprefwidget.cpp
index ab84a2e..dd61a3c 100644
--- a/plugins/upnp/upnpprefwidget.cpp
+++ b/plugins/upnp/upnpprefwidget.cpp
@@ -41,9 +41,9 @@ namespace kt
: UPnPWidget(parent,name,fl)
{
def_router = 0;
- connect(m_forward_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onForwardBtnClicked()));
- connect(m_undo_forward_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onUndoForwardBtnClicked()));
- connect(m_rescan,TQT_SIGNAL(clicked()),this,TQT_SLOT(onRescanClicked()));
+ connect(m_forward_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onForwardBtnClicked()));
+ connect(m_undo_forward_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onUndoForwardBtnClicked()));
+ connect(m_rescan,TQ_SIGNAL(clicked()),this,TQ_SLOT(onRescanClicked()));
bt::Globals::instance().getPortList().setListener(this);
}
@@ -72,7 +72,7 @@ namespace kt
void UPnPPrefWidget::addDevice(UPnPRouter* r)
{
- connect(r,TQT_SIGNAL(updateGUI()),this,TQT_SLOT(updatePortMappings()));
+ connect(r,TQ_SIGNAL(updateGUI()),this,TQ_SLOT(updatePortMappings()));
TDEListViewItem* item = new TDEListViewItem(m_device_list,r->getDescription().friendlyName);
item->setMultiLinesEnabled(true);
itemmap[item] = r;
diff --git a/plugins/upnp/upnpprefwidget.h b/plugins/upnp/upnpprefwidget.h
index 272e0a2..bcd9ac1 100644
--- a/plugins/upnp/upnpprefwidget.h
+++ b/plugins/upnp/upnpprefwidget.h
@@ -40,7 +40,7 @@ namespace kt
*/
class UPnPPrefWidget : public UPnPWidget,public net::PortListener
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/plugins/upnp/upnprouter.cpp b/plugins/upnp/upnprouter.cpp
index 0e18e92..ee0a5c3 100644
--- a/plugins/upnp/upnprouter.cpp
+++ b/plugins/upnp/upnprouter.cpp
@@ -171,7 +171,7 @@ namespace kt
{
// downlaod XML description into a temporary file in /tmp
TDEIO::Job* job = TDEIO::file_copy(location,tmp_file,-1,true,false,false);
- connect(job,TQT_SIGNAL(result(TDEIO::Job *)),this,TQT_SLOT(downloadFinished( TDEIO::Job* )));
+ connect(job,TQ_SIGNAL(result(TDEIO::Job *)),this,TQ_SLOT(downloadFinished( TDEIO::Job* )));
}
void UPnPRouter::debugPrintData()
@@ -339,12 +339,12 @@ namespace kt
HTTPRequest* r = new HTTPRequest(http_hdr,query,location.host(),location.port(),verbose);
- connect(r,TQT_SIGNAL(replyError(bt::HTTPRequest* ,const TQString& )),
- this,TQT_SLOT(onReplyError(bt::HTTPRequest* ,const TQString& )));
- connect(r,TQT_SIGNAL(replyOK(bt::HTTPRequest* ,const TQString& )),
- this,TQT_SLOT(onReplyOK(bt::HTTPRequest* ,const TQString& )));
- connect(r,TQT_SIGNAL(error(bt::HTTPRequest*, bool )),
- this,TQT_SLOT(onError(bt::HTTPRequest*, bool )));
+ connect(r,TQ_SIGNAL(replyError(bt::HTTPRequest* ,const TQString& )),
+ this,TQ_SLOT(onReplyError(bt::HTTPRequest* ,const TQString& )));
+ connect(r,TQ_SIGNAL(replyOK(bt::HTTPRequest* ,const TQString& )),
+ this,TQ_SLOT(onReplyOK(bt::HTTPRequest* ,const TQString& )));
+ connect(r,TQ_SIGNAL(error(bt::HTTPRequest*, bool )),
+ this,TQ_SLOT(onError(bt::HTTPRequest*, bool )));
r->start();
if (!at_exit)
active_reqs.append(r);
diff --git a/plugins/upnp/upnprouter.h b/plugins/upnp/upnprouter.h
index 081d958..6dbf828 100644
--- a/plugins/upnp/upnprouter.h
+++ b/plugins/upnp/upnprouter.h
@@ -104,7 +104,7 @@ namespace kt
*/
class UPnPRouter : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public: