20 files changed, 51 insertions, 51 deletions
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: