summaryrefslogtreecommitdiffstats
path: root/kresources/scalix/scalixadmin
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
commit67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch)
tree5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kresources/scalix/scalixadmin
parent2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff)
downloadtdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz
tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kresources/scalix/scalixadmin')
-rw-r--r--kresources/scalix/scalixadmin/delegatedialog.cpp4
-rw-r--r--kresources/scalix/scalixadmin/delegatedialog.h3
-rw-r--r--kresources/scalix/scalixadmin/delegatemanager.h3
-rw-r--r--kresources/scalix/scalixadmin/delegatepage.cpp4
-rw-r--r--kresources/scalix/scalixadmin/delegatepage.h5
-rw-r--r--kresources/scalix/scalixadmin/delegateview.cpp10
-rw-r--r--kresources/scalix/scalixadmin/delegateview.h3
-rw-r--r--kresources/scalix/scalixadmin/jobs.h3
-rw-r--r--kresources/scalix/scalixadmin/ldapdialog.cpp4
-rw-r--r--kresources/scalix/scalixadmin/ldapdialog.h2
-rw-r--r--kresources/scalix/scalixadmin/ldapview.cpp10
-rw-r--r--kresources/scalix/scalixadmin/ldapview.h3
-rw-r--r--kresources/scalix/scalixadmin/otherusermanager.h3
-rw-r--r--kresources/scalix/scalixadmin/otheruserpage.cpp8
-rw-r--r--kresources/scalix/scalixadmin/otheruserpage.h5
-rw-r--r--kresources/scalix/scalixadmin/otheruserview.cpp10
-rw-r--r--kresources/scalix/scalixadmin/otheruserview.h3
-rw-r--r--kresources/scalix/scalixadmin/outofofficepage.cpp6
-rw-r--r--kresources/scalix/scalixadmin/outofofficepage.h5
-rw-r--r--kresources/scalix/scalixadmin/passwordpage.cpp4
-rw-r--r--kresources/scalix/scalixadmin/passwordpage.h5
21 files changed, 58 insertions, 45 deletions
diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp
index d0a9644e8..70ab3734c 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.cpp
+++ b/kresources/scalix/scalixadmin/delegatedialog.cpp
@@ -31,8 +31,8 @@
#include "delegatedialog.h"
-DelegateDialog::DelegateDialog( TQWidget *parent )
- : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true )
+DelegateDialog::DelegateDialog( TQWidget *tqparent )
+ : KDialogBase( tqparent, "", true, "", Ok | Cancel, Ok, true )
{
TQWidget *page = new TQWidget( this );
TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 11, 6 );
diff --git a/kresources/scalix/scalixadmin/delegatedialog.h b/kresources/scalix/scalixadmin/delegatedialog.h
index 1cadb5929..a515fe890 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.h
+++ b/kresources/scalix/scalixadmin/delegatedialog.h
@@ -35,9 +35,10 @@ class Delegate;
class DelegateDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- DelegateDialog( TQWidget *parent = 0 );
+ DelegateDialog( TQWidget *tqparent = 0 );
void setDelegate( const Scalix::Delegate &delegate );
Scalix::Delegate delegate() const;
diff --git a/kresources/scalix/scalixadmin/delegatemanager.h b/kresources/scalix/scalixadmin/delegatemanager.h
index 7f5e2e5a7..2edff628f 100644
--- a/kresources/scalix/scalixadmin/delegatemanager.h
+++ b/kresources/scalix/scalixadmin/delegatemanager.h
@@ -26,9 +26,10 @@
#include "jobs.h"
-class DelegateManager : public QObject
+class DelegateManager : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
DelegateManager();
diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp
index 32b29d465..cdfef5916 100644
--- a/kresources/scalix/scalixadmin/delegatepage.cpp
+++ b/kresources/scalix/scalixadmin/delegatepage.cpp
@@ -34,8 +34,8 @@
#include "delegatepage.h"
-DelegatePage::DelegatePage( TQWidget *parent )
- : TQWidget( parent )
+DelegatePage::DelegatePage( TQWidget *tqparent )
+ : TQWidget( tqparent )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
diff --git a/kresources/scalix/scalixadmin/delegatepage.h b/kresources/scalix/scalixadmin/delegatepage.h
index e62c89eed..3d266580e 100644
--- a/kresources/scalix/scalixadmin/delegatepage.h
+++ b/kresources/scalix/scalixadmin/delegatepage.h
@@ -28,12 +28,13 @@
class TQPushButton;
class DelegateView;
-class DelegatePage : public QWidget
+class DelegatePage : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- DelegatePage( TQWidget *parent = 0 );
+ DelegatePage( TQWidget *tqparent = 0 );
~DelegatePage();
private slots:
diff --git a/kresources/scalix/scalixadmin/delegateview.cpp b/kresources/scalix/scalixadmin/delegateview.cpp
index e253f1f36..12f27b770 100644
--- a/kresources/scalix/scalixadmin/delegateview.cpp
+++ b/kresources/scalix/scalixadmin/delegateview.cpp
@@ -24,11 +24,11 @@
#include "delegateview.h"
-class DelegateItem : public QListViewItem
+class DelegateItem : public TQListViewItem
{
public:
- DelegateItem( TQListView *parent, const Scalix::Delegate &delegate )
- : TQListViewItem( parent ), mDelegate( delegate )
+ DelegateItem( TQListView *tqparent, const Scalix::Delegate &delegate )
+ : TQListViewItem( tqparent ), mDelegate( delegate )
{
setText( 0, mDelegate.email() );
setText( 1, Scalix::Delegate::rightsAsString( mDelegate.rights() ) );
@@ -40,8 +40,8 @@ class DelegateItem : public QListViewItem
Scalix::Delegate mDelegate;
};
-DelegateView::DelegateView( DelegateManager *manager, TQWidget *parent )
- : KListView( parent ), mManager( manager )
+DelegateView::DelegateView( DelegateManager *manager, TQWidget *tqparent )
+ : KListView( tqparent ), mManager( manager )
{
addColumn( i18n( "Delegate" ) );
addColumn( i18n( "Rights" ) );
diff --git a/kresources/scalix/scalixadmin/delegateview.h b/kresources/scalix/scalixadmin/delegateview.h
index 1e9e6300f..243d3c8dc 100644
--- a/kresources/scalix/scalixadmin/delegateview.h
+++ b/kresources/scalix/scalixadmin/delegateview.h
@@ -32,9 +32,10 @@ class DelegateManager;
class DelegateView : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- DelegateView( DelegateManager *manager, TQWidget *parent = 0 );
+ DelegateView( DelegateManager *manager, TQWidget *tqparent = 0 );
Scalix::Delegate selectedDelegate() const;
diff --git a/kresources/scalix/scalixadmin/jobs.h b/kresources/scalix/scalixadmin/jobs.h
index 24ce1c020..845744561 100644
--- a/kresources/scalix/scalixadmin/jobs.h
+++ b/kresources/scalix/scalixadmin/jobs.h
@@ -133,6 +133,7 @@ namespace Scalix {
class GetDelegatesJob : public KIO::SimpleJob
{
Q_OBJECT
+ TQ_OBJECT
public:
GetDelegatesJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
@@ -161,6 +162,7 @@ namespace Scalix {
class GetOtherUsersJob : public KIO::SimpleJob
{
Q_OBJECT
+ TQ_OBJECT
public:
GetOtherUsersJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
@@ -183,6 +185,7 @@ namespace Scalix {
class GetOutOfOfficeJob : public KIO::SimpleJob
{
Q_OBJECT
+ TQ_OBJECT
public:
GetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
diff --git a/kresources/scalix/scalixadmin/ldapdialog.cpp b/kresources/scalix/scalixadmin/ldapdialog.cpp
index 6af08c4d7..35f5d1c04 100644
--- a/kresources/scalix/scalixadmin/ldapdialog.cpp
+++ b/kresources/scalix/scalixadmin/ldapdialog.cpp
@@ -24,8 +24,8 @@
#include "ldapdialog.h"
-LdapDialog::LdapDialog( TQWidget *parent )
- : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true )
+LdapDialog::LdapDialog( TQWidget *tqparent )
+ : KDialogBase( tqparent, "", true, "", Ok | Cancel, Ok, true )
{
setCaption( i18n( "User Account Selection" ) );
diff --git a/kresources/scalix/scalixadmin/ldapdialog.h b/kresources/scalix/scalixadmin/ldapdialog.h
index 9d822af19..bcccd2802 100644
--- a/kresources/scalix/scalixadmin/ldapdialog.h
+++ b/kresources/scalix/scalixadmin/ldapdialog.h
@@ -27,7 +27,7 @@ class LdapView;
class LdapDialog : public KDialogBase
{
public:
- LdapDialog( TQWidget *parent = 0 );
+ LdapDialog( TQWidget *tqparent = 0 );
TQString selectedUser() const;
diff --git a/kresources/scalix/scalixadmin/ldapview.cpp b/kresources/scalix/scalixadmin/ldapview.cpp
index 0e40f3ae6..04351395e 100644
--- a/kresources/scalix/scalixadmin/ldapview.cpp
+++ b/kresources/scalix/scalixadmin/ldapview.cpp
@@ -26,11 +26,11 @@
#include "ldapview.h"
-class LdapItem : public QListViewItem
+class LdapItem : public TQListViewItem
{
public:
- LdapItem( TQListView *parent, const TQString &text, const TQString &email )
- : TQListViewItem( parent )
+ LdapItem( TQListView *tqparent, const TQString &text, const TQString &email )
+ : TQListViewItem( tqparent )
{
setText( 0, text );
setText( 1, email );
@@ -38,8 +38,8 @@ class LdapItem : public QListViewItem
};
-LdapView::LdapView( TQWidget *parent )
- : KListView( parent )
+LdapView::LdapView( TQWidget *tqparent )
+ : KListView( tqparent )
{
addColumn( i18n( "User" ) );
setFullWidth( true );
diff --git a/kresources/scalix/scalixadmin/ldapview.h b/kresources/scalix/scalixadmin/ldapview.h
index 4616e11ce..8d7375da4 100644
--- a/kresources/scalix/scalixadmin/ldapview.h
+++ b/kresources/scalix/scalixadmin/ldapview.h
@@ -30,9 +30,10 @@ class LdapObject;
class LdapView : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- LdapView( TQWidget *parent = 0 );
+ LdapView( TQWidget *tqparent = 0 );
~LdapView();
TQString selectedUser() const;
diff --git a/kresources/scalix/scalixadmin/otherusermanager.h b/kresources/scalix/scalixadmin/otherusermanager.h
index 90d7195a4..386280adf 100644
--- a/kresources/scalix/scalixadmin/otherusermanager.h
+++ b/kresources/scalix/scalixadmin/otherusermanager.h
@@ -24,9 +24,10 @@
#include <tqobject.h>
#include <tqstringlist.h>
-class OtherUserManager : public QObject
+class OtherUserManager : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
OtherUserManager();
diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp
index f7a9ee63f..6aba51c7c 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.cpp
+++ b/kresources/scalix/scalixadmin/otheruserpage.cpp
@@ -37,8 +37,8 @@
#include "otheruserpage.h"
-OtherUserPage::OtherUserPage( TQWidget *parent )
- : TQWidget( parent )
+OtherUserPage::OtherUserPage( TQWidget *tqparent )
+ : TQWidget( tqparent )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, 11, 6 );
@@ -149,8 +149,8 @@ void OtherUserPage::updateKmail()
TQString error;
TQCString dcopService;
int result = KDCOPServiceStarter::self()->
- findServiceFor( "DCOP/ResourceBackend/IMAP", TQString::null,
- TQString::null, &error, &dcopService );
+ findServiceFor( "DCOP/ResourceBackend/IMAP", TQString(),
+ TQString(), &error, &dcopService );
if ( result != 0 ) {
KMessageBox::error( 0, i18n( "Unable to start KMail to trigger account update with Scalix server" ) );
delete msg;
diff --git a/kresources/scalix/scalixadmin/otheruserpage.h b/kresources/scalix/scalixadmin/otheruserpage.h
index e77536ec4..f547c078e 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.h
+++ b/kresources/scalix/scalixadmin/otheruserpage.h
@@ -28,12 +28,13 @@
class TQPushButton;
class OtherUserView;
-class OtherUserPage : public QWidget
+class OtherUserPage : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- OtherUserPage( TQWidget *parent = 0 );
+ OtherUserPage( TQWidget *tqparent = 0 );
~OtherUserPage();
private slots:
diff --git a/kresources/scalix/scalixadmin/otheruserview.cpp b/kresources/scalix/scalixadmin/otheruserview.cpp
index 19b9c3b65..7b07612c3 100644
--- a/kresources/scalix/scalixadmin/otheruserview.cpp
+++ b/kresources/scalix/scalixadmin/otheruserview.cpp
@@ -24,11 +24,11 @@
#include "otheruserview.h"
-class OtherUserItem : public QListViewItem
+class OtherUserItem : public TQListViewItem
{
public:
- OtherUserItem( TQListView *parent, const TQString &user )
- : TQListViewItem( parent ), mUser( user )
+ OtherUserItem( TQListView *tqparent, const TQString &user )
+ : TQListViewItem( tqparent ), mUser( user )
{
setText( 0, mUser );
}
@@ -39,8 +39,8 @@ class OtherUserItem : public QListViewItem
TQString mUser;
};
-OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *parent )
- : KListView( parent ), mManager( manager )
+OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *tqparent )
+ : KListView( tqparent ), mManager( manager )
{
addColumn( i18n( "Registered Accounts" ) );
setFullWidth( true );
diff --git a/kresources/scalix/scalixadmin/otheruserview.h b/kresources/scalix/scalixadmin/otheruserview.h
index def14a84b..36f5923b8 100644
--- a/kresources/scalix/scalixadmin/otheruserview.h
+++ b/kresources/scalix/scalixadmin/otheruserview.h
@@ -28,9 +28,10 @@ class OtherUserManager;
class OtherUserView : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- OtherUserView( OtherUserManager *manager, TQWidget *parent = 0 );
+ OtherUserView( OtherUserManager *manager, TQWidget *tqparent = 0 );
TQString selectedUser() const;
diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp
index 401d4de18..d56e8954e 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.cpp
+++ b/kresources/scalix/scalixadmin/outofofficepage.cpp
@@ -33,12 +33,12 @@
#include "outofofficepage.h"
-OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
- : TQWidget( parent )
+OutOfOfficePage::OutOfOfficePage( TQWidget *tqparent )
+ : TQWidget( tqparent )
{
TQGridLayout *tqlayout = 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 );
diff --git a/kresources/scalix/scalixadmin/outofofficepage.h b/kresources/scalix/scalixadmin/outofofficepage.h
index 148379d75..8e536b287 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.h
+++ b/kresources/scalix/scalixadmin/outofofficepage.h
@@ -28,12 +28,13 @@ class TQPushButton;
class TQRadioButton;
class TQTextEdit;
-class OutOfOfficePage : public QWidget
+class OutOfOfficePage : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- OutOfOfficePage( TQWidget *parent = 0 );
+ OutOfOfficePage( TQWidget *tqparent = 0 );
~OutOfOfficePage();
private slots:
diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp
index e75d3fdd2..53a163b83 100644
--- a/kresources/scalix/scalixadmin/passwordpage.cpp
+++ b/kresources/scalix/scalixadmin/passwordpage.cpp
@@ -35,8 +35,8 @@
#include "passwordpage.h"
-PasswordPage::PasswordPage( TQWidget *parent )
- : TQWidget( parent ), mJob( 0 )
+PasswordPage::PasswordPage( TQWidget *tqparent )
+ : TQWidget( tqparent ), mJob( 0 )
{
TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
diff --git a/kresources/scalix/scalixadmin/passwordpage.h b/kresources/scalix/scalixadmin/passwordpage.h
index 99f912f11..a461a086a 100644
--- a/kresources/scalix/scalixadmin/passwordpage.h
+++ b/kresources/scalix/scalixadmin/passwordpage.h
@@ -30,12 +30,13 @@ namespace KIO {
class Job;
}
-class PasswordPage : public QWidget
+class PasswordPage : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- PasswordPage( TQWidget *parent = 0 );
+ PasswordPage( TQWidget *tqparent = 0 );
private slots:
void buttonClicked();