summaryrefslogtreecommitdiffstats
path: root/tdeio/misc
diff options
context:
space:
mode:
Diffstat (limited to 'tdeio/misc')
-rw-r--r--tdeio/misc/kpac/discovery.cpp6
-rw-r--r--tdeio/misc/kpac/discovery.h2
-rw-r--r--tdeio/misc/kpac/downloader.cpp6
-rw-r--r--tdeio/misc/kpac/downloader.h2
-rw-r--r--tdeio/misc/kpac/proxyscout.cpp8
-rw-r--r--tdeio/misc/kpac/proxyscout.h2
-rw-r--r--tdeio/misc/kpac/script.cpp8
-rw-r--r--tdeio/misc/kssld/kssld.cpp9
-rw-r--r--tdeio/misc/kssld/kssld.h2
-rw-r--r--tdeio/misc/tdesendbugmail/main.cpp4
-rw-r--r--tdeio/misc/tdesendbugmail/main.h2
-rw-r--r--tdeio/misc/tdesendbugmail/smtp.cpp16
-rw-r--r--tdeio/misc/tdesendbugmail/smtp.h4
-rw-r--r--tdeio/misc/tdewalletd/kbetterthankdialogbase.ui7
-rw-r--r--tdeio/misc/tdewalletd/ktimeout.cpp2
-rw-r--r--tdeio/misc/tdewalletd/ktimeout.h2
-rw-r--r--tdeio/misc/tdewalletd/tdewalletd.cpp22
-rw-r--r--tdeio/misc/tdewalletd/tdewalletd.h2
-rw-r--r--tdeio/misc/tdewalletd/tdewalletwizard.ui4
-rw-r--r--tdeio/misc/uiserver.cpp58
-rw-r--r--tdeio/misc/uiserver.h6
21 files changed, 85 insertions, 89 deletions
diff --git a/tdeio/misc/kpac/discovery.cpp b/tdeio/misc/kpac/discovery.cpp
index e076a083e..9e3cafd19 100644
--- a/tdeio/misc/kpac/discovery.cpp
+++ b/tdeio/misc/kpac/discovery.cpp
@@ -53,12 +53,12 @@ namespace KPAC
: Downloader( parent ),
m_helper( new KProcIO )
{
- connect( m_helper, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( helperOutput() ) );
- connect( m_helper, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( failed() ) );
+ connect( m_helper, TQ_SIGNAL( readReady( KProcIO* ) ), TQ_SLOT( helperOutput() ) );
+ connect( m_helper, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( failed() ) );
*m_helper << "kpac_dhcp_helper";
if ( !m_helper->start() )
- TQTimer::singleShot( 0, this, TQT_SLOT( failed() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( failed() ) );
}
bool Discovery::initHostName()
diff --git a/tdeio/misc/kpac/discovery.h b/tdeio/misc/kpac/discovery.h
index 97f9cbc5c..b725fb469 100644
--- a/tdeio/misc/kpac/discovery.h
+++ b/tdeio/misc/kpac/discovery.h
@@ -31,7 +31,7 @@ namespace KPAC
{
class Discovery : public Downloader
{
- Q_OBJECT
+ TQ_OBJECT
public:
Discovery( TQObject* );
diff --git a/tdeio/misc/kpac/downloader.cpp b/tdeio/misc/kpac/downloader.cpp
index 298d660dc..30857df0c 100644
--- a/tdeio/misc/kpac/downloader.cpp
+++ b/tdeio/misc/kpac/downloader.cpp
@@ -44,9 +44,9 @@ namespace KPAC
m_scriptURL = url;
TDEIO::TransferJob* job = TDEIO::get( url, false, false );
- connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
- TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( result( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+ TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( result( TDEIO::Job* ) ) );
}
void Downloader::failed()
diff --git a/tdeio/misc/kpac/downloader.h b/tdeio/misc/kpac/downloader.h
index d64984446..d2264f8b2 100644
--- a/tdeio/misc/kpac/downloader.h
+++ b/tdeio/misc/kpac/downloader.h
@@ -31,7 +31,7 @@ namespace KPAC
{
class Downloader : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Downloader( TQObject* );
diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp
index a8f0a4062..1d2cf8f87 100644
--- a/tdeio/misc/kpac/proxyscout.cpp
+++ b/tdeio/misc/kpac/proxyscout.cpp
@@ -105,8 +105,8 @@ namespace KPAC
default:
return false;
}
- connect( m_downloader, TQT_SIGNAL( result( bool ) ),
- TQT_SLOT( downloadResult( bool ) ) );
+ connect( m_downloader, TQ_SIGNAL( result( bool ) ),
+ TQ_SLOT( downloadResult( bool ) ) );
return true;
}
@@ -130,7 +130,7 @@ namespace KPAC
for ( RequestQueue::ConstIterator it = m_requestQueue.begin();
it != m_requestQueue.end(); ++it )
{
- TQCString type = TQSTRING_OBJECT_NAME_STRING;
+ TQCString type = "TQString";
TQByteArray data;
TQDataStream ds( data, IO_WriteOnly );
if ( success ) ds << handleRequest( ( *it ).url );
@@ -187,7 +187,7 @@ namespace KPAC
return "DIRECT";
}
- extern "C" KDE_EXPORT KDEDModule* create_proxyscout( const TQCString& name )
+ extern "C" TDE_EXPORT KDEDModule* create_proxyscout( const TQCString& name )
{
return new ProxyScout( name );
}
diff --git a/tdeio/misc/kpac/proxyscout.h b/tdeio/misc/kpac/proxyscout.h
index 237887c95..524ee5f43 100644
--- a/tdeio/misc/kpac/proxyscout.h
+++ b/tdeio/misc/kpac/proxyscout.h
@@ -38,7 +38,7 @@ namespace KPAC
class ProxyScout : public KDEDModule
{
- Q_OBJECT
+ TQ_OBJECT
K_DCOP
public:
ProxyScout( const TQCString& );
diff --git a/tdeio/misc/kpac/script.cpp b/tdeio/misc/kpac/script.cpp
index b1f2fee82..6891d37a7 100644
--- a/tdeio/misc/kpac/script.cpp
+++ b/tdeio/misc/kpac/script.cpp
@@ -447,11 +447,11 @@ namespace KPAC
throw Error( "No such function FindProxyForURL" );
KURL cleanUrl = url;
- cleanUrl.setPass(QString());
- cleanUrl.setUser(QString());
+ cleanUrl.setPass(TQString());
+ cleanUrl.setUser(TQString());
if (cleanUrl.protocol().lower() == "https") {
- cleanUrl.setPath(QString());
- cleanUrl.setQuery(QString());
+ cleanUrl.setPath(TQString());
+ cleanUrl.setQuery(TQString());
}
Object thisObj;
diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp
index a376ebfac..3a04d93f0 100644
--- a/tdeio/misc/kssld/kssld.cpp
+++ b/tdeio/misc/kssld/kssld.cpp
@@ -41,7 +41,6 @@
#include <pwd.h>
#include <unistd.h>
#include <tqfile.h>
-#include <tqsortedlist.h>
#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
@@ -53,11 +52,11 @@
// See design notes at end
extern "C" {
- KDE_EXPORT KDEDModule *create_kssld(const TQCString &name) {
+ TDE_EXPORT KDEDModule *create_kssld(const TQCString &name) {
return new KSSLD(name);
}
- KDE_EXPORT void *__kde_do_unload;
+ TDE_EXPORT void *__kde_do_unload;
}
@@ -287,7 +286,7 @@ KSSLCNode *node;
if ( !node->permanent ) {
node->expires = TQDateTime::currentDateTime();
// FIXME: make this configurable
- node->expires = TQT_TQDATETIME_OBJECT(node->expires.addSecs(5));
+ node->expires = node->expires.addSecs(5);
} else {
node->expires = node->cert->getQDTNotAfter(); // set to certs expiry date
}
@@ -310,7 +309,7 @@ KSSLCNode *node;
if (!permanent) {
n->expires = TQDateTime::currentDateTime();
- n->expires = TQT_TQDATETIME_OBJECT(n->expires.addSecs(5));
+ n->expires = n->expires.addSecs(5);
} else {
if ( !n->expires.isValid() )
n->expires = n->cert->getQDTNotAfter(); // set to certs expiry date
diff --git a/tdeio/misc/kssld/kssld.h b/tdeio/misc/kssld/kssld.h
index 028a30809..a20582ce2 100644
--- a/tdeio/misc/kssld/kssld.h
+++ b/tdeio/misc/kssld/kssld.h
@@ -38,7 +38,7 @@ class KOpenSSLProxy;
class KSSLD : public KDEDModule
{
- Q_OBJECT
+ TQ_OBJECT
K_DCOP
public:
diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp
index bf3099094..d1e8ae483 100644
--- a/tdeio/misc/tdesendbugmail/main.cpp
+++ b/tdeio/misc/tdesendbugmail/main.cpp
@@ -122,8 +122,8 @@ int main(int argc, char **argv) {
SMTP *sm = new SMTP;
BugMailer bm(sm);
- TQObject::connect(sm, TQT_SIGNAL(messageSent()), &bm, TQT_SLOT(slotSend()));
- TQObject::connect(sm, TQT_SIGNAL(error(int)), &bm, TQT_SLOT(slotError(int)));
+ TQObject::connect(sm, TQ_SIGNAL(messageSent()), &bm, TQ_SLOT(slotSend()));
+ TQObject::connect(sm, TQ_SIGNAL(error(int)), &bm, TQ_SLOT(slotError(int)));
sm->setServerHost(server);
sm->setPort(25);
sm->setSenderAddress(fromaddr);
diff --git a/tdeio/misc/tdesendbugmail/main.h b/tdeio/misc/tdesendbugmail/main.h
index 39d424bef..f06088694 100644
--- a/tdeio/misc/tdesendbugmail/main.h
+++ b/tdeio/misc/tdesendbugmail/main.h
@@ -6,7 +6,7 @@
class SMTP;
class BugMailer : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
BugMailer(SMTP* s) : TQObject(0, "mailer"), sm(s) {}
diff --git a/tdeio/misc/tdesendbugmail/smtp.cpp b/tdeio/misc/tdesendbugmail/smtp.cpp
index 470f24050..ae507e76a 100644
--- a/tdeio/misc/tdesendbugmail/smtp.cpp
+++ b/tdeio/misc/tdesendbugmail/smtp.cpp
@@ -38,12 +38,12 @@ SMTP::SMTP(char *serverhost, unsigned short int port, int timeout)
kdDebug() << "SMTP object created" << endl;
- connect(&connectTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimerTick()));
- connect(&timeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimedOut()));
- connect(&interactTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(interactTimedOut()));
+ connect(&connectTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimerTick()));
+ connect(&timeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimedOut()));
+ connect(&interactTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(interactTimedOut()));
// some sendmail will give 'duplicate helo' error, quick fix for now
- connect(this, TQT_SIGNAL(messageSent()), TQT_SLOT(closeConnection()));
+ connect(this, TQ_SIGNAL(messageSent()), TQ_SLOT(closeConnection()));
}
SMTP::~SMTP()
@@ -175,8 +175,8 @@ void SMTP::connectTimerTick(void)
state = INIT;
serverState = NONE;
- connect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
- connect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
+ connect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *)));
+ connect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *)));
// sock->enableRead(true);
timeOutTimer.stop();
kdDebug() << "connected" << endl;
@@ -233,8 +233,8 @@ void SMTP::socketRead(TDESocket *socket)
void SMTP::socketClose(TDESocket *socket)
{
timeOutTimer.stop();
- disconnect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
- disconnect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
+ disconnect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *)));
+ disconnect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *)));
socket->enableRead(false);
kdDebug() << "connection terminated" << endl;
connected = false;
diff --git a/tdeio/misc/tdesendbugmail/smtp.h b/tdeio/misc/tdesendbugmail/smtp.h
index acdb4a3c3..3d00b4c1a 100644
--- a/tdeio/misc/tdesendbugmail/smtp.h
+++ b/tdeio/misc/tdesendbugmail/smtp.h
@@ -37,9 +37,9 @@ int SMTPClientStatus[] = {
#define SMTP_READ_BUFFER_SIZE 256
-class SMTP:public QObject
+class SMTP:public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
SMTP(char *serverhost = 0, unsigned short int port = 0, int timeout = DEFAULT_SMTP_TIMEOUT);
~SMTP();
diff --git a/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
index a02d5def7..8f72031e3 100644
--- a/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
+++ b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
@@ -140,15 +140,12 @@
<include location="global" impldecl="in declaration">kactivelabel.h</include>
<include location="local" impldecl="in implementation">kbetterthankdialogbase.ui.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot access="private">clicked()</slot>
<slot>setLabel( const TQString &amp; label )</slot>
<slot access="private">init()</slot>
<slot access="protected">accept()</slot>
<slot access="protected">reject()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kactivelabel.h</includehint>
-</includehints>
</UI>
diff --git a/tdeio/misc/tdewalletd/ktimeout.cpp b/tdeio/misc/tdewalletd/ktimeout.cpp
index c431ecf69..25108bdc5 100644
--- a/tdeio/misc/tdewalletd/ktimeout.cpp
+++ b/tdeio/misc/tdewalletd/ktimeout.cpp
@@ -52,7 +52,7 @@ void KTimeout::addTimer(int id, int timeout) {
}
TQTimer *t = new TQTimer;
- connect(t, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
+ connect(t, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
t->start(timeout);
_timers.insert(id, t);
}
diff --git a/tdeio/misc/tdewalletd/ktimeout.h b/tdeio/misc/tdewalletd/ktimeout.h
index 441e4ed77..0aced67ae 100644
--- a/tdeio/misc/tdewalletd/ktimeout.h
+++ b/tdeio/misc/tdewalletd/ktimeout.h
@@ -28,7 +28,7 @@
// @internal
class KTimeout : public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
KTimeout(int size = 29);
virtual ~KTimeout();
diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index 0aaec0f9a..009ea348b 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -51,7 +51,7 @@
#include <assert.h>
extern "C" {
- KDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) {
+ TDE_EXPORT KDEDModule *create_tdewalletd(const TQCString &name) {
return new TDEWalletD(name);
}
}
@@ -92,17 +92,17 @@ TDEWalletD::TDEWalletD(const TQCString &name)
_timeouts = new KTimeout(17);
_closeIdle = false;
_idleTime = 0;
- connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int)));
+ connect(_timeouts, TQ_SIGNAL(timedOut(int)), this, TQ_SLOT(timedOut(int)));
reconfigure();
TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
connect(TDEApplication::dcopClient(),
- TQT_SIGNAL(applicationRemoved(const TQCString&)),
+ TQ_SIGNAL(applicationRemoved(const TQCString&)),
this,
- TQT_SLOT(slotAppUnregistered(const TQCString&)));
+ TQ_SLOT(slotAppUnregistered(const TQCString&)));
_dw = new KDirWatch(this, "TDEWallet Directory Watcher");
_dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet"));
_dw->startScan(true);
- connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty()));
+ connect(_dw, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(emitWalletListDirty()));
}
@@ -229,7 +229,7 @@ void TDEWalletD::openAsynchronous(const TQString& wallet, const TQCString& retur
DCOPRef(appid, returnObject).send("walletOpenResult", 0);
- TQTimer::singleShot(0, this, TQT_SLOT(processTransactions()));
+ TQTimer::singleShot(0, this, TQ_SLOT(processTransactions()));
checkActiveDialog();
}
@@ -266,7 +266,7 @@ int TDEWalletD::open(const TQString& wallet, uint wId) {
xact->wId = wId;
xact->tType = TDEWalletTransaction::Open;
xact->modal = true; // mark dialogs as modal, the app has blocking wait
- TQTimer::singleShot(0, this, TQT_SLOT(processTransactions()));
+ TQTimer::singleShot(0, this, TQ_SLOT(processTransactions()));
checkActiveDialog();
return 0; // process later
}
@@ -386,7 +386,7 @@ int TDEWalletD::tryOpen(const TQString& wallet, const TQCString& password)
_tryOpenBlocked.start (30 * 1000, true /*single shot*/);
if (++_failed > 5) {
_failed = 0;
- TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures()));
+ TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures()));
}
rc = -1;
@@ -627,7 +627,7 @@ void TDEWalletD::changePassword(const TQString& wallet, uint wId) {
_transactions.append(xact);
- TQTimer::singleShot(0, this, TQT_SLOT(processTransactions()));
+ TQTimer::singleShot(0, this, TQ_SLOT(processTransactions()));
checkActiveDialog();
}
@@ -801,7 +801,7 @@ bool TDEWalletD::isOpen(int handle) {
if (rc == 0 && ++_failed > 5) {
_failed = 0;
- TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures()));
+ TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures()));
} else if (rc != 0) {
_failed = 0;
}
@@ -1229,7 +1229,7 @@ TDEWallet::Backend *TDEWalletD::getWallet(const TQCString& appid, int handle) {
if (++_failed > 5) {
_failed = 0;
- TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures()));
+ TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures()));
}
return 0L;
diff --git a/tdeio/misc/tdewalletd/tdewalletd.h b/tdeio/misc/tdewalletd/tdewalletd.h
index c35ebc630..65e77771e 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.h
+++ b/tdeio/misc/tdewalletd/tdewalletd.h
@@ -40,7 +40,7 @@ class KTimeout;
class TDEWalletTransaction;
class TDEWalletD : public KDEDModule {
- Q_OBJECT
+ TQ_OBJECT
K_DCOP
public:
TDEWalletD(const TQCString &name);
diff --git a/tdeio/misc/tdewalletd/tdewalletwizard.ui b/tdeio/misc/tdewalletd/tdewalletwizard.ui
index 3e034bac1..1cad5f4a0 100644
--- a/tdeio/misc/tdewalletd/tdewalletwizard.ui
+++ b/tdeio/misc/tdewalletd/tdewalletwizard.ui
@@ -534,12 +534,12 @@
<include location="global" impldecl="in implementation">tdelocale.h</include>
<include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot access="private">passwordPageUpdate()</slot>
<slot access="private">init()</slot>
<slot>setAdvanced()</slot>
<slot>setBasic()</slot>
<slot access="private">destroy()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 128b77bff..05f11fd06 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -94,11 +94,11 @@ class UIServerSystemTray:public KSystemTray
:KSystemTray(uis)
{
TDEPopupMenu* pop= contextMenu();
- pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure()));
- pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
+ pop->insertItem(i18n("Settings..."), uis, TQ_SLOT(slotConfigure()));
+ pop->insertItem(i18n("Remove"), uis, TQ_SLOT(slotRemoveSystemTrayIcon()));
setPixmap(loadIcon("document-save"));
//actionCollection()->action("file_quit")->setEnabled(true);
- KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection());
+ KStdAction::quit(uis, TQ_SLOT(slotQuit()), actionCollection());
}
};
@@ -193,8 +193,8 @@ ProgressItem::ProgressItem( ListProgress* view, TQListViewItem *after, TQCString
// create dialog, but don't show it
defaultProgress = new TDEIO::DefaultProgress( false );
defaultProgress->setOnlyClean( true );
- connect ( defaultProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotCanceled() ) );
- connect ( &m_showTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(slotShowDefaultProgress()) );
+ connect ( defaultProgress, TQ_SIGNAL( stopped() ), this, TQ_SLOT( slotCanceled() ) );
+ connect ( &m_showTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(slotShowDefaultProgress()) );
if ( showDefault ) {
m_showTimer.start( 500, true );
@@ -478,7 +478,7 @@ ListProgress::ListProgress (TQWidget *parent, const char *name)
//used for squeezing the text in local file name and url
m_squeezer=new KSqueezedTextLabel(this);
m_squeezer->hide();
- connect(header(),TQT_SIGNAL(sizeChange(int,int,int)),this,TQT_SLOT(columnWidthChanged(int)));
+ connect(header(),TQ_SIGNAL(sizeChange(int,int,int)),this,TQ_SLOT(columnWidthChanged(int)));
}
@@ -595,11 +595,11 @@ UIServer::UIServer()
// setup toolbar
toolBar()->insertButton("edit-delete", TOOL_CANCEL,
- TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
- TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
+ TQ_SIGNAL(clicked()), this,
+ TQ_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
toolBar()->insertButton("configure", TOOL_CONFIGURE,
- TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
- TQT_SLOT(slotConfigure()), true, i18n("Settings..."));
+ TQ_SIGNAL(clicked()), this,
+ TQ_SLOT(slotConfigure()), true, i18n("Settings..."));
toolBar()->setBarPos( TDEToolBar::Left );
@@ -614,18 +614,18 @@ UIServer::UIServer()
setCentralWidget( listProgress );
- connect( listProgress, TQT_SIGNAL( selectionChanged() ),
- TQT_SLOT( slotSelection() ) );
- connect( listProgress, TQT_SIGNAL( executed( TQListViewItem* ) ),
- TQT_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) );
- connect( listProgress, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)),
- TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
+ connect( listProgress, TQ_SIGNAL( selectionChanged() ),
+ TQ_SLOT( slotSelection() ) );
+ connect( listProgress, TQ_SIGNAL( executed( TQListViewItem* ) ),
+ TQ_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) );
+ connect( listProgress, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)),
+ TQ_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
// setup animation timer
updateTimer = new TQTimer( this );
- connect( updateTimer, TQT_SIGNAL( timeout() ),
- TQT_SLOT( slotUpdate() ) );
+ connect( updateTimer, TQ_SIGNAL( timeout() ),
+ TQ_SLOT( slotUpdate() ) );
m_bUpdateNewJob=false;
setCaption(i18n("Progress Dialog"));
@@ -675,10 +675,10 @@ void UIServer::slotShowContextMenu(TDEListView*, TQListViewItem* item, const TQP
if (m_contextMenu==0)
{
m_contextMenu=new TQPopupMenu(this);
- m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQT_SLOT(slotCancelCurrent()));
-// m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQT_SLOT(slotToggleDefaultProgress()));
+ m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQ_SLOT(slotCancelCurrent()));
+// m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQ_SLOT(slotToggleDefaultProgress()));
m_contextMenu->insertSeparator();
- m_contextMenu->insertItem(i18n("Settings..."), this, TQT_SLOT(slotConfigure()));
+ m_contextMenu->insertItem(i18n("Settings..."), this, TQ_SLOT(slotConfigure()));
}
if ( item )
item->setSelected( true );
@@ -707,9 +707,9 @@ void UIServer::slotConfigure()
if (m_configDialog==0)
{
m_configDialog=new ProgressConfigDialog(0);
-// connect(m_configDialog,TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancelConfig()));
- connect(m_configDialog,TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotApplyConfig()));
- connect(m_configDialog,TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApplyConfig()));
+// connect(m_configDialog,TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCancelConfig()));
+ connect(m_configDialog,TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotApplyConfig()));
+ connect(m_configDialog,TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotApplyConfig()));
}
m_configDialog->m_showSystemTrayCb->setChecked(m_showSystemTray);
m_configDialog->m_keepOpenCb->setChecked(m_keepListOpen);
@@ -760,8 +760,8 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress )
bool show = !m_bShowList && showProgress;
ProgressItem *item = new ProgressItem( listProgress, it.current(), observerAppId, s_jobId, show );
- connect( item, TQT_SIGNAL( jobCanceled( ProgressItem* ) ),
- TQT_SLOT( slotJobCanceled( ProgressItem* ) ) );
+ connect( item, TQ_SIGNAL( jobCanceled( ProgressItem* ) ),
+ TQ_SLOT( slotJobCanceled( ProgressItem* ) ) );
if ( m_bShowList && !updateTimer->isActive() )
updateTimer->start( 1000 );
@@ -1205,7 +1205,7 @@ void UIServer::showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &met
meta["ssl_cipher_bits"].toInt(),
KSSLCertificate::KSSLValidation(meta["ssl_cert_state"].toInt()));
kdDebug(7024) << "Showing SSL Info dialog" << endl;
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
if( mainwindow != 0 )
KWin::setMainWindow( kid, mainwindow );
#endif
@@ -1233,7 +1233,7 @@ KSSLCertDlgRet UIServer::showSSLCertDialog(const TQString& host, const TQStringL
kcd->setupDialog(certList);
kcd->setHost(host);
kdDebug(7024) << "Showing SSL certificate dialog" << endl;
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
if( mainwindow != 0 )
KWin::setMainWindow( kcd, mainwindow );
#endif
@@ -1374,7 +1374,7 @@ UIServer* UIServer::createInstance()
//------------------------------------------------------------
-extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
+extern "C" TDE_EXPORT int kdemain(int argc, char **argv)
{
TDELocale::setMainCatalogue("tdelibs");
// GS 5/2001 - I changed the name to "TDE" to make it look better
diff --git a/tdeio/misc/uiserver.h b/tdeio/misc/uiserver.h
index edb4531bc..8ba492da5 100644
--- a/tdeio/misc/uiserver.h
+++ b/tdeio/misc/uiserver.h
@@ -57,7 +57,7 @@ struct ListProgressColumnConfig
*/
class TDEIO_EXPORT ListProgress : public TDEListView {
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -105,7 +105,7 @@ protected:
*/
class TDEIO_EXPORT ProgressItem : public TQObject, public TQListViewItem {
- Q_OBJECT
+ TQ_OBJECT
public:
ProgressItem( ListProgress* view, TQListViewItem *after, TQCString app_id, int job_id,
@@ -217,7 +217,7 @@ class UIServerSystemTray;
class TDEIO_EXPORT UIServer : public TDEMainWindow, public DCOPObject {
K_DCOP
- Q_OBJECT
+ TQ_OBJECT
UIServer();
virtual ~UIServer();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 08:57:18 +0000