diff options
Diffstat (limited to 'tdeabc/plugins')
22 files changed, 72 insertions, 72 deletions
diff --git a/tdeabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp index 304f585f0..d3cde77c1 100644 --- a/tdeabc/plugins/dir/resourcedir.cpp +++ b/tdeabc/plugins/dir/resourcedir.cpp @@ -34,7 +34,7 @@ #include <kgenericfactory.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include "addressbook.h" @@ -87,9 +87,9 @@ void ResourceDir::init( const TQString &path, const TQString &format ) mLock = 0; - connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( pathChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( pathChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( pathChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( pathChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( pathChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( pathChanged() ) ); setPath( path ); } diff --git a/tdeabc/plugins/dir/resourcedir.h b/tdeabc/plugins/dir/resourcedir.h index dc9d1d06a..8c9eb66a4 100644 --- a/tdeabc/plugins/dir/resourcedir.h +++ b/tdeabc/plugins/dir/resourcedir.h @@ -40,7 +40,7 @@ class Lock; */ class KABC_EXPORT ResourceDir : public Resource { - Q_OBJECT + TQ_OBJECT public: ResourceDir( const TDEConfig* ); diff --git a/tdeabc/plugins/dir/resourcedirconfig.cpp b/tdeabc/plugins/dir/resourcedirconfig.cpp index 91512cfa6..0a4aba8f8 100644 --- a/tdeabc/plugins/dir/resourcedirconfig.cpp +++ b/tdeabc/plugins/dir/resourcedirconfig.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdialog.h> #include "formatfactory.h" diff --git a/tdeabc/plugins/dir/resourcedirconfig.h b/tdeabc/plugins/dir/resourcedirconfig.h index 51fac5812..9ba2ec492 100644 --- a/tdeabc/plugins/dir/resourcedirconfig.h +++ b/tdeabc/plugins/dir/resourcedirconfig.h @@ -30,7 +30,7 @@ namespace TDEABC { class KABC_EXPORT ResourceDirConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceDirConfig( TQWidget* parent = 0, const char* name = 0 ); diff --git a/tdeabc/plugins/dir/resourcedirplugin.cpp b/tdeabc/plugins/dir/resourcedirplugin.cpp index 028dce31c..b2e749c6a 100644 --- a/tdeabc/plugins/dir/resourcedirplugin.cpp +++ b/tdeabc/plugins/dir/resourcedirplugin.cpp @@ -25,7 +25,7 @@ using namespace TDEABC; extern "C" { - KDE_EXPORT void *init_tdeabc_dir() + TDE_EXPORT void *init_tdeabc_dir() { return new KRES::PluginFactory<ResourceDir, ResourceDirConfig>(); } diff --git a/tdeabc/plugins/evolution/resourceevo.cpp b/tdeabc/plugins/evolution/resourceevo.cpp index a5df5fe18..c9b71b818 100644 --- a/tdeabc/plugins/evolution/resourceevo.cpp +++ b/tdeabc/plugins/evolution/resourceevo.cpp @@ -30,7 +30,7 @@ class EvolutionFactory : public KRES::PluginFactoryBase extern "C" { - KDE_EXPORT void *init_tdeabc_evo() + TDE_EXPORT void *init_tdeabc_evo() { return ( new EvolutionFactory() ); } diff --git a/tdeabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp index 3fa2a9406..f48790948 100644 --- a/tdeabc/plugins/file/resourcefile.cpp +++ b/tdeabc/plugins/file/resourcefile.cpp @@ -35,7 +35,7 @@ #include <tdeio/scheduler.h> #include <tdelocale.h> #include <ksavefile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "formatfactory.h" #include "resourcefileconfig.h" @@ -83,9 +83,9 @@ void ResourceFile::init( const TQString &fileName, const TQString &formatName ) mFormat = factory->format( mFormatName ); } - connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( fileChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( fileChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( fileChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( fileChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( fileChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( fileChanged() ) ); setFileName( fileName ); @@ -333,9 +333,9 @@ bool ResourceFile::asyncSave( Ticket *ticket ) bool ok = save( ticket ); if ( !ok ) - TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingError() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( emitSavingError() ) ); else - TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingFinished() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( emitSavingFinished() ) ); return ok; } diff --git a/tdeabc/plugins/file/resourcefile.h b/tdeabc/plugins/file/resourcefile.h index ffa19a4bf..2f38254a2 100644 --- a/tdeabc/plugins/file/resourcefile.h +++ b/tdeabc/plugins/file/resourcefile.h @@ -39,7 +39,7 @@ class Lock; */ class KABC_EXPORT ResourceFile : public Resource { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp index 2c8e0fce6..6f9a67965 100644 --- a/tdeabc/plugins/file/resourcefileconfig.cpp +++ b/tdeabc/plugins/file/resourcefileconfig.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdialog.h> #include <unistd.h> @@ -51,8 +51,8 @@ ResourceFileConfig::ResourceFileConfig( TQWidget* parent, const char* name ) label = new TQLabel( i18n( "Location:" ), this ); mFileNameEdit = new KURLRequester( this ); - connect( mFileNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( checkFilePermissions( const TQString & ) ) ); + connect( mFileNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( checkFilePermissions( const TQString & ) ) ); mainLayout->addWidget( label, 1, 0 ); mainLayout->addWidget( mFileNameEdit, 1, 1 ); diff --git a/tdeabc/plugins/file/resourcefileconfig.h b/tdeabc/plugins/file/resourcefileconfig.h index 3be4cca49..0f3c12cd5 100644 --- a/tdeabc/plugins/file/resourcefileconfig.h +++ b/tdeabc/plugins/file/resourcefileconfig.h @@ -30,7 +30,7 @@ namespace TDEABC { class KABC_EXPORT ResourceFileConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceFileConfig( TQWidget* parent = 0, const char* name = 0 ); diff --git a/tdeabc/plugins/file/resourcefileplugin.cpp b/tdeabc/plugins/file/resourcefileplugin.cpp index 6f7598a40..1838bf6b9 100644 --- a/tdeabc/plugins/file/resourcefileplugin.cpp +++ b/tdeabc/plugins/file/resourcefileplugin.cpp @@ -25,7 +25,7 @@ using namespace TDEABC; extern "C" { - KDE_EXPORT void *init_tdeabc_file() + TDE_EXPORT void *init_tdeabc_file() { return new KRES::PluginFactory<ResourceFile, ResourceFileConfig>(); } diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp index ed6675392..a2c5523af 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klineedit.h> #include <tdelocale.h> #include <tdeconfig.h> @@ -123,7 +123,7 @@ ResourceLDAPTDEIO::~ResourceLDAPTDEIO() void ResourceLDAPTDEIO::enter_loop() { TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); @@ -173,10 +173,10 @@ TQString ResourceLDAPTDEIO::findUid( const TQString &uid ) TDEIO::ListJob * listJob = TDEIO::listDir( url, false /* no GUI */ ); connect( listJob, - TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); - connect( listJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( listResult( TDEIO::Job* ) ) ); + TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( listJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( listResult( TDEIO::Job* ) ) ); enter_loop(); return d->mResultDn; @@ -511,8 +511,8 @@ TDEIO::Job *ResourceLDAPTDEIO::loadFromCache() KURL url( d->mCacheDst ); job = TDEIO::get( url, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); } return job; } @@ -535,17 +535,17 @@ bool ResourceLDAPTDEIO::load() createCache(); if ( d->mCachePolicy != Cache_Always ) { job = TDEIO::get( d->mLDAPUrl, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); } job = loadFromCache(); if ( job ) { - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); } if ( mErrorMsg.isEmpty() ) { @@ -572,10 +572,10 @@ bool ResourceLDAPTDEIO::asyncLoad() createCache(); if ( d->mCachePolicy != Cache_Always ) { TDEIO::Job *job = TDEIO::get( d->mLDAPUrl, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( result( TDEIO::Job* ) ) ); } else { result( NULL ); } @@ -714,8 +714,8 @@ void ResourceLDAPTDEIO::result( TDEIO::Job *job ) TDEIO::Job *cjob; cjob = loadFromCache(); if ( cjob ) { - connect( cjob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( loadCacheResult( TDEIO::Job* ) ) ); + connect( cjob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( loadCacheResult( TDEIO::Job* ) ) ); } else { if ( !mErrorMsg.isEmpty() ) emit loadingError( this, mErrorMsg ); @@ -730,10 +730,10 @@ bool ResourceLDAPTDEIO::save( Ticket* ) d->mSaveIt = begin(); TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false ); - connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQ_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); if ( mErrorMsg.isEmpty() ) { kdDebug(7125) << "ResourceLDAPTDEIO save ok!" << endl; @@ -750,10 +750,10 @@ bool ResourceLDAPTDEIO::asyncSave( Ticket* ) kdDebug(7125) << "ResourceLDAPTDEIO asyncSave" << endl; d->mSaveIt = begin(); TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false ); - connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( saveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQ_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( saveResult( TDEIO::Job* ) ) ); return true; } diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h index 8f0565c3e..e82e94c83 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h @@ -32,7 +32,7 @@ namespace TDEABC { class KABC_EXPORT ResourceLDAPTDEIO : public Resource { - Q_OBJECT + TQ_OBJECT public: enum CachePolicy{ Cache_No, Cache_NoConnection, Cache_Always }; diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp index 429e6b494..9dc8a8a57 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp @@ -58,8 +58,8 @@ ResourceLDAPTDEIOConfig::ResourceLDAPTDEIOConfig( TQWidget* parent, const char* mEditButton = new TQPushButton( i18n( "Edit Attributes..." ), box ); mCacheButton = new TQPushButton( i18n( "Offline Use..." ), box ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editAttributes() ) ); - connect( mCacheButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCache() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editAttributes() ) ); + connect( mCacheButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editCache() ) ); } void ResourceLDAPTDEIOConfig::loadSettings( KRES::Resource *res ) @@ -247,7 +247,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes, mMapCombo->insertItem( i18n( "Netscape" ) ); mMapCombo->insertItem( i18n( "Evolution" ) ); mMapCombo->insertItem( i18n( "Outlook" ) ); - connect( mMapCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( mapChanged( int ) ) ); + connect( mMapCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( mapChanged( int ) ) ); label = new TQLabel( i18n( "RDN prefix attribute:" ), page ); layout->addWidget( label, 1, 0 ); @@ -342,7 +342,7 @@ OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src, layout->setAutoAdd( true ); mSrc = src; mDst = dst; - mCacheGroup = new TQButtonGroup( 1, Qt::Horizontal, + mCacheGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Offline Cache Policy"), page ); TQRadioButton *bt; @@ -356,10 +356,10 @@ OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src, mAutoCache->setChecked( autoCache ); mAutoCache->setEnabled( bt->isChecked() ); - connect( bt, TQT_SIGNAL(toggled(bool)), mAutoCache, TQT_SLOT(setEnabled(bool)) ); + connect( bt, TQ_SIGNAL(toggled(bool)), mAutoCache, TQ_SLOT(setEnabled(bool)) ); TQPushButton *lcache = new TQPushButton( i18n("Load into Cache"), page ); - connect( lcache, TQT_SIGNAL( clicked() ), TQT_SLOT( loadCache() ) ); + connect( lcache, TQ_SIGNAL( clicked() ), TQ_SLOT( loadCache() ) ); } OfflineDialog::~OfflineDialog() diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h index d56b4de31..2d3f3571f 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h @@ -44,7 +44,7 @@ namespace TDEABC { class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceLDAPTDEIOConfig( TQWidget* parent = 0, const char* name = 0 ); @@ -68,7 +68,7 @@ class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget class AttributesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AttributesDialog( const TQMap<TQString, TQString> &attributes, int rdnprefix, @@ -93,7 +93,7 @@ class AttributesDialog : public KDialogBase class OfflineDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: OfflineDialog( bool autoCache, int cachePolicy, const KURL &src, diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp index 6046e9ae2..aefd56b02 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp @@ -28,7 +28,7 @@ using namespace TDEABC; extern "C" { - KDE_EXPORT void *init_tdeabc_ldaptdeio() + TDE_EXPORT void *init_tdeabc_ldaptdeio() { TDEGlobal::locale()->insertCatalogue("tdeabc_ldaptdeio"); return new KRES::PluginFactory<ResourceLDAPTDEIO, ResourceLDAPTDEIOConfig>(); diff --git a/tdeabc/plugins/net/resourcenet.cpp b/tdeabc/plugins/net/resourcenet.cpp index cb908cd22..08fa8764a 100644 --- a/tdeabc/plugins/net/resourcenet.cpp +++ b/tdeabc/plugins/net/resourcenet.cpp @@ -192,8 +192,8 @@ bool ResourceNet::asyncLoad() TDEIO::Scheduler::checkSlaveOnHold( true ); d->mLoadJob = TDEIO::file_copy( mUrl, dest, -1, true, false, false ); d->mIsLoading = true; - connect( d->mLoadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( downloadFinished( TDEIO::Job* ) ) ); + connect( d->mLoadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( downloadFinished( TDEIO::Job* ) ) ); return true; } @@ -286,8 +286,8 @@ bool ResourceNet::asyncSave( Ticket* ) TDEIO::Scheduler::checkSlaveOnHold( true ); d->mIsSaving = true; d->mSaveJob = TDEIO::file_copy( src, mUrl, -1, true, false, false ); - connect( d->mSaveJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( uploadFinished( TDEIO::Job* ) ) ); + connect( d->mSaveJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( uploadFinished( TDEIO::Job* ) ) ); return true; } @@ -352,7 +352,7 @@ void ResourceNet::downloadFinished( TDEIO::Job* ) if ( !hasTempFile() || mTempFile->status() != 0 ) { d->mLastErrorString = i18n( "Download failed: Unable to create temporary file" ); - TQTimer::singleShot( 0, this, TQT_SLOT( signalError() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( signalError() ) ); return; } diff --git a/tdeabc/plugins/net/resourcenet.h b/tdeabc/plugins/net/resourcenet.h index e190c63c8..0ce7bf862 100644 --- a/tdeabc/plugins/net/resourcenet.h +++ b/tdeabc/plugins/net/resourcenet.h @@ -44,7 +44,7 @@ class FormatPlugin; */ class KABC_EXPORT ResourceNet : public Resource { - Q_OBJECT + TQ_OBJECT public: ResourceNet( const TDEConfig* ); diff --git a/tdeabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h index 513c77de2..df1a73ba6 100644 --- a/tdeabc/plugins/net/resourcenetconfig.h +++ b/tdeabc/plugins/net/resourcenetconfig.h @@ -30,7 +30,7 @@ namespace TDEABC { class KABC_EXPORT ResourceNetConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceNetConfig( TQWidget* parent = 0, const char* name = 0 ); diff --git a/tdeabc/plugins/net/resourcenetplugin.cpp b/tdeabc/plugins/net/resourcenetplugin.cpp index cd87cc000..0e3b1d3c7 100644 --- a/tdeabc/plugins/net/resourcenetplugin.cpp +++ b/tdeabc/plugins/net/resourcenetplugin.cpp @@ -25,7 +25,7 @@ using namespace TDEABC; extern "C" { - KDE_EXPORT void *init_tdeabc_net() + TDE_EXPORT void *init_tdeabc_net() { return new KRES::PluginFactory<ResourceNet, ResourceNetConfig>(); } diff --git a/tdeabc/plugins/sql/resourcesql.cpp b/tdeabc/plugins/sql/resourcesql.cpp index b72afea15..3741fff3b 100644 --- a/tdeabc/plugins/sql/resourcesql.cpp +++ b/tdeabc/plugins/sql/resourcesql.cpp @@ -33,7 +33,7 @@ using namespace TDEABC; extern "C" { - KDE_EXPORT void *init_tdeabc_sql() + TDE_EXPORT void *init_tdeabc_sql() { return new KRES::PluginFactory<ResourceSql,ResourceSqlConfig>(); } @@ -247,7 +247,7 @@ bool ResourceSql::save( Ticket * ) (*it).prefix() + "','" + (*it).suffix() + "','" + (*it).nickName() + "','" + - (*it).birthday().toString( Qt::ISODate ) + "','" + + (*it).birthday().toString( TQt::ISODate ) + "','" + (*it).mailer() + "','" + TQString::number( (*it).timeZone().offset() ) + "','" + TQString::number( (*it).geo().latitude() ) + "','" + @@ -257,7 +257,7 @@ bool ResourceSql::save( Ticket * ) (*it).organization() + "','" + (*it).note() + "','" + (*it).productId() + "','" + - (*it).revision().toString( Qt::ISODate ) + "','" + + (*it).revision().toString( TQt::ISODate ) + "','" + (*it).sortString() + "','" + (*it).url().url() + "')" ); diff --git a/tdeabc/plugins/sql/resourcesqlconfig.h b/tdeabc/plugins/sql/resourcesqlconfig.h index e0c08880c..116248809 100644 --- a/tdeabc/plugins/sql/resourcesqlconfig.h +++ b/tdeabc/plugins/sql/resourcesqlconfig.h @@ -30,7 +30,7 @@ namespace TDEABC { class ResourceSqlConfig : public ResourceConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceSqlConfig( TQWidget* parent = 0, const char* name = 0 ); |
