diff options
Diffstat (limited to 'tderesources/scalix')
33 files changed, 90 insertions, 90 deletions
diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index ff9158d1..cd341e2d 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() @@ -165,7 +165,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource, UIServer_stub uiserver( "tdeio_uiserver", "UIServer" ); int progressId = 0; if ( useProgress ) { - progressId = uiserver.newJob( kapp->dcopClient()->appId(), true ); + progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true ); uiserver.totalFiles( progressId, count ); uiserver.infoMessage( progressId, labelTxt ); uiserver.transferring( progressId, labelTxt ); @@ -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/kcal/resourcescalix.h b/tderesources/scalix/kcal/resourcescalix.h index d4e564c0..0890eaf0 100644 --- a/tderesources/scalix/kcal/resourcescalix.h +++ b/tderesources/scalix/kcal/resourcescalix.h @@ -36,7 +36,7 @@ #include <tqtimer.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <libkcal/calendarlocal.h> #include <libkcal/icalformat.h> #include <libkcal/resourcecalendar.h> @@ -46,11 +46,11 @@ namespace KCal { struct TemporarySilencer; -class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar, +class TDE_EXPORT ResourceScalix : public KCal::ResourceCalendar, public KCal::IncidenceBase::Observer, public Scalix::ResourceScalixBase { - Q_OBJECT + TQ_OBJECT friend struct TemporarySilencer; diff --git a/tderesources/scalix/knotes/resourcescalix.h b/tderesources/scalix/knotes/resourcescalix.h index ab40b707..592fc0a3 100644 --- a/tderesources/scalix/knotes/resourcescalix.h +++ b/tderesources/scalix/knotes/resourcescalix.h @@ -38,7 +38,7 @@ #include <libkcal/calendarlocal.h> #include "../shared/resourcescalixbase.h" #include "../shared/subresource.h" -#include <kdemacros.h> +#include <tdemacros.h> namespace Scalix { @@ -48,11 +48,11 @@ namespace Scalix { * addresses in an IMAP folder in KMail (or other conforming email * clients). */ -class KDE_EXPORT ResourceScalix : public ResourceNotes, +class TDE_EXPORT ResourceScalix : public ResourceNotes, public KCal::IncidenceBase::Observer, public ResourceScalixBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/Makefile.am b/tderesources/scalix/scalixadmin/Makefile.am index 0758ccfc..30ddfd86 100644 --- a/tderesources/scalix/scalixadmin/Makefile.am +++ b/tderesources/scalix/scalixadmin/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = scalixadmin INCLUDES = $(all_includes) -scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor scalixadmin_LDADD = $(LIB_TDEABC) scalixadmin_SOURCES = main.cpp mainwindow.cpp passwordpage.cpp settings.cpp jobs.cpp \ otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp \ diff --git a/tderesources/scalix/scalixadmin/delegatedialog.cpp b/tderesources/scalix/scalixadmin/delegatedialog.cpp index 8674ce70..af843285 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/delegatedialog.h b/tderesources/scalix/scalixadmin/delegatedialog.h index 2f258113..874bced5 100644 --- a/tderesources/scalix/scalixadmin/delegatedialog.h +++ b/tderesources/scalix/scalixadmin/delegatedialog.h @@ -34,7 +34,7 @@ class Delegate; class DelegateDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/delegatemanager.h b/tderesources/scalix/scalixadmin/delegatemanager.h index 05b0262d..b58d8ac9 100644 --- a/tderesources/scalix/scalixadmin/delegatemanager.h +++ b/tderesources/scalix/scalixadmin/delegatemanager.h @@ -28,7 +28,7 @@ class DelegateManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/delegatepage.cpp b/tderesources/scalix/scalixadmin/delegatepage.cpp index b4368f7d..b43dac85 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/delegatepage.h b/tderesources/scalix/scalixadmin/delegatepage.h index 0523effe..eabd988d 100644 --- a/tderesources/scalix/scalixadmin/delegatepage.h +++ b/tderesources/scalix/scalixadmin/delegatepage.h @@ -30,7 +30,7 @@ class DelegateView; class DelegatePage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/delegateview.cpp b/tderesources/scalix/scalixadmin/delegateview.cpp index 79b8cf33..e999baff 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/delegateview.h b/tderesources/scalix/scalixadmin/delegateview.h index 0416b8a0..2b72d284 100644 --- a/tderesources/scalix/scalixadmin/delegateview.h +++ b/tderesources/scalix/scalixadmin/delegateview.h @@ -31,7 +31,7 @@ class DelegateManager; class DelegateView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp index e07b17ca..d965438d 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/jobs.h b/tderesources/scalix/scalixadmin/jobs.h index 832db070..0f65a104 100644 --- a/tderesources/scalix/scalixadmin/jobs.h +++ b/tderesources/scalix/scalixadmin/jobs.h @@ -132,7 +132,7 @@ namespace Scalix { class GetDelegatesJob : public TDEIO::SimpleJob { - Q_OBJECT + TQ_OBJECT public: @@ -161,7 +161,7 @@ namespace Scalix { class GetOtherUsersJob : public TDEIO::SimpleJob { - Q_OBJECT + TQ_OBJECT public: @@ -184,7 +184,7 @@ namespace Scalix { class GetOutOfOfficeJob : public TDEIO::SimpleJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp index 3e6eea04..a58dec2e 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/ldapview.h b/tderesources/scalix/scalixadmin/ldapview.h index 9de45817..f405045b 100644 --- a/tderesources/scalix/scalixadmin/ldapview.h +++ b/tderesources/scalix/scalixadmin/ldapview.h @@ -29,7 +29,7 @@ class LdapObject; class LdapView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/otherusermanager.h b/tderesources/scalix/scalixadmin/otherusermanager.h index 26f33ee4..e02e53a1 100644 --- a/tderesources/scalix/scalixadmin/otherusermanager.h +++ b/tderesources/scalix/scalixadmin/otherusermanager.h @@ -26,7 +26,7 @@ class OtherUserManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/otheruserpage.cpp b/tderesources/scalix/scalixadmin/otheruserpage.cpp index 3cc220ea..f7594acf 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/otheruserpage.h b/tderesources/scalix/scalixadmin/otheruserpage.h index e8c5e269..03527125 100644 --- a/tderesources/scalix/scalixadmin/otheruserpage.h +++ b/tderesources/scalix/scalixadmin/otheruserpage.h @@ -30,7 +30,7 @@ class OtherUserView; class OtherUserPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/otheruserview.cpp b/tderesources/scalix/scalixadmin/otheruserview.cpp index e8aa13bc..be09dc74 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/otheruserview.h b/tderesources/scalix/scalixadmin/otheruserview.h index 832b09b8..b52ce1d7 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.h +++ b/tderesources/scalix/scalixadmin/otheruserview.h @@ -27,7 +27,7 @@ class OtherUserManager; class OtherUserView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/outofofficepage.cpp b/tderesources/scalix/scalixadmin/outofofficepage.cpp index e807379a..343f4f4c 100644 --- a/tderesources/scalix/scalixadmin/outofofficepage.cpp +++ b/tderesources/scalix/scalixadmin/outofofficepage.cpp @@ -38,7 +38,7 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent ) { TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 ); - TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this ); + TQButtonGroup *group = new TQButtonGroup( 1, TQt::Vertical, this ); mDisabled = new TQRadioButton( i18n( "I am in the office" ), group ); mDisabled->setChecked( true ); @@ -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/outofofficepage.h b/tderesources/scalix/scalixadmin/outofofficepage.h index f9863fa1..b96de352 100644 --- a/tderesources/scalix/scalixadmin/outofofficepage.h +++ b/tderesources/scalix/scalixadmin/outofofficepage.h @@ -30,7 +30,7 @@ class TQTextEdit; class OutOfOfficePage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp index 38262725..f67e4251 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/scalixadmin/passwordpage.h b/tderesources/scalix/scalixadmin/passwordpage.h index 5255193e..d7d6f455 100644 --- a/tderesources/scalix/scalixadmin/passwordpage.h +++ b/tderesources/scalix/scalixadmin/passwordpage.h @@ -32,7 +32,7 @@ class Job; class PasswordPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp index 147b9822..dec929ce 100644 --- a/tderesources/scalix/shared/kmailconnection.cpp +++ b/tderesources/scalix/shared/kmailconnection.cpp @@ -54,14 +54,14 @@ KMailConnection::KMailConnection( ResourceScalixBase* resource, mDCOPClient->attach(); mDCOPClient->registerAs( objId, true ); - kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + tdeApp->dcopClient()->setNotifications( true ); + connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); } KMailConnection::~KMailConnection() { - kapp->dcopClient()->setNotifications( false ); + tdeApp->dcopClient()->setNotifications( false ); delete mKMailIcalIfaceStub; mKMailIcalIfaceStub = 0; delete mDCOPClient; @@ -84,7 +84,7 @@ bool KMailConnection::connectToKMail() return false; } - mKMailIcalIfaceStub = new KMailICalIface_stub( kapp->dcopClient(), + mKMailIcalIfaceStub = new KMailICalIface_stub( tdeApp->dcopClient(), dcopService, dcopObjectId ); // Attach to the KMail signals diff --git a/tderesources/scalix/shared/kmailconnection.h b/tderesources/scalix/shared/kmailconnection.h index 7fec6274..b8f102cd 100644 --- a/tderesources/scalix/shared/kmailconnection.h +++ b/tderesources/scalix/shared/kmailconnection.h @@ -48,7 +48,7 @@ class ResourceScalixBase; This class provides the kmail connectivity for IMAP resources. */ class KMailConnection : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/tderesources/scalix/shared/resourcescalixbase.cpp b/tderesources/scalix/shared/resourcescalixbase.cpp index 6108230c..f9b10423 100644 --- a/tderesources/scalix/shared/resourcescalixbase.cpp +++ b/tderesources/scalix/shared/resourcescalixbase.cpp @@ -36,7 +36,7 @@ #include <folderselectdialog.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kinputdialog.h> #include <kurl.h> #include <tdetempfile.h> diff --git a/tderesources/scalix/shared/scalixbase.cpp b/tderesources/scalix/shared/scalixbase.cpp index f07a6983..51ef8798 100644 --- a/tderesources/scalix/shared/scalixbase.cpp +++ b/tderesources/scalix/shared/scalixbase.cpp @@ -372,12 +372,12 @@ TQDomDocument ScalixBase::domTree() TQString ScalixBase::dateTimeToString( const TQDateTime& time ) { - return time.toString( Qt::ISODate ) + 'Z'; + return time.toString( TQt::ISODate ) + 'Z'; } TQString ScalixBase::dateToString( const TQDate& date ) { - return date.toString( Qt::ISODate ); + return date.toString( TQt::ISODate ); } TQDateTime ScalixBase::stringToDateTime( const TQString& _date ) @@ -385,12 +385,12 @@ TQDateTime ScalixBase::stringToDateTime( const TQString& _date ) TQString date( _date ); if ( date.endsWith( "Z" ) ) date.truncate( date.length() - 1 ); - return TQDateTime::fromString( date, Qt::ISODate ); + return TQDateTime::fromString( date, TQt::ISODate ); } TQDate ScalixBase::stringToDate( const TQString& date ) { - return TQDate::fromString( date, Qt::ISODate ); + return TQDate::fromString( date, TQt::ISODate ); } TQString ScalixBase::sensitivityToString( Sensitivity s ) diff --git a/tderesources/scalix/tdeabc/contact.cpp b/tderesources/scalix/tdeabc/contact.cpp index 190837a0..6d4cc2bf 100644 --- a/tderesources/scalix/tdeabc/contact.cpp +++ b/tderesources/scalix/tdeabc/contact.cpp @@ -71,7 +71,7 @@ TQString Contact::toXml( const TDEABC::Addressee &addr ) xml += "<reminder_set>" + custom( "reminder_set", addr, "false" ) + "</reminder_set>\n"; xml += "<send_rich_info>" + custom( "send_rich_info", addr, "false" ) + "</send_rich_info>\n"; xml += "<subject>" + addr.formattedName() + "</subject>\n"; - xml += "<last_modification_time>" + addr.revision().toString( Qt::ISODate ) + "</last_modification_time>\n"; + xml += "<last_modification_time>" + addr.revision().toString( TQt::ISODate ) + "</last_modification_time>\n"; xml += "<display_name_prefix>" + addr.prefix() + "</display_name_prefix>\n"; xml += "<first_name>" + addr.givenName() + "</first_name>\n"; @@ -166,7 +166,7 @@ TQString Contact::toXml( const TDEABC::Addressee &addr ) xml += "<office_location>" + addr.custom( "KADDRESSBOOK", "X-Office" ) + "</office_location>\n"; xml += "<spouse>" + addr.custom( "KADDRESSBOOK", "X-SpousesName" ) + "</spouse>\n"; - xml += "<bday>" + addr.birthday().toString( Qt::ISODate ) + "</bday>\n"; + xml += "<bday>" + addr.birthday().toString( TQt::ISODate ) + "</bday>\n"; xml += "<anniversary>" + addr.custom( "KADDRESSBOOK", "X-Anniversary" ) + "</anniversary>\n"; xml += "<mapi_charset>" + custom( "mapi_charset", addr, "UTF8" ) + "</mapi_charset>"; @@ -235,7 +235,7 @@ TDEABC::Addressee Contact::fromXml( const TQString &xml ) else if ( element.tagName() == "send_rich_info" ) setCustom( "send_rich_info", element.text(), addr ); else if ( element.tagName() == "last_modification_time" ) - addr.setRevision( TQDateTime::fromString( element.text(), Qt::ISODate ) ); + addr.setRevision( TQDateTime::fromString( element.text(), TQt::ISODate ) ); // name else if ( element.tagName() == "display_name_prefix" ) @@ -352,7 +352,7 @@ TDEABC::Addressee Contact::fromXml( const TQString &xml ) addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", element.text() ); else if ( element.tagName() == "bday" ) - addr.setBirthday( TQDateTime::fromString( element.text(), Qt::ISODate ) ); + addr.setBirthday( TQDateTime::fromString( element.text(), TQt::ISODate ) ); else if ( element.tagName() == "anniversary" ) addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", element.text() ); else diff --git a/tderesources/scalix/tdeabc/resourcescalix.cpp b/tderesources/scalix/tdeabc/resourcescalix.cpp index dc953ded..91fe99dd 100644 --- a/tderesources/scalix/tdeabc/resourcescalix.cpp +++ b/tderesources/scalix/tdeabc/resourcescalix.cpp @@ -197,7 +197,7 @@ bool TDEABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource, UIServer_stub uiserver( "tdeio_uiserver", "UIServer" ); int progressId = 0; if ( count > 200 ) { - progressId = uiserver.newJob( kapp->dcopClient()->appId(), true ); + progressId = uiserver.newJob( tdeApp->dcopClient()->appId(), true ); uiserver.totalFiles( progressId, count ); uiserver.infoMessage( progressId, i18n( "Loading contacts..." ) ); uiserver.transferring( progressId, "Contacts" ); diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h index f5c8ffe6..c3e8765c 100644 --- a/tderesources/scalix/tdeabc/resourcescalix.h +++ b/tderesources/scalix/tdeabc/resourcescalix.h @@ -39,7 +39,7 @@ #include "../shared/resourcescalixbase.h" #include "../shared/subresource.h" #include <kmail/kmailicalIface.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace TDEABC { @@ -50,10 +50,10 @@ namespace TDEABC { * addresses in an Scalix folder in KMail (or other conforming email * clients). */ -class KDE_EXPORT ResourceScalix : public KPIM::ResourceABC, +class TDE_EXPORT ResourceScalix : public KPIM::ResourceABC, public Scalix::ResourceScalixBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index 0af6c466..165f4772 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -28,14 +28,14 @@ #include <tdeio/global.h> #include <tdelocale.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <stdlib.h> #include "scalix.h" extern "C" { - KDE_EXPORT int kdemain( int argc, char **argv ); + TDE_EXPORT int kdemain( int argc, char **argv ); } static const TDECmdLineOptions options[] = @@ -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/scalix/tdeioslave/scalix.h b/tderesources/scalix/tdeioslave/scalix.h index f4dbdead..78a71447 100644 --- a/tderesources/scalix/tdeioslave/scalix.h +++ b/tderesources/scalix/tdeioslave/scalix.h @@ -28,7 +28,7 @@ class Scalix : public TQObject, public TDEIO::SlaveBase { - Q_OBJECT + TQ_OBJECT public: |