summaryrefslogtreecommitdiffstats
path: root/tderesources
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-01-14 12:33:20 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-01-14 12:43:48 +0900
commit3b3f9ec8f31978030c17309fae48335bea5c1587 (patch)
tree0b493383a1501860371aacd792ec6fc08d595824 /tderesources
parent99e6e1d1f43610c3573e9824a2a8a38f69930cd0 (diff)
downloadtdepim-3b3f9ec8f31978030c17309fae48335bea5c1587.tar.gz
tdepim-3b3f9ec8f31978030c17309fae48335bea5c1587.zip
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tderesources')
-rw-r--r--tderesources/birthdays/resourcetdeabc.cpp2
-rw-r--r--tderesources/birthdays/resourcetdeabcconfig.cpp6
-rw-r--r--tderesources/blogging/bloggingcalendaradaptor.cpp16
-rw-r--r--tderesources/caldav/config.cpp8
-rw-r--r--tderesources/caldav/configwidgets.cpp8
-rw-r--r--tderesources/caldav/resource.cpp10
-rw-r--r--tderesources/carddav/configwidgets.cpp8
-rw-r--r--tderesources/carddav/resource.cpp8
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpc.cpp56
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpc.cpp20
-rw-r--r--tderesources/egroupware/synchronizer.h4
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpc.cpp32
-rw-r--r--tderesources/egroupware/xmlrpciface.cpp14
-rw-r--r--tderesources/exchange/resourceexchange.cpp12
-rw-r--r--tderesources/exchange/resourceexchangeconfig.cpp6
-rw-r--r--tderesources/groupware/kcal_resourcegroupware.cpp12
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupware.cpp16
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp2
-rw-r--r--tderesources/groupwise/groupwisesettingswidget.cpp4
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwise.cpp12
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp2
-rw-r--r--tderesources/groupwise/soap/groupwiseserver.cpp2
-rw-r--r--tderesources/groupwise/soap/ksslsocket.cpp6
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwise.cpp32
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwise.h2
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp2
-rw-r--r--tderesources/groupwise/tdeioslave/groupwise.cpp24
-rw-r--r--tderesources/kolab/kcal/resourcekolab.cpp8
-rw-r--r--tderesources/kolab/shared/kmailconnection.cpp4
-rw-r--r--tderesources/lib/folderconfig.cpp4
-rw-r--r--tderesources/lib/folderlister.cpp12
-rw-r--r--tderesources/lib/folderlistview.cpp22
-rw-r--r--tderesources/lib/folderselectdialog.cpp8
-rw-r--r--tderesources/lib/groupwaredownloadjob.cpp36
-rw-r--r--tderesources/lib/groupwareresourcejob.cpp2
-rw-r--r--tderesources/lib/groupwareuploadjob.cpp62
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebase.cpp20
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp8
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebase.cpp8
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp4
-rw-r--r--tderesources/newexchange/exchangecalendaradaptor.cpp2
-rw-r--r--tderesources/newexchange/exchangeconvertercalendar.cpp4
-rw-r--r--tderesources/remote/resourceremote.cpp12
-rw-r--r--tderesources/scalix/kcal/resourcescalix.cpp6
-rw-r--r--tderesources/scalix/scalixadmin/delegatedialog.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/delegatepage.cpp16
-rw-r--r--tderesources/scalix/scalixadmin/delegateview.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/jobs.cpp12
-rw-r--r--tderesources/scalix/scalixadmin/ldapview.cpp8
-rw-r--r--tderesources/scalix/scalixadmin/otheruserpage.cpp12
-rw-r--r--tderesources/scalix/scalixadmin/otheruserview.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/outofofficepage.cpp12
-rw-r--r--tderesources/scalix/scalixadmin/passwordpage.cpp8
-rw-r--r--tderesources/scalix/shared/kmailconnection.cpp4
-rw-r--r--tderesources/scalix/tdeioslave/scalix.cpp12
-rw-r--r--tderesources/slox/kcalresourceslox.cpp36
-rw-r--r--tderesources/slox/kcalresourcesloxconfig.cpp4
-rw-r--r--tderesources/slox/sloxaccounts.cpp4
-rw-r--r--tderesources/slox/sloxfolderdialog.cpp2
-rw-r--r--tderesources/slox/sloxfoldermanager.cpp4
-rw-r--r--tderesources/slox/tdeabcresourceslox.cpp24
-rw-r--r--tderesources/slox/tdeabcresourcesloxconfig.cpp2
-rw-r--r--tderesources/slox/testsloxaccounts.cpp2
-rw-r--r--tderesources/tvanytime/kcal_resourcetvanytime.cpp12
64 files changed, 364 insertions, 364 deletions
diff --git a/tderesources/birthdays/resourcetdeabc.cpp b/tderesources/birthdays/resourcetdeabc.cpp
index f5271ac7d..2e937a7d5 100644
--- a/tderesources/birthdays/resourcetdeabc.cpp
+++ b/tderesources/birthdays/resourcetdeabc.cpp
@@ -125,7 +125,7 @@ bool ResourceTDEABC::doOpen()
kdDebug(5800) << "ResourceTDEABC::doOpen()" << endl;
mAddressbook = TDEABC::StdAddressBook::self( true );
- connect( mAddressbook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT( reload() ) );
+ connect( mAddressbook, TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT( reload() ) );
return true;
}
diff --git a/tderesources/birthdays/resourcetdeabcconfig.cpp b/tderesources/birthdays/resourcetdeabcconfig.cpp
index 0f9b3279b..4b3b0a1df 100644
--- a/tderesources/birthdays/resourcetdeabcconfig.cpp
+++ b/tderesources/birthdays/resourcetdeabcconfig.cpp
@@ -61,13 +61,13 @@ ResourceTDEABCConfig::ResourceTDEABCConfig( TQWidget* parent, const char* name
mCategoryView->setEnabled( false );
topLayout->addMultiCellWidget( mCategoryView, 4, 4, 0, 1 );
- connect( mUseCategories, TQT_SIGNAL( toggled( bool ) ),
- mCategoryView, TQT_SLOT( setEnabled( bool ) ) );
+ connect( mUseCategories, TQ_SIGNAL( toggled( bool ) ),
+ mCategoryView, TQ_SLOT( setEnabled( bool ) ) );
mAlarmTimeEdit->setDisabled(true);
mALabel->setDisabled(true);
- connect(mAlarm, TQT_SIGNAL(clicked()), TQT_SLOT(alarmClicked()));
+ connect(mAlarm, TQ_SIGNAL(clicked()), TQ_SLOT(alarmClicked()));
setReadOnly( true );
diff --git a/tderesources/blogging/bloggingcalendaradaptor.cpp b/tderesources/blogging/bloggingcalendaradaptor.cpp
index 2ed925a88..9c899e5c4 100644
--- a/tderesources/blogging/bloggingcalendaradaptor.cpp
+++ b/tderesources/blogging/bloggingcalendaradaptor.cpp
@@ -102,17 +102,17 @@ void BloggingCalendarAdaptor::setAPI( KBlog::APIBlog *api )
delete mAPI;
mAPI = api;
mAuthenticated = false;
- connect( api, TQT_SIGNAL( userInfoRetrieved( const TQString &, const TQString &,
+ connect( api, TQ_SIGNAL( userInfoRetrieved( const TQString &, const TQString &,
const TQString & ) ),
- TQT_SLOT( slotUserInfoRetrieved( const TQString &, const TQString &,
+ TQ_SLOT( slotUserInfoRetrieved( const TQString &, const TQString &,
const TQString & ) ) );
- connect( api, TQT_SIGNAL( folderInfoRetrieved( const TQString &, const TQString & ) ),
- TQT_SLOT( slotFolderInfoRetrieved( const TQString&, const TQString & ) ) );
- connect( api, TQT_SIGNAL( itemOnServer( const KURL & ) ),
- TQT_SIGNAL( itemOnServer( const KURL & ) ) );
- connect( api, TQT_SIGNAL( itemDownloaded( KCal::Incidence *, const TQString &,
+ connect( api, TQ_SIGNAL( folderInfoRetrieved( const TQString &, const TQString & ) ),
+ TQ_SLOT( slotFolderInfoRetrieved( const TQString&, const TQString & ) ) );
+ connect( api, TQ_SIGNAL( itemOnServer( const KURL & ) ),
+ TQ_SIGNAL( itemOnServer( const KURL & ) ) );
+ connect( api, TQ_SIGNAL( itemDownloaded( KCal::Incidence *, const TQString &,
const KURL &, const TQString &, const TQString & ) ),
- TQT_SLOT( calendarItemDownloaded( KCal::Incidence *, const TQString &,
+ TQ_SLOT( calendarItemDownloaded( KCal::Incidence *, const TQString &,
const KURL &, const TQString &, const TQString & ) ) );
}
diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp
index b83660f8b..4a9888ea1 100644
--- a/tderesources/caldav/config.cpp
+++ b/tderesources/caldav/config.cpp
@@ -167,12 +167,12 @@ void ResourceCalDavConfig::setupUI() {
mainLayout->addWidget(mRememberPassword, 8, 1);
mTasksUrl->setEnabled(mUseSTasks->isChecked());
- connect( mUseSTasks, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotSTasksToggled( bool ) ) );
+ connect( mUseSTasks, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotSTasksToggled( bool ) ) );
mJournalsUrl->setEnabled(mUseSJournals->isChecked());
- connect( mUseSJournals, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotSJournalsToggled( bool ) ) );
+ connect( mUseSJournals, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotSJournalsToggled( bool ) ) );
// configs
TQHBoxLayout* horizontal = new TQHBoxLayout(this);
diff --git a/tderesources/caldav/configwidgets.cpp b/tderesources/caldav/configwidgets.cpp
index 7e003dcde..9f4f1e110 100644
--- a/tderesources/caldav/configwidgets.cpp
+++ b/tderesources/caldav/configwidgets.cpp
@@ -103,8 +103,8 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent )
d->mGroup->insert( automaticReloadOnStartup, 1 );
d->mGroup->insert( noAutomaticReload, 0 );
- connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotIntervalToggled( bool ) ) );
TQHBox *intervalBox = new TQHBox( groupBox );
//new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
@@ -179,8 +179,8 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent )
d->mGroup->insert( onExit, 1 );
d->mGroup->insert( intervalRadio, 2 );
- connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotIntervalToggled( bool ) ) );
TQHBox *intervalBox = new TQHBox( groupBox );
//new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp
index 8fae5c984..2c63da224 100644
--- a/tderesources/caldav/resource.cpp
+++ b/tderesources/caldav/resource.cpp
@@ -197,7 +197,7 @@ bool ResourceCalDav::doSave() {
clearChanges();
if (mWriteRetryTimer != NULL) {
if (mWriteRetryTimer->isActive() == false) {
- disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) );
+ disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) );
delete mWriteRetryTimer;
mWriteRetryTimer = NULL;
}
@@ -249,8 +249,8 @@ void ResourceCalDav::init() {
// creating jobs
// TQt4 handles this quite differently, as shown below,
// whereas TQt3 needs events (see ::event())
-// connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished()));
-// connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished()));
+// connect(mLoader, TQ_SIGNAL(finished()), this, TQ_SLOT(loadFinished()));
+// connect(mWriter, TQ_SIGNAL(finished()), this, TQ_SLOT(writingFinished()));
setType("ResourceCalDav");
}
@@ -850,7 +850,7 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl,
if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) {
if (mWriteRetryTimer == NULL) {
mWriteRetryTimer = new TQTimer(this);
- connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) );
+ connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) );
}
mWriteRetryTimer->start(1000, TRUE);
return false;
@@ -995,7 +995,7 @@ void ResourceCalDav::writingFinished() {
}
// Give the remote system a few seconds to process the data before we allow any read operations
- TQTimer::singleShot( 3000, this, TQT_SLOT(releaseReadLockout()) );
+ TQTimer::singleShot( 3000, this, TQ_SLOT(releaseReadLockout()) );
// Writing queue and mWritingQueueReady flag are not shared resources, i.e. only one thread has an access to them.
// That's why no mutexes are required.
diff --git a/tderesources/carddav/configwidgets.cpp b/tderesources/carddav/configwidgets.cpp
index 3d7475130..60fc5ed24 100644
--- a/tderesources/carddav/configwidgets.cpp
+++ b/tderesources/carddav/configwidgets.cpp
@@ -102,8 +102,8 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent )
d->mGroup->insert( automaticReloadOnStartup, 1 );
d->mGroup->insert( noAutomaticReload, 0 );
- connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotIntervalToggled( bool ) ) );
TQHBox *intervalBox = new TQHBox( groupBox );
//new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
@@ -178,8 +178,8 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent )
d->mGroup->insert( onExit, 1 );
d->mGroup->insert( intervalRadio, 2 );
- connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ),
- TQT_SLOT( slotIntervalToggled( bool ) ) );
+ connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ),
+ TQ_SLOT( slotIntervalToggled( bool ) ) );
TQHBox *intervalBox = new TQHBox( groupBox );
//new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox );
diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp
index 69eb98e4a..ddd6928e9 100644
--- a/tderesources/carddav/resource.cpp
+++ b/tderesources/carddav/resource.cpp
@@ -197,7 +197,7 @@ bool ResourceCardDav::doSave() {
clearChanges();
if (mWriteRetryTimer != NULL) {
if (mWriteRetryTimer->isActive() == false) {
- disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) );
+ disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) );
delete mWriteRetryTimer;
mWriteRetryTimer = NULL;
}
@@ -256,8 +256,8 @@ void ResourceCardDav::init() {
// creating jobs
// TQt4 handles this quite differently, as shown below,
// whereas TQt3 needs events (see ::event())
-// connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished()));
-// connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished()));
+// connect(mLoader, TQ_SIGNAL(finished()), this, TQ_SLOT(loadFinished()));
+// connect(mWriter, TQ_SIGNAL(finished()), this, TQ_SLOT(writingFinished()));
setType("ResourceCardDav");
}
@@ -609,7 +609,7 @@ bool ResourceCardDav::startWriting(const TQString& url) {
if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) {
if (mWriteRetryTimer == NULL) {
mWriteRetryTimer = new TQTimer(this);
- connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) );
+ connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) );
}
mWriteRetryTimer->start(1000, TRUE);
return false;
diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
index 676770ed7..9ccc24b53 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
@@ -197,8 +197,8 @@ bool ResourceXMLRPC::doOpen()
args.insert( "password", mPrefs->password() );
mServer->call( "system.login", TQVariant( args ),
- this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
@@ -214,8 +214,8 @@ void ResourceXMLRPC::doClose()
args.insert( "kp3", mKp3 );
mServer->call( "system.logout", TQVariant( args ),
- this, TQT_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
}
@@ -243,8 +243,8 @@ bool ResourceXMLRPC::doLoad()
args.insert( "end", TQDateTime( TQDate::currentDate().addDays( 2000 ) ) );
mServer->call( SearchEventsCommand, args,
- this, TQT_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
args.clear();
columns.insert( "type", "task" );
@@ -253,16 +253,16 @@ bool ResourceXMLRPC::doLoad()
args.insert( "order", "id_parent" );
mServer->call( SearchTodosCommand, args,
- this, TQT_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mServer->call( LoadEventCategoriesCommand, TQVariant( TQStringVariantMap() ),
- this, TQT_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mServer->call( LoadTodoCategoriesCommand, TQVariant( false ),
- this, TQT_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
return true;
}
@@ -286,8 +286,8 @@ bool ResourceXMLRPC::doSave()
args.insert( "id", idMapper().remoteId( (*evIt)->uid() ).toInt() );
mServer->call( AddEventCommand, TQVariant( args ),
- this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
counter++;
}
}
@@ -302,8 +302,8 @@ bool ResourceXMLRPC::doSave()
args.insert( "id", idMapper().remoteId( (*todoIt)->uid() ).toInt() );
mServer->call( AddTodoCommand, TQVariant( args ),
- this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
counter++;
}
}
@@ -340,8 +340,8 @@ bool ResourceXMLRPC::addEvent( Event* ev )
writeEvent( ev, args );
args.insert( "id", idMapper().remoteId( ev->uid() ).toInt() );
mServer->call( AddEventCommand, TQVariant( args ),
- this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mCalendar.deleteIncidence( oldEvent );
mCalendar.addIncidence( ev );
@@ -350,8 +350,8 @@ bool ResourceXMLRPC::addEvent( Event* ev )
} else { // new event
writeEvent( ev, args );
mServer->call( AddEventCommand, TQVariant( args ),
- this, TQT_SLOT( addEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( addEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
TQVariant( ev->uid() ) );
mCalendar.addEvent( ev );
@@ -369,9 +369,9 @@ bool ResourceXMLRPC::deleteEvent( Event* ev )
return false;
mServer->call( DeleteEventCommand, idMapper().remoteId( ev->uid() ).toInt(),
- this, TQT_SLOT( deleteEventFinished( const TQValueList<TQVariant>&,
+ this, TQ_SLOT( deleteEventFinished( const TQValueList<TQVariant>&,
const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
TQVariant( ev->uid() ) );
return true;
}
@@ -420,8 +420,8 @@ bool ResourceXMLRPC::addTodo( Todo *todo )
writeTodo( todo, args );
args.insert( "id", idMapper().remoteId( todo->uid() ).toInt() );
mServer->call( AddTodoCommand, TQVariant( args ),
- this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mCalendar.deleteIncidence( oldTodo );
mCalendar.addIncidence( todo );
@@ -430,8 +430,8 @@ bool ResourceXMLRPC::addTodo( Todo *todo )
} else { // new todo
writeTodo( todo, args );
mServer->call( AddTodoCommand, TQVariant( args ),
- this, TQT_SLOT( addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
TQVariant( todo->uid() ) );
mCalendar.addTodo( todo );
@@ -449,9 +449,9 @@ bool ResourceXMLRPC::deleteTodo( Todo *todo )
return false;
mServer->call( DeleteTodoCommand, idMapper().remoteId( todo->uid() ).toInt(),
- this, TQT_SLOT( deleteTodoFinished( const TQValueList<TQVariant>&,
+ this, TQ_SLOT( deleteTodoFinished( const TQValueList<TQVariant>&,
const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
TQVariant( todo->uid() ) );
return true;
}
diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp
index 9a4770760..05306c876 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp
@@ -123,8 +123,8 @@ bool ResourceXMLRPC::load()
args.insert( "password", mPrefs->password() );
mServer->call( "system.login", TQVariant( args ),
- this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
@@ -135,8 +135,8 @@ bool ResourceXMLRPC::load()
args.insert( "order", "id_parent" );
mServer->call( SearchNotesCommand, args,
- this, TQT_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
@@ -163,15 +163,15 @@ bool ResourceXMLRPC::addNote( KCal::Journal *journal )
writeNote( journal, args );
args.insert( "id", mUidMap[ journal->uid() ].toInt() );
mServer->call( AddNoteCommand, TQVariant( args ),
- this, TQT_SLOT( updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mCalendar.addJournal( journal );
added = true;
}
} else {
mServer->call( AddNoteCommand, TQVariant( args ),
- this, TQT_SLOT( addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
TQVariant( journal->uid() ) );
mCalendar.addJournal( journal );
@@ -189,8 +189,8 @@ bool ResourceXMLRPC::deleteNote( KCal::Journal *journal )
int id = mUidMap[ journal->uid() ].toInt();
mServer->call( DeleteNoteCommand, id,
- this, TQT_SLOT( deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ),
TQVariant( journal->uid() ) );
mSynchronizer->start();
diff --git a/tderesources/egroupware/synchronizer.h b/tderesources/egroupware/synchronizer.h
index ed9fd1353..9e14fd93a 100644
--- a/tderesources/egroupware/synchronizer.h
+++ b/tderesources/egroupware/synchronizer.h
@@ -37,8 +37,8 @@
...
job = TDEIO::file_copy( url, file, -1, true );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
mSynchronizer.start(); // will block here until the slot was called
...
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
index dd791cd87..4e95f792d 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
@@ -159,8 +159,8 @@ bool ResourceXMLRPC::doOpen()
args.insert( "password", mPrefs->password() );
mServer->call( "system.login", TQVariant( args ),
- this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
@@ -174,8 +174,8 @@ void ResourceXMLRPC::doClose()
args.insert( "kp3", mKp3 );
mServer->call( "system.logout", TQVariant( args ),
- this, TQT_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mSynchronizer->start();
}
@@ -205,16 +205,16 @@ bool ResourceXMLRPC::asyncLoad()
args.insert( "include_users", "calendar" );
mServer->call( SearchContactsCommand, args,
- this, TQT_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mServer->call( LoadCategoriesCommand, TQVariant( false ),
- this, TQT_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
mServer->call( LoadCustomFieldsCommand, TQVariant( TQValueList<TQVariant>() ),
- this, TQT_SLOT( loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
+ this, TQ_SLOT( loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) );
return true;
}
@@ -253,8 +253,8 @@ void ResourceXMLRPC::addContact( const Addressee& addr )
writeContact( addr, args );
mServer->call( AddContactCommand, args,
- this, TQT_SLOT( addContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( addContactFault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( addContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( addContactFault( int, const TQString&, const TQVariant& ) ),
TQVariant( addr.uid() ) );
}
@@ -270,8 +270,8 @@ void ResourceXMLRPC::updateContact( const Addressee& addr )
args.insert( "id", idMapper().remoteId( addr.uid() ) );
mServer->call( AddContactCommand, args,
- this, TQT_SLOT( updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( updateContactFault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( updateContactFault( int, const TQString&, const TQVariant& ) ),
TQVariant( addr.uid() ) );
}
@@ -284,8 +284,8 @@ void ResourceXMLRPC::deleteContact( const Addressee& addr )
}
mServer->call( DeleteContactCommand, idMapper().remoteId( addr.uid() ),
- this, TQT_SLOT( deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
- this, TQT_SLOT( deleteContactFault( int, const TQString&, const TQVariant& ) ),
+ this, TQ_SLOT( deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
+ this, TQ_SLOT( deleteContactFault( int, const TQString&, const TQVariant& ) ),
TQVariant( addr.uid() ) );
}
diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp
index 3f4b9aa47..29d5563ec 100644
--- a/tderesources/egroupware/xmlrpciface.cpp
+++ b/tderesources/egroupware/xmlrpciface.cpp
@@ -78,10 +78,10 @@ void Query::call( const TQString &server, const TQString &method,
job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" );
job->addMetaData( "ConnectTimeout", "50" );
- connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
m_pendingJobs.append( job );
}
@@ -360,9 +360,9 @@ void Server::call( const TQString &method, const TQValueList<TQVariant> &args,
kdWarning() << "Cannot execute call to " << method << ": empty server URL" << endl;
Query *query = Query::create( id, this );
- connect( query, TQT_SIGNAL( message( const TQValueList<TQVariant> &, const TQVariant& ) ), msgObj, messageSlot );
- connect( query, TQT_SIGNAL( fault( int, const TQString&, const TQVariant& ) ), faultObj, faultSlot );
- connect( query, TQT_SIGNAL( finished( Query* ) ), this, TQT_SLOT( queryFinished( Query* ) ) );
+ connect( query, TQ_SIGNAL( message( const TQValueList<TQVariant> &, const TQVariant& ) ), msgObj, messageSlot );
+ connect( query, TQ_SIGNAL( fault( int, const TQString&, const TQVariant& ) ), faultObj, faultSlot );
+ connect( query, TQ_SIGNAL( finished( Query* ) ), this, TQ_SLOT( queryFinished( Query* ) ) );
mPendingQueries.append( query );
query->call( m_url.url(), method, args, m_userAgent );
diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp
index ae65f9cdc..a2cbbed04 100644
--- a/tderesources/exchange/resourceexchange.cpp
+++ b/tderesources/exchange/resourceexchange.cpp
@@ -123,18 +123,18 @@ bool ResourceExchange::doOpen()
kdDebug() << "ResourceExchange::doOpen()" << endl;
mClient = new ExchangeClient( mAccount, mTimeZoneId );
- connect( mClient, TQT_SIGNAL( downloadFinished( int, const TQString & ) ),
- TQT_SLOT( slotDownloadFinished( int, const TQString & ) ) );
- connect( mClient, TQT_SIGNAL( event( KCal::Event *, const KURL & ) ),
- TQT_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) );
+ connect( mClient, TQ_SIGNAL( downloadFinished( int, const TQString & ) ),
+ TQ_SLOT( slotDownloadFinished( int, const TQString & ) ) );
+ connect( mClient, TQ_SIGNAL( event( KCal::Event *, const KURL & ) ),
+ TQ_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) );
#if 0
kdDebug() << "Creating monitor" << endl;
TQHostAddress ip;
ip.setAddress( mAccount->host() );
mMonitor = new ExchangeMonitor( mAccount, ExchangeMonitor::CallBack, ip );
- connect( mMonitor, TQT_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQT_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) );
- connect( mMonitor, TQT_SIGNAL(error(int , const TQString&)), this, TQT_SLOT(slotMonitorError(int , const TQString&)) );
+ connect( mMonitor, TQ_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQ_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) );
+ connect( mMonitor, TQ_SIGNAL(error(int , const TQString&)), this, TQ_SLOT(slotMonitorError(int , const TQString&)) );
mMonitor->addWatch( mAccount->calendarURL(), ExchangeMonitor::UpdateNewMember, 1 );
#endif
diff --git a/tderesources/exchange/resourceexchangeconfig.cpp b/tderesources/exchange/resourceexchangeconfig.cpp
index 3b3bf14f2..57ad9d0f6 100644
--- a/tderesources/exchange/resourceexchangeconfig.cpp
+++ b/tderesources/exchange/resourceexchangeconfig.cpp
@@ -62,7 +62,7 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent, const char* n
mAutoMailbox = new TQCheckBox( i18n( "Determine mailbox &automatically" ), this );
mainLayout->addMultiCellWidget( mAutoMailbox, 5, 5, 0, 1 );
- connect( mAutoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) );
+ connect( mAutoMailbox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAuto(bool)) );
mMailboxEdit = new KLineEdit( this );
mainLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), this ), 6, 0 );
@@ -70,11 +70,11 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent, const char* n
mTryFindMailbox = new TQPushButton( i18n( "&Find" ), this );
mainLayout->addWidget( mTryFindMailbox, 6, 2 );
- connect( mTryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) );
+ connect( mTryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) );
label = new TQLabel( i18n( "Cache timeout:" ), this );
mCacheEdit = new KIntNumInput( this );
- connect(mCacheEdit, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(slotCacheEditChanged( int )));
+ connect(mCacheEdit, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(slotCacheEditChanged( int )));
mCacheEdit->setMinValue( 0 );
mainLayout->addWidget( label, 7, 0 );
mainLayout->addWidget( mCacheEdit, 7, 1 );
diff --git a/tderesources/groupware/kcal_resourcegroupware.cpp b/tderesources/groupware/kcal_resourcegroupware.cpp
index 6200773bf..f3897d79e 100644
--- a/tderesources/groupware/kcal_resourcegroupware.cpp
+++ b/tderesources/groupware/kcal_resourcegroupware.cpp
@@ -159,16 +159,16 @@ bool ResourceGroupware::doLoad()
mJobData = TQString();
mDownloadJob = KPIM::GroupwareJob::getCalendar( url );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
- connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") );
connect( mProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoad() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoad() ) );
return true;
}
diff --git a/tderesources/groupware/tdeabc_resourcegroupware.cpp b/tderesources/groupware/tdeabc_resourcegroupware.cpp
index e8f0c0a2b..b6b259115 100644
--- a/tderesources/groupware/tdeabc_resourcegroupware.cpp
+++ b/tderesources/groupware/tdeabc_resourcegroupware.cpp
@@ -244,18 +244,18 @@ bool ResourceGroupware::asyncLoad()
mJobData = TQString();
mDownloadJob = KPIM::GroupwareJob::getAddressBook( url );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
- connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
- connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading addressbook") );
connect( mProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoad() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoad() ) );
return true;
}
diff --git a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
index e171c7e75..74e866003 100644
--- a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
+++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
@@ -106,7 +106,7 @@ ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent, const char*
mainLayout->addWidget( label, 6, 0 );
mainLayout->addWidget( mAddressBookBox, 6, 1 );
- connect( updateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAddressBookList() ) );
+ connect( updateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAddressBookList() ) );
}
void ResourceGroupwareConfig::loadSettings( KRES::Resource *res )
diff --git a/tderesources/groupwise/groupwisesettingswidget.cpp b/tderesources/groupwise/groupwisesettingswidget.cpp
index 48de81433..cbff52ac9 100644
--- a/tderesources/groupwise/groupwisesettingswidget.cpp
+++ b/tderesources/groupwise/groupwisesettingswidget.cpp
@@ -27,8 +27,8 @@
GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * parent )
: GroupWiseSettingsWidgetBase( parent )
{
- connect( m_settingsList, TQT_SIGNAL( itemRenamed( TQListViewItem *, int ) ),
- this, TQT_SLOT( slotItemRenamed( TQListViewItem *, int ) ) );
+ connect( m_settingsList, TQ_SIGNAL( itemRenamed( TQListViewItem *, int ) ),
+ this, TQ_SLOT( slotItemRenamed( TQListViewItem *, int ) ) );
}
void GroupWiseSettingsWidget::slotItemRenamed( TQListViewItem * item, int )
diff --git a/tderesources/groupwise/kcal_resourcegroupwise.cpp b/tderesources/groupwise/kcal_resourcegroupwise.cpp
index a8a0727ec..6c3db3a89 100644
--- a/tderesources/groupwise/kcal_resourcegroupwise.cpp
+++ b/tderesources/groupwise/kcal_resourcegroupwise.cpp
@@ -158,16 +158,16 @@ bool ResourceGroupwise::doLoad()
mJobData = TQString();
mDownloadJob = TDEIO::get( url, false, false );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
- connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") );
connect( mProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoad() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoad() ) );
return true;
}
diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp
index 9371ef590..bd081f5e1 100644
--- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp
+++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp
@@ -73,7 +73,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char*
mainLayout->addMultiCellWidget( mSaveConfig, 6, 6, 0, 1 );
settingsButton->hide();
- // connect( settingsButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotViewUserSettings() ) );
+ // connect( settingsButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotViewUserSettings() ) );
}
diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp
index 07342ec4f..3ba461b90 100644
--- a/tderesources/groupwise/soap/groupwiseserver.cpp
+++ b/tderesources/groupwise/soap/groupwiseserver.cpp
@@ -114,7 +114,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
// kdDebug() << "Creating KSSLSocket()" << endl;
m_sock = new KSSLSocket();
m_sock->setTimeout( KProtocolManager::connectTimeout() );
- connect( m_sock, TQT_SIGNAL( sslFailure() ), TQT_SLOT( slotSslError() ) );
+ connect( m_sock, TQ_SIGNAL( sslFailure() ), TQ_SLOT( slotSslError() ) );
} else {
m_sock = new KExtendedSocket();
}
diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp
index 2f085cf2b..b753249d0 100644
--- a/tderesources/groupwise/soap/ksslsocket.cpp
+++ b/tderesources/groupwise/soap/ksslsocket.cpp
@@ -57,9 +57,9 @@ KSSLSocket::KSSLSocket() : KExtendedSocket()
setBlockingMode(false);
//Connect internal slots
- TQObject::connect( this, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(slotConnected()) );
- TQObject::connect( this, TQT_SIGNAL(closed(int)), this, TQT_SLOT(slotDisconnected()) );
- TQObject::connect( this, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(slotDisconnected()));
+ TQObject::connect( this, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(slotConnected()) );
+ TQObject::connect( this, TQ_SIGNAL(closed(int)), this, TQ_SLOT(slotDisconnected()) );
+ TQObject::connect( this, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(slotDisconnected()));
}
KSSLSocket::~KSSLSocket()
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
index 7c3ed791e..04ecc769d 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
@@ -288,8 +288,8 @@ bool ResourceGroupwise::asyncLoad()
{
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) );
- connect( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoad() ) );
+ connect( mProgress, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoad() ) );
}
if ( addressBooks().isEmpty() ) {
@@ -349,15 +349,15 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
mJob = TDEIO::get( url, false, false ); // TODO: make the GW jobs call finished if the URL
// contains no address book IDs
kdDebug() << " Job address: " << mJob << endl;
- connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) );
- connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
+ connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
if ( bookType == System )
{
- connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( fetchSABResult( TDEIO::Job * ) ) );
+ connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( fetchSABResult( TDEIO::Job * ) ) );
mSABProgress = KPIM::ProgressManager::instance()->createProgressItem(
mProgress, KPIM::ProgressManager::getUniqueID(),
i18n( "Fetching System Address Book" ), TQString(),
@@ -366,8 +366,8 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
}
else
{
- connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( fetchUABResult( TDEIO::Job * ) ) );
+ connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( fetchUABResult( TDEIO::Job * ) ) );
mUABProgress = KPIM::ProgressManager::instance()->createProgressItem(
mProgress, KPIM::ProgressManager::getUniqueID(),
i18n( "Fetching User Address Books" ), TQString(),
@@ -446,12 +446,12 @@ void ResourceGroupwise::updateSystemAddressBook()
mJob = TDEIO::get( url, false, false );
mJob->setInteractive( false );
- connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( updateSABResult( TDEIO::Job * ) ) );
- connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) );
- connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
+ connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( updateSABResult( TDEIO::Job * ) ) );
+ connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) );
return;
}
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h
index 29b3ed818..ccf74403a 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwise.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h
@@ -143,7 +143,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
/** DATA PROCESSING SLOTS **/
void slotReadJobData( TDEIO::Job *, const TQByteArray & );
void slotUpdateJobData( TDEIO::Job *, const TQByteArray & );
- /** HELPER TQT_SLOT **/
+ /** HELPER TQ_SLOT **/
void slotJobPercent( TDEIO::Job *job, unsigned long percent );
void cancelLoad();
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
index 49016cdd5..69dd7a6f9 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
+++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
@@ -102,7 +102,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char*
mainLayout->addWidget( label, 6, 0 );
mainLayout->addWidget( mAddressBookBox, 6, 1 );
- connect( updateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAddressBookList() ) );
+ connect( updateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAddressBookList() ) );
}
void ResourceGroupwiseConfig::loadSettings( KRES::Resource *res )
diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp
index c51fa4e4f..1c68d654e 100644
--- a/tderesources/groupwise/tdeioslave/groupwise.cpp
+++ b/tderesources/groupwise/tdeioslave/groupwise.cpp
@@ -295,14 +295,14 @@ void Groupwise::getAddressbook( const KURL &url )
GroupwiseServer server( u, user, pass, 0 );
- connect( &server, TQT_SIGNAL( readAddressBookTotalSize( int ) ),
- TQT_SLOT( slotReadAddressBookTotalSize( int ) ) );
- connect( &server, TQT_SIGNAL( readAddressBookProcessedSize( int ) ),
- TQT_SLOT( slotReadAddressBookProcessedSize( int ) ) );
- connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ),
- TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
- connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
- TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
+ connect( &server, TQ_SIGNAL( readAddressBookTotalSize( int ) ),
+ TQ_SLOT( slotReadAddressBookTotalSize( int ) ) );
+ connect( &server, TQ_SIGNAL( readAddressBookProcessedSize( int ) ),
+ TQ_SLOT( slotReadAddressBookProcessedSize( int ) ) );
+ connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ),
+ TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
+ connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
+ TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
kdDebug() << "Login" << endl;
if ( !server.login() ) {
@@ -369,10 +369,10 @@ void Groupwise::updateAddressbook( const KURL &url )
debugMessage( "update IDs: " + ids.join( "," ) );
GroupwiseServer server( u, user, pass, 0 );
- connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ),
- TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
- connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
- TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
+ connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ),
+ TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
+ connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
+ TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
kdDebug() << " Login" << endl;
if ( !server.login() ) {
diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index e68321a84..24f6efe0c 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -77,8 +77,8 @@ ResourceKolab::ResourceKolab( const TDEConfig *config )
setResourceName( i18n( "Kolab Server" ) );
}
setType( "imap" );
- connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotEmitResourceChanged() ) );
+ connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotEmitResourceChanged() ) );
}
ResourceKolab::~ResourceKolab()
@@ -402,7 +402,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre
KIncidenceChooser* ch = new KIncidenceChooser();
ch->setIncidence( local ,inc );
if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) {
- connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT ( useGlobalMode() ) );
+ connect ( this, TQ_SIGNAL( useGlobalMode() ), ch, TQ_SLOT ( useGlobalMode() ) );
if ( ch->exec() ) {
if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask ) {
emit useGlobalMode() ;
@@ -1185,7 +1185,7 @@ void ResourceKolab::setSubresourceActive( const TQString &subresource, bool v )
}
mResourceChangedTimer.changeInterval( 100 );
}
- TQTimer::singleShot( 0, this, TQT_SLOT(writeConfig()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(writeConfig()) );
}
bool ResourceKolab::subresourceWritable( const TQString& subresource ) const
diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp
index 8011c15d3..ac4904a83 100644
--- a/tderesources/kolab/shared/kmailconnection.cpp
+++ b/tderesources/kolab/shared/kmailconnection.cpp
@@ -56,8 +56,8 @@ KMailConnection::KMailConnection( ResourceKolabBase* resource,
mDCOPClient->registerAs( objId, true );
kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
- this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+ connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+ this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
}
KMailConnection::~KMailConnection()
diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp
index bbae13469..facdf13be 100644
--- a/tderesources/lib/folderconfig.cpp
+++ b/tderesources/lib/folderconfig.cpp
@@ -52,7 +52,7 @@ FolderConfig::FolderConfig( TQWidget *parent )
topLayout->addWidget( topBox );
TQPushButton *button = new TQPushButton( i18n("Update Folder List"), topBox );
- connect( button, TQT_SIGNAL( clicked() ), TQT_SIGNAL( updateFoldersClicked() ) );
+ connect( button, TQ_SIGNAL( clicked() ), TQ_SIGNAL( updateFoldersClicked() ) );
mFolderList = new FolderListView( topBox );
@@ -81,7 +81,7 @@ void FolderConfig::setFolderLister( FolderLister *f )
if ( suptypes.contains( FolderLister::Unknown ) ) types << FolderListView::Unknown;
mFolderList->setEnabledTypes( types );
- connect( mFolderLister, TQT_SIGNAL( foldersRead() ), TQT_SLOT( updateFolderList() ) );
+ connect( mFolderLister, TQ_SIGNAL( foldersRead() ), TQ_SLOT( updateFolderList() ) );
}
void FolderConfig::retrieveFolderList( const KURL &url )
diff --git a/tderesources/lib/folderlister.cpp b/tderesources/lib/folderlister.cpp
index c12d3ae69..ec40e8cc4 100644
--- a/tderesources/lib/folderlister.cpp
+++ b/tderesources/lib/folderlister.cpp
@@ -216,12 +216,12 @@ void FolderLister::setAdaptor( KPIM::GroupwareDataAdaptor *adaptor )
disconnect( mAdaptor, 0, this, 0 );
}
mAdaptor = adaptor;
- connect( mAdaptor, TQT_SIGNAL( folderInfoRetrieved( const KURL &,
+ connect( mAdaptor, TQ_SIGNAL( folderInfoRetrieved( const KURL &,
const TQString &, KPIM::FolderLister::ContentType ) ),
- this, TQT_SLOT( processFolderResult( const KURL &, const TQString &,
+ this, TQ_SLOT( processFolderResult( const KURL &, const TQString &,
KPIM::FolderLister::ContentType ) ) );
- connect( mAdaptor, TQT_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ),
- this, TQT_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) );
+ connect( mAdaptor, TQ_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ),
+ this, TQ_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) );
}
void FolderLister::folderSubitemRetrieved( const KURL &url, bool isFolder )
@@ -272,8 +272,8 @@ void FolderLister::doRetrieveFolder( const KURL &u )
kdDebug(7000) << "FolderLister::retrieveFolders: adjustedURL="
<< url.prettyURL() << endl;
- connect( listjob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotListJobResult( TDEIO::Job * ) ) );
+ connect( listjob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotListJobResult( TDEIO::Job * ) ) );
} else {
// TODO: Indicate a problem to the user!
kdWarning() << "Unable to create the folder list job for the url "
diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp
index d43d77ce6..f2427c48d 100644
--- a/tderesources/lib/folderlistview.cpp
+++ b/tderesources/lib/folderlistview.cpp
@@ -43,10 +43,10 @@ FolderListView::FolderListView( TQWidget *parent, const TQValueList<Property> &t
{
setEnabledTypes( types );
- connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
- this, TQT_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) );
- connect( this, TQT_SIGNAL(spacePressed(TQListViewItem*)),
- this, TQT_SLOT(showPopupMenu(TQListViewItem*)) );
+ connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+ this, TQ_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) );
+ connect( this, TQ_SIGNAL(spacePressed(TQListViewItem*)),
+ this, TQ_SLOT(showPopupMenu(TQListViewItem*)) );
}
void FolderListView::setEnabledTypes( const TQValueList<Property> &types )
@@ -99,32 +99,32 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos
int id;
m.insertTitle( folder.name, 9999 );
- id = m.insertItem( i18n("&Enabled"), this, TQT_SLOT(slotPopupHandler(int)), 0, FolderName );
+ id = m.insertItem( i18n("&Enabled"), this, TQ_SLOT(slotPopupHandler(int)), 0, FolderName );
m.setItemChecked( id, i->isOn() );
m.insertSeparator();
if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.contains( Event ) ) ) {
- id = m.insertItem( i18n("Default for New &Events"), this, TQT_SLOT(slotPopupHandler(int)), 0, Event );
+ id = m.insertItem( i18n("Default for New &Events"), this, TQ_SLOT(slotPopupHandler(int)), 0, Event );
m.setItemChecked( id, i->isDefault( Event ) );
}
if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.contains( Todo ) ) ) {
- id = m.insertItem( i18n("Default for New &Todos"), this, TQT_SLOT(slotPopupHandler(int)), 0, Todo );
+ id = m.insertItem( i18n("Default for New &Todos"), this, TQ_SLOT(slotPopupHandler(int)), 0, Todo );
m.setItemChecked( id, i->isDefault( Todo ) );
}
if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.contains( Journal ) ) ) {
- id = m.insertItem( i18n("Default for New &Journals"), this, TQT_SLOT(slotPopupHandler(int)), 0, Journal );
+ id = m.insertItem( i18n("Default for New &Journals"), this, TQ_SLOT(slotPopupHandler(int)), 0, Journal );
m.setItemChecked( id, i->isDefault( Journal ) );
}
if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.contains( Contact ) ) ) {
- id = m.insertItem( i18n("Default for New &Contacts"), this, TQT_SLOT(slotPopupHandler(int)), 0, Contact );
+ id = m.insertItem( i18n("Default for New &Contacts"), this, TQ_SLOT(slotPopupHandler(int)), 0, Contact );
m.setItemChecked( id, i->isDefault( Contact ) );
}
if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.contains( All ) ) ) {
- id = m.insertItem( i18n("Default for All New &Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, All );
+ id = m.insertItem( i18n("Default for All New &Items"), this, TQ_SLOT(slotPopupHandler(int)), 0, All );
m.setItemChecked( id, i->isDefault( All ) );
}
if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.contains( Unknown ) ) ) {
- id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, Unknown );
+ id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQ_SLOT(slotPopupHandler(int)), 0, Unknown );
m.setItemChecked( id, i->isDefault( Unknown ) );
}
diff --git a/tderesources/lib/folderselectdialog.cpp b/tderesources/lib/folderselectdialog.cpp
index ab5991531..7ffd3e38e 100644
--- a/tderesources/lib/folderselectdialog.cpp
+++ b/tderesources/lib/folderselectdialog.cpp
@@ -53,10 +53,10 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString&
mListBox->ensureCurrentVisible();
layout->addWidget( mListBox, 10 );
- connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ),
- TQT_SLOT( slotOk() ) );
- connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ),
- TQT_SLOT( slotOk() ) );
+ connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ),
+ TQ_SLOT( slotOk() ) );
+ connect( mListBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ),
+ TQ_SLOT( slotOk() ) );
mListBox->setFocus();
diff --git a/tderesources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp
index 52a01fd47..1381b9293 100644
--- a/tderesources/lib/groupwaredownloadjob.cpp
+++ b/tderesources/lib/groupwaredownloadjob.cpp
@@ -59,21 +59,21 @@ void GroupwareDownloadJob::run()
mItemsForDownload.clear();
mCurrentlyOnServer.clear();
- connect( adaptor(), TQT_SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ),
- TQT_SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) );
- connect( adaptor(), TQT_SIGNAL( itemOnServer( const KURL & ) ),
- TQT_SLOT( slotItemOnServer( const KURL & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemDownloaded( const TQString &, const KURL &, const TQString & ) ),
- TQT_SLOT( slotItemDownloaded( const TQString &, const KURL &, const TQString & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemDownloadError( const KURL &, const TQString & ) ),
- TQT_SLOT( slotItemDownloadError( const KURL &, const TQString & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ),
+ TQ_SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemOnServer( const KURL & ) ),
+ TQ_SLOT( slotItemOnServer( const KURL & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemDownloaded( const TQString &, const KURL &, const TQString & ) ),
+ TQ_SLOT( slotItemDownloaded( const TQString &, const KURL &, const TQString & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemDownloadError( const KURL &, const TQString & ) ),
+ TQ_SLOT( slotItemDownloadError( const KURL &, const TQString & ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(),
adaptor()->downloadProgressMessage() );
connect( mProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoad() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoad() ) );
listItems();
}
@@ -105,10 +105,10 @@ void GroupwareDownloadJob::listItems()
mListItemsData = TQString();
mListEventsJob = adaptor()->createListItemsJob( url );
- connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotListItemsResult( TDEIO::Job * ) ) );
- connect( mListEventsJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mListEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotListItemsResult( TDEIO::Job * ) ) );
+ connect( mListEventsJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) );
}
}
@@ -187,10 +187,10 @@ void GroupwareDownloadJob::downloadItem()
mDownloadJob = adaptor()->createDownloadJob( href, ctype );
}
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) );
- connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) );
}
}
diff --git a/tderesources/lib/groupwareresourcejob.cpp b/tderesources/lib/groupwareresourcejob.cpp
index b7e4b57b0..09972b851 100644
--- a/tderesources/lib/groupwareresourcejob.cpp
+++ b/tderesources/lib/groupwareresourcejob.cpp
@@ -30,7 +30,7 @@ using namespace KPIM;
GroupwareJob::GroupwareJob( GroupwareDataAdaptor *adaptor )
: mAdaptor( adaptor )
{
- TQTimer::singleShot( 0, this, TQT_SLOT( run() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( run() ) );
}
bool GroupwareJob::error() const
diff --git a/tderesources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp
index 51307d836..4c0f1ba2b 100644
--- a/tderesources/lib/groupwareuploadjob.cpp
+++ b/tderesources/lib/groupwareuploadjob.cpp
@@ -52,22 +52,22 @@ void GroupwareUploadJob::run()
KPIM::ProgressManager::getUniqueID(),
adaptor()->uploadProgressMessage() );
connect( mUploadProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelSave() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelSave() ) );
- connect( adaptor(), TQT_SIGNAL( itemDeletionError( const KURL &, const TQString & ) ),
- TQT_SLOT( slotItemDeleteError( const KURL &, const TQString & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemUploadError( const KURL &, const TQString & ) ),
- TQT_SLOT( slotItemUploadError( const KURL &, const TQString & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemUploadNewError( const TQString &, const TQString & ) ),
- TQT_SLOT( slotItemUploadNewError( const TQString &, const TQString & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemDeletionError( const KURL &, const TQString & ) ),
+ TQ_SLOT( slotItemDeleteError( const KURL &, const TQString & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemUploadError( const KURL &, const TQString & ) ),
+ TQ_SLOT( slotItemUploadError( const KURL &, const TQString & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemUploadNewError( const TQString &, const TQString & ) ),
+ TQ_SLOT( slotItemUploadNewError( const TQString &, const TQString & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemDeleted( const TQString &, const KURL & ) ),
- TQT_SLOT( slotItemDeleted( const TQString &, const KURL & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemUploaded( const TQString &, const KURL & ) ),
- TQT_SLOT( slotItemUploaded( const TQString &, const KURL & ) ) );
- connect( adaptor(), TQT_SIGNAL( itemUploadedNew( const TQString &, const KURL& ) ),
- TQT_SLOT( slotItemUploadedNew( const TQString &, const KURL & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemDeleted( const TQString &, const KURL & ) ),
+ TQ_SLOT( slotItemDeleted( const TQString &, const KURL & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemUploaded( const TQString &, const KURL & ) ),
+ TQ_SLOT( slotItemUploaded( const TQString &, const KURL & ) ) );
+ connect( adaptor(), TQ_SIGNAL( itemUploadedNew( const TQString &, const KURL& ) ),
+ TQ_SLOT( slotItemUploadedNew( const TQString &, const KURL & ) ) );
mUploadProgress->setTotalItems( mAddedItems.size() + mChangedItems.size() +
@@ -81,7 +81,7 @@ void GroupwareUploadJob::deleteItem()
{
kdDebug(5800)<<"GroupwareUploadJob::deleteItem()"<<endl;
if ( mDeletedItems.isEmpty() ) {
- TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( uploadItem() ) );
} else {
kdDebug(7000) << " Deleting " << mDeletedItems.size() << " items from the server " << endl;
@@ -102,10 +102,10 @@ kdDebug() << "Not using batch delete " << endl;
if ( mDeletionJob ) {
mDeletionJobData = TQString();
- connect( mDeletionJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
- TQT_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) );
-// connect( mDeletionJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-// TQT_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mDeletionJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ TQ_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) );
+// connect( mDeletionJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+// TQ_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) );
} else {
deleteItem();
}
@@ -129,7 +129,7 @@ void GroupwareUploadJob::slotDeletionJobResult( TDEIO::Job *job )
adaptor()->interpretRemoveJob( job, mDeletionJobData );
}
mDeletionJob = 0;
- TQTimer::singleShot( 0, this, TQT_SLOT( deleteItem() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( deleteItem() ) );
}
@@ -138,7 +138,7 @@ void GroupwareUploadJob::uploadItem()
{
kdDebug(5800)<<"GroupwareUploadJob::uploadItem()"<<endl;
if ( mChangedItems.isEmpty() ) {
- TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( uploadNewItem() ) );
} else {
kdDebug(5800)<<"We still have "<<mChangedItems.count()<<" changed items to upload"<<endl;
@@ -159,10 +159,10 @@ kdDebug() << "Not using batch upload " << endl;
if ( mUploadJob ) {
mUploadJobData = TQString();
- connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
- TQT_SLOT( slotUploadJobResult( TDEIO::Job* ) ) );
- connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ TQ_SLOT( slotUploadJobResult( TDEIO::Job* ) ) );
+ connect( mUploadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) );
} else {
uploadItem();
}
@@ -185,7 +185,7 @@ void GroupwareUploadJob::slotUploadJobResult( TDEIO::Job *job )
adaptor()->interpretUploadJob( job, mUploadJobData );
}
mUploadJob = 0;
- TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( uploadItem() ) );
}
@@ -217,10 +217,10 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " <
if ( mUploadJob ) {
mUploadNewJobData = TQString();
- connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
- TQT_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) );
- connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
- TQT_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ TQ_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) );
+ connect( mUploadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+ TQ_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) );
} else {
uploadNewItem();
}
@@ -246,7 +246,7 @@ void GroupwareUploadJob::slotUploadNewJobResult( TDEIO::Job *job )
adaptor()->interpretUploadNewJob( job, mUploadNewJobData );
}
mUploadJob = 0;
- TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( uploadNewItem() ) );
}
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp
index 11eedfe52..1710a11ed 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.cpp
+++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp
@@ -195,8 +195,8 @@ bool ResourceGroupwareBase::doOpen()
return false;
} else {
mLoginFinished = false;
- connect( loginJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotLoginJobResult( TDEIO::Job* ) ) );
+ connect( loginJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotLoginJobResult( TDEIO::Job* ) ) );
enter_loop();
return mLoginFinished;
}
@@ -239,8 +239,8 @@ void ResourceGroupwareBase::doClose()
if ( adaptor() &&
adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogoff ) {
TDEIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() );
- connect( logoffJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) );
+ connect( logoffJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) );
// TODO: Do we really need to block while waiting for the job to return?
enter_loop();
}
@@ -276,8 +276,8 @@ bool ResourceGroupwareBase::doLoad()
emit resourceChanged( this );
mDownloadJob = createDownloadJob( adaptor() );
- connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
- TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
return true;
}
@@ -322,8 +322,8 @@ bool ResourceGroupwareBase::doSave()
if ( !confirmSave() ) return false;
mUploadJob = createUploadJob( adaptor() );
- connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
- TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQ_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
Incidence::List inc;
Incidence::List::Iterator it;
@@ -376,8 +376,8 @@ void ResourceGroupwareBase::slotUploadJobResult( KPIM::GroupwareJob *job )
if ( !mDownloadJob ) {
mDownloadJob = createDownloadJob( adaptor() );
- connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
- TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
} else {
kdWarning() << k_funcinfo << "Download still in progress. "
"Can't happen. (TM)" << endl;
diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp
index 1ca2570af..4f576ed76 100644
--- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp
+++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp
@@ -68,15 +68,15 @@ ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent,
mPasswordEdit->setEchoMode( KLineEdit::Password );
mFolderConfig = new KPIM::FolderConfig( this );
- connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ),
- TQT_SLOT( updateFolders() ) );
+ connect( mFolderConfig, TQ_SIGNAL( updateFoldersClicked() ),
+ TQ_SLOT( updateFolders() ) );
mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 );
TQHBox *hBox = new TQHBox( this );
mCacheSettingsButton = new KPushButton( i18n("Configure Cache Settings..."), hBox );
mainLayout->addMultiCellWidget( hBox, 5, 5, 0, 1 );
- connect( mCacheSettingsButton, TQT_SIGNAL( clicked() ),
- TQT_SLOT( showCacheSettings() ) );
+ connect( mCacheSettingsButton, TQ_SIGNAL( clicked() ),
+ TQ_SLOT( showCacheSettings() ) );
mCacheDialog = new CacheSettingsDialog( this );
}
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
index f4a469905..cf73e03ac 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
@@ -177,8 +177,8 @@ bool ResourceGroupwareBase::asyncLoad()
loadCache();
mDownloadJob = createDownloadJob( mAdaptor );
- connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
- TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) );
return true;
}
@@ -212,8 +212,8 @@ bool ResourceGroupwareBase::asyncSave( Ticket* )
}
mUploadJob = createUploadJob( mAdaptor );
- connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
- TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ),
+ TQ_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
TDEABC::Addressee::List addr;
TDEABC::Addressee::List::Iterator it;
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
index 69dfb3d83..a80ce9e02 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
+++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
@@ -67,8 +67,8 @@ ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, con
mainLayout->addMultiCellWidget( hline, 3, 3, 0, 1 );
mFolderConfig = new KPIM::FolderConfig( this );
- connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ),
- TQT_SLOT( updateFolders() ) );
+ connect( mFolderConfig, TQ_SIGNAL( updateFoldersClicked() ),
+ TQ_SLOT( updateFolders() ) );
mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 );
}
diff --git a/tderesources/newexchange/exchangecalendaradaptor.cpp b/tderesources/newexchange/exchangecalendaradaptor.cpp
index 5b51de5ed..3b7aa36dc 100644
--- a/tderesources/newexchange/exchangecalendaradaptor.cpp
+++ b/tderesources/newexchange/exchangecalendaradaptor.cpp
@@ -109,7 +109,7 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid )
TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false );
job->setWindow( mWindow );
- connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *)));
+ connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFindUidResult(TDEIO::Job *)));
}
*/
diff --git a/tderesources/newexchange/exchangeconvertercalendar.cpp b/tderesources/newexchange/exchangeconvertercalendar.cpp
index e67acdeb2..58c315358 100644
--- a/tderesources/newexchange/exchangeconvertercalendar.cpp
+++ b/tderesources/newexchange/exchangeconvertercalendar.cpp
@@ -314,8 +314,8 @@ void ExchangeDownload::handleRecurrence( TQString uid )
query, false );
TDEIO::Scheduler::scheduleJob( job );
job->setWindow( mWindow );
- connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotMasterResult( TDEIO::Job * ) ) );
}
*/
diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp
index 0a58aefb3..9ee4aef52 100644
--- a/tderesources/remote/resourceremote.cpp
+++ b/tderesources/remote/resourceremote.cpp
@@ -197,11 +197,11 @@ bool ResourceRemote::doLoad()
mDownloadJob = TDEIO::file_copy( mDownloadUrl, KURL( cacheFile() ), -1, true,
false, !mUseProgressManager );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotLoadJobResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotLoadJobResult( TDEIO::Job * ) ) );
if ( mUseProgressManager ) {
- connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) );
mProgress = KPIM::ProgressManager::createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading Calendar") );
@@ -283,8 +283,8 @@ bool ResourceRemote::doSave()
saveCache();
mUploadJob = TDEIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true );
- connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotSaveJobResult( TDEIO::Job * ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotSaveJobResult( TDEIO::Job * ) ) );
return true;
}
diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp
index ff9158d10..6b796e5d4 100644
--- a/tderesources/scalix/kcal/resourcescalix.cpp
+++ b/tderesources/scalix/kcal/resourcescalix.cpp
@@ -66,8 +66,8 @@ ResourceScalix::ResourceScalix( const TDEConfig *config )
mCalendar( TQString::fromLatin1("UTC") ), mOpen( false )
{
setType( "scalix" );
- connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotEmitResourceChanged() ) );
+ connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotEmitResourceChanged() ) );
}
ResourceScalix::~ResourceScalix()
@@ -310,7 +310,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr
KIncidenceChooser* ch = new KIncidenceChooser();
ch->setIncidence( local ,inc );
if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) {
- connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT ( useGlobalMode() ) );
+ connect ( this, TQ_SIGNAL( useGlobalMode() ), ch, TQ_SLOT ( useGlobalMode() ) );
if ( ch->exec() )
if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask )
emit useGlobalMode() ;
diff --git a/tderesources/scalix/scalixadmin/delegatedialog.cpp b/tderesources/scalix/scalixadmin/delegatedialog.cpp
index 8674ce70c..af8432854 100644
--- a/tderesources/scalix/scalixadmin/delegatedialog.cpp
+++ b/tderesources/scalix/scalixadmin/delegatedialog.cpp
@@ -63,7 +63,7 @@ DelegateDialog::DelegateDialog( TQWidget *parent )
row++;
}
- connect( emailSelector, TQT_SIGNAL( clicked() ), TQT_SLOT( selectEmail() ) );
+ connect( emailSelector, TQ_SIGNAL( clicked() ), TQ_SLOT( selectEmail() ) );
setMainWidget( page );
}
diff --git a/tderesources/scalix/scalixadmin/delegatepage.cpp b/tderesources/scalix/scalixadmin/delegatepage.cpp
index b4368f7d1..b43dac85a 100644
--- a/tderesources/scalix/scalixadmin/delegatepage.cpp
+++ b/tderesources/scalix/scalixadmin/delegatepage.cpp
@@ -53,10 +53,10 @@ DelegatePage::DelegatePage( TQWidget *parent )
mRemoveButton->setEnabled( false );
layout->addWidget( mRemoveButton, 1, 2 );
- connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addDelegate() ) );
- connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editDelegate() ) );
- connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeDelegate() ) );
+ connect( mView, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( selectionChanged() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addDelegate() ) );
+ connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editDelegate() ) );
+ connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeDelegate() ) );
loadAllDelegates();
}
@@ -69,7 +69,7 @@ void DelegatePage::loadAllDelegates()
{
Scalix::GetDelegatesJob *job = Scalix::getDelegates( Settings::self()->globalSlave(),
Settings::self()->accountUrl() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allDelegates( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( allDelegates( TDEIO::Job* ) ) );
}
void DelegatePage::addDelegate()
@@ -88,7 +88,7 @@ void DelegatePage::addDelegate()
Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(),
Settings::self()->accountUrl(),
delegate.email(), delegate.rights() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateAdded( TDEIO::Job* ) ) );
}
void DelegatePage::editDelegate()
@@ -113,7 +113,7 @@ void DelegatePage::editDelegate()
Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(),
Settings::self()->accountUrl(),
delegate.email(), delegate.rights() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateAdded( TDEIO::Job* ) ) );
}
void DelegatePage::removeDelegate()
@@ -124,7 +124,7 @@ void DelegatePage::removeDelegate()
Scalix::DeleteDelegateJob *job = Scalix::deleteDelegate( Settings::self()->globalSlave(),
Settings::self()->accountUrl(), delegate.email() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateRemoved( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateRemoved( TDEIO::Job* ) ) );
}
void DelegatePage::allDelegates( TDEIO::Job *job )
diff --git a/tderesources/scalix/scalixadmin/delegateview.cpp b/tderesources/scalix/scalixadmin/delegateview.cpp
index 79b8cf335..e999baffb 100644
--- a/tderesources/scalix/scalixadmin/delegateview.cpp
+++ b/tderesources/scalix/scalixadmin/delegateview.cpp
@@ -48,7 +48,7 @@ DelegateView::DelegateView( DelegateManager *manager, TQWidget *parent )
setFullWidth( true );
setAllColumnsShowFocus( true );
- connect( mManager, TQT_SIGNAL( changed() ), TQT_SLOT( delegateChanged() ) );
+ connect( mManager, TQ_SIGNAL( changed() ), TQ_SLOT( delegateChanged() ) );
delegateChanged();
}
diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp
index e07b17cad..d965438df 100644
--- a/tderesources/scalix/scalixadmin/jobs.cpp
+++ b/tderesources/scalix/scalixadmin/jobs.cpp
@@ -207,8 +207,8 @@ DeleteDelegateJob::DeleteDelegateJob( const KURL& url, const TQByteArray &packed
GetDelegatesJob::GetDelegatesJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
- this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+ connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
}
Delegate::List GetDelegatesJob::delegates() const
@@ -259,8 +259,8 @@ DeleteOtherUserJob::DeleteOtherUserJob( const KURL& url, const TQByteArray &pack
GetOtherUsersJob::GetOtherUsersJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
- this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+ connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
}
TQStringList GetOtherUsersJob::otherUsers() const
@@ -281,8 +281,8 @@ SetOutOfOfficeJob::SetOutOfOfficeJob( const KURL& url, const TQByteArray &packed
GetOutOfOfficeJob::GetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo )
: TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo )
{
- connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
- this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+ connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
}
bool GetOutOfOfficeJob::enabled() const
diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp
index 3e6eea04f..a58dec2e8 100644
--- a/tderesources/scalix/scalixadmin/ldapview.cpp
+++ b/tderesources/scalix/scalixadmin/ldapview.cpp
@@ -56,10 +56,10 @@ LdapView::LdapView( TQWidget *parent )
attrs << "surname" << "mail";
mClient->setAttrs( attrs );
- connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ),
- this, TQT_SLOT( entryAdded( const TDEABC::LdapObject& ) ) );
- connect( mClient, TQT_SIGNAL( error( const TQString& ) ),
- this, TQT_SLOT( error( const TQString& ) ) );
+ connect( mClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ),
+ this, TQ_SLOT( entryAdded( const TDEABC::LdapObject& ) ) );
+ connect( mClient, TQ_SIGNAL( error( const TQString& ) ),
+ this, TQ_SLOT( error( const TQString& ) ) );
}
LdapView::~LdapView()
diff --git a/tderesources/scalix/scalixadmin/otheruserpage.cpp b/tderesources/scalix/scalixadmin/otheruserpage.cpp
index 3cc220eab..f7594acf2 100644
--- a/tderesources/scalix/scalixadmin/otheruserpage.cpp
+++ b/tderesources/scalix/scalixadmin/otheruserpage.cpp
@@ -52,9 +52,9 @@ OtherUserPage::OtherUserPage( TQWidget *parent )
mDeleteButton->setEnabled( false );
layout->addWidget( mDeleteButton, 1, 1 );
- connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
- connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) );
- connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeUser() ) );
+ connect( mView, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( selectionChanged() ) );
+ connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addUser() ) );
+ connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeUser() ) );
loadAllUsers();
}
@@ -67,7 +67,7 @@ void OtherUserPage::loadAllUsers()
{
Scalix::GetOtherUsersJob *job = Scalix::getOtherUsers( Settings::self()->globalSlave(),
Settings::self()->accountUrl() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allUsers( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( allUsers( TDEIO::Job* ) ) );
}
void OtherUserPage::addUser()
@@ -82,7 +82,7 @@ void OtherUserPage::addUser()
Scalix::AddOtherUserJob *job = Scalix::addOtherUser( Settings::self()->globalSlave(),
Settings::self()->accountUrl(), email );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userAdded( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( userAdded( TDEIO::Job* ) ) );
}
void OtherUserPage::removeUser()
@@ -93,7 +93,7 @@ void OtherUserPage::removeUser()
Scalix::DeleteOtherUserJob *job = Scalix::deleteOtherUser( Settings::self()->globalSlave(),
Settings::self()->accountUrl(), email );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userRemoved( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( userRemoved( TDEIO::Job* ) ) );
}
void OtherUserPage::allUsers( TDEIO::Job *job )
diff --git a/tderesources/scalix/scalixadmin/otheruserview.cpp b/tderesources/scalix/scalixadmin/otheruserview.cpp
index e8aa13bc4..be09dc742 100644
--- a/tderesources/scalix/scalixadmin/otheruserview.cpp
+++ b/tderesources/scalix/scalixadmin/otheruserview.cpp
@@ -45,7 +45,7 @@ OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *parent )
addColumn( i18n( "Registered Accounts" ) );
setFullWidth( true );
- connect( mManager, TQT_SIGNAL( changed() ), TQT_SLOT( userChanged() ) );
+ connect( mManager, TQ_SIGNAL( changed() ), TQ_SLOT( userChanged() ) );
userChanged();
}
diff --git a/tderesources/scalix/scalixadmin/outofofficepage.cpp b/tderesources/scalix/scalixadmin/outofofficepage.cpp
index 557772d89..343f4f4c4 100644
--- a/tderesources/scalix/scalixadmin/outofofficepage.cpp
+++ b/tderesources/scalix/scalixadmin/outofofficepage.cpp
@@ -55,10 +55,10 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
statusChanged();
- connect( mEnabled, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( statusChanged() ) );
- connect( mEnabled, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( changed() ) );
- connect( mSaveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( store() ) );
- connect( mMessage, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( changed() ) );
+ connect( mEnabled, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( statusChanged() ) );
+ connect( mEnabled, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( changed() ) );
+ connect( mSaveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( store() ) );
+ connect( mMessage, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( changed() ) );
load();
}
@@ -71,7 +71,7 @@ void OutOfOfficePage::load()
{
Scalix::GetOutOfOfficeJob *job = Scalix::getOutOfOffice( Settings::self()->globalSlave(),
Settings::self()->accountUrl() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( loaded( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( loaded( TDEIO::Job* ) ) );
}
void OutOfOfficePage::loaded( TDEIO::Job* job )
@@ -98,7 +98,7 @@ void OutOfOfficePage::store()
mEnabled->isChecked(),
mMessage->text() );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( stored( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( stored( TDEIO::Job* ) ) );
mSaveButton->setEnabled( false );
}
diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp
index 38262725f..f67e42511 100644
--- a/tderesources/scalix/scalixadmin/passwordpage.cpp
+++ b/tderesources/scalix/scalixadmin/passwordpage.cpp
@@ -62,9 +62,9 @@ PasswordPage::PasswordPage( TQWidget *parent )
layout->setRowSpacing( 3, 1 );
- connect( mPassword, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) );
- connect( mPasswordRetype, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) );
- connect( mButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonClicked() ) );
+ connect( mPassword, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( textChanged() ) );
+ connect( mPasswordRetype, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( textChanged() ) );
+ connect( mButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonClicked() ) );
}
void PasswordPage::buttonClicked()
@@ -77,7 +77,7 @@ void PasswordPage::buttonClicked()
mJob = Scalix::setPassword( Settings::self()->globalSlave(), Settings::self()->accountUrl(),
Settings::self()->accountPassword(), mPassword->text() );
- connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( finished( TDEIO::Job* ) ) );
+ connect( mJob, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( finished( TDEIO::Job* ) ) );
updateState( true );
} else {
diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp
index 147b9822a..6f239cc2f 100644
--- a/tderesources/scalix/shared/kmailconnection.cpp
+++ b/tderesources/scalix/shared/kmailconnection.cpp
@@ -55,8 +55,8 @@ KMailConnection::KMailConnection( ResourceScalixBase* resource,
mDCOPClient->registerAs( objId, true );
kapp->dcopClient()->setNotifications( true );
- connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ),
- this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+ connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ),
+ this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
}
KMailConnection::~KMailConnection()
diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp
index 0af6c4660..8dbb86516 100644
--- a/tderesources/scalix/tdeioslave/scalix.cpp
+++ b/tderesources/scalix/tdeioslave/scalix.cpp
@@ -116,10 +116,10 @@ void Scalix::retrieveFreeBusy( const KURL &url )
mFreeBusyData = TQString();
TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false );
- connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
- this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( slotRetrieveResult( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+ this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( slotRetrieveResult( TDEIO::Job* ) ) );
tqApp->eventLoop()->enterLoop();
}
@@ -182,8 +182,8 @@ void Scalix::publishFreeBusy( const KURL &url )
.arg( url.host() );
TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false );
- connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
- this, TQT_SLOT( slotPublishResult( TDEIO::Job* ) ) );
+ connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+ this, TQ_SLOT( slotPublishResult( TDEIO::Job* ) ) );
tqApp->eventLoop()->enterLoop();
}
diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp
index 4c2ab12c8..e93b89444 100644
--- a/tderesources/slox/kcalresourceslox.cpp
+++ b/tderesources/slox/kcalresourceslox.cpp
@@ -226,16 +226,16 @@ void KCalResourceSlox::requestEvents()
kdDebug() << "REQUEST CALENDAR: \n" << doc.toString( 2 ) << endl;
mLoadEventsJob = TDEIO::davPropFind( url, doc, "0", false );
- connect( mLoadEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) );
- connect( mLoadEventsJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) );
+ connect( mLoadEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) );
+ connect( mLoadEventsJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) );
mLoadEventsProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading events") );
connect( mLoadEventsProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoadEvents() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoadEvents() ) );
mPrefs->setLastEventSync( TQDateTime::currentDateTime() );
}
@@ -271,16 +271,16 @@ void KCalResourceSlox::requestTodos()
kdDebug() << "REQUEST TASKS: \n" << doc.toString( 2 ) << endl;
mLoadTodosJob = TDEIO::davPropFind( url, doc, "0", false );
- connect( mLoadTodosJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) );
- connect( mLoadTodosJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) );
+ connect( mLoadTodosJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) );
+ connect( mLoadTodosJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) );
mLoadTodosProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading to-dos") );
connect( mLoadTodosProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoadTodos() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoadTodos() ) );
mPrefs->setLastTodoSync( TQDateTime::currentDateTime() );
}
@@ -380,16 +380,16 @@ void KCalResourceSlox::uploadIncidences()
kdDebug() << "UPLOAD: \n" << doc.toString( 2 ) << endl;
mUploadJob = TDEIO::davPropPatch( url, doc, false );
- connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) );
- connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotUploadResult( TDEIO::Job * ) ) );
+ connect( mUploadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) );
mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Uploading incidence") );
connect( mUploadProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelUpload() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelUpload() ) );
}
void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc,
diff --git a/tderesources/slox/kcalresourcesloxconfig.cpp b/tderesources/slox/kcalresourcesloxconfig.cpp
index 83246a033..8652263f5 100644
--- a/tderesources/slox/kcalresourcesloxconfig.cpp
+++ b/tderesources/slox/kcalresourcesloxconfig.cpp
@@ -72,11 +72,11 @@ KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* parent, const char* n
mCalButton = new KPushButton( i18n("Calendar Folder..."), this );
mainLayout->addWidget( mCalButton, 5, 0 );
- connect( mCalButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectCalendarFolder() ) );
+ connect( mCalButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectCalendarFolder() ) );
mTaskButton = new KPushButton( i18n("Task Folder..."), this );
mainLayout->addWidget( mTaskButton, 5, 1 );
- connect( mTaskButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectTaskFolder() ) );
+ connect( mTaskButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectTaskFolder() ) );
mReloadConfig = new KCal::ResourceCachedReloadConfig( this );
mainLayout->addMultiCellWidget( mReloadConfig, 6, 6, 0, 1 );
diff --git a/tderesources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp
index 3afa7019d..e5ba26512 100644
--- a/tderesources/slox/sloxaccounts.cpp
+++ b/tderesources/slox/sloxaccounts.cpp
@@ -139,8 +139,8 @@ void SloxAccounts::requestAccounts()
mDownloadJob = TDEIO::davPropFind( url, doc, "0", false );
}
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
}
void SloxAccounts::slotResult( TDEIO::Job *job )
diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp
index 716c2d40e..c1f1086ef 100644
--- a/tderesources/slox/sloxfolderdialog.cpp
+++ b/tderesources/slox/sloxfolderdialog.cpp
@@ -37,7 +37,7 @@ SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type,
mListView->addColumn( i18n("Folder ID"), 0 );
setMainWidget( mListView );
updateFolderView();
- connect( manager, TQT_SIGNAL( foldersUpdated() ), TQT_SLOT( updateFolderView() ) );
+ connect( manager, TQ_SIGNAL( foldersUpdated() ), TQ_SLOT( updateFolderView() ) );
}
SloxFolderDialog::~SloxFolderDialog()
diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp
index d7284d3a0..b862a388d 100644
--- a/tderesources/slox/sloxfoldermanager.cpp
+++ b/tderesources/slox/sloxfoldermanager.cpp
@@ -79,8 +79,8 @@ void SloxFolderManager::requestFolders()
mDownloadJob = TDEIO::davPropFind( url, doc, "0", false );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
}
void SloxFolderManager::slotResult( TDEIO::Job *job )
diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp
index 5b0b65157..d77347d3d 100644
--- a/tderesources/slox/tdeabcresourceslox.cpp
+++ b/tderesources/slox/tdeabcresourceslox.cpp
@@ -208,16 +208,16 @@ bool ResourceSlox::asyncLoad()
kdDebug() << "REQUEST CONTACTS: \n" << doc.toString( 2 ) << endl;
mDownloadJob = TDEIO::davPropFind( url, doc, "0", false );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotResult( TDEIO::Job * ) ) );
- connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
mDownloadProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading contacts") );
connect( mDownloadProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelDownload() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelDownload() ) );
mPrefs->setLastSync( TQDateTime::currentDateTime() );
@@ -521,16 +521,16 @@ void ResourceSlox::uploadContacts()
url.setPass( mPrefs->password() );
mUploadJob = TDEIO::davPropPatch( url, doc, false );
- connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) );
- connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
- TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
+ connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotUploadResult( TDEIO::Job * ) ) );
+ connect( mUploadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ),
+ TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) );
mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Uploading contacts") );
connect( mUploadProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelUpload() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelUpload() ) );
}
void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop,
diff --git a/tderesources/slox/tdeabcresourcesloxconfig.cpp b/tderesources/slox/tdeabcresourcesloxconfig.cpp
index 8ad6701c0..36f762387 100644
--- a/tderesources/slox/tdeabcresourcesloxconfig.cpp
+++ b/tderesources/slox/tdeabcresourcesloxconfig.cpp
@@ -69,7 +69,7 @@ ResourceSloxConfig::ResourceSloxConfig( TQWidget* parent, const char* name )
mFolderButton = new KPushButton( i18n("Select Folder..."), this );
mainLayout->addMultiCellWidget( mFolderButton, 4, 4, 0, 1 );
- connect( mFolderButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectAddressFolder() ) );
+ connect( mFolderButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectAddressFolder() ) );
}
diff --git a/tderesources/slox/testsloxaccounts.cpp b/tderesources/slox/testsloxaccounts.cpp
index 22c44e662..ea7b3da11 100644
--- a/tderesources/slox/testsloxaccounts.cpp
+++ b/tderesources/slox/testsloxaccounts.cpp
@@ -55,7 +55,7 @@ int main(int argc,char **argv)
app.setMainWidget( &button );
button.show();
- TQObject::connect( &button, TQT_SIGNAL( clicked() ), &app, TQT_SLOT( quit() ) );
+ TQObject::connect( &button, TQ_SIGNAL( clicked() ), &app, TQ_SLOT( quit() ) );
app.exec();
}
diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.cpp b/tderesources/tvanytime/kcal_resourcetvanytime.cpp
index 12161d90b..44b3e324b 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/tderesources/tvanytime/kcal_resourcetvanytime.cpp
@@ -93,8 +93,8 @@ void ResourceTVAnytime::init()
//setReadOnly( true );
- connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
- this, TQT_SLOT( slotEmitResourceChanged() ) );
+ connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ),
+ this, TQ_SLOT( slotEmitResourceChanged() ) );
}
TVAnytimePrefsBase *ResourceTVAnytime::prefs()
@@ -179,15 +179,15 @@ bool ResourceTVAnytime::doLoad()
// TODO: find out if the file to download is fresh. if not, just work with the cache.
mDownloadJob = TDEIO::file_copy( url, destination, -1, true );
- connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
- TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
+ connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+ TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
KPIM::ProgressManager::getUniqueID(), i18n("Downloading program schedule") );
connect( mProgress,
- TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
- TQT_SLOT( cancelLoad() ) );
+ TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
+ TQ_SLOT( cancelLoad() ) );
return true;
}