diff options
Diffstat (limited to 'tderesources/slox')
-rw-r--r-- | tderesources/slox/kcalresourceslox.cpp | 36 | ||||
-rw-r--r-- | tderesources/slox/kcalresourceslox.h | 4 | ||||
-rw-r--r-- | tderesources/slox/kcalresourcesloxconfig.cpp | 4 | ||||
-rw-r--r-- | tderesources/slox/kcalresourcesloxconfig.h | 4 | ||||
-rw-r--r-- | tderesources/slox/sloxaccounts.cpp | 4 | ||||
-rw-r--r-- | tderesources/slox/sloxaccounts.h | 4 | ||||
-rw-r--r-- | tderesources/slox/sloxbase.h | 2 | ||||
-rw-r--r-- | tderesources/slox/sloxfolder.h | 2 | ||||
-rw-r--r-- | tderesources/slox/sloxfolderdialog.cpp | 2 | ||||
-rw-r--r-- | tderesources/slox/sloxfolderdialog.h | 2 | ||||
-rw-r--r-- | tderesources/slox/sloxfoldermanager.cpp | 4 | ||||
-rw-r--r-- | tderesources/slox/sloxfoldermanager.h | 4 | ||||
-rw-r--r-- | tderesources/slox/tdeabcresourceslox.cpp | 28 | ||||
-rw-r--r-- | tderesources/slox/tdeabcresourceslox.h | 4 | ||||
-rw-r--r-- | tderesources/slox/tdeabcresourcesloxconfig.cpp | 2 | ||||
-rw-r--r-- | tderesources/slox/tdeabcresourcesloxconfig.h | 4 | ||||
-rw-r--r-- | tderesources/slox/testsloxaccounts.cpp | 2 | ||||
-rw-r--r-- | tderesources/slox/webdavhandler.cpp | 4 | ||||
-rw-r--r-- | tderesources/slox/webdavhandler.h | 4 |
19 files changed, 60 insertions, 60 deletions
diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp index 4c2ab12c..e93b8944 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/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h index cfad65ed..59db8a9f 100644 --- a/tderesources/slox/kcalresourceslox.h +++ b/tderesources/slox/kcalresourceslox.h @@ -58,9 +58,9 @@ class SloxAccounts; /** This class provides a calendar stored as a remote file. */ -class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase +class TDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase { - Q_OBJECT + TQ_OBJECT friend class KCalResourceSloxConfig; diff --git a/tderesources/slox/kcalresourcesloxconfig.cpp b/tderesources/slox/kcalresourcesloxconfig.cpp index 83246a03..8652263f 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/kcalresourcesloxconfig.h b/tderesources/slox/kcalresourcesloxconfig.h index f5784f84..2ebd0108 100644 --- a/tderesources/slox/kcalresourcesloxconfig.h +++ b/tderesources/slox/kcalresourcesloxconfig.h @@ -42,9 +42,9 @@ class SloxBase; @see KCalResourceSlox */ -class KDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget +class TDE_EXPORT KCalResourceSloxConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: KCalResourceSloxConfig( TQWidget *parent = 0, const char *name = 0 ); diff --git a/tderesources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp index 3afa7019..e5ba2651 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/sloxaccounts.h b/tderesources/slox/sloxaccounts.h index 1af80586..a9e615da 100644 --- a/tderesources/slox/sloxaccounts.h +++ b/tderesources/slox/sloxaccounts.h @@ -30,9 +30,9 @@ class Job; class SloxBase; -class KDE_EXPORT SloxAccounts : public TQObject +class TDE_EXPORT SloxAccounts : public TQObject { - Q_OBJECT + TQ_OBJECT public: SloxAccounts( SloxBase *res, const KURL &baseUrl ); diff --git a/tderesources/slox/sloxbase.h b/tderesources/slox/sloxbase.h index dc3c9c53..577c8387 100644 --- a/tderesources/slox/sloxbase.h +++ b/tderesources/slox/sloxbase.h @@ -27,7 +27,7 @@ namespace KRES { class Resource; } -class KDE_EXPORT SloxBase { +class TDE_EXPORT SloxBase { public: enum Field { ObjectId = 0, // system fields diff --git a/tderesources/slox/sloxfolder.h b/tderesources/slox/sloxfolder.h index 06f08003..bb39ba85 100644 --- a/tderesources/slox/sloxfolder.h +++ b/tderesources/slox/sloxfolder.h @@ -32,7 +32,7 @@ enum FolderType { Contacts }; -class KDE_EXPORT SloxFolder +class TDE_EXPORT SloxFolder { public: SloxFolder( const TQString &id, const TQString &parentId, const TQString &type, const TQString &name, bool def = false ); diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp index 716c2d40..c1f1086e 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/sloxfolderdialog.h b/tderesources/slox/sloxfolderdialog.h index 1a0749ea..0b8785ea 100644 --- a/tderesources/slox/sloxfolderdialog.h +++ b/tderesources/slox/sloxfolderdialog.h @@ -30,7 +30,7 @@ class SloxFolderManager; class SloxFolderDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: SloxFolderDialog( SloxFolderManager *manager, FolderType type, TQWidget* parent = 0, const char *name = 0 ); diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp index d7284d3a..b862a388 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/sloxfoldermanager.h b/tderesources/slox/sloxfoldermanager.h index 3907dab7..c0be7c1a 100644 --- a/tderesources/slox/sloxfoldermanager.h +++ b/tderesources/slox/sloxfoldermanager.h @@ -35,9 +35,9 @@ class DavJob; class SloxBase; class SloxFolder; -class KDE_EXPORT SloxFolderManager : public TQObject +class TDE_EXPORT SloxFolderManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: SloxFolderManager( SloxBase *res, const KURL &baseUrl ); diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp index 79036abd..d77347d3 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() ); @@ -402,7 +402,7 @@ void ResourceSlox::parseContactAttribute( const TQDomElement &e, Addressee &a ) a.insertCustom( "KADDRESSBOOK", "X-SpousesName", text ); } else if ( tag == fieldName( Anniversary ) ) { TQDateTime dt = WebdavHandler::sloxToTQDateTime( text ); - a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( Qt::ISODate ) ); + a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( TQt::ISODate ) ); } else if ( tag == fieldName( Categories ) ) { a.setCategories( TQStringList::split( TQRegExp(",\\s*"), text ) ); } else if ( type() == "ox" ) { // FIXME: Address reading is missing for SLOX @@ -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, @@ -577,7 +577,7 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop TQString anniversary = a.custom( "KADDRESSBOOK", "X-Anniversary" ); if ( !anniversary.isEmpty() ) WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ), - WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, Qt::ISODate ).date() ) ); + WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, TQt::ISODate ).date() ) ); else WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ) ); } diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h index a37f17d6..126ee75c 100644 --- a/tderesources/slox/tdeabcresourceslox.h +++ b/tderesources/slox/tdeabcresourceslox.h @@ -45,9 +45,9 @@ namespace TDEABC { class SloxPrefs; -class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase +class TDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase { - Q_OBJECT + TQ_OBJECT public: ResourceSlox( const TDEConfig * ); diff --git a/tderesources/slox/tdeabcresourcesloxconfig.cpp b/tderesources/slox/tdeabcresourcesloxconfig.cpp index 8ad6701c..36f76238 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/tdeabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h index 36e02126..37b27e1d 100644 --- a/tderesources/slox/tdeabcresourcesloxconfig.h +++ b/tderesources/slox/tdeabcresourcesloxconfig.h @@ -32,9 +32,9 @@ class SloxBase; namespace TDEABC { -class KDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget +class TDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/slox/testsloxaccounts.cpp b/tderesources/slox/testsloxaccounts.cpp index 22c44e66..ea7b3da1 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/slox/webdavhandler.cpp b/tderesources/slox/webdavhandler.cpp index 4b57e1de..8d677bd0 100644 --- a/tderesources/slox/webdavhandler.cpp +++ b/tderesources/slox/webdavhandler.cpp @@ -199,7 +199,7 @@ TQDateTime WebdavHandler::sloxToTQDateTime( const TQString &str ) TQDateTime dt; if (preEpoch) { - dt.setTime_t( 0, Qt::UTC ); + dt.setTime_t( 0, TQt::UTC ); if (ticks > INT_MAX) { dt = dt.addSecs(-INT_MAX); ticks -= INT_MAX; @@ -208,7 +208,7 @@ TQDateTime WebdavHandler::sloxToTQDateTime( const TQString &str ) } else { - dt.setTime_t( ticks, Qt::UTC ); + dt.setTime_t( ticks, TQt::UTC ); } return dt; diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h index 6d98fd52..338fe2c3 100644 --- a/tderesources/slox/webdavhandler.h +++ b/tderesources/slox/webdavhandler.h @@ -34,7 +34,7 @@ class Incidence; class SloxBase; -class KDE_EXPORT SloxItem +class TDE_EXPORT SloxItem { public: enum Status { Invalid, Delete, Create, New }; @@ -49,7 +49,7 @@ class KDE_EXPORT SloxItem TQString responseDescription; }; -class KDE_EXPORT WebdavHandler +class TDE_EXPORT WebdavHandler { public: WebdavHandler(); |