summaryrefslogtreecommitdiffstats
path: root/kresources/scalix/scalixadmin
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /kresources/scalix/scalixadmin
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kresources/scalix/scalixadmin')
-rw-r--r--kresources/scalix/scalixadmin/delegatedialog.cpp10
-rw-r--r--kresources/scalix/scalixadmin/delegatepage.cpp10
-rw-r--r--kresources/scalix/scalixadmin/otherusermanager.cpp2
-rw-r--r--kresources/scalix/scalixadmin/otheruserpage.cpp14
-rw-r--r--kresources/scalix/scalixadmin/outofofficepage.cpp10
-rw-r--r--kresources/scalix/scalixadmin/passwordpage.cpp18
6 files changed, 32 insertions, 32 deletions
diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp
index 661f57430..d0a9644e8 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.cpp
+++ b/kresources/scalix/scalixadmin/delegatedialog.cpp
@@ -35,18 +35,18 @@ DelegateDialog::DelegateDialog( TQWidget *parent )
: KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true )
{
TQWidget *page = new TQWidget( this );
- TQGridLayout *layout = new TQGridLayout( page, 5, 3, 11, 6 );
+ TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 11, 6 );
TQLabel *label = new TQLabel( i18n( "User:" ), page );
- layout->addWidget( label, 0, 0 );
+ tqlayout->addWidget( label, 0, 0 );
mEmail = new TQLineEdit( page );
- layout->addWidget( mEmail, 0, 1 );
+ tqlayout->addWidget( mEmail, 0, 1 );
TQToolButton *emailSelector = new TQToolButton( page );
emailSelector->setUsesTextLabel( true );
emailSelector->setTextLabel( i18n( "..." ) );
- layout->addWidget( emailSelector, 0, 2 );
+ tqlayout->addWidget( emailSelector, 0, 2 );
TQValueList<Scalix::DelegateTypes> types;
types << Scalix::SendOnBehalfOf;
@@ -57,7 +57,7 @@ DelegateDialog::DelegateDialog( TQWidget *parent )
int row = 1;
for ( uint i = 0; i < types.count(); ++i ) {
TQCheckBox *box = new TQCheckBox( Scalix::Delegate::rightsAsString( types[ i ] ), page );
- layout->addMultiCellWidget( box, row, row, 1, 2 );
+ tqlayout->addMultiCellWidget( box, row, row, 1, 2 );
mRights.insert( types[ i ], box );
row++;
diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp
index 033472901..32b29d465 100644
--- a/kresources/scalix/scalixadmin/delegatepage.cpp
+++ b/kresources/scalix/scalixadmin/delegatepage.cpp
@@ -37,21 +37,21 @@
DelegatePage::DelegatePage( TQWidget *parent )
: TQWidget( parent )
{
- TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 );
+ TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
mView = new DelegateView( &mManager, this );
- layout->addMultiCellWidget( mView, 0, 0, 0, 2 );
+ tqlayout->addMultiCellWidget( mView, 0, 0, 0, 2 );
mAddButton = new TQPushButton( i18n( "Add Delegate..." ), this );
- layout->addWidget( mAddButton, 1, 0 );
+ tqlayout->addWidget( mAddButton, 1, 0 );
mEditButton = new TQPushButton( i18n( "Edit Delegate..." ), this );
mEditButton->setEnabled( false );
- layout->addWidget( mEditButton, 1, 1 );
+ tqlayout->addWidget( mEditButton, 1, 1 );
mRemoveButton = new TQPushButton( i18n( "Remove Delegate" ), this );
mRemoveButton->setEnabled( false );
- layout->addWidget( mRemoveButton, 1, 2 );
+ tqlayout->addWidget( mRemoveButton, 1, 2 );
connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addDelegate() ) );
diff --git a/kresources/scalix/scalixadmin/otherusermanager.cpp b/kresources/scalix/scalixadmin/otherusermanager.cpp
index a3c19de12..cacb94742 100644
--- a/kresources/scalix/scalixadmin/otherusermanager.cpp
+++ b/kresources/scalix/scalixadmin/otherusermanager.cpp
@@ -30,7 +30,7 @@ OtherUserManager::~OtherUserManager()
void OtherUserManager::addOtherUser( const TQString &email )
{
- if ( !mOtherUsers.contains( email ) ) {
+ if ( !mOtherUsers.tqcontains( email ) ) {
mOtherUsers.append( email );
emit changed();
}
diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp
index 8570cab06..f7a9ee63f 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.cpp
+++ b/kresources/scalix/scalixadmin/otheruserpage.cpp
@@ -40,17 +40,17 @@
OtherUserPage::OtherUserPage( TQWidget *parent )
: TQWidget( parent )
{
- TQGridLayout *layout = new TQGridLayout( this, 2, 2, 11, 6 );
+ TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, 11, 6 );
mView = new OtherUserView( &mManager, this );
- layout->addMultiCellWidget( mView, 0, 0, 0, 1 );
+ tqlayout->addMultiCellWidget( mView, 0, 0, 0, 1 );
mAddButton = new TQPushButton( i18n( "Add Account..." ), this );
- layout->addWidget( mAddButton, 1, 0 );
+ tqlayout->addWidget( mAddButton, 1, 0 );
mDeleteButton = new TQPushButton( i18n( "Remove Account" ), this );
mDeleteButton->setEnabled( false );
- layout->addWidget( mDeleteButton, 1, 1 );
+ tqlayout->addWidget( mDeleteButton, 1, 1 );
connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) );
@@ -139,12 +139,12 @@ void OtherUserPage::selectionChanged()
void OtherUserPage::updateKmail()
{
- TQMessageBox *msg = new TQMessageBox( qApp->mainWidget() );
+ TQMessageBox *msg = new TQMessageBox( tqApp->mainWidget() );
msg->setText( i18n( "Updating account..." ) );
msg->show();
- qApp->processEvents();
+ tqApp->processEvents();
sleep( 1 );
- qApp->processEvents();
+ tqApp->processEvents();
TQString error;
TQCString dcopService;
diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp
index e1e331fc4..401d4de18 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.cpp
+++ b/kresources/scalix/scalixadmin/outofofficepage.cpp
@@ -36,7 +36,7 @@
OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
: TQWidget( parent )
{
- TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 );
+ TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 );
TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this );
@@ -48,10 +48,10 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
mMessage = new TQTextEdit( this );
mSaveButton = new TQPushButton( i18n( "Save" ), this );
- layout->addMultiCellWidget( group, 0, 0, 0, 1 );
- layout->addMultiCellWidget( mLabel, 1, 1, 0, 1 );
- layout->addMultiCellWidget( mMessage, 2, 2, 0, 1 );
- layout->addWidget( mSaveButton, 3, 1 );
+ tqlayout->addMultiCellWidget( group, 0, 0, 0, 1 );
+ tqlayout->addMultiCellWidget( mLabel, 1, 1, 0, 1 );
+ tqlayout->addMultiCellWidget( mMessage, 2, 2, 0, 1 );
+ tqlayout->addWidget( mSaveButton, 3, 1 );
statusChanged();
diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp
index facc29170..e75d3fdd2 100644
--- a/kresources/scalix/scalixadmin/passwordpage.cpp
+++ b/kresources/scalix/scalixadmin/passwordpage.cpp
@@ -38,29 +38,29 @@
PasswordPage::PasswordPage( TQWidget *parent )
: TQWidget( parent ), mJob( 0 )
{
- TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 );
+ TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
TQLabel *label = new TQLabel( i18n( "New password:" ), this );
- layout->addWidget( label, 0, 0 );
+ tqlayout->addWidget( label, 0, 0 );
mPassword = new TQLineEdit( this );
mPassword->setEchoMode( TQLineEdit::Password );
label->setBuddy( mPassword );
- layout->addWidget( mPassword, 0, 1 );
+ tqlayout->addWidget( mPassword, 0, 1 );
label = new TQLabel( i18n( "Retype new password:" ), this );
- layout->addWidget( label, 1, 0 );
+ tqlayout->addWidget( label, 1, 0 );
mPasswordRetype = new TQLineEdit( this );
mPasswordRetype->setEchoMode( TQLineEdit::Password );
label->setBuddy( mPasswordRetype );
- layout->addWidget( mPasswordRetype, 1, 1 );
+ tqlayout->addWidget( mPasswordRetype, 1, 1 );
mButton = new TQPushButton( i18n( "Change" ), this );
mButton->setEnabled( false );
- layout->addWidget( mButton, 2, 1 );
+ tqlayout->addWidget( mButton, 2, 1 );
- layout->setRowSpacing( 3, 1 );
+ tqlayout->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() ) );
@@ -165,8 +165,8 @@ void PasswordPage::finished( KIO::Job* job )
// First try to store in KWallet
if ( KWallet::Wallet::isEnabled() ) {
WId window = 0;
- if ( qApp->activeWindow() )
- window = qApp->activeWindow()->winId();
+ if ( tqApp->activeWindow() )
+ window = tqApp->activeWindow()->winId();
KWallet::Wallet *wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), window );
if ( wallet ) {