summaryrefslogtreecommitdiffstats
path: root/kftpgrabber
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-12-28 21:14:54 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-12-28 21:21:42 +0900
commit638b81d96f17e659ffc86fc2aac2befe33d1d3af (patch)
tree644d784ff8dea9142d3d2e283dba8dd0876e8290 /kftpgrabber
parent70edee2c4c424e634435df06e9b6bc3dc3ae3ef8 (diff)
downloadkftpgrabber-638b81d96f17e659ffc86fc2aac2befe33d1d3af.tar.gz
kftpgrabber-638b81d96f17e659ffc86fc2aac2befe33d1d3af.zip
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kftpgrabber')
-rw-r--r--kftpgrabber/src/engine/connectionretry.cpp4
-rw-r--r--kftpgrabber/src/engine/speedlimiter.cpp2
-rw-r--r--kftpgrabber/src/kftpbookmarks.cpp6
-rw-r--r--kftpgrabber/src/kftpqueue.cpp6
-rw-r--r--kftpgrabber/src/kftpqueueprocessor.cpp4
-rw-r--r--kftpgrabber/src/kftpsession.cpp30
-rw-r--r--kftpgrabber/src/kftptransfer.cpp12
-rw-r--r--kftpgrabber/src/kftptransferdir.cpp10
-rw-r--r--kftpgrabber/src/kftptransferfile.cpp34
-rw-r--r--kftpgrabber/src/mainactions.cpp22
-rw-r--r--kftpgrabber/src/mainwindow.cpp14
-rw-r--r--kftpgrabber/src/misc/customcommands/entry.cpp2
-rw-r--r--kftpgrabber/src/misc/customcommands/manager.cpp2
-rw-r--r--kftpgrabber/src/misc/filterwidgethandler.cpp16
-rw-r--r--kftpgrabber/src/misc/kftpwalletconnection.cpp6
-rw-r--r--kftpgrabber/src/misc/kftpzeroconf.cpp2
-rw-r--r--kftpgrabber/src/queuegroup.cpp4
-rw-r--r--kftpgrabber/src/queueobject.cpp4
-rw-r--r--kftpgrabber/src/site.cpp2
-rw-r--r--kftpgrabber/src/widgets/balloon.cpp6
-rw-r--r--kftpgrabber/src/widgets/bookmarks/editor.cpp32
-rw-r--r--kftpgrabber/src/widgets/bookmarks/editortls.cpp2
-rw-r--r--kftpgrabber/src/widgets/bookmarks/importwizard.cpp4
-rw-r--r--kftpgrabber/src/widgets/bookmarks/listview.cpp22
-rw-r--r--kftpgrabber/src/widgets/bookmarks/sidebar.cpp6
-rw-r--r--kftpgrabber/src/widgets/browser/actions.cpp64
-rw-r--r--kftpgrabber/src/widgets/browser/detailsview.cpp28
-rw-r--r--kftpgrabber/src/widgets/browser/dirlister.cpp10
-rw-r--r--kftpgrabber/src/widgets/browser/filterwidget.cpp4
-rw-r--r--kftpgrabber/src/widgets/browser/locationnavigator.cpp2
-rw-r--r--kftpgrabber/src/widgets/browser/propsplugin.cpp4
-rw-r--r--kftpgrabber/src/widgets/browser/treeview.cpp4
-rw-r--r--kftpgrabber/src/widgets/browser/view.cpp16
-rw-r--r--kftpgrabber/src/widgets/configdialog.cpp16
-rw-r--r--kftpgrabber/src/widgets/configfilter.cpp4
-rw-r--r--kftpgrabber/src/widgets/failedtransfers.cpp16
-rw-r--r--kftpgrabber/src/widgets/filtereditor.cpp36
-rw-r--r--kftpgrabber/src/widgets/kftpselectserverdialog.cpp2
-rw-r--r--kftpgrabber/src/widgets/kftpserverlineedit.cpp2
-rw-r--r--kftpgrabber/src/widgets/kftpzeroconflistview.cpp4
-rw-r--r--kftpgrabber/src/widgets/logview.cpp4
-rw-r--r--kftpgrabber/src/widgets/multitabbar.cpp8
-rw-r--r--kftpgrabber/src/widgets/popupmessage.cpp2
-rw-r--r--kftpgrabber/src/widgets/queueview/queueeditor.cpp22
-rw-r--r--kftpgrabber/src/widgets/queueview/queueview.cpp62
-rw-r--r--kftpgrabber/src/widgets/queueview/threadview.cpp14
-rw-r--r--kftpgrabber/src/widgets/quickconnect.cpp20
-rw-r--r--kftpgrabber/src/widgets/searchdialog.cpp4
-rw-r--r--kftpgrabber/src/widgets/sidebar.cpp4
-rw-r--r--kftpgrabber/src/widgets/systemtray.cpp6
-rw-r--r--kftpgrabber/src/widgets/verifier.cpp8
-rw-r--r--kftpgrabber/src/widgets/widgetlister.cpp6
52 files changed, 313 insertions, 313 deletions
diff --git a/kftpgrabber/src/engine/connectionretry.cpp b/kftpgrabber/src/engine/connectionretry.cpp
index bddb796..c14216c 100644
--- a/kftpgrabber/src/engine/connectionretry.cpp
+++ b/kftpgrabber/src/engine/connectionretry.cpp
@@ -51,8 +51,8 @@ ConnectionRetry::ConnectionRetry(Socket *socket)
{
m_timer = new TQTimer(this);
- connect(m_timer, SIGNAL(timeout()), this, SLOT(slotShouldRetry()));
- connect(m_socket->thread()->eventHandler(), SIGNAL(engineEvent(KFTPEngine::Event*)), this, SLOT(slotEngineEvent(KFTPEngine::Event*)));
+ connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotShouldRetry()));
+ connect(m_socket->thread()->eventHandler(), TQ_SIGNAL(engineEvent(KFTPEngine::Event*)), this, TQ_SLOT(slotEngineEvent(KFTPEngine::Event*)));
}
void ConnectionRetry::startRetry()
diff --git a/kftpgrabber/src/engine/speedlimiter.cpp b/kftpgrabber/src/engine/speedlimiter.cpp
index 27b3a87..c4187d1 100644
--- a/kftpgrabber/src/engine/speedlimiter.cpp
+++ b/kftpgrabber/src/engine/speedlimiter.cpp
@@ -68,7 +68,7 @@ SpeedLimiter::SpeedLimiter()
m_tokenDebt[1] = 0;
// Subscribe to config updates and update the limits
- connect(Config::self(), SIGNAL(configChanged()), this, SLOT(updateLimits()));
+ connect(Config::self(), TQ_SIGNAL(configChanged()), this, TQ_SLOT(updateLimits()));
updateLimits();
}
diff --git a/kftpgrabber/src/kftpbookmarks.cpp b/kftpgrabber/src/kftpbookmarks.cpp
index 8ba0e4f..6e4fe0e 100644
--- a/kftpgrabber/src/kftpbookmarks.cpp
+++ b/kftpgrabber/src/kftpbookmarks.cpp
@@ -792,7 +792,7 @@ void Manager::guiPopulateBookmarksMenu(TDEActionMenu *parentMenu, TQDomNode pare
// Fill the menu
guiPopulateBookmarksMenu(menu, n, false, data);
} else if (n.toElement().tagName() == "server") {
- action = new KFTPBookmarkAction(name, "ftp", TDEShortcut(), this, SLOT(slotBookmarkExecuted()), KFTPAPI::getInstance()->mainWindow()->actionCollection());
+ action = new KFTPBookmarkAction(name, "ftp", TDEShortcut(), this, TQ_SLOT(slotBookmarkExecuted()), KFTPAPI::getInstance()->mainWindow()->actionCollection());
action->setSiteId(n.toElement().attribute("id"));
action->setData(data);
@@ -815,7 +815,7 @@ void Manager::guiPopulateZeroconfMenu(TDEActionMenu *parentMenu)
TQValueList<DNSSD::RemoteService::Ptr>::iterator end(list.end());
for (TQValueList<DNSSD::RemoteService::Ptr>::iterator i(list.begin()); i != end; ++i) {
- KFTPZeroconfAction *newService = new KFTPZeroconfAction((*i)->serviceName(), "lan", TDEShortcut(), this, SLOT(slotZeroconfExecuted()), KFTPAPI::getInstance()->mainWindow()->actionCollection());
+ KFTPZeroconfAction *newService = new KFTPZeroconfAction((*i)->serviceName(), "lan", TDEShortcut(), this, TQ_SLOT(slotZeroconfExecuted()), KFTPAPI::getInstance()->mainWindow()->actionCollection());
newService->setSite(*i);
parentMenu->insert(newService);
@@ -846,7 +846,7 @@ void Manager::guiPopulateWalletMenu(TDEActionMenu *parentMenu)
else
desc = TQString("%1@%2").arg((*i).user()).arg((*i).host());
- KFTPWalletAction *newSite = new KFTPWalletAction(desc, "ftp", TDEShortcut(), this, SLOT(slotWalletExecuted()), KFTPAPI::getInstance()->mainWindow()->actionCollection());
+ KFTPWalletAction *newSite = new KFTPWalletAction(desc, "ftp", TDEShortcut(), this, TQ_SLOT(slotWalletExecuted()), KFTPAPI::getInstance()->mainWindow()->actionCollection());
newSite->setSite(*i);
parentMenu->insert(newSite);
diff --git a/kftpgrabber/src/kftpqueue.cpp b/kftpgrabber/src/kftpqueue.cpp
index a325cb1..5223d0d 100644
--- a/kftpgrabber/src/kftpqueue.cpp
+++ b/kftpgrabber/src/kftpqueue.cpp
@@ -146,8 +146,8 @@ Manager::Manager()
// Create the queue processor object
m_queueProc = new KFTPQueueProcessor(this);
- connect(m_queueProc, SIGNAL(queueComplete()), this, SLOT(slotQueueProcessingComplete()));
- connect(m_queueProc, SIGNAL(queueAborted()), this, SLOT(slotQueueProcessingAborted()));
+ connect(m_queueProc, TQ_SIGNAL(queueComplete()), this, TQ_SLOT(slotQueueProcessingComplete()));
+ connect(m_queueProc, TQ_SIGNAL(queueAborted()), this, TQ_SLOT(slotQueueProcessingAborted()));
// Create the queue converter object
m_converter = new KFTPQueueConverter(this);
@@ -798,7 +798,7 @@ void Manager::openAfterTransfer(TransferFile *transfer)
TDEProcess *p = new TDEProcess(this);
*p << params;
- connect(p, SIGNAL(processExited(TDEProcess*)), this, SLOT(slotEditProcessTerminated(TDEProcess*)));
+ connect(p, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotEditProcessTerminated(TDEProcess*)));
p->start();
diff --git a/kftpgrabber/src/kftpqueueprocessor.cpp b/kftpgrabber/src/kftpqueueprocessor.cpp
index 1c500c7..fc138c5 100644
--- a/kftpgrabber/src/kftpqueueprocessor.cpp
+++ b/kftpgrabber/src/kftpqueueprocessor.cpp
@@ -80,8 +80,8 @@ bool KFTPQueueProcessor::nextSite()
if (m_activeSite) {
// Connect the signals
- connect(m_activeSite, SIGNAL(destroyed(TQObject*)), this, SLOT(slotSiteComplete()));
- connect(m_activeSite, SIGNAL(siteAborted()), this, SLOT(slotSiteAborted()));
+ connect(m_activeSite, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(slotSiteComplete()));
+ connect(m_activeSite, TQ_SIGNAL(siteAborted()), this, TQ_SLOT(slotSiteAborted()));
return true;
} else {
diff --git a/kftpgrabber/src/kftpsession.cpp b/kftpgrabber/src/kftpsession.cpp
index c8fdc24..f492426 100644
--- a/kftpgrabber/src/kftpsession.cpp
+++ b/kftpgrabber/src/kftpsession.cpp
@@ -75,7 +75,7 @@ Connection::Connection(Session *session, bool primary)
// Create the actual connection client
m_client = new KFTPEngine::Thread();
- connect(m_client->eventHandler(), SIGNAL(engineEvent(KFTPEngine::Event*)), this, SLOT(slotEngineEvent(KFTPEngine::Event*)));
+ connect(m_client->eventHandler(), TQ_SIGNAL(engineEvent(KFTPEngine::Event*)), this, TQ_SLOT(slotEngineEvent(KFTPEngine::Event*)));
// If this is not a core session connection, connect
if (!primary) {
@@ -105,8 +105,8 @@ void Connection::acquire(KFTPQueue::Transfer *transfer)
m_curTransfer = transfer;
m_busy = true;
- connect(transfer, SIGNAL(transferComplete(long)), this, SLOT(slotTransferCompleted()));
- connect(transfer, SIGNAL(transferAbort(long)), this, SLOT(slotTransferCompleted()));
+ connect(transfer, TQ_SIGNAL(transferComplete(long)), this, TQ_SLOT(slotTransferCompleted()));
+ connect(transfer, TQ_SIGNAL(transferAbort(long)), this, TQ_SLOT(slotTransferCompleted()));
emit connectionAcquired();
}
@@ -408,7 +408,7 @@ void Session::scanDirectory(KFTPQueue::Transfer *parent, Connection *connection)
KURL path = parent->getSourceUrl();
if (path.isLocalFile()) {
- connect(new DirectoryScanner(parent), SIGNAL(completed()), this, SIGNAL(dirScanDone()));
+ connect(new DirectoryScanner(parent), TQ_SIGNAL(completed()), this, TQ_SIGNAL(dirScanDone()));
} else if (m_remote) {
if (!connection) {
if (!isFreeConnection()) {
@@ -450,7 +450,7 @@ void Session::reconnect(const KURL &url)
if (m_remote && getClient()->socket()->isConnected()) {
abort();
- connect(getClient()->eventHandler(), SIGNAL(disconnected()), this, SLOT(slotStartReconnect()));
+ connect(getClient()->eventHandler(), TQ_SIGNAL(disconnected()), this, TQ_SLOT(slotStartReconnect()));
getClient()->disconnect();
} else {
// The session is already disconnected, just call the slot
@@ -460,7 +460,7 @@ void Session::reconnect(const KURL &url)
void Session::slotStartReconnect()
{
- disconnect(getClient()->eventHandler(), SIGNAL(disconnected()), this, SLOT(slotStartReconnect()));
+ disconnect(getClient()->eventHandler(), TQ_SIGNAL(disconnected()), this, TQ_SLOT(slotStartReconnect()));
// Reconnect only if this is a remote url
if (!m_reconnectUrl.isLocalFile()) {
@@ -579,11 +579,11 @@ Manager::Manager(TQObject *parent, TQTabWidget *stat, KFTPTabWidget *left, KFTPT
Manager::m_self = this;
// Connect some signals
- connect(left, SIGNAL(currentChanged(TQWidget*)), this, SLOT(slotActiveChanged(TQWidget*)));
- connect(right, SIGNAL(currentChanged(TQWidget*)), this, SLOT(slotActiveChanged(TQWidget*)));
+ connect(left, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotActiveChanged(TQWidget*)));
+ connect(right, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotActiveChanged(TQWidget*)));
- connect(left, SIGNAL(closeRequest(TQWidget*)), this, SLOT(slotSessionCloseRequest(TQWidget*)));
- connect(right, SIGNAL(closeRequest(TQWidget*)), this, SLOT(slotSessionCloseRequest(TQWidget*)));
+ connect(left, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(slotSessionCloseRequest(TQWidget*)));
+ connect(right, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(slotSessionCloseRequest(TQWidget*)));
}
void Manager::registerSession(Session *session)
@@ -601,13 +601,13 @@ void Manager::registerSession(Session *session)
session->getFileView()->m_toolBarFirst->installEventFilter(this);
session->getFileView()->m_toolBarSecond->installEventFilter(this);
- connect(session->getFileView()->getDetailsView(), SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotSwitchFocus()));
- connect(session->getFileView()->getTreeView(), SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotSwitchFocus()));
- connect(session->getFileView()->m_toolBarFirst, SIGNAL(clicked(int)), this, SLOT(slotSwitchFocus()));
- connect(session->getFileView()->m_toolBarSecond, SIGNAL(clicked(int)), this, SLOT(slotSwitchFocus()));
+ connect(session->getFileView()->getDetailsView(), TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotSwitchFocus()));
+ connect(session->getFileView()->getTreeView(), TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotSwitchFocus()));
+ connect(session->getFileView()->m_toolBarFirst, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotSwitchFocus()));
+ connect(session->getFileView()->m_toolBarSecond, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotSwitchFocus()));
// Connect some signals
- connect(session->getClient()->eventHandler(), SIGNAL(engineEvent(KFTPEngine::Event*)), session, SLOT(slotClientEngineEvent(KFTPEngine::Event*)));
+ connect(session->getClient()->eventHandler(), TQ_SIGNAL(engineEvent(KFTPEngine::Event*)), session, TQ_SLOT(slotClientEngineEvent(KFTPEngine::Event*)));
// Assign GUI positions
m_statTabs->addTab(session->m_log, "[" + i18n("Log") + "]");
diff --git a/kftpgrabber/src/kftptransfer.cpp b/kftpgrabber/src/kftptransfer.cpp
index 82d44b7..9e37110 100644
--- a/kftpgrabber/src/kftptransfer.cpp
+++ b/kftpgrabber/src/kftptransfer.cpp
@@ -171,7 +171,7 @@ Connection *Transfer::initializeSession(Session *session)
{
if (!session->isFreeConnection()) {
// We should wait for a connection to come
- connect(session, SIGNAL(freeConnectionAvailable()), this, SLOT(slotConnectionAvailable()));
+ connect(session, TQ_SIGNAL(freeConnectionAvailable()), this, TQ_SLOT(slotConnectionAvailable()));
if (m_status != Waiting) {
m_status = Waiting;
@@ -184,7 +184,7 @@ Connection *Transfer::initializeSession(Session *session)
Connection *connection = session->assignConnection();
connection->acquire(this);
- connect(connection->getClient()->eventHandler(), SIGNAL(connected()), this, SLOT(slotConnectionConnected()));
+ connect(connection->getClient()->eventHandler(), TQ_SIGNAL(connected()), this, TQ_SLOT(slotConnectionConnected()));
return connection;
}
@@ -242,10 +242,10 @@ void Transfer::slotConnectionAvailable()
return;
if (m_srcSession)
- m_srcSession->TQObject::disconnect(this, SLOT(slotConnectionAvailable()));
+ m_srcSession->TQObject::disconnect(this, TQ_SLOT(slotConnectionAvailable()));
if (m_dstSession)
- m_dstSession->TQObject::disconnect(this, SLOT(slotConnectionAvailable()));
+ m_dstSession->TQObject::disconnect(this, TQ_SLOT(slotConnectionAvailable()));
// Connection has become available, grab it now
execute();
@@ -291,10 +291,10 @@ void Transfer::resetTransfer()
// Disconnect signals
if (getStatus() != Waiting) {
if (m_srcConnection)
- m_srcConnection->getClient()->eventHandler()->TQObject::disconnect(this, SLOT(slotConnectionConnected()));
+ m_srcConnection->getClient()->eventHandler()->TQObject::disconnect(this, TQ_SLOT(slotConnectionConnected()));
if (m_dstConnection)
- m_dstConnection->getClient()->eventHandler()->TQObject::disconnect(this, SLOT(slotConnectionConnected()));
+ m_dstConnection->getClient()->eventHandler()->TQObject::disconnect(this, TQ_SLOT(slotConnectionConnected()));
}
// Reset connections & session pointers
diff --git a/kftpgrabber/src/kftptransferdir.cpp b/kftpgrabber/src/kftptransferdir.cpp
index 9aaa408..260e90b 100644
--- a/kftpgrabber/src/kftptransferdir.cpp
+++ b/kftpgrabber/src/kftptransferdir.cpp
@@ -51,8 +51,8 @@ TransferDir::TransferDir(TQObject *parent)
m_group(new QueueGroup(this))
{
// Connect to some group signals
- connect(m_group, SIGNAL(interrupted()), this, SLOT(slotGroupInterrupted()));
- connect(m_group, SIGNAL(done()), this, SLOT(slotGroupDone()));
+ connect(m_group, TQ_SIGNAL(interrupted()), this, TQ_SLOT(slotGroupInterrupted()));
+ connect(m_group, TQ_SIGNAL(done()), this, TQ_SLOT(slotGroupDone()));
}
void TransferDir::execute()
@@ -72,9 +72,9 @@ void TransferDir::execute()
m_srcSession->scanDirectory(this, m_srcConnection);
m_scanned = true;
- connect(m_srcSession, SIGNAL(dirScanDone()), this, SLOT(slotDirScanDone()));
+ connect(m_srcSession, TQ_SIGNAL(dirScanDone()), this, TQ_SLOT(slotDirScanDone()));
} else {
- connect(new DirectoryScanner(this), SIGNAL(completed()), this, SLOT(slotDirScanDone()));
+ connect(new DirectoryScanner(this), TQ_SIGNAL(completed()), this, TQ_SLOT(slotDirScanDone()));
}
return;
@@ -140,7 +140,7 @@ void TransferDir::slotGroupInterrupted()
void TransferDir::slotDirScanDone()
{
if (m_srcSession)
- disconnect(m_srcSession, SIGNAL(dirScanDone()), this, SLOT(slotDirScanDone()));
+ disconnect(m_srcSession, TQ_SIGNAL(dirScanDone()), this, TQ_SLOT(slotDirScanDone()));
// Reexecute the transfer
delayedExecute();
diff --git a/kftpgrabber/src/kftptransferfile.cpp b/kftpgrabber/src/kftptransferfile.cpp
index adf262b..4c73bcd 100644
--- a/kftpgrabber/src/kftptransferfile.cpp
+++ b/kftpgrabber/src/kftptransferfile.cpp
@@ -69,15 +69,15 @@ bool TransferFile::assignSessions(Session *source, Session *destination)
// Connect signals
if (m_srcConnection) {
- connect(m_srcConnection->getClient()->eventHandler(), SIGNAL(engineEvent(KFTPEngine::Event*)), this, SLOT(slotEngineEvent(KFTPEngine::Event*)));
- connect(m_srcConnection, SIGNAL(aborting()), this, SLOT(slotSessionAborting()));
- connect(m_srcConnection, SIGNAL(connectionLost(KFTPSession::Connection*)), this, SLOT(slotConnectionLost(KFTPSession::Connection*)));
+ connect(m_srcConnection->getClient()->eventHandler(), TQ_SIGNAL(engineEvent(KFTPEngine::Event*)), this, TQ_SLOT(slotEngineEvent(KFTPEngine::Event*)));
+ connect(m_srcConnection, TQ_SIGNAL(aborting()), this, TQ_SLOT(slotSessionAborting()));
+ connect(m_srcConnection, TQ_SIGNAL(connectionLost(KFTPSession::Connection*)), this, TQ_SLOT(slotConnectionLost(KFTPSession::Connection*)));
}
if (m_dstConnection) {
- connect(m_dstConnection->getClient()->eventHandler(), SIGNAL(engineEvent(KFTPEngine::Event*)), this, SLOT(slotEngineEvent(KFTPEngine::Event*)));
- connect(m_dstConnection, SIGNAL(aborting()), this, SLOT(slotSessionAborting()));
- connect(m_dstConnection, SIGNAL(connectionLost(KFTPSession::Connection*)), this, SLOT(slotConnectionLost(KFTPSession::Connection*)));
+ connect(m_dstConnection->getClient()->eventHandler(), TQ_SIGNAL(engineEvent(KFTPEngine::Event*)), this, TQ_SLOT(slotEngineEvent(KFTPEngine::Event*)));
+ connect(m_dstConnection, TQ_SIGNAL(aborting()), this, TQ_SLOT(slotSessionAborting()));
+ connect(m_dstConnection, TQ_SIGNAL(connectionLost(KFTPSession::Connection*)), this, TQ_SLOT(slotConnectionLost(KFTPSession::Connection*)));
}
return true;
@@ -108,14 +108,14 @@ void TransferFile::execute()
// Init timer to follow the update
if (!m_updateTimer) {
m_updateTimer = new TQTimer(this);
- connect(m_updateTimer, SIGNAL(timeout()), this, SLOT(slotTimerUpdate()));
+ connect(m_updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimerUpdate()));
m_updateTimer->start(1000);
}
// Should we check for free space ?
if (KFTPCore::Config::diskCheckSpace() && !m_dfTimer) {
m_dfTimer = new TQTimer(this);
- connect(m_dfTimer, SIGNAL(timeout()), this, SLOT(slotTimerDiskFree()));
+ connect(m_dfTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimerDiskFree()));
m_dfTimer->start(KFTPCore::Config::diskCheckInterval() * 1000);
}
@@ -305,7 +305,7 @@ void TransferFile::slotTimerDiskFree()
// Check for disk usage
if (KFTPCore::Config::diskCheckSpace()) {
KDiskFreeSp *df = KDiskFreeSp::findUsageInfo((getDestUrl().path()));
- connect(df, SIGNAL(foundMountPoint(const TQString&, unsigned long, unsigned long, unsigned long)), this, SLOT(slotDiskFree(const TQString&, unsigned long, unsigned long, unsigned long)));
+ connect(df, TQ_SIGNAL(foundMountPoint(const TQString&, unsigned long, unsigned long, unsigned long)), this, TQ_SLOT(slotDiskFree(const TQString&, unsigned long, unsigned long, unsigned long)));
}
}
@@ -334,17 +334,17 @@ void TransferFile::resetTransfer()
if (getStatus() != Waiting) {
// Disconnect signals
if (m_srcConnection) {
- m_srcConnection->getClient()->eventHandler()->TQObject::disconnect(this, SLOT(slotEngineEvent(KFTPEngine::Event*)));
- m_srcConnection->TQObject::disconnect(this, SLOT(slotSessionAborting()));
- m_srcConnection->TQObject::disconnect(this, SLOT(slotConnectionLost(KFTPSession::Connection*)));
+ m_srcConnection->getClient()->eventHandler()->TQObject::disconnect(this, TQ_SLOT(slotEngineEvent(KFTPEngine::Event*)));
+ m_srcConnection->TQObject::disconnect(this, TQ_SLOT(slotSessionAborting()));
+ m_srcConnection->TQObject::disconnect(this, TQ_SLOT(slotConnectionLost(KFTPSession::Connection*)));
m_srcConnection->remove();
}
if (m_dstConnection) {
- m_dstConnection->getClient()->eventHandler()->TQObject::disconnect(this, SLOT(slotEngineEvent(KFTPEngine::Event*)));
- m_dstConnection->TQObject::disconnect(this, SLOT(slotSessionAborting()));
- m_dstConnection->TQObject::disconnect(this, SLOT(slotConnectionLost(KFTPSession::Connection*)));
+ m_dstConnection->getClient()->eventHandler()->TQObject::disconnect(this, TQ_SLOT(slotEngineEvent(KFTPEngine::Event*)));
+ m_dstConnection->TQObject::disconnect(this, TQ_SLOT(slotSessionAborting()));
+ m_dstConnection->TQObject::disconnect(this, TQ_SLOT(slotConnectionLost(KFTPSession::Connection*)));
m_dstConnection->remove();
}
@@ -368,10 +368,10 @@ void TransferFile::abort()
if (getStatus() == Waiting) {
if (m_srcSession)
- m_srcSession->TQObject::disconnect(this, SLOT(slotConnectionAvailable()));
+ m_srcSession->TQObject::disconnect(this, TQ_SLOT(slotConnectionAvailable()));
if (m_dstSession)
- m_dstSession->TQObject::disconnect(this, SLOT(slotConnectionAvailable()));
+ m_dstSession->TQObject::disconnect(this, TQ_SLOT(slotConnectionAvailable()));
}
if (m_updateTimer) {
diff --git a/kftpgrabber/src/mainactions.cpp b/kftpgrabber/src/mainactions.cpp
index be43f35..763a805 100644
--- a/kftpgrabber/src/mainactions.cpp
+++ b/kftpgrabber/src/mainactions.cpp
@@ -76,30 +76,30 @@ MainActions::MainActions(MainWindow *parent)
m_closeApp(false)
{
// setup File menu
- m_fileConnectAction = new TDEAction(i18n("Quick &Connect..."), "connect_creating", TDEShortcut(), mainWidget(), SLOT(slotQuickConnect()), actionCollection(), "file_quick_connect");
+ m_fileConnectAction = new TDEAction(i18n("Quick &Connect..."), "connect_creating", TDEShortcut(), mainWidget(), TQ_SLOT(slotQuickConnect()), actionCollection(), "file_quick_connect");
m_newSessionAction = new TDEActionMenu(i18n("&New Session"), "document-new", actionCollection(), "file_newsession");
- TDEAction *leftSide = new TDEAction(i18n("&Left Side"), TDEShortcut(), this, SLOT(slotNewSessionLeft()), actionCollection());
- TDEAction *rightSide = new TDEAction(i18n("&Right Side"), TDEShortcut(), this, SLOT(slotNewSessionRight()), actionCollection());
+ TDEAction *leftSide = new TDEAction(i18n("&Left Side"), TDEShortcut(), this, TQ_SLOT(slotNewSessionLeft()), actionCollection());
+ TDEAction *rightSide = new TDEAction(i18n("&Right Side"), TDEShortcut(), this, TQ_SLOT(slotNewSessionRight()), actionCollection());
m_newSessionAction->insert(leftSide);
m_newSessionAction->insert(rightSide);
m_newSessionAction->setStickyMenu(true);
m_newSessionAction->setDelayed(false);
- KStdAction::quit(this, SLOT(slotFileQuit()), actionCollection());
+ KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection());
// setup Settings menu
- //KStdAction::configureToolbars(this, SLOT(slotConfigureToolbars()), actionCollection());
- //KStdAction::keyBindings(this, SLOT(slotKeyBindings()), actionCollection());
- KStdAction::saveOptions(this, SLOT(slotSettingsSave()), actionCollection());
- KStdAction::preferences(this, SLOT(slotSettingsConfig()), actionCollection());
+ //KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), actionCollection());
+ //KStdAction::keyBindings(this, TQ_SLOT(slotKeyBindings()), actionCollection());
+ KStdAction::saveOptions(this, TQ_SLOT(slotSettingsSave()), actionCollection());
+ KStdAction::preferences(this, TQ_SLOT(slotSettingsConfig()), actionCollection());
mainWidget()->createStandardStatusBarAction();
mainWidget()->setStandardToolBarMenuEnabled(true);
// setup transfermode actions
m_transModeAction = new TDEActionMenu(i18n("&Transfer Mode (Auto)"), "application-octet-stream", actionCollection(), "transfermode");
- m_modeAscii = new TDERadioAction(i18n("ASCII"), "text-vnd.tde.ascii", TDEShortcut(), this, SLOT(slotModeAscii()), actionCollection());
- m_modeBinary = new TDERadioAction(i18n("Binary"), "application-octet-stream", TDEShortcut(), this, SLOT(slotModeBinary()), actionCollection());
- m_modeAuto = new TDERadioAction(i18n("Auto"), TDEShortcut(), this, SLOT(slotModeAuto()), actionCollection());
+ m_modeAscii = new TDERadioAction(i18n("ASCII"), "text-vnd.tde.ascii", TDEShortcut(), this, TQ_SLOT(slotModeAscii()), actionCollection());
+ m_modeBinary = new TDERadioAction(i18n("Binary"), "application-octet-stream", TDEShortcut(), this, TQ_SLOT(slotModeBinary()), actionCollection());
+ m_modeAuto = new TDERadioAction(i18n("Auto"), TDEShortcut(), this, TQ_SLOT(slotModeAuto()), actionCollection());
// Set grouping so only one action can be selected
m_modeAscii->setExclusiveGroup("Transfer mode");
diff --git a/kftpgrabber/src/mainwindow.cpp b/kftpgrabber/src/mainwindow.cpp
index eacad93..e7ed3ee 100644
--- a/kftpgrabber/src/mainwindow.cpp
+++ b/kftpgrabber/src/mainwindow.cpp
@@ -105,7 +105,7 @@ MainWindow::MainWindow()
// Set the shell's ui resource file
setXMLFile("kftpgrabberui.rc");
- connect(TDEApplication::kApplication(), SIGNAL(shutDown()), this, SLOT(appShutdown()));
+ connect(TDEApplication::kApplication(), TQ_SIGNAL(shutDown()), this, TQ_SLOT(appShutdown()));
// Restore size and position
resize(KFTPCore::Config::size());
@@ -120,9 +120,9 @@ MainWindow::MainWindow()
// Load custom commands
KFTPCore::CustomCommands::Manager::self()->load();
- connect(KFTPQueue::Manager::self(), SIGNAL(queueUpdate()), this, SLOT(slotUpdateStatusBar()));
- connect(KFTPBookmarks::Manager::self(), SIGNAL(update()), this, SLOT(initBookmarkMenu()));
- connect(KFTPCore::Config::self(), SIGNAL(configChanged()), this, SLOT(slotConfigChanged()));
+ connect(KFTPQueue::Manager::self(), TQ_SIGNAL(queueUpdate()), this, TQ_SLOT(slotUpdateStatusBar()));
+ connect(KFTPBookmarks::Manager::self(), TQ_SIGNAL(update()), this, TQ_SLOT(initBookmarkMenu()));
+ connect(KFTPCore::Config::self(), TQ_SIGNAL(configChanged()), this, TQ_SLOT(slotConfigChanged()));
m_trafficGraph = 0L;
m_bookmarkMenu = 0L;
@@ -146,7 +146,7 @@ MainWindow::MainWindow()
KFTPSession::Manager::self()->spawnLocalSession(KFTPSession::RightSide);
// Load bookmarks
- TQTimer::singleShot(500, this, SLOT(slotReadBookmarks()));
+ TQTimer::singleShot(500, this, TQ_SLOT(slotReadBookmarks()));
// Check for the uirc file
if (TDEGlobal::dirs()->findResource("appdata", xmlFile()) == TQString::null) {
@@ -264,7 +264,7 @@ void MainWindow::initTrafficGraph()
{
// Setup traffic graph
m_graphTimer = new TQTimer(this);
- connect(m_graphTimer, SIGNAL(timeout()), this, SLOT(slotUpdateTrafficGraph()));
+ connect(m_graphTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateTrafficGraph()));
m_graphTimer->start(1000);
// Create and configure the traffic graph
@@ -304,7 +304,7 @@ void MainWindow::initBookmarkMenu()
m_walletMenu = new TDEActionMenu(i18n("Sites In TDEWallet"), loadSmallIcon("wallet_open"));
m_bookmarkMenu->popupMenu()->insertItem(loadSmallIcon("bookmark"), i18n("Edit Bookmarks..."), 1);
- m_bookmarkMenu->popupMenu()->connectItem(1, this, SLOT(showBookmarkEditor()));
+ m_bookmarkMenu->popupMenu()->connectItem(1, this, TQ_SLOT(showBookmarkEditor()));
m_bookmarkMenu->insert(m_zeroconfMenu);
if (KFTPCore::Config::showWalletSites())
diff --git a/kftpgrabber/src/misc/customcommands/entry.cpp b/kftpgrabber/src/misc/customcommands/entry.cpp
index 4f9d0fb..f503e3b 100644
--- a/kftpgrabber/src/misc/customcommands/entry.cpp
+++ b/kftpgrabber/src/misc/customcommands/entry.cpp
@@ -83,7 +83,7 @@ void Entry::execute(KFTPSession::Session *session)
// Execute the command with proper parameters
m_lastSession = session;
- connect(session->getClient()->eventHandler(), SIGNAL(gotRawResponse(const TQString&)), this, SLOT(handleResponse(const TQString&)));
+ connect(session->getClient()->eventHandler(), TQ_SIGNAL(gotRawResponse(const TQString&)), this, TQ_SLOT(handleResponse(const TQString&)));
session->getClient()->raw(command);
}
diff --git a/kftpgrabber/src/misc/customcommands/manager.cpp b/kftpgrabber/src/misc/customcommands/manager.cpp
index 2d0f8b5..625f62d 100644
--- a/kftpgrabber/src/misc/customcommands/manager.cpp
+++ b/kftpgrabber/src/misc/customcommands/manager.cpp
@@ -167,7 +167,7 @@ void Manager::parseEntries(TDEActionMenu *parentMenu, const TQDomNode &parentNod
// Create a new action
EntryAction *action = new EntryAction(entry, session);
- connect(action, SIGNAL(activated()), this, SLOT(slotActionActivated()));
+ connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(slotActionActivated()));
parentMenu->insert(action);
} else if (tagName == "separator") {
diff --git a/kftpgrabber/src/misc/filterwidgethandler.cpp b/kftpgrabber/src/misc/filterwidgethandler.cpp
index 0e34214..bf18543 100644
--- a/kftpgrabber/src/misc/filterwidgethandler.cpp
+++ b/kftpgrabber/src/misc/filterwidgethandler.cpp
@@ -83,7 +83,7 @@ public:
combo->adjustSize();
// Connect the signal
- TQObject::connect(combo, SIGNAL(activated(int)), receiver, SLOT(slotTypeChanged()));
+ TQObject::connect(combo, TQ_SIGNAL(activated(int)), receiver, TQ_SLOT(slotTypeChanged()));
return combo;
}
@@ -97,7 +97,7 @@ public:
void createValueWidgets(TQWidgetStack *stack, const TQObject *receiver) const
{
KLineEdit *lineEdit = new KLineEdit(stack, "textWidgetHandler_LineEdit");
- TQObject::connect(lineEdit, SIGNAL(textChanged(const TQString&)), receiver, SLOT(slotValueChanged()));
+ TQObject::connect(lineEdit, TQ_SIGNAL(textChanged(const TQString&)), receiver, TQ_SLOT(slotValueChanged()));
stack->addWidget(lineEdit);
}
@@ -171,7 +171,7 @@ public:
combo->adjustSize();
// Connect the signal
- TQObject::connect(combo, SIGNAL(activated(int)), receiver, SLOT(slotTypeChanged()));
+ TQObject::connect(combo, TQ_SIGNAL(activated(int)), receiver, TQ_SLOT(slotTypeChanged()));
return combo;
}
@@ -188,7 +188,7 @@ public:
combo->insertItem(i18n("File"), 0);
combo->insertItem(i18n("Directory"), 1);
- TQObject::connect(combo, SIGNAL(activated(int)), receiver, SLOT(slotValueChanged()));
+ TQObject::connect(combo, TQ_SIGNAL(activated(int)), receiver, TQ_SLOT(slotValueChanged()));
stack->addWidget(combo);
}
@@ -271,7 +271,7 @@ public:
combo->adjustSize();
// Connect the signal
- TQObject::connect(combo, SIGNAL(activated(int)), receiver, SLOT(slotTypeChanged()));
+ TQObject::connect(combo, TQ_SIGNAL(activated(int)), receiver, TQ_SLOT(slotTypeChanged()));
return combo;
}
@@ -288,7 +288,7 @@ public:
numInput->setMinValue(0);
numInput->setSuffix(" " + i18n("bytes"));
- TQObject::connect(numInput, SIGNAL(valueChanged(int)), receiver, SLOT(slotValueChanged()));
+ TQObject::connect(numInput, TQ_SIGNAL(valueChanged(int)), receiver, TQ_SLOT(slotValueChanged()));
stack->addWidget(numInput);
}
@@ -388,7 +388,7 @@ public:
KIntNumInput *numInput = new KIntNumInput(parent);
numInput->setPrefix(i18n("Priority:") + " ");
- TQObject::connect(numInput, SIGNAL(valueChanged(int)), receiver, SLOT(slotValueChanged()));
+ TQObject::connect(numInput, TQ_SIGNAL(valueChanged(int)), receiver, TQ_SLOT(slotValueChanged()));
return numInput;
}
@@ -418,7 +418,7 @@ public:
{
KColorButton *colorButton = new KColorButton(parent);
- TQObject::connect(colorButton, SIGNAL(changed(const TQColor&)), receiver, SLOT(slotValueChanged()));
+ TQObject::connect(colorButton, TQ_SIGNAL(changed(const TQColor&)), receiver, TQ_SLOT(slotValueChanged()));
return colorButton;
}
diff --git a/kftpgrabber/src/misc/kftpwalletconnection.cpp b/kftpgrabber/src/misc/kftpwalletconnection.cpp
index 83dbe17..1de6f80 100644
--- a/kftpgrabber/src/misc/kftpwalletconnection.cpp
+++ b/kftpgrabber/src/misc/kftpwalletconnection.cpp
@@ -80,7 +80,7 @@ TQValueList<KURL> KFTPWalletConnection::getSiteList()
if (m_wallet) {
m_walletRefCount++;
- connect(m_wallet, SIGNAL(walletClosed()), this, SLOT(slotWalletClosed()));
+ connect(m_wallet, TQ_SIGNAL(walletClosed()), this, TQ_SLOT(slotWalletClosed()));
}
}
@@ -125,7 +125,7 @@ TQString KFTPWalletConnection::getPassword(const TQString &whatFor)
if (m_wallet) {
m_walletRefCount++;
- connect(m_wallet, SIGNAL(walletClosed()), this, SLOT(slotWalletClosed()));
+ connect(m_wallet, TQ_SIGNAL(walletClosed()), this, TQ_SLOT(slotWalletClosed()));
}
}
@@ -147,7 +147,7 @@ void KFTPWalletConnection::setPassword(const TQString &whatFor, const TQString &
if (m_wallet) {
m_walletRefCount++;
- connect(m_wallet, SIGNAL(walletClosed()), this, SLOT(slotWalletClosed()));
+ connect(m_wallet, TQ_SIGNAL(walletClosed()), this, TQ_SLOT(slotWalletClosed()));
}
}
diff --git a/kftpgrabber/src/misc/kftpzeroconf.cpp b/kftpgrabber/src/misc/kftpzeroconf.cpp
index 37a73c4..654d556 100644
--- a/kftpgrabber/src/misc/kftpzeroconf.cpp
+++ b/kftpgrabber/src/misc/kftpzeroconf.cpp
@@ -40,7 +40,7 @@ KFTPZeroConf::KFTPZeroConf(TQObject *parent, const char *name)
{
m_browser = new DNSSD::ServiceBrowser("_ftp._tcp", 0, true);
- connect(m_browser, SIGNAL(finished()), this, SLOT(slotServiceChanged()));
+ connect(m_browser, TQ_SIGNAL(finished()), this, TQ_SLOT(slotServiceChanged()));
m_browser->startBrowse();
}
diff --git a/kftpgrabber/src/queuegroup.cpp b/kftpgrabber/src/queuegroup.cpp
index ae8caf8..9539b22 100644
--- a/kftpgrabber/src/queuegroup.cpp
+++ b/kftpgrabber/src/queuegroup.cpp
@@ -87,8 +87,8 @@ int QueueGroup::executeNextTransfer()
// Get the transfer instance and schedule it's execution
transfer->TQObject::disconnect(this);
- connect(transfer, SIGNAL(transferComplete(long)), this, SLOT(incrementAndExecute()));
- connect(transfer, SIGNAL(transferAbort(long)), this, SIGNAL(interrupted()));
+ connect(transfer, TQ_SIGNAL(transferComplete(long)), this, TQ_SLOT(incrementAndExecute()));
+ connect(transfer, TQ_SIGNAL(transferAbort(long)), this, TQ_SIGNAL(interrupted()));
transfer->delayedExecute();
diff --git a/kftpgrabber/src/queueobject.cpp b/kftpgrabber/src/queueobject.cpp
index 916733d..8cfd436 100644
--- a/kftpgrabber/src/queueobject.cpp
+++ b/kftpgrabber/src/queueobject.cpp
@@ -56,7 +56,7 @@ QueueObject::QueueObject(TQObject *parent, Type type)
static_cast<QueueObject*>(parent)->addChildObject(this);
// Connect the delayed execution timer
- connect(&m_delayedExecuteTimer, SIGNAL(timeout()), this, SLOT(execute()));
+ connect(&m_delayedExecuteTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(execute()));
}
@@ -154,7 +154,7 @@ void QueueObject::addChildObject(QueueObject *object)
{
m_children.append(object);
- connect(object, SIGNAL(destroyed(TQObject*)), this, SLOT(slotChildDestroyed(TQObject*)));
+ connect(object, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(slotChildDestroyed(TQObject*)));
}
void QueueObject::delChildObject(QueueObject *object)
diff --git a/kftpgrabber/src/site.cpp b/kftpgrabber/src/site.cpp
index 6f6668f..bfd0ecd 100644
--- a/kftpgrabber/src/site.cpp
+++ b/kftpgrabber/src/site.cpp
@@ -47,7 +47,7 @@ Site::Site(QueueObject *parent, KURL url)
m_siteUrl = url;
// Connect to some group signals
- connect(m_group, SIGNAL(interrupted()), this, SLOT(slotGroupInterrupted()));
+ connect(m_group, TQ_SIGNAL(interrupted()), this, TQ_SLOT(slotGroupInterrupted()));
}
void Site::execute()
diff --git a/kftpgrabber/src/widgets/balloon.cpp b/kftpgrabber/src/widgets/balloon.cpp
index 5cdd616..31be4bd 100644
--- a/kftpgrabber/src/widgets/balloon.cpp
+++ b/kftpgrabber/src/widgets/balloon.cpp
@@ -81,9 +81,9 @@ Balloon::Balloon(const TQString &text, const TQString &pix)
setPalette(TQToolTip::palette());
setAutoMask(true);
- connect(caption, SIGNAL(clicked(int, int)), this, SIGNAL(signalBalloonClicked()));
- connect(caption, SIGNAL(linkClicked(const TQString &)), this, SIGNAL(signalIgnoreButtonClicked()));
- connect(caption, SIGNAL(linkClicked(const TQString &)), this, SLOT(deleteLater()));
+ connect(caption, TQ_SIGNAL(clicked(int, int)), this, TQ_SIGNAL(signalBalloonClicked()));
+ connect(caption, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SIGNAL(signalIgnoreButtonClicked()));
+ connect(caption, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SLOT(deleteLater()));
}
void Balloon::mousePressEvent(TQMouseEvent *e)
diff --git a/kftpgrabber/src/widgets/bookmarks/editor.cpp b/kftpgrabber/src/widgets/bookmarks/editor.cpp
index 86b848b..74bf68b 100644
--- a/kftpgrabber/src/widgets/bookmarks/editor.cpp
+++ b/kftpgrabber/src/widgets/bookmarks/editor.cpp
@@ -100,15 +100,15 @@ BookmarkEditor::BookmarkEditor(TQWidget *parent, const char *name)
initDialog();
- connect(this, SIGNAL(user1Clicked()), this, SLOT(slotImportWizard()));
- connect(this, SIGNAL(user2Clicked()), this, SLOT(slotExportWizard()));
+ connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotImportWizard()));
+ connect(this, TQ_SIGNAL(user2Clicked()), this, TQ_SLOT(slotExportWizard()));
- connect(m_tree, SIGNAL(bookmarkClicked(TQListViewItem*)), this, SLOT(slotTreeClicked(TQListViewItem*)));
- connect(m_tree, SIGNAL(bookmarkNew(ListViewItem*, KFTPBookmarks::Site*)), this, SLOT(slotNewAction(ListViewItem*, KFTPBookmarks::Site*)));
- connect(m_tree, SIGNAL(bookmarkDuplicated(ListViewItem*, KFTPBookmarks::Site*)), this, SLOT(slotDuplicateAction(ListViewItem*, KFTPBookmarks::Site*)));
- connect(m_tree, SIGNAL(bookmarkDeleted()), this, SLOT(slotDeleteAction()));
- connect(m_tree, SIGNAL(bookmarkMoved()), this, SLOT(refresh()));
- connect(m_tree, SIGNAL(categoryRenamed()), this, SLOT(refresh()));
+ connect(m_tree, TQ_SIGNAL(bookmarkClicked(TQListViewItem*)), this, TQ_SLOT(slotTreeClicked(TQListViewItem*)));
+ connect(m_tree, TQ_SIGNAL(bookmarkNew(ListViewItem*, KFTPBookmarks::Site*)), this, TQ_SLOT(slotNewAction(ListViewItem*, KFTPBookmarks::Site*)));
+ connect(m_tree, TQ_SIGNAL(bookmarkDuplicated(ListViewItem*, KFTPBookmarks::Site*)), this, TQ_SLOT(slotDuplicateAction(ListViewItem*, KFTPBookmarks::Site*)));
+ connect(m_tree, TQ_SIGNAL(bookmarkDeleted()), this, TQ_SLOT(slotDeleteAction()));
+ connect(m_tree, TQ_SIGNAL(bookmarkMoved()), this, TQ_SLOT(refresh()));
+ connect(m_tree, TQ_SIGNAL(categoryRenamed()), this, TQ_SLOT(refresh()));
// Get the new bookmark data
m_tree->fillBookmarkData();
@@ -153,15 +153,15 @@ void BookmarkEditor::initDialog()
m_properties->retryGroup->setEnabled(false);
m_properties->defLocalDir->setMode(KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
- connect(m_properties->anonLogin, SIGNAL(clicked()), this, SLOT(slotChangeAnonLogin()));
- connect(m_properties->doRetry, SIGNAL(clicked()), this, SLOT(slotChangeActiveRetryGroup()));
- connect(m_properties->doKeepalive, SIGNAL(clicked()), this, SLOT(slotChangeActiveKeepaliveGroup()));
- connect(m_properties->protoAdvanced, SIGNAL(clicked()), this, SLOT(slotProtoAdvancedClicked()));
- connect(m_properties->serverProtocol, SIGNAL(activated(int)), this, SLOT(slotChangeServerProtocol(int)));
- connect(m_properties->serverPort, SIGNAL(valueChanged(int)), this, SLOT(slotPortChanged()));
+ connect(m_properties->anonLogin, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeAnonLogin()));
+ connect(m_properties->doRetry, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeActiveRetryGroup()));
+ connect(m_properties->doKeepalive, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeActiveKeepaliveGroup()));
+ connect(m_properties->protoAdvanced, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotProtoAdvancedClicked()));
+ connect(m_properties->serverProtocol, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeServerProtocol(int)));
+ connect(m_properties->serverPort, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotPortChanged()));
- connect(this, SIGNAL(applyClicked()), this, SLOT(slotSaveActiveNode()));
- connect(this, SIGNAL(okClicked()), this, SLOT(slotSaveActiveNode()));
+ connect(this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotSaveActiveNode()));
+ connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotSaveActiveNode()));
// Populate charsets
TQStringList charsets = TDEGlobal::charsets()->descriptiveEncodingNames();
diff --git a/kftpgrabber/src/widgets/bookmarks/editortls.cpp b/kftpgrabber/src/widgets/bookmarks/editortls.cpp
index c4ac763..b8d6867 100644
--- a/kftpgrabber/src/widgets/bookmarks/editortls.cpp
+++ b/kftpgrabber/src/widgets/bookmarks/editortls.cpp
@@ -65,7 +65,7 @@ BookmarkEditorTLS::BookmarkEditorTLS(TQWidget *parent, const char *name)
setCaption(i18n("SSL/TLS Settings"));
showButtonApply(false);
- connect(m_mainWidget->useCert, SIGNAL(clicked()), this, SLOT(slotChangeActiveX509Group()));
+ connect(m_mainWidget->useCert, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeActiveX509Group()));
}
BookmarkEditorTLS::~BookmarkEditorTLS()
diff --git a/kftpgrabber/src/widgets/bookmarks/importwizard.cpp b/kftpgrabber/src/widgets/bookmarks/importwizard.cpp
index 38758d1..fc51a2d 100644
--- a/kftpgrabber/src/widgets/bookmarks/importwizard.cpp
+++ b/kftpgrabber/src/widgets/bookmarks/importwizard.cpp
@@ -67,7 +67,7 @@ ImportWizard::ImportWizard(TQWidget *parent, const char *name)
m_pluginList->setFullWidth(true);
m_pluginList->setAllColumnsShowFocus(true);
- connect(m_pluginList, SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotPluginsSelectionChanged(TQListViewItem*)));
+ connect(m_pluginList, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotPluginsSelectionChanged(TQListViewItem*)));
setNextEnabled(Step1, false);
@@ -116,7 +116,7 @@ void ImportWizard::next()
// Start the import
setBackEnabled(Step3, false);
- connect(m_plugin, SIGNAL(progress(int)), this, SLOT(slotImportProgress(int)));
+ connect(m_plugin, TQ_SIGNAL(progress(int)), this, TQ_SLOT(slotImportProgress(int)));
m_plugin->import(m_importUrl->url());
}
}
diff --git a/kftpgrabber/src/widgets/bookmarks/listview.cpp b/kftpgrabber/src/widgets/bookmarks/listview.cpp
index 488ee30..bbc5f6b 100644
--- a/kftpgrabber/src/widgets/bookmarks/listview.cpp
+++ b/kftpgrabber/src/widgets/bookmarks/listview.cpp
@@ -103,17 +103,17 @@ ListView::ListView(KFTPBookmarks::Manager *bookmarks, TQWidget *parent, const ch
// Init auto open timer
m_openTimer = new TQTimer(this);
- connect(this, SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, SLOT(slotDropped(TQDropEvent*, TQListViewItem*)));
- connect(this, SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotClicked(TQListViewItem*)));
- connect(this, SIGNAL(doubleClicked(TQListViewItem*)), this, SLOT(slotDoubleClicked(TQListViewItem*)));
- connect(this, SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), this, SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int)));
+ connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)));
+ connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotClicked(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(slotDoubleClicked(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotContextMenu(TQListViewItem*, const TQPoint&, int)));
/* Init the actions */
- m_newAction = new TDEAction(i18n("&New..."), "document-new", TDEShortcut(), this, SLOT(slotNewAction()), actionCollection(), "bookmark_new");
- m_renameAction = new TDEAction(i18n("&Rename"), TDEShortcut(), this, SLOT(slotRenameAction()), actionCollection(), "bookmark_rename");
- m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", TDEShortcut(), this, SLOT(slotDeleteAction()), actionCollection(), "bookmark_delete");
- m_subCatAction = new TDEAction(i18n("&Create Subcategory..."), "folder-new", TDEShortcut(), this, SLOT(slotSubCatAction()), actionCollection(), "bookmark_subcat");
- m_copyAction = new TDEAction(i18n("&Duplicate"), TDEShortcut(), this, SLOT(slotDuplicateAction()), actionCollection(), "bookmark_duplicate");
+ m_newAction = new TDEAction(i18n("&New..."), "document-new", TDEShortcut(), this, TQ_SLOT(slotNewAction()), actionCollection(), "bookmark_new");
+ m_renameAction = new TDEAction(i18n("&Rename"), TDEShortcut(), this, TQ_SLOT(slotRenameAction()), actionCollection(), "bookmark_rename");
+ m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", TDEShortcut(), this, TQ_SLOT(slotDeleteAction()), actionCollection(), "bookmark_delete");
+ m_subCatAction = new TDEAction(i18n("&Create Subcategory..."), "folder-new", TDEShortcut(), this, TQ_SLOT(slotSubCatAction()), actionCollection(), "bookmark_subcat");
+ m_copyAction = new TDEAction(i18n("&Duplicate"), TDEShortcut(), this, TQ_SLOT(slotDuplicateAction()), actionCollection(), "bookmark_duplicate");
}
TDEActionCollection *ListView::actionCollection()
@@ -126,7 +126,7 @@ void ListView::setAutoUpdate(bool value)
m_autoUpdate = value;
if (value)
- connect(m_bookmarks, SIGNAL(update()), this, SLOT(slotAutoUpdate()));
+ connect(m_bookmarks, TQ_SIGNAL(update()), this, TQ_SLOT(slotAutoUpdate()));
slotAutoUpdate();
}
@@ -136,7 +136,7 @@ void ListView::setConnectBookmark(bool value)
m_connectBookmark = value;
if (value)
- connect(this, SIGNAL(executed(TQListViewItem*)), this, SLOT(slotBookmarkExecuted(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotBookmarkExecuted(TQListViewItem*)));
}
void ListView::setEditMenuItem(bool value)
diff --git a/kftpgrabber/src/widgets/bookmarks/sidebar.cpp b/kftpgrabber/src/widgets/bookmarks/sidebar.cpp
index 944f134..3e19e09 100644
--- a/kftpgrabber/src/widgets/bookmarks/sidebar.cpp
+++ b/kftpgrabber/src/widgets/bookmarks/sidebar.cpp
@@ -77,9 +77,9 @@ Sidebar::Sidebar(TQWidget *parent, const char *name)
layout->addWidget(m_tree);
- m_editAction = new TDEAction(i18n("&Edit..."), "edit", TDEShortcut(), this, SLOT(slotEditAction()), actionCollection(), "bookmark_edit2");
- connect(m_tree, SIGNAL(bookmarkClicked(TQListViewItem*)), this, SLOT(slotClicked(TQListViewItem*)));
- connect(m_tree, SIGNAL(bookmarkNew(ListViewItem*, KFTPBookmarks::Site*)), this, SLOT(slotNewAction(ListViewItem*, KFTPBookmarks::Site*)));
+ m_editAction = new TDEAction(i18n("&Edit..."), "edit", TDEShortcut(), this, TQ_SLOT(slotEditAction()), actionCollection(), "bookmark_edit2");
+ connect(m_tree, TQ_SIGNAL(bookmarkClicked(TQListViewItem*)), this, TQ_SLOT(slotClicked(TQListViewItem*)));
+ connect(m_tree, TQ_SIGNAL(bookmarkNew(ListViewItem*, KFTPBookmarks::Site*)), this, TQ_SLOT(slotNewAction(ListViewItem*, KFTPBookmarks::Site*)));
// Get the new bookmark data
m_tree->fillBookmarkData();
diff --git a/kftpgrabber/src/widgets/browser/actions.cpp b/kftpgrabber/src/widgets/browser/actions.cpp
index 2355f80..2eb9dcd 100644
--- a/kftpgrabber/src/widgets/browser/actions.cpp
+++ b/kftpgrabber/src/widgets/browser/actions.cpp
@@ -92,52 +92,52 @@ void Actions::initActions()
m_actionCollection = new TDEActionCollection(m_view, this);
// Create all the actions
- m_goUpAction = KStdAction::up(this, SLOT(slotGoUp()), m_actionCollection, "go_up");
- m_goBackAction = KStdAction::back(this, SLOT(slotGoBack()), m_actionCollection, "go_back");
- m_goForwardAction = KStdAction::forward(this, SLOT(slotGoForward()), m_actionCollection, "go_forward");
- m_goHomeAction = KStdAction::home(this, SLOT(slotGoHome()), m_actionCollection, "go_home");
+ m_goUpAction = KStdAction::up(this, TQ_SLOT(slotGoUp()), m_actionCollection, "go_up");
+ m_goBackAction = KStdAction::back(this, TQ_SLOT(slotGoBack()), m_actionCollection, "go_back");
+ m_goForwardAction = KStdAction::forward(this, TQ_SLOT(slotGoForward()), m_actionCollection, "go_forward");
+ m_goHomeAction = KStdAction::home(this, TQ_SLOT(slotGoHome()), m_actionCollection, "go_home");
- m_reloadAction = KStdAction::redisplay(this, SLOT(slotReload()), m_actionCollection, "reload");
+ m_reloadAction = KStdAction::redisplay(this, TQ_SLOT(slotReload()), m_actionCollection, "reload");
m_reloadAction->setText(i18n("&Reload"));
m_reloadAction->setShortcut(TDEShortcut(TQt::Key_F5));
- m_abortAction = new TDEAction(i18n("&Abort"), "process-stop", TDEShortcut(), this, SLOT(slotAbort()), m_actionCollection, "abort");
- m_toggleTreeViewAction = new TDEToggleAction(i18n("&Show Tree View"), "view_tree", TDEShortcut(), this, SLOT(slotShowHideTree()), m_actionCollection, "toggle_tree_view");
- m_toggleFilterAction = new TDEToggleAction(i18n("Show &Filter"), "filter", TDEShortcut(), this, SLOT(slotShowHideFilter()), m_actionCollection, "toggle_filter");
+ m_abortAction = new TDEAction(i18n("&Abort"), "process-stop", TDEShortcut(), this, TQ_SLOT(slotAbort()), m_actionCollection, "abort");
+ m_toggleTreeViewAction = new TDEToggleAction(i18n("&Show Tree View"), "view_tree", TDEShortcut(), this, TQ_SLOT(slotShowHideTree()), m_actionCollection, "toggle_tree_view");
+ m_toggleFilterAction = new TDEToggleAction(i18n("Show &Filter"), "filter", TDEShortcut(), this, TQ_SLOT(slotShowHideFilter()), m_actionCollection, "toggle_filter");
- m_renameAction = new TDEAction(i18n("&Rename"), TDEShortcut(TQt::Key_F2), this, SLOT(slotRename()), m_actionCollection, "edit_rename");
- m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", TDEShortcut(TQt::Key_Delete), this, SLOT(slotDelete()), m_actionCollection, "edit_delete");
- m_propsAction = new TDEAction(i18n("&Properties"), TDEShortcut(), this, SLOT(slotProps()), m_actionCollection, "edit_properties");
- m_shredAction = new TDEAction(i18n("&Shred"), "editshred", TDEShortcut(), this, SLOT(slotShred()), m_actionCollection, "edit_shred");
+ m_renameAction = new TDEAction(i18n("&Rename"), TDEShortcut(TQt::Key_F2), this, TQ_SLOT(slotRename()), m_actionCollection, "edit_rename");
+ m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", TDEShortcut(TQt::Key_Delete), this, TQ_SLOT(slotDelete()), m_actionCollection, "edit_delete");
+ m_propsAction = new TDEAction(i18n("&Properties"), TDEShortcut(), this, TQ_SLOT(slotProps()), m_actionCollection, "edit_properties");
+ m_shredAction = new TDEAction(i18n("&Shred"), "editshred", TDEShortcut(), this, TQ_SLOT(slotShred()), m_actionCollection, "edit_shred");
- m_copyAction = KStdAction::copy(this, SLOT(slotCopy()), m_actionCollection, "edit_copy");
- m_pasteAction = KStdAction::paste(this, SLOT(slotPaste()), m_actionCollection, "edit_paste");
+ m_copyAction = KStdAction::copy(this, TQ_SLOT(slotCopy()), m_actionCollection, "edit_copy");
+ m_pasteAction = KStdAction::paste(this, TQ_SLOT(slotPaste()), m_actionCollection, "edit_paste");
m_filterActions = new TDEActionMenu(i18n("&Filter Options"), "", m_actionCollection, "edit_filter_options");
- m_alwaysSkipAction = new TDEAction(i18n("Always &skip this file when queuing"), TDEShortcut(), this, SLOT(slotAlwaysSkip()), m_actionCollection);
- m_topPriorityAction = new TDEAction(i18n("Make this file &top priority"), TDEShortcut(), this, SLOT(slotTopPriority()), m_actionCollection);
- m_lowPriorityAction = new TDEAction(i18n("Make this file &lowest priority"), TDEShortcut(), this, SLOT(slotLowPriority()), m_actionCollection);
+ m_alwaysSkipAction = new TDEAction(i18n("Always &skip this file when queuing"), TDEShortcut(), this, TQ_SLOT(slotAlwaysSkip()), m_actionCollection);
+ m_topPriorityAction = new TDEAction(i18n("Make this file &top priority"), TDEShortcut(), this, TQ_SLOT(slotTopPriority()), m_actionCollection);
+ m_lowPriorityAction = new TDEAction(i18n("Make this file &lowest priority"), TDEShortcut(), this, TQ_SLOT(slotLowPriority()), m_actionCollection);
m_filterActions->insert(m_alwaysSkipAction);
m_filterActions->insert(m_topPriorityAction);
m_filterActions->insert(m_lowPriorityAction);
- m_transferAction = new TDEAction(i18n("&Transfer"), TDEShortcut(), this, SLOT(slotTransfer()), m_actionCollection, "transfer");
- m_queueTransferAction = new TDEAction(i18n("&Queue Transfer"), "queue", TDEShortcut(), this, SLOT(slotQueueTransfer()), m_actionCollection, "queue_transfer");
- m_createDirAction = new TDEAction(i18n("&Create Directory..."), "folder-new", TDEShortcut(), this, SLOT(slotCreateDir()), m_actionCollection, "create_dir");
- m_fileEditAction = new TDEAction(i18n("&Open file"), "document-open", TDEShortcut(), this, SLOT(slotFileEdit()), m_actionCollection, "open_file");
- m_verifyAction = new TDEAction(i18n("&Verify..."), "ok", TDEShortcut(), this, SLOT(slotVerify()), m_actionCollection, "verify");
+ m_transferAction = new TDEAction(i18n("&Transfer"), TDEShortcut(), this, TQ_SLOT(slotTransfer()), m_actionCollection, "transfer");
+ m_queueTransferAction = new TDEAction(i18n("&Queue Transfer"), "queue", TDEShortcut(), this, TQ_SLOT(slotQueueTransfer()), m_actionCollection, "queue_transfer");
+ m_createDirAction = new TDEAction(i18n("&Create Directory..."), "folder-new", TDEShortcut(), this, TQ_SLOT(slotCreateDir()), m_actionCollection, "create_dir");
+ m_fileEditAction = new TDEAction(i18n("&Open file"), "document-open", TDEShortcut(), this, TQ_SLOT(slotFileEdit()), m_actionCollection, "open_file");
+ m_verifyAction = new TDEAction(i18n("&Verify..."), "ok", TDEShortcut(), this, TQ_SLOT(slotVerify()), m_actionCollection, "verify");
populateEncodings();
m_moreActions = new TDEActionMenu(i18n("&More Actions"), "configure", this);
- m_rawCmdAction = new TDEAction(i18n("&Manual Command Entry..."), "openterm", TDEShortcut(), this, SLOT(slotRawCmd()), m_actionCollection, "send_raw_cmd");
- m_exportListingAction = new TDEAction(i18n("&Export Directory Listing..."), "", TDEShortcut(), this, SLOT(slotExportListing()), m_actionCollection, "export_listing");
- m_showHiddenFilesAction = new TDEToggleAction(i18n("Show &Hidden Files && Directories"), TDEShortcut(), this, SLOT(slotShowHiddenFiles()), m_actionCollection, "show_hidden");
- m_openExternalAction = new TDEAction(i18n("Open current directory in &Konqueror..."), "konqueror", TDEShortcut(), this, SLOT(slotOpenExternal()), m_actionCollection, "open_konqi");
+ m_rawCmdAction = new TDEAction(i18n("&Manual Command Entry..."), "openterm", TDEShortcut(), this, TQ_SLOT(slotRawCmd()), m_actionCollection, "send_raw_cmd");
+ m_exportListingAction = new TDEAction(i18n("&Export Directory Listing..."), "", TDEShortcut(), this, TQ_SLOT(slotExportListing()), m_actionCollection, "export_listing");
+ m_showHiddenFilesAction = new TDEToggleAction(i18n("Show &Hidden Files && Directories"), TDEShortcut(), this, TQ_SLOT(slotShowHiddenFiles()), m_actionCollection, "show_hidden");
+ m_openExternalAction = new TDEAction(i18n("Open current directory in &Konqueror..."), "konqueror", TDEShortcut(), this, TQ_SLOT(slotOpenExternal()), m_actionCollection, "open_konqi");
- m_markItemsAction = new TDEAction(i18n("Compare &selected items"), "", TDEShortcut(TQt::Key_Space), this, SLOT(slotMarkItems()), m_actionCollection, "compare_selected");
- m_compareAction = new TDEAction(i18n("Compare &directories"), "", TDEShortcut(), this, SLOT(slotCompare()), m_actionCollection, "compare_dirs");
+ m_markItemsAction = new TDEAction(i18n("Compare &selected items"), "", TDEShortcut(TQt::Key_Space), this, TQ_SLOT(slotMarkItems()), m_actionCollection, "compare_selected");
+ m_compareAction = new TDEAction(i18n("Compare &directories"), "", TDEShortcut(), this, TQ_SLOT(slotCompare()), m_actionCollection, "compare_dirs");
m_showHiddenFilesAction->setChecked(KFTPCore::Config::showHiddenFiles());
@@ -159,9 +159,9 @@ void Actions::initActions()
m_moreActions->setDelayed(false);
m_siteChangeAction = new TDEActionMenu(i18n("&Change Site"), "goto", this);
- m_quickConnectAction = new TDEAction(i18n("&Quick Connect..."), "connect_creating", TDEShortcut(), this, SLOT(slotQuickConnect()), m_actionCollection, "quick_connect");
+ m_quickConnectAction = new TDEAction(i18n("&Quick Connect..."), "connect_creating", TDEShortcut(), this, TQ_SLOT(slotQuickConnect()), m_actionCollection, "quick_connect");
m_connectAction = new TDEActionMenu(i18n("&Connect To"), this);
- m_disconnectAction = new TDEAction(i18n("&Disconnect"), "connect_no", TDEShortcut(), this, SLOT(slotDisconnect()), m_actionCollection, "disconnect");
+ m_disconnectAction = new TDEAction(i18n("&Disconnect"), "connect_no", TDEShortcut(), this, TQ_SLOT(slotDisconnect()), m_actionCollection, "disconnect");
m_siteChangeAction->insert(m_quickConnectAction);
m_siteChangeAction->insert(m_connectAction);
@@ -185,10 +185,10 @@ void Actions::populateEncodings()
TQStringList charsets = TDEGlobal::charsets()->descriptiveEncodingNames();
int count = 0;
for (TQStringList::iterator i = charsets.begin(); i != charsets.end(); ++i)
- menu->insertItem(*i, this, SLOT(slotCharsetChanged(int)), 0, ++count);
+ menu->insertItem(*i, this, TQ_SLOT(slotCharsetChanged(int)), 0, ++count);
menu->insertSeparator();
- menu->insertItem(i18n("Default"), this, SLOT(slotCharsetReset(int)), 0, ++count);
+ menu->insertItem(i18n("Default"), this, TQ_SLOT(slotCharsetReset(int)), 0, ++count);
menu->setItemChecked(count, true);
m_defaultCharsetOption = count;
diff --git a/kftpgrabber/src/widgets/browser/detailsview.cpp b/kftpgrabber/src/widgets/browser/detailsview.cpp
index 20df37f..1fc1cdc 100644
--- a/kftpgrabber/src/widgets/browser/detailsview.cpp
+++ b/kftpgrabber/src/widgets/browser/detailsview.cpp
@@ -67,32 +67,32 @@ DetailsView::DetailsView(TQWidget *parent, View *view, KFTPSession::Session *ses
m_autoResizeEnabled(true)
{
m_resizeTimer = new TQTimer(this);
- connect(m_resizeTimer, SIGNAL(timeout()), this, SLOT(updateColumnWidths()));
+ connect(m_resizeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateColumnWidths()));
m_dirLister = new DirLister(this);
m_dirLister->setSession(session);
- connect(m_dirLister, SIGNAL(clear()), this, SLOT(slotClear()));
- connect(m_dirLister, SIGNAL(completed()), this, SLOT(slotCompleted()));
- connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)), this, SLOT(slotDeleteItem(KFileItem*)));
- connect(m_dirLister, SIGNAL(refreshItems()), this, SLOT(slotRefreshItems()));
- connect(m_dirLister, SIGNAL(siteChanged(const KURL&)), this, SLOT(slotSiteChanged(const KURL&)));
+ connect(m_dirLister, TQ_SIGNAL(clear()), this, TQ_SLOT(slotClear()));
+ connect(m_dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted()));
+ connect(m_dirLister, TQ_SIGNAL(deleteItem(KFileItem*)), this, TQ_SLOT(slotDeleteItem(KFileItem*)));
+ connect(m_dirLister, TQ_SIGNAL(refreshItems()), this, TQ_SLOT(slotRefreshItems()));
+ connect(m_dirLister, TQ_SIGNAL(siteChanged(const KURL&)), this, TQ_SLOT(slotSiteChanged(const KURL&)));
m_navigator = new LocationNavigator(this);
- connect(m_navigator, SIGNAL(urlChanged(const KURL&)), this, SLOT(slotUrlChanged(const KURL&)));
+ connect(m_navigator, TQ_SIGNAL(urlChanged(const KURL&)), this, TQ_SLOT(slotUrlChanged(const KURL&)));
- connect(this, SIGNAL(executed(TQListViewItem*)), this, SLOT(slotItemExecuted()));
- connect(this, SIGNAL(returnPressed(TQListViewItem*)), this, SLOT(slotItemExecuted()));
- connect(this, SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
- connect(this, SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), this, SLOT(slotItemRenamed(TQListViewItem*, const TQString&)));
+ connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted()));
+ connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(slotItemExecuted()));
+ connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+ connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString&)));
// Setup the header
TQHeader *viewHeader = header();
viewHeader->setResizeEnabled(true);
viewHeader->setMovingEnabled(false);
- connect(viewHeader, SIGNAL(sizeChange(int, int, int)), this, SLOT(slotHeaderResized(int)));
+ connect(viewHeader, TQ_SIGNAL(sizeChange(int, int, int)), this, TQ_SLOT(slotHeaderResized(int)));
// Set column width
setColumnWidthMode(NameColumn, TQListView::Manual);
@@ -153,7 +153,7 @@ void DetailsView::setTreeView(TreeView *tree)
{
m_treeView = tree;
- connect(m_treeView, SIGNAL(pathChanged(const KURL&)), this, SLOT(openUrl(const KURL&)));
+ connect(m_treeView, TQ_SIGNAL(pathChanged(const KURL&)), this, TQ_SLOT(openUrl(const KURL&)));
}
void DetailsView::setHomeUrl(const KURL &url)
@@ -247,7 +247,7 @@ void DetailsView::slotCompleted()
void DetailsView::slotRefreshItems()
{
- TQTimer::singleShot(0, this, SLOT(reload()));
+ TQTimer::singleShot(0, this, TQ_SLOT(reload()));
}
void DetailsView::reload()
diff --git a/kftpgrabber/src/widgets/browser/dirlister.cpp b/kftpgrabber/src/widgets/browser/dirlister.cpp
index 9336a59..b28e15e 100644
--- a/kftpgrabber/src/widgets/browser/dirlister.cpp
+++ b/kftpgrabber/src/widgets/browser/dirlister.cpp
@@ -99,10 +99,10 @@ void DirLister::enableLocal()
m_localLister->stop();
m_localLister->TQObject::disconnect(this);
- connect(m_localLister, SIGNAL(clear()), this, SIGNAL(clear()));
- connect(m_localLister, SIGNAL(completed()), this, SIGNAL(completed()));
- connect(m_localLister, SIGNAL(deleteItem(KFileItem*)), this, SIGNAL(deleteItem(KFileItem*)));
- connect(m_localLister, SIGNAL(refreshItems(const KFileItemList&)), this, SIGNAL(refreshItems()));
+ connect(m_localLister, TQ_SIGNAL(clear()), this, TQ_SIGNAL(clear()));
+ connect(m_localLister, TQ_SIGNAL(completed()), this, TQ_SIGNAL(completed()));
+ connect(m_localLister, TQ_SIGNAL(deleteItem(KFileItem*)), this, TQ_SIGNAL(deleteItem(KFileItem*)));
+ connect(m_localLister, TQ_SIGNAL(refreshItems(const KFileItemList&)), this, TQ_SIGNAL(refreshItems()));
}
void DirLister::enableRemote()
@@ -111,7 +111,7 @@ void DirLister::enableRemote()
m_localLister->TQObject::disconnect(this);
m_remoteSession->getClient()->eventHandler()->TQObject::disconnect(this);
- connect(m_remoteSession->getClient()->eventHandler(), SIGNAL(engineEvent(KFTPEngine::Event*)), this, SLOT(slotRemoteEngineEvent(KFTPEngine::Event*)));
+ connect(m_remoteSession->getClient()->eventHandler(), TQ_SIGNAL(engineEvent(KFTPEngine::Event*)), this, TQ_SLOT(slotRemoteEngineEvent(KFTPEngine::Event*)));
}
void DirLister::disableRemote()
diff --git a/kftpgrabber/src/widgets/browser/filterwidget.cpp b/kftpgrabber/src/widgets/browser/filterwidget.cpp
index a5642e8..387fd9d 100644
--- a/kftpgrabber/src/widgets/browser/filterwidget.cpp
+++ b/kftpgrabber/src/widgets/browser/filterwidget.cpp
@@ -52,7 +52,7 @@ FilterWidget::FilterWidget(TQWidget *parent, DetailsView *view)
m_filterSymlinks(true),
m_caseSensitive(false)
{
- connect(view, SIGNAL(itemsChanged()), this, SLOT(updateSearch()));
+ connect(view, TQ_SIGNAL(itemsChanged()), this, TQ_SLOT(updateSearch()));
}
bool FilterWidget::itemMatches(const TQListViewItem *item, const TQString &pattern) const
@@ -82,7 +82,7 @@ TQPopupMenu *FilterWidget::createPopupMenu()
TQPopupMenu *popup = KLineEdit::createPopupMenu();
TQPopupMenu *subMenu = new TQPopupMenu(popup);
- connect(subMenu, SIGNAL(activated(int)), this, SLOT(slotOptionsMenuActivated(int)));
+ connect(subMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOptionsMenuActivated(int)));
popup->insertSeparator();
popup->insertItem(i18n("Filter Options"), subMenu);
diff --git a/kftpgrabber/src/widgets/browser/locationnavigator.cpp b/kftpgrabber/src/widgets/browser/locationnavigator.cpp
index 35d3e87..2f885e2 100644
--- a/kftpgrabber/src/widgets/browser/locationnavigator.cpp
+++ b/kftpgrabber/src/widgets/browser/locationnavigator.cpp
@@ -60,7 +60,7 @@ LocationNavigator::LocationNavigator(DetailsView *view)
: m_view(view),
m_historyIndex(0)
{
- connect(view, SIGNAL(contentsMoved(int, int)), this, SLOT(slotContentsMoved(int, int)));
+ connect(view, TQ_SIGNAL(contentsMoved(int, int)), this, TQ_SLOT(slotContentsMoved(int, int)));
}
void LocationNavigator::setUrl(const KURL &url)
diff --git a/kftpgrabber/src/widgets/browser/propsplugin.cpp b/kftpgrabber/src/widgets/browser/propsplugin.cpp
index 607fdf2..06a70c7 100644
--- a/kftpgrabber/src/widgets/browser/propsplugin.cpp
+++ b/kftpgrabber/src/widgets/browser/propsplugin.cpp
@@ -296,7 +296,7 @@ PermissionsPropsPlugin::PermissionsPropsPlugin(KPropertiesDialog *_props, KFileI
for (int row = 0; row < 3; ++row) {
for (int col = 0; col < 4; ++col) {
TQCheckBox *cb = new TQCheckBox(gb);
- connect(cb, SIGNAL(clicked()), this, SLOT(setDirty()));
+ connect(cb, TQ_SIGNAL(clicked()), this, TQ_SLOT(setDirty()));
m_permsCheck[row][col] = cb;
cb->setChecked(permissions & fperm[row][col]);
@@ -309,7 +309,7 @@ PermissionsPropsPlugin::PermissionsPropsPlugin(KPropertiesDialog *_props, KFileI
if (isDir) {
m_cbRecursive = new TQCheckBox(i18n("Apply changes to all subfolders and their contents"), frame);
- connect(m_cbRecursive, SIGNAL(clicked()), this, SLOT(changed()));
+ connect(m_cbRecursive, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()));
box->addWidget(m_cbRecursive);
}
}
diff --git a/kftpgrabber/src/widgets/browser/treeview.cpp b/kftpgrabber/src/widgets/browser/treeview.cpp
index b9a5929..1b94bee 100644
--- a/kftpgrabber/src/widgets/browser/treeview.cpp
+++ b/kftpgrabber/src/widgets/browser/treeview.cpp
@@ -114,8 +114,8 @@ TreeView::TreeView(TQWidget *parent)
m_noItemOpen = false;
// Connect signals
- connect(this, SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotClicked(TQListViewItem*)));
- connect(this, SIGNAL(doubleClicked(TQListViewItem*)), this, SLOT(slotDoubleClicked(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotClicked(TQListViewItem*)));
+ connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(slotDoubleClicked(TQListViewItem*)));
// Drag and drop
m_dropItem = 0L;
diff --git a/kftpgrabber/src/widgets/browser/view.cpp b/kftpgrabber/src/widgets/browser/view.cpp
index b990b3a..4058bd6 100644
--- a/kftpgrabber/src/widgets/browser/view.cpp
+++ b/kftpgrabber/src/widgets/browser/view.cpp
@@ -93,14 +93,14 @@ View::View(TQWidget *parent, const char *name, KFTPEngine::Thread *client, KFTPS
setTreeVisible(KFTPCore::Config::showTree());
// Let us be up to date with bookmark changes
- connect(KFTPBookmarks::Manager::self(), SIGNAL(update()), this, SLOT(updateBookmarks()));
+ connect(KFTPBookmarks::Manager::self(), TQ_SIGNAL(update()), this, TQ_SLOT(updateBookmarks()));
// Some other stuff
- connect(m_ftpClient->eventHandler(), SIGNAL(engineEvent(KFTPEngine::Event*)), this, SLOT(slotEngineEvent(KFTPEngine::Event*)));
- connect(m_connTimer, SIGNAL(timeout()), this, SLOT(slotDurationUpdate()));
+ connect(m_ftpClient->eventHandler(), TQ_SIGNAL(engineEvent(KFTPEngine::Event*)), this, TQ_SLOT(slotEngineEvent(KFTPEngine::Event*)));
+ connect(m_connTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDurationUpdate()));
// Config updates to hide/show the tree
- connect(KFTPCore::Config::self(), SIGNAL(configChanged()), this, SLOT(slotConfigUpdate()));
+ connect(KFTPCore::Config::self(), TQ_SIGNAL(configChanged()), this, TQ_SLOT(slotConfigUpdate()));
}
View::~View()
@@ -137,7 +137,7 @@ void View::init()
m_searchToolBar->insertWidget(1, 35, filterLabel);
// Create the erase button
- m_toolBarSecond->insertButton(TQApplication::reverseLayout() ? "clear_left" :"locationbar_erase", 0, SIGNAL(clicked()), this, SLOT(slotHistoryEraseClicked()), true);
+ m_toolBarSecond->insertButton(TQApplication::reverseLayout() ? "clear_left" :"locationbar_erase", 0, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHistoryEraseClicked()), true);
// Create the labels
TQLabel *pathLabel = new TQLabel(i18n("Path: "), m_toolBarSecond);
@@ -152,7 +152,7 @@ void View::init()
m_historyCombo->setDuplicatesEnabled(false);
m_historyCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
- connect(m_historyCombo, SIGNAL(activated(const TQString&)), this, SLOT(slotHistoryActivated(const TQString&)));
+ connect(m_historyCombo, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotHistoryActivated(const TQString&)));
// Do some more stuff
m_toolBarSecond->setItemAutoSized(1, true);
@@ -178,7 +178,7 @@ void View::init()
m_sslIcon->setIconSet(SmallIconSet("decrypted"));
m_sslIcon->setEnabled(false);
- connect(m_sslIcon, SIGNAL(clicked()), this, SLOT(slotDisplayCertInfo()));
+ connect(m_sslIcon, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDisplayCertInfo()));
m_statusMsg = new TQLabel(this);
m_statusMsg->setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken);
@@ -199,7 +199,7 @@ void View::init()
m_detailsView = new DetailsView(m_splitter, this, m_session);
m_splitter->moveToLast(m_detailsView);
- connect(m_detailsView->locationNavigator(), SIGNAL(historyChanged()), this, SLOT(slotHistoryChanged()));
+ connect(m_detailsView->locationNavigator(), TQ_SIGNAL(historyChanged()), this, TQ_SLOT(slotHistoryChanged()));
// Create the tree view
m_tree = new TreeView(m_splitter);
diff --git a/kftpgrabber/src/widgets/configdialog.cpp b/kftpgrabber/src/widgets/configdialog.cpp
index 5af131b..9954eb3 100644
--- a/kftpgrabber/src/widgets/configdialog.cpp
+++ b/kftpgrabber/src/widgets/configdialog.cpp
@@ -93,12 +93,12 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name)
static_cast<KURLRequester*>(child("kcfg_defLocalDir"))->setMode(KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly);
// Setup signals
- connect(child("kcfg_globalMail"), SIGNAL(toggled(bool)), this, SLOT(slotGeneralEmailChanged(bool)));
- connect(child("kcfg_portForceIp"), SIGNAL(toggled(bool)), this, SLOT(slotTransfersForceIpChanged(bool)));
- connect(child("kcfg_activeForcePort"), SIGNAL(toggled(bool)), this, SLOT(slotTransfersForcePortChanged(bool)));
- connect(child("kcfg_diskCheckSpace"), SIGNAL(toggled(bool)), this, SLOT(slotTransfersDiskChanged(bool)));
- connect(child("kcfg_failedAutoRetry"), SIGNAL(toggled(bool)), this, SLOT(slotTransfersFailedRetryChanged(bool)));
- connect(child("kcfg_saveToFile"), SIGNAL(toggled(bool)), this, SLOT(slotLogOutputFileChanged(bool)));
+ connect(child("kcfg_globalMail"), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotGeneralEmailChanged(bool)));
+ connect(child("kcfg_portForceIp"), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotTransfersForceIpChanged(bool)));
+ connect(child("kcfg_activeForcePort"), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotTransfersForcePortChanged(bool)));
+ connect(child("kcfg_diskCheckSpace"), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotTransfersDiskChanged(bool)));
+ connect(child("kcfg_failedAutoRetry"), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotTransfersFailedRetryChanged(bool)));
+ connect(child("kcfg_saveToFile"), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotLogOutputFileChanged(bool)));
// Refresh states
slotGeneralEmailChanged(static_cast<TQCheckBox*>(child("kcfg_globalMail"))->isChecked());
@@ -109,8 +109,8 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name)
slotTransfersForcePortChanged(static_cast<TQCheckBox*>(child("kcfg_activeForcePort"))->isChecked());
// Let the config be up-to-date
- connect(this, SIGNAL(settingsChanged()), KFTPCore::Config::self(), SLOT(emitChange()));
- connect(this, SIGNAL(okClicked()), this, SLOT(slotSettingsChanged()));
+ connect(this, TQ_SIGNAL(settingsChanged()), KFTPCore::Config::self(), TQ_SLOT(emitChange()));
+ connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotSettingsChanged()));
}
void ConfigDialog::prepareDialog()
diff --git a/kftpgrabber/src/widgets/configfilter.cpp b/kftpgrabber/src/widgets/configfilter.cpp
index 5a4c169..ca5a2fb 100644
--- a/kftpgrabber/src/widgets/configfilter.cpp
+++ b/kftpgrabber/src/widgets/configfilter.cpp
@@ -75,8 +75,8 @@ ConfigFilter::ConfigFilter(TQWidget *parent, const char *name)
loadSettings();
// Connect the slots
- connect(m_editorLayout->addExtButton, SIGNAL(clicked()), this, SLOT(slotAddAscii()));
- connect(m_editorLayout->removeExtButton, SIGNAL(clicked()), this, SLOT(slotRemoveAscii()));
+ connect(m_editorLayout->addExtButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddAscii()));
+ connect(m_editorLayout->removeExtButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveAscii()));
}
void ConfigFilter::loadSettings()
diff --git a/kftpgrabber/src/widgets/failedtransfers.cpp b/kftpgrabber/src/widgets/failedtransfers.cpp
index 03fc6de..494658d 100644
--- a/kftpgrabber/src/widgets/failedtransfers.cpp
+++ b/kftpgrabber/src/widgets/failedtransfers.cpp
@@ -99,10 +99,10 @@ FailedTransfers::FailedTransfers(TQWidget *parent, const char *name)
layout->addWidget(m_list);
- connect(KFTPQueue::Manager::self(), SIGNAL(failedTransferNew(KFTPQueue::FailedTransfer*)), this, SLOT(slotFailedTransferNew(KFTPQueue::FailedTransfer*)));
- connect(KFTPQueue::Manager::self(), SIGNAL(failedTransferRemoved(long)), this, SLOT(slotFailedTransferRemoved(long)));
+ connect(KFTPQueue::Manager::self(), TQ_SIGNAL(failedTransferNew(KFTPQueue::FailedTransfer*)), this, TQ_SLOT(slotFailedTransferNew(KFTPQueue::FailedTransfer*)));
+ connect(KFTPQueue::Manager::self(), TQ_SIGNAL(failedTransferRemoved(long)), this, TQ_SLOT(slotFailedTransferRemoved(long)));
- connect(m_list, SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, SLOT(contextMenuRequested(TDEListView*, TQListViewItem*, const TQPoint&)));
+ connect(m_list, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQ_SLOT(contextMenuRequested(TDEListView*, TQListViewItem*, const TQPoint&)));
// Initialize the actions
initActions();
@@ -114,11 +114,11 @@ FailedTransfers::~FailedTransfers()
void FailedTransfers::initActions()
{
- m_restartAction = new TDEAction(i18n("&Restart Transfer"), "launch", TDEShortcut(), this, SLOT(slotRestart()), actionCollection(), "launch");
- m_addToQueueAction = new TDEAction(i18n("&Add To Queue"), "queue", TDEShortcut(), this, SLOT(slotAddToQueue()), actionCollection(), "addtoqueue");
- m_addAllToQueueAction = new TDEAction(i18n("Add All To Queue"), TDEShortcut(), this, SLOT(slotAddAllToQueue()), actionCollection(), "addalltoqueue");
- m_removeAction = new TDEAction(i18n("R&emove"), "edit-delete", TDEShortcut(), this, SLOT(slotRemove()), actionCollection(), "remove");
- m_removeAllAction = new TDEAction(i18n("Remove All"), TDEShortcut(), this, SLOT(slotRemoveAll()), actionCollection(), "removeall");
+ m_restartAction = new TDEAction(i18n("&Restart Transfer"), "launch", TDEShortcut(), this, TQ_SLOT(slotRestart()), actionCollection(), "launch");
+ m_addToQueueAction = new TDEAction(i18n("&Add To Queue"), "queue", TDEShortcut(), this, TQ_SLOT(slotAddToQueue()), actionCollection(), "addtoqueue");
+ m_addAllToQueueAction = new TDEAction(i18n("Add All To Queue"), TDEShortcut(), this, TQ_SLOT(slotAddAllToQueue()), actionCollection(), "addalltoqueue");
+ m_removeAction = new TDEAction(i18n("R&emove"), "edit-delete", TDEShortcut(), this, TQ_SLOT(slotRemove()), actionCollection(), "remove");
+ m_removeAllAction = new TDEAction(i18n("Remove All"), TDEShortcut(), this, TQ_SLOT(slotRemoveAll()), actionCollection(), "removeall");
}
void FailedTransfers::updateActions()
diff --git a/kftpgrabber/src/widgets/filtereditor.cpp b/kftpgrabber/src/widgets/filtereditor.cpp
index f13c91c..2dd5987 100644
--- a/kftpgrabber/src/widgets/filtereditor.cpp
+++ b/kftpgrabber/src/widgets/filtereditor.cpp
@@ -76,16 +76,16 @@ FilterEditor::FilterEditor(TQWidget *parent)
rightLayout->addStretch(1);
// Connect some signals
- connect(m_enabledCheck, SIGNAL(clicked()), this, SLOT(slotEnabledChanged()));
+ connect(m_enabledCheck, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEnabledChanged()));
- connect(m_listView, SIGNAL(ruleChanged(KFTPCore::Filter::Rule*)), this, SLOT(slotRuleChanged(KFTPCore::Filter::Rule*)));
- connect(m_listView, SIGNAL(ruleRemoved()), this, SLOT(slotRuleRemoved()));
+ connect(m_listView, TQ_SIGNAL(ruleChanged(KFTPCore::Filter::Rule*)), this, TQ_SLOT(slotRuleChanged(KFTPCore::Filter::Rule*)));
+ connect(m_listView, TQ_SIGNAL(ruleRemoved()), this, TQ_SLOT(slotRuleRemoved()));
- connect(m_listView, SIGNAL(ruleChanged(KFTPCore::Filter::Rule*)), m_conditionsList, SLOT(loadRule(KFTPCore::Filter::Rule*)));
- connect(m_listView, SIGNAL(ruleRemoved()), m_conditionsList, SLOT(reset()));
+ connect(m_listView, TQ_SIGNAL(ruleChanged(KFTPCore::Filter::Rule*)), m_conditionsList, TQ_SLOT(loadRule(KFTPCore::Filter::Rule*)));
+ connect(m_listView, TQ_SIGNAL(ruleRemoved()), m_conditionsList, TQ_SLOT(reset()));
- connect(m_listView, SIGNAL(ruleChanged(KFTPCore::Filter::Rule*)), m_actionsList, SLOT(loadRule(KFTPCore::Filter::Rule*)));
- connect(m_listView, SIGNAL(ruleRemoved()), m_actionsList, SLOT(reset()));
+ connect(m_listView, TQ_SIGNAL(ruleChanged(KFTPCore::Filter::Rule*)), m_actionsList, TQ_SLOT(loadRule(KFTPCore::Filter::Rule*)));
+ connect(m_listView, TQ_SIGNAL(ruleRemoved()), m_actionsList, TQ_SLOT(reset()));
}
void FilterEditor::slotRuleChanged(KFTPCore::Filter::Rule *rule)
@@ -177,15 +177,15 @@ FilterListView::FilterListView(TQWidget *parent)
TQToolTip::add(m_buttonDelete, i18n("Delete"));
// Connect the signals
- connect(m_buttonNew, SIGNAL(clicked()), this, SLOT(slotNewRule()));
- connect(m_buttonDelete, SIGNAL(clicked()), this, SLOT(slotDeleteRule()));
- connect(m_buttonRename, SIGNAL(clicked()), this, SLOT(slotRenameRule()));
- connect(m_buttonCopy, SIGNAL(clicked()), this, SLOT(slotCopyRule()));
+ connect(m_buttonNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewRule()));
+ connect(m_buttonDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteRule()));
+ connect(m_buttonRename, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRenameRule()));
+ connect(m_buttonCopy, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopyRule()));
- connect(m_buttonUp, SIGNAL(clicked()), this, SLOT(slotUp()));
- connect(m_buttonDown, SIGNAL(clicked()), this, SLOT(slotDown()));
+ connect(m_buttonUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUp()));
+ connect(m_buttonDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDown()));
- connect(m_listView, SIGNAL(selectionChanged(TQListViewItem*)), this, SLOT(slotSelectionChanged(TQListViewItem*)));
+ connect(m_listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
m_buttonUp->setEnabled(false);
m_buttonDown->setEnabled(false);
@@ -346,7 +346,7 @@ FilterConditionsList::FilterConditionsList(TQWidget *parent)
bg->insert(m_buttonAny, (int) ConditionChain::Any);
// Connect some signals
- connect(bg, SIGNAL(clicked(int)), this, SLOT(slotMatchTypeChanged(int)));
+ connect(bg, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotMatchTypeChanged(int)));
m_lister = new FilterConditionWidgetLister(this);
}
@@ -454,7 +454,7 @@ FilterConditionWidget::FilterConditionWidget(TQWidget *parent)
WidgetHandlerManager::self()->createConditionWidgets(m_typeStack, m_valueStack, this);
// Connect signals
- connect(m_fieldCombo, SIGNAL(activated(int)), this, SLOT(slotFieldChanged(int)));
+ connect(m_fieldCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotFieldChanged(int)));
setFocusProxy(m_fieldCombo);
}
@@ -591,8 +591,8 @@ FilterActionWidget::FilterActionWidget(TQWidget *parent)
WidgetHandlerManager::self()->createActionWidgets(m_valueStack, this);
// Connect signals
- connect(m_actionCombo, SIGNAL(activated(int)), this, SLOT(slotActionChanged(int)));
- connect(m_actionCombo, SIGNAL(activated(int)), m_valueStack, SLOT(raiseWidget(int)));
+ connect(m_actionCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActionChanged(int)));
+ connect(m_actionCombo, TQ_SIGNAL(activated(int)), m_valueStack, TQ_SLOT(raiseWidget(int)));
setFocusProxy(m_actionCombo);
}
diff --git a/kftpgrabber/src/widgets/kftpselectserverdialog.cpp b/kftpgrabber/src/widgets/kftpselectserverdialog.cpp
index effaf46..bfc3c78 100644
--- a/kftpgrabber/src/widgets/kftpselectserverdialog.cpp
+++ b/kftpgrabber/src/widgets/kftpselectserverdialog.cpp
@@ -53,7 +53,7 @@ KFTPSelectServerDialog::KFTPSelectServerDialog(TQWidget *parent, const char *nam
m_tree->setMinimumWidth(270);
m_tree->fillBookmarkData();
- connect(m_tree, SIGNAL(clicked(TQListViewItem*)), this, SLOT(slotTreeClicked()));
+ connect(m_tree, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotTreeClicked()));
// Set some stuff
setMainWidget(m_tree);
diff --git a/kftpgrabber/src/widgets/kftpserverlineedit.cpp b/kftpgrabber/src/widgets/kftpserverlineedit.cpp
index 5e458f6..30da520 100644
--- a/kftpgrabber/src/widgets/kftpserverlineedit.cpp
+++ b/kftpgrabber/src/widgets/kftpserverlineedit.cpp
@@ -53,7 +53,7 @@ KFTPServerLineEdit::KFTPServerLineEdit(TQWidget *parent, const char *name, WFlag
KPushButton *selectButton = new KPushButton(i18n("Select..."), this);
selectButton->setFlat(true);
- connect(selectButton, SIGNAL(clicked()), this, SLOT(slotSelectButtonClicked()));
+ connect(selectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectButtonClicked()));
layout->addWidget(m_lineEdit);
layout->addWidget(selectButton);
diff --git a/kftpgrabber/src/widgets/kftpzeroconflistview.cpp b/kftpgrabber/src/widgets/kftpzeroconflistview.cpp
index 383cdb8..a311f51 100644
--- a/kftpgrabber/src/widgets/kftpzeroconflistview.cpp
+++ b/kftpgrabber/src/widgets/kftpzeroconflistview.cpp
@@ -55,8 +55,8 @@ KFTPZeroConfListView::KFTPZeroConfListView(TQWidget *parent, const char *name)
setEmptyListText(i18n("No sites published."));
setItemsRenameable(false);
- connect(KFTPAPI::getInstance()->zeroConfInterface(), SIGNAL(servicesUpdated()), this, SLOT(slotSitesChanged()));
- connect(this, SIGNAL(executed(TQListViewItem*)), this, SLOT(slotSiteExecuted(TQListViewItem*)));
+ connect(KFTPAPI::getInstance()->zeroConfInterface(), TQ_SIGNAL(servicesUpdated()), this, TQ_SLOT(slotSitesChanged()));
+ connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotSiteExecuted(TQListViewItem*)));
slotSitesChanged();
}
diff --git a/kftpgrabber/src/widgets/logview.cpp b/kftpgrabber/src/widgets/logview.cpp
index 05b49b5..6f4dfdf 100644
--- a/kftpgrabber/src/widgets/logview.cpp
+++ b/kftpgrabber/src/widgets/logview.cpp
@@ -58,8 +58,8 @@ LogView::LogView(TQWidget *parent, const char *name)
unsetPalette();
// Init actions
- m_saveToFileAction = KStdAction::saveAs(this, SLOT(slotSaveToFile()), KFTPAPI::getInstance()->mainWindow()->actionCollection(), "log_safeAs");
- m_clearLogAction = KStdAction::clear(this, SLOT(slotClearLog()), KFTPAPI::getInstance()->mainWindow()->actionCollection(), "log_clear");
+ m_saveToFileAction = KStdAction::saveAs(this, TQ_SLOT(slotSaveToFile()), KFTPAPI::getInstance()->mainWindow()->actionCollection(), "log_safeAs");
+ m_clearLogAction = KStdAction::clear(this, TQ_SLOT(slotClearLog()), KFTPAPI::getInstance()->mainWindow()->actionCollection(), "log_clear");
append(i18n("<b>KFTPGrabber</b> logger initialized.<br>"));
}
diff --git a/kftpgrabber/src/widgets/multitabbar.cpp b/kftpgrabber/src/widgets/multitabbar.cpp
index a976d68..fb49231 100644
--- a/kftpgrabber/src/widgets/multitabbar.cpp
+++ b/kftpgrabber/src/widgets/multitabbar.cpp
@@ -439,8 +439,8 @@ MultiTabBarButton::MultiTabBarButton(MultiTabBarInternal *tb, const TQPixmap& pi
setFixedWidth(24);
m_id = id;
- connect(this, SIGNAL(clicked()), this, SLOT(slotClicked()));
- connect(m_animTimer, SIGNAL(timeout()), this, SLOT(slotAnimTimer()));
+ connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked()));
+ connect(m_animTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimTimer()));
}
MultiTabBarButton::MultiTabBarButton(MultiTabBarInternal *tb, const TQString& text, TQPopupMenu *popup,
@@ -462,8 +462,8 @@ MultiTabBarButton::MultiTabBarButton(MultiTabBarInternal *tb, const TQString& te
setFixedWidth(24);
m_id = id;
- connect(this, SIGNAL(clicked()), this, SLOT(slotClicked()));
- connect(m_animTimer, SIGNAL(timeout()), this, SLOT(slotAnimTimer()));
+ connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked()));
+ connect(m_animTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAnimTimer()));
}
MultiTabBarButton::~MultiTabBarButton()
diff --git a/kftpgrabber/src/widgets/popupmessage.cpp b/kftpgrabber/src/widgets/popupmessage.cpp
index bb6c2f9..36c91be 100644
--- a/kftpgrabber/src/widgets/popupmessage.cpp
+++ b/kftpgrabber/src/widgets/popupmessage.cpp
@@ -98,7 +98,7 @@ PopupMessage::PopupMessage(TQWidget *parent, TQWidget *anchor, int timeout)
hbox->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Preferred));
hbox->add(new KPushButton(KStdGuiItem::close(), this, "closeButton"));
- connect(child("closeButton"), SIGNAL(clicked()), SLOT(close()));
+ connect(child("closeButton"), TQ_SIGNAL(clicked()), TQ_SLOT(close()));
}
void PopupMessage::addWidget(TQWidget *widget)
diff --git a/kftpgrabber/src/widgets/queueview/queueeditor.cpp b/kftpgrabber/src/widgets/queueview/queueeditor.cpp
index 7ec4d5e..f3f2c4f 100644
--- a/kftpgrabber/src/widgets/queueview/queueeditor.cpp
+++ b/kftpgrabber/src/widgets/queueview/queueeditor.cpp
@@ -59,21 +59,21 @@ QueueEditor::QueueEditor(TQWidget *parent, const char *name)
m_layout = new KFTPQueueEditorLayout(this);
setMainWidget(m_layout);
- connect(m_layout->srcPath, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged()));
- connect(m_layout->dstPath, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged()));
+ connect(m_layout->srcPath, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged()));
+ connect(m_layout->dstPath, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged()));
- connect(m_layout->srcHost, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged()));
- connect(m_layout->srcUser, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged()));
- connect(m_layout->srcPass, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged()));
+ connect(m_layout->srcHost, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged()));
+ connect(m_layout->srcUser, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged()));
+ connect(m_layout->srcPass, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged()));
- connect(m_layout->dstHost, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged()));
- connect(m_layout->dstUser, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged()));
- connect(m_layout->dstPass, SIGNAL(textChanged(const TQString&)), this, SLOT(slotTextChanged()));
+ connect(m_layout->dstHost, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged()));
+ connect(m_layout->dstUser, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged()));
+ connect(m_layout->dstPass, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged()));
- connect(m_layout->srcName, SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, SLOT(slotSourceSiteChanged(KFTPBookmarks::Site*)));
- connect(m_layout->dstName, SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, SLOT(slotDestSiteChanged(KFTPBookmarks::Site*)));
+ connect(m_layout->srcName, TQ_SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, TQ_SLOT(slotSourceSiteChanged(KFTPBookmarks::Site*)));
+ connect(m_layout->dstName, TQ_SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, TQ_SLOT(slotDestSiteChanged(KFTPBookmarks::Site*)));
- connect(m_layout->transferType, SIGNAL(activated(int)), this, SLOT(slotTransferModeChanged(int)));
+ connect(m_layout->transferType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTransferModeChanged(int)));
setMaximumHeight(250);
setInitialSize(TQSize(500, 250));
diff --git a/kftpgrabber/src/widgets/queueview/queueview.cpp b/kftpgrabber/src/widgets/queueview/queueview.cpp
index 1b58839..c0615c8 100644
--- a/kftpgrabber/src/widgets/queueview/queueview.cpp
+++ b/kftpgrabber/src/widgets/queueview/queueview.cpp
@@ -411,7 +411,7 @@ QueueView::QueueView(TQWidget *parent, const char *name)
m_searchToolBar->setFullSize(true);
// Create the erase button
- m_searchToolBar->insertButton(TQApplication::reverseLayout() ? "clear_left" :"locationbar_erase", 0, SIGNAL(clicked()), this, SLOT(slotSearchEraseClicked()), true);
+ m_searchToolBar->insertButton(TQApplication::reverseLayout() ? "clear_left" :"locationbar_erase", 0, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchEraseClicked()), true);
// Create the labels
TQLabel *searchLabel = new TQLabel(i18n("Filter: "), m_searchToolBar);
@@ -453,16 +453,16 @@ QueueView::QueueView(TQWidget *parent, const char *name)
layout->addWidget(m_queue);
// The signals
- connect(m_queue, SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this,
- SLOT(contextMenuRequested(TDEListView*, TQListViewItem*, const TQPoint&)));
- connect(m_queue, SIGNAL(selectionChanged()), this, SLOT(updateActions()));
+ connect(m_queue, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this,
+ TQ_SLOT(contextMenuRequested(TDEListView*, TQListViewItem*, const TQPoint&)));
+ connect(m_queue, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateActions()));
// Let us be up-to-date
- connect(KFTPQueue::Manager::self(), SIGNAL(transferRemoved(long)), this, SLOT(slotObjectRemoved(long)));
- connect(KFTPQueue::Manager::self(), SIGNAL(siteRemoved(long)), this, SLOT(slotObjectRemoved(long)));
- connect(KFTPQueue::Manager::self(), SIGNAL(newTransfer(KFTPQueue::Transfer*)), this, SLOT(slotTransferAdded(KFTPQueue::Transfer*)));
- connect(KFTPQueue::Manager::self(), SIGNAL(newSite(KFTPQueue::Site*)), this, SLOT(slotSiteAdded(KFTPQueue::Site*)));
- connect(KFTPQueue::Manager::self(), SIGNAL(queueUpdate()), this, SLOT(updateActions()));
+ connect(KFTPQueue::Manager::self(), TQ_SIGNAL(transferRemoved(long)), this, TQ_SLOT(slotObjectRemoved(long)));
+ connect(KFTPQueue::Manager::self(), TQ_SIGNAL(siteRemoved(long)), this, TQ_SLOT(slotObjectRemoved(long)));
+ connect(KFTPQueue::Manager::self(), TQ_SIGNAL(newTransfer(KFTPQueue::Transfer*)), this, TQ_SLOT(slotTransferAdded(KFTPQueue::Transfer*)));
+ connect(KFTPQueue::Manager::self(), TQ_SIGNAL(newSite(KFTPQueue::Site*)), this, TQ_SLOT(slotSiteAdded(KFTPQueue::Site*)));
+ connect(KFTPQueue::Manager::self(), TQ_SIGNAL(queueUpdate()), this, TQ_SLOT(updateActions()));
// Load the listview layout
loadLayout();
@@ -509,7 +509,7 @@ void QueueView::initToolBar()
m_toolBar->insertWidget(1, 35, new TQLabel(i18n("Down: "), m_toolBar));
m_toolBar->insertWidget(2, 35, downloadSpeed);
downloadSpeed->setValue(Config::downloadSpeedLimit());
- connect(downloadSpeed, SIGNAL(valueChanged(int)), this, SLOT(slotDownloadLimitChanged(int)));
+ connect(downloadSpeed, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDownloadLimitChanged(int)));
m_toolBar->insertSeparator();
@@ -518,7 +518,7 @@ void QueueView::initToolBar()
m_toolBar->insertWidget(3, 35, new TQLabel(i18n("Up: "), m_toolBar));
m_toolBar->insertWidget(4, 35, uploadSpeed);
uploadSpeed->setValue(Config::uploadSpeedLimit());
- connect(uploadSpeed, SIGNAL(valueChanged(int)), this, SLOT(slotUploadLimitChanged(int)));
+ connect(uploadSpeed, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotUploadLimitChanged(int)));
// Create thread count control widget
m_toolBar->insertSeparator();
@@ -528,7 +528,7 @@ void QueueView::initToolBar()
m_toolBar->insertWidget(5, 35, new TQLabel(i18n("Threads: "), m_toolBar));
m_toolBar->insertWidget(6, 35, threadCount);
threadCount->setValue(Config::threadCount());
- connect(threadCount, SIGNAL(valueChanged(int)), this, SLOT(slotThreadCountChanged(int)));
+ connect(threadCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotThreadCountChanged(int)));
}
void QueueView::slotDownloadLimitChanged(int value)
@@ -554,25 +554,25 @@ void QueueView::initActions()
m_actionCollection = new TDEActionCollection(this, this);
// Create all the actions
- m_launchAction = new TDEAction(i18n("&Start Transfer"), "launch", TDEShortcut(), this, SLOT(slotLaunch()), m_actionCollection, "launch");
- m_abortAction = new TDEAction(i18n("&Abort Transfer"), TDEShortcut(), this, SLOT(slotAbort()), m_actionCollection, "abort");
- m_removeAction = new TDEAction(i18n("&Remove"), "edit-delete", TDEShortcut(TQt::Key_Delete), this, SLOT(slotRemove()), m_actionCollection, "remove");
- m_removeAllAction = new TDEAction(i18n("Remove &All"), TDEShortcut(), this, SLOT(slotRemoveAll()), m_actionCollection, "removeAll");
- m_moveUpAction = new TDEAction(i18n("Move &Up"), "go-up", TDEShortcut(), this, SLOT(slotMoveUp()), m_actionCollection, "moveUp");
- m_moveDownAction = new TDEAction(i18n("Move &Down"), "go-down", TDEShortcut("del"), this, SLOT(slotMoveDown()), m_actionCollection, "moveDown");
- m_moveTopAction = new TDEAction(i18n("Move To &Top"), "go-top", TDEShortcut(), this, SLOT(slotMoveTop()), m_actionCollection, "moveTop");
- m_moveBottomAction = new TDEAction(i18n("Move To &Bottom"), "go-bottom", TDEShortcut(), this, SLOT(slotMoveBottom()), m_actionCollection, "moveBottom");
- m_editAction = new TDEAction(i18n("&Change Transfer Info"), TDEShortcut(), this, SLOT(slotEdit()), m_actionCollection, "changeTransfer");
+ m_launchAction = new TDEAction(i18n("&Start Transfer"), "launch", TDEShortcut(), this, TQ_SLOT(slotLaunch()), m_actionCollection, "launch");
+ m_abortAction = new TDEAction(i18n("&Abort Transfer"), TDEShortcut(), this, TQ_SLOT(slotAbort()), m_actionCollection, "abort");
+ m_removeAction = new TDEAction(i18n("&Remove"), "edit-delete", TDEShortcut(TQt::Key_Delete), this, TQ_SLOT(slotRemove()), m_actionCollection, "remove");
+ m_removeAllAction = new TDEAction(i18n("Remove &All"), TDEShortcut(), this, TQ_SLOT(slotRemoveAll()), m_actionCollection, "removeAll");
+ m_moveUpAction = new TDEAction(i18n("Move &Up"), "go-up", TDEShortcut(), this, TQ_SLOT(slotMoveUp()), m_actionCollection, "moveUp");
+ m_moveDownAction = new TDEAction(i18n("Move &Down"), "go-down", TDEShortcut("del"), this, TQ_SLOT(slotMoveDown()), m_actionCollection, "moveDown");
+ m_moveTopAction = new TDEAction(i18n("Move To &Top"), "go-top", TDEShortcut(), this, TQ_SLOT(slotMoveTop()), m_actionCollection, "moveTop");
+ m_moveBottomAction = new TDEAction(i18n("Move To &Bottom"), "go-bottom", TDEShortcut(), this, TQ_SLOT(slotMoveBottom()), m_actionCollection, "moveBottom");
+ m_editAction = new TDEAction(i18n("&Change Transfer Info"), TDEShortcut(), this, TQ_SLOT(slotEdit()), m_actionCollection, "changeTransfer");
// Create the toolbar actions
- m_loadAction = new TDEAction(i18n("&Load Queue From File"), "document-open", TDEShortcut(), this, SLOT(slotLoad()), m_actionCollection, "load");
- m_saveAction = new TDEAction(i18n("&Save Queue to File"), "document-save-as", TDEShortcut(), this, SLOT(slotSave()), m_actionCollection, "save");
- m_startAction = new TDEAction(i18n("S&tart"), "media-playback-start", TDEShortcut(), this, SLOT(slotStart()), m_actionCollection, "start");
- m_pauseAction = new TDEAction(i18n("&Pause"), "media-playback-pause", TDEShortcut(), this, SLOT(slotPause()), m_actionCollection, "pause");
- m_stopAction = new TDEAction(i18n("St&op"), "media-playback-stop", TDEShortcut(), this, SLOT(slotStop()), m_actionCollection, "stop");
- m_addAction = new TDEAction(i18n("&Add Transfer..."), "document-new", TDEShortcut(), this, SLOT(slotAdd()), m_actionCollection, "add");
- m_searchAction = new TDEAction(i18n("&Search && Replace..."), "edit-find", TDEShortcut(), this, SLOT(slotSearch()), m_actionCollection, "search");
- m_filterAction = new TDEToggleAction(i18n("Show &Filter"), "filter", TDEShortcut(), this, SLOT(slotFilter()), m_actionCollection, "filter");
+ m_loadAction = new TDEAction(i18n("&Load Queue From File"), "document-open", TDEShortcut(), this, TQ_SLOT(slotLoad()), m_actionCollection, "load");
+ m_saveAction = new TDEAction(i18n("&Save Queue to File"), "document-save-as", TDEShortcut(), this, TQ_SLOT(slotSave()), m_actionCollection, "save");
+ m_startAction = new TDEAction(i18n("S&tart"), "media-playback-start", TDEShortcut(), this, TQ_SLOT(slotStart()), m_actionCollection, "start");
+ m_pauseAction = new TDEAction(i18n("&Pause"), "media-playback-pause", TDEShortcut(), this, TQ_SLOT(slotPause()), m_actionCollection, "pause");
+ m_stopAction = new TDEAction(i18n("St&op"), "media-playback-stop", TDEShortcut(), this, TQ_SLOT(slotStop()), m_actionCollection, "stop");
+ m_addAction = new TDEAction(i18n("&Add Transfer..."), "document-new", TDEShortcut(), this, TQ_SLOT(slotAdd()), m_actionCollection, "add");
+ m_searchAction = new TDEAction(i18n("&Search && Replace..."), "edit-find", TDEShortcut(), this, TQ_SLOT(slotSearch()), m_actionCollection, "search");
+ m_filterAction = new TDEToggleAction(i18n("Show &Filter"), "filter", TDEShortcut(), this, TQ_SLOT(slotFilter()), m_actionCollection, "filter");
m_saveAction->setEnabled( false );
m_startAction->setEnabled(false);
@@ -629,7 +629,7 @@ void QueueView::slotSiteAdded(KFTPQueue::Site *site)
{
// The site should be inserted top-level
m_queuedItems.insert(site->getId(), new QueueViewItem(this, site, m_queue));
- connect(site, SIGNAL(objectUpdated()), this, SLOT(slotObjectUpdated()));
+ connect(site, TQ_SIGNAL(objectUpdated()), this, TQ_SLOT(slotObjectUpdated()));
}
void QueueView::slotTransferAdded(KFTPQueue::Transfer *transfer)
@@ -639,7 +639,7 @@ void QueueView::slotTransferAdded(KFTPQueue::Transfer *transfer)
if (parent) {
m_queuedItems.insert(transfer->getId(), new QueueViewItem(this, transfer, parent));
- connect(transfer, SIGNAL(objectUpdated()), this, SLOT(slotObjectUpdated()));
+ connect(transfer, TQ_SIGNAL(objectUpdated()), this, TQ_SLOT(slotObjectUpdated()));
}
// Update actions
diff --git a/kftpgrabber/src/widgets/queueview/threadview.cpp b/kftpgrabber/src/widgets/queueview/threadview.cpp
index cd1c27e..ac60421 100644
--- a/kftpgrabber/src/widgets/queueview/threadview.cpp
+++ b/kftpgrabber/src/widgets/queueview/threadview.cpp
@@ -59,16 +59,16 @@ ThreadViewItem::ThreadViewItem(KFTPSession::Connection *conn, TQListViewItem *pa
m_connection(conn),
m_session(0)
{
- connect(conn, SIGNAL(connectionRemoved()), this, SLOT(slotUpdateItemRequested()));
- connect(conn, SIGNAL(connectionLost(KFTPSession::Connection*)), this, SLOT(slotUpdateItemRequested()));
- connect(conn, SIGNAL(connectionEstablished()), this, SLOT(slotUpdateItemRequested()));
+ connect(conn, TQ_SIGNAL(connectionRemoved()), this, TQ_SLOT(slotUpdateItemRequested()));
+ connect(conn, TQ_SIGNAL(connectionLost(KFTPSession::Connection*)), this, TQ_SLOT(slotUpdateItemRequested()));
+ connect(conn, TQ_SIGNAL(connectionEstablished()), this, TQ_SLOT(slotUpdateItemRequested()));
// Connect the transfer signals if the transfer is already present
KFTPQueue::Transfer *transfer = m_connection->getTransfer();
if (transfer) {
- connect(transfer, SIGNAL(objectUpdated()), this, SLOT(slotUpdateItemRequested()));
+ connect(transfer, TQ_SIGNAL(objectUpdated()), this, TQ_SLOT(slotUpdateItemRequested()));
} else {
- connect(conn, SIGNAL(connectionAcquired()), this, SLOT(slotConnectionAcquired()));
+ connect(conn, TQ_SIGNAL(connectionAcquired()), this, TQ_SLOT(slotConnectionAcquired()));
}
refresh();
@@ -79,7 +79,7 @@ void ThreadViewItem::slotConnectionAcquired()
if (!m_connection->getTransfer())
return;
- connect(m_connection->getTransfer(), SIGNAL(objectUpdated()), this, SLOT(slotUpdateItemRequested()));
+ connect(m_connection->getTransfer(), TQ_SIGNAL(objectUpdated()), this, TQ_SLOT(slotUpdateItemRequested()));
refresh();
}
@@ -162,7 +162,7 @@ ThreadView::ThreadView(TQWidget *parent, const char *name)
layout->addWidget(m_threads);
- connect(KFTPSession::Manager::self(), SIGNAL(update()), this, SLOT(slotUpdateSessions()));
+ connect(KFTPSession::Manager::self(), TQ_SIGNAL(update()), this, TQ_SLOT(slotUpdateSessions()));
}
ThreadView::~ThreadView()
diff --git a/kftpgrabber/src/widgets/quickconnect.cpp b/kftpgrabber/src/widgets/quickconnect.cpp
index 48f066f..3909b33 100644
--- a/kftpgrabber/src/widgets/quickconnect.cpp
+++ b/kftpgrabber/src/widgets/quickconnect.cpp
@@ -79,16 +79,16 @@ QuickConnectDialog::QuickConnectDialog(TQWidget *parent, const char *name)
m_layout->protoAdvanced->setIconSet(loadSmallIcon("configure"));
// Connect the slots
- connect(m_layout->urlBox, SIGNAL(textChanged(const TQString&)), this, SLOT(slotUrlChanged(const TQString &)));
- connect(m_layout->hostBox, SIGNAL(textChanged(const TQString&)), this, SLOT(slotHostChanged(const TQString&)));
- connect(m_layout->protocolBox, SIGNAL(activated(int)), this, SLOT(slotProtocolChanged(int)));
- connect(m_layout->protoAdvanced, SIGNAL(clicked()), this, SLOT(slotProtoAdvancedClicked()));
- connect(m_layout->usernameBox, SIGNAL(textChanged(const TQString&)), this, SLOT(slotUserChanged()));
- connect(m_layout->passwordBox, SIGNAL(textChanged(const TQString&)), this, SLOT(slotPassChanged()));
- connect(m_layout->portBox, SIGNAL(valueChanged(int)), this, SLOT(slotPortChanged(int)));
- connect(m_layout->anonLogin, SIGNAL(clicked()), this, SLOT(slotAnonClicked()));
- connect(m_layout->recentConnections, SIGNAL(activated(int)), this, SLOT(slotRecentConnectionActivated(int)));
- connect(m_layout->clearRecent, SIGNAL(clicked()), this, SLOT(slotClearRecentClicked()));
+ connect(m_layout->urlBox, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUrlChanged(const TQString &)));
+ connect(m_layout->hostBox, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotHostChanged(const TQString&)));
+ connect(m_layout->protocolBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotProtocolChanged(int)));
+ connect(m_layout->protoAdvanced, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotProtoAdvancedClicked()));
+ connect(m_layout->usernameBox, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUserChanged()));
+ connect(m_layout->passwordBox, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPassChanged()));
+ connect(m_layout->portBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotPortChanged(int)));
+ connect(m_layout->anonLogin, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAnonClicked()));
+ connect(m_layout->recentConnections, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotRecentConnectionActivated(int)));
+ connect(m_layout->clearRecent, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClearRecentClicked()));
// Init url
m_url.setProtocol("ftp");
diff --git a/kftpgrabber/src/widgets/searchdialog.cpp b/kftpgrabber/src/widgets/searchdialog.cpp
index d0a31c6..c10e6b6 100644
--- a/kftpgrabber/src/widgets/searchdialog.cpp
+++ b/kftpgrabber/src/widgets/searchdialog.cpp
@@ -60,8 +60,8 @@ SearchDialog::SearchDialog(TQWidget *parent, const char *name)
setMainWidget(m_layout);
setInitialSize(TQSize(500,400));
- connect(m_layout->searchServer, SIGNAL(clicked()), this, SLOT(slotSearchServerClicked()));
- connect(m_layout->searchServerName, SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, SLOT(slotSiteChanged(KFTPBookmarks::Site*)));
+ connect(m_layout->searchServer, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchServerClicked()));
+ connect(m_layout->searchServerName, TQ_SIGNAL(siteChanged(KFTPBookmarks::Site*)), this, TQ_SLOT(slotSiteChanged(KFTPBookmarks::Site*)));
}
TQString SearchDialog::replaceCap(TQStringList cap, const TQString &text)
diff --git a/kftpgrabber/src/widgets/sidebar.cpp b/kftpgrabber/src/widgets/sidebar.cpp
index 9483b15..fc75d76 100644
--- a/kftpgrabber/src/widgets/sidebar.cpp
+++ b/kftpgrabber/src/widgets/sidebar.cpp
@@ -127,7 +127,7 @@ Sidebar::Sidebar(TQWidget *parent, Position position)
m_content->setSpacing(1);
}
- connect(m_mapper, SIGNAL(mapped(int)), SLOT(showHideSidebar(int)));
+ connect(m_mapper, TQ_SIGNAL(mapped(int)), TQ_SLOT(showHideSidebar(int)));
}
void Sidebar::setVisible(bool visible)
@@ -321,7 +321,7 @@ void Sidebar::addSidebar(TQWidget *widget, const TQString &title, const TQString
tab->setFocusPolicy(TQWidget::NoFocus);
// We use a SignalMapper to show/hide the corresponding browser when tabs are clicked
- connect(tab, SIGNAL(clicked()), m_mapper, SLOT(map()));
+ connect(tab, TQ_SIGNAL(clicked()), m_mapper, TQ_SLOT(map()));
m_mapper->setMapping(tab, id);
m_sidebars.push_back(widget);
diff --git a/kftpgrabber/src/widgets/systemtray.cpp b/kftpgrabber/src/widgets/systemtray.cpp
index ca4c91d..8a0ebaa 100644
--- a/kftpgrabber/src/widgets/systemtray.cpp
+++ b/kftpgrabber/src/widgets/systemtray.cpp
@@ -70,13 +70,13 @@ SystemTray::SystemTray(MainWindow *parent)
slotUpdateBookmarks();
// Let our bookmarks be up to date
- connect(KFTPBookmarks::Manager::self(), SIGNAL(update()), this, SLOT(slotUpdateBookmarks()));
+ connect(KFTPBookmarks::Manager::self(), TQ_SIGNAL(update()), this, TQ_SLOT(slotUpdateBookmarks()));
m_actions->m_fileConnectAction->plug(contextMenu(), 1);
m_bookmarkMenu->plug(contextMenu(), 1);
// Ensure that we actually quit
- connect(this, SIGNAL(quitSelected()), this, SLOT(slotQuitSelected()));
+ connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotQuitSelected()));
}
SystemTray::~SystemTray()
@@ -110,7 +110,7 @@ void SystemTray::showBalloon(const TQString &text)
KWin::setOnAllDesktops(m_balloon->winId() , true);
// Hide the balloon after 5 sec
- TQTimer::singleShot(5000, this, SLOT(slotHideBalloon()));
+ TQTimer::singleShot(5000, this, TQ_SLOT(slotHideBalloon()));
}
void SystemTray::slotHideBalloon()
diff --git a/kftpgrabber/src/widgets/verifier.cpp b/kftpgrabber/src/widgets/verifier.cpp
index 9b7b5d2..78e61ac 100644
--- a/kftpgrabber/src/widgets/verifier.cpp
+++ b/kftpgrabber/src/widgets/verifier.cpp
@@ -81,10 +81,10 @@ void Verifier::setFile(const TQString &filename)
m_verifier = new KFTPCore::ChecksumVerifier(filename);
m_layout->currentFile->setText(KURL(filename).fileName());
- connect(m_verifier, SIGNAL(fileList(TQValueList<TQPair<TQString, TQString> >)), this, SLOT(slotHaveFileList(TQValueList<TQPair<TQString, TQString> >)));
- connect(m_verifier, SIGNAL(fileDone(const TQString&, KFTPCore::ChecksumVerifier::Result)), this, SLOT(slotFileDone(const TQString&, KFTPCore::ChecksumVerifier::Result)));
- connect(m_verifier, SIGNAL(progress(int)), this, SLOT(slotProgress(int)));
- connect(m_verifier, SIGNAL(error()), this, SLOT(slotError()));
+ connect(m_verifier, TQ_SIGNAL(fileList(TQValueList<TQPair<TQString, TQString> >)), this, TQ_SLOT(slotHaveFileList(TQValueList<TQPair<TQString, TQString> >)));
+ connect(m_verifier, TQ_SIGNAL(fileDone(const TQString&, KFTPCore::ChecksumVerifier::Result)), this, TQ_SLOT(slotFileDone(const TQString&, KFTPCore::ChecksumVerifier::Result)));
+ connect(m_verifier, TQ_SIGNAL(progress(int)), this, TQ_SLOT(slotProgress(int)));
+ connect(m_verifier, TQ_SIGNAL(error()), this, TQ_SLOT(slotError()));
// Start the verification
m_verifier->verify();
diff --git a/kftpgrabber/src/widgets/widgetlister.cpp b/kftpgrabber/src/widgets/widgetlister.cpp
index 01447b2..1ba7a15 100644
--- a/kftpgrabber/src/widgets/widgetlister.cpp
+++ b/kftpgrabber/src/widgets/widgetlister.cpp
@@ -73,9 +73,9 @@ WidgetLister::WidgetLister(TQWidget *parent, int minWidgets, int maxWidgets)
m_buttonBox->setStretchFactor(m_buttonClear, 0);
// Connect signals
- connect(m_buttonMore, SIGNAL(clicked()), this, SLOT(slotMore()));
- connect(m_buttonFewer, SIGNAL(clicked()), this, SLOT(slotFewer()));
- connect(m_buttonClear, SIGNAL(clicked()), this, SLOT(slotClear()));
+ connect(m_buttonMore, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMore()));
+ connect(m_buttonFewer, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFewer()));
+ connect(m_buttonClear, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClear()));
enableControls();
}