summaryrefslogtreecommitdiffstats
path: root/kresources/scalix
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:50 -0600
commit9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch)
treeab537a329b9613e11dce8195761f93ffe82aed24 /kresources/scalix
parent3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff)
downloadtdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz
tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'kresources/scalix')
-rw-r--r--kresources/scalix/kabc/contact.cpp20
-rw-r--r--kresources/scalix/kcal/resourcescalix.cpp8
-rw-r--r--kresources/scalix/kioslave/scalix.cpp14
-rw-r--r--kresources/scalix/knotes/resourcescalix.cpp2
-rw-r--r--kresources/scalix/scalixadmin/delegatedialog.cpp12
-rw-r--r--kresources/scalix/scalixadmin/delegatepage.cpp12
-rw-r--r--kresources/scalix/scalixadmin/jobs.cpp10
-rw-r--r--kresources/scalix/scalixadmin/ldapview.cpp4
-rw-r--r--kresources/scalix/scalixadmin/otheruserpage.cpp10
-rw-r--r--kresources/scalix/scalixadmin/outofofficepage.cpp14
-rw-r--r--kresources/scalix/scalixadmin/passwordpage.cpp18
-rw-r--r--kresources/scalix/scalixadmin/settings.cpp4
-rw-r--r--kresources/scalix/shared/resourcescalixbase.cpp4
-rw-r--r--kresources/scalix/shared/scalixbase.cpp32
-rw-r--r--kresources/scalix/shared/scalixbase.h10
15 files changed, 87 insertions, 87 deletions
diff --git a/kresources/scalix/kabc/contact.cpp b/kresources/scalix/kabc/contact.cpp
index 9f38674ef..762d4b9fe 100644
--- a/kresources/scalix/kabc/contact.cpp
+++ b/kresources/scalix/kabc/contact.cpp
@@ -103,19 +103,19 @@ TQString Contact::toXml( const KABC::Addressee &addr )
comment = addr.formattedName();
display = emails[ i ];
} else {
- comment = custom( TQString( "email%1_address_with_comment" ).arg( i + 1 ), addr );
- display = custom( TQString( "email%1_display_name" ).arg( i + 1 ), addr );
+ comment = custom( TQString( "email%1_address_with_comment" ).tqarg( i + 1 ), addr );
+ display = custom( TQString( "email%1_display_name" ).tqarg( i + 1 ), addr );
}
}
- xml += TQString( "<email%1_address_type>" ).arg( i + 1 ) + type +
- TQString( "</email%1_address_type>" ).arg( i + 1 ) +"\n";
- xml += TQString( "<email%1_address>" ).arg( i + 1 ) + address +
- TQString( "</email%1_address>" ).arg( i + 1 ) +"\n";
- xml += TQString( "<email%1_address_with_comment>" ).arg( i + 1 ) + comment +
- TQString( "</email%1_address_with_comment>" ).arg( i + 1 ) + "\n";
- xml += TQString( "<email%1_display_name>" ).arg( i + 1 ) + display +
- TQString( "</email%1_display_name>" ).arg( i + 1 ) + "\n";
+ xml += TQString( "<email%1_address_type>" ).tqarg( i + 1 ) + type +
+ TQString( "</email%1_address_type>" ).tqarg( i + 1 ) +"\n";
+ xml += TQString( "<email%1_address>" ).tqarg( i + 1 ) + address +
+ TQString( "</email%1_address>" ).tqarg( i + 1 ) +"\n";
+ xml += TQString( "<email%1_address_with_comment>" ).tqarg( i + 1 ) + comment +
+ TQString( "</email%1_address_with_comment>" ).tqarg( i + 1 ) + "\n";
+ xml += TQString( "<email%1_display_name>" ).tqarg( i + 1 ) + display +
+ TQString( "</email%1_display_name>" ).tqarg( i + 1 ) + "\n";
}
KABC::PhoneNumber phone = addr.phoneNumber( KABC::PhoneNumber::Home );
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index eeebb32f8..645c5b88e 100644
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@@ -63,7 +63,7 @@ static const char* incidenceInlineMimeType = "text/calendar";
ResourceScalix::ResourceScalix( const KConfig *config )
: ResourceCalendar( config ), ResourceScalixBase( "ResourceScalix-libkcal" ),
- mCalendar( TQString::fromLatin1("UTC") ), mOpen( false )
+ mCalendar( TQString::tqfromLatin1("UTC") ), mOpen( false )
{
setType( "scalix" );
connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
@@ -268,8 +268,8 @@ bool ResourceScalix::doSave()
void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase )
{
if ( incidencebase->isReadOnly() ) return; // Should not happen (TM)
- incidencebase->setSyncStatus( KCal::Event::SYNCMOD );
- incidencebase->setLastModified( TQDateTime::currentDateTime() );
+ incidencebase->setSynctqStatus( KCal::Event::SYNCMOD );
+ incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() );
// we should probably update the revision number here,
// or internally in the Event itself when certain things change.
// need to verify with ical documentation.
@@ -325,7 +325,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr
} else if ( result == 0 ) { // take both
localIncidence = local->clone();
localIncidence->recreate();
- localIncidence->setSummary( i18n("Copy of: %1").arg(localIncidence->summary()) );
+ localIncidence->setSummary( i18n("Copy of: %1").tqarg(localIncidence->summary()) );
addedIncidence = inc;
}
bool silent = mSilent;
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index c5631f78c..acfa088e6 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -104,14 +104,14 @@ void Scalix::retrieveFreeBusy( const KURL &url )
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
- const TQString argument = TQString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).arg( requestUser );
- const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).arg( argument.length() );
+ const TQString argument = TQString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).tqarg( requestUser );
+ const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).tqarg( argument.length() );
stream << (int) 'X' << 'E' << command << argument;
- TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
+ TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ?
url.user() : url.user() + ":" + url.pass() )
- .arg( url.host() );
+ .tqarg( url.host() );
mFreeBusyData = TQString();
@@ -173,13 +173,13 @@ void Scalix::publishFreeBusy( const KURL &url )
TQDataStream stream( packedArgs, IO_WriteOnly );
const TQString argument = TQString::fromUtf8( data );
- const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).arg( argument.length() );
+ const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).tqarg( argument.length() );
stream << (int) 'X' << 'E' << command << argument;
- TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
+ TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ?
url.user() : url.user() + ":" + url.pass() )
- .arg( url.host() );
+ .tqarg( url.host() );
KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false );
connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp
index 0289fab0a..69922283e 100644
--- a/kresources/scalix/knotes/resourcescalix.cpp
+++ b/kresources/scalix/knotes/resourcescalix.cpp
@@ -49,7 +49,7 @@ static const char* inlineMimeType = "text/calendar";
ResourceScalix::ResourceScalix( const KConfig *config )
: ResourceNotes( config ), ResourceScalixBase( "ResourceScalix-KNotes" ),
- mCalendar( TQString::fromLatin1("UTC") )
+ mCalendar( TQString::tqfromLatin1("UTC") )
{
setType( "scalix" );
}
diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp
index 3b24f2d4c..d0a9644e8 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.cpp
+++ b/kresources/scalix/scalixadmin/delegatedialog.cpp
@@ -20,7 +20,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqtoolbutton.h>
@@ -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 d1610d232..32b29d465 100644
--- a/kresources/scalix/scalixadmin/delegatepage.cpp
+++ b/kresources/scalix/scalixadmin/delegatepage.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <kinputdialog.h>
@@ -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/jobs.cpp b/kresources/scalix/scalixadmin/jobs.cpp
index f1bce9f2c..2d6823918 100644
--- a/kresources/scalix/scalixadmin/jobs.cpp
+++ b/kresources/scalix/scalixadmin/jobs.cpp
@@ -73,7 +73,7 @@ SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url,
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'X' << (int)'N'
- << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).arg( oldPassword ).arg( newPassword );
+ << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).tqarg( oldPassword ).tqarg( newPassword );
SetPasswordJob* job = new SetPasswordJob( url, packedArgs, false );
KIO::Scheduler::assignJobToSlave( slave, job );
@@ -95,7 +95,7 @@ SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const T
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
stream << (int)'X' << (int)'N'
- << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).arg( email ).arg( types.join( " " ) );
+ << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).tqarg( email ).tqarg( types.join( " " ) );
SetDelegateJob* job = new SetDelegateJob( url, packedArgs, false );
KIO::Scheduler::assignJobToSlave( slave, job );
@@ -164,9 +164,9 @@ GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url )
SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg )
{
const TQString argument = msg;
- const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).arg( enabled ? "ENABLED" : "DISABLED" )
- .arg( "UTF-8" )
- .arg( msg.utf8().length() );
+ const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).tqarg( enabled ? "ENABLED" : "DISABLED" )
+ .tqarg( "UTF-8" )
+ .tqarg( msg.utf8().length() );
TQByteArray packedArgs;
TQDataStream stream( packedArgs, IO_WriteOnly );
diff --git a/kresources/scalix/scalixadmin/ldapview.cpp b/kresources/scalix/scalixadmin/ldapview.cpp
index adf2fe3fa..b52c0aad9 100644
--- a/kresources/scalix/scalixadmin/ldapview.cpp
+++ b/kresources/scalix/scalixadmin/ldapview.cpp
@@ -85,8 +85,8 @@ void LdapView::setQuery( const TQString &query )
void LdapView::entryAdded( const KABC::LdapObject &obj )
{
- const TQString text = TQString( "%1 (%2)" ).arg( TQString(obj.attrs[ "surname" ].first()) )
- .arg( TQString(obj.attrs[ "mail" ].first()) );
+ const TQString text = TQString( "%1 (%2)" ).tqarg( TQString(obj.attrs[ "surname" ].first()) )
+ .tqarg( TQString(obj.attrs[ "mail" ].first()) );
new LdapItem( this, text, obj.attrs[ "mail" ].first() );
}
diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp
index daec37f2d..ab5a417a9 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.cpp
+++ b/kresources/scalix/scalixadmin/otheruserpage.cpp
@@ -19,7 +19,7 @@
*/
#include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <dcopref.h>
@@ -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() ) );
diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp
index deb01a7d6..401d4de18 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.cpp
+++ b/kresources/scalix/scalixadmin/outofofficepage.cpp
@@ -20,10 +20,10 @@
#include <tqbuttongroup.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <klocale.h>
#include <kmessagebox.h>
@@ -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 ba7f25a07..51b11f6ff 100644
--- a/kresources/scalix/scalixadmin/passwordpage.cpp
+++ b/kresources/scalix/scalixadmin/passwordpage.cpp
@@ -20,7 +20,7 @@
#include <tqapplication.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
@@ -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() ) );
@@ -179,7 +179,7 @@ void PasswordPage::finished( KIO::Job* job )
group.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
}
- KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) );
+ KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).tqarg( group.readNumEntry( "Folder" ) ) );
fileGroup.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
}
}
diff --git a/kresources/scalix/scalixadmin/settings.cpp b/kresources/scalix/scalixadmin/settings.cpp
index 52f72296f..d5c5cdb1c 100644
--- a/kresources/scalix/scalixadmin/settings.cpp
+++ b/kresources/scalix/scalixadmin/settings.cpp
@@ -92,8 +92,8 @@ TQString Settings::rulesWizardUrl() const
TQString url = group.readEntry( "rulesWizardUrl" );
if ( url.isEmpty() ) {
KConfigGroup group( &config, "Account" );
- url = TQString( "http://%1/Scalix/rw/?username=%2" ).arg( group.readEntry( "host" ) )
- .arg( group.readEntry( "user" ) );
+ url = TQString( "http://%1/Scalix/rw/?username=%2" ).tqarg( group.readEntry( "host" ) )
+ .tqarg( group.readEntry( "user" ) );
}
return url;
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index 5f1c36497..c9bfca350 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -41,7 +41,7 @@
#include <kurl.h>
#include <ktempfile.h>
#include <kmessagebox.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <kdebug.h>
using namespace Scalix;
@@ -130,7 +130,7 @@ bool ResourceScalixBase::kmailUpdate( const TQString& resource,
TQString ResourceScalixBase::configFile( const TQString& type ) const
{
return locateLocal( "config",
- TQString( "kresources/scalix/%1rc" ).arg( type ) );
+ TQString( "kresources/scalix/%1rc" ).tqarg( type ) );
}
bool ResourceScalixBase::connectToKMail() const
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index 0d305c0af..5a23623bc 100644
--- a/kresources/scalix/shared/scalixbase.cpp
+++ b/kresources/scalix/shared/scalixbase.cpp
@@ -42,10 +42,10 @@ using namespace Scalix;
ScalixBase::ScalixBase( const TQString& tz )
- : mCreationDate( TQDateTime::currentDateTime() ),
- mLastModified( TQDateTime::currentDateTime() ),
+ : mCreationDate( TQDateTime::tqcurrentDateTime() ),
+ mLastModified( TQDateTime::tqcurrentDateTime() ),
mSensitivity( Public ), mTimeZoneId( tz ),
- mHasPilotSyncId( false ), mHasPilotSyncStatus( false )
+ mHasPilotSyncId( false ), mHasPilotSynctqStatus( false )
{
}
@@ -56,7 +56,7 @@ ScalixBase::~ScalixBase()
void ScalixBase::setFields( const KCal::Incidence* incidence )
{
// So far unhandled KCal::IncidenceBase fields:
- // mPilotID, mSyncStatus, mFloats
+ // mPilotID, mSynctqStatus, mFloats
setUid( incidence->uid() );
setBody( incidence->description() );
@@ -92,7 +92,7 @@ void ScalixBase::setFields( const KABC::Addressee* addressee )
kdDebug(5006) << "Creation time string: " << creationString << endl;
TQDateTime creationDate;
if ( creationString.isEmpty() ) {
- creationDate = TQDateTime::currentDateTime();
+ creationDate = TQDateTime::tqcurrentDateTime();
kdDebug(5006) << "Creation date set to current time\n";
}
else {
@@ -101,7 +101,7 @@ void ScalixBase::setFields( const KABC::Addressee* addressee )
}
TQDateTime modified = addressee->revision();
if ( !modified.isValid() )
- modified = TQDateTime::currentDateTime();
+ modified = TQDateTime::tqcurrentDateTime();
setLastModified( modified );
if ( modified < creationDate ) {
// It's not possible that the modification date is earlier than creation
@@ -231,20 +231,20 @@ unsigned long ScalixBase::pilotSyncId() const
return mPilotSyncId;
}
-void ScalixBase::setPilotSyncStatus( int status )
+void ScalixBase::setPilotSynctqStatus( int status )
{
- mHasPilotSyncStatus = true;
- mPilotSyncStatus = status;
+ mHasPilotSynctqStatus = true;
+ mPilotSynctqStatus = status;
}
-bool ScalixBase::hasPilotSyncStatus() const
+bool ScalixBase::hasPilotSynctqStatus() const
{
- return mHasPilotSyncStatus;
+ return mHasPilotSynctqStatus;
}
-int ScalixBase::pilotSyncStatus() const
+int ScalixBase::pilotSynctqStatus() const
{
- return mPilotSyncStatus;
+ return mPilotSynctqStatus;
}
bool ScalixBase::loadEmailAttribute( TQDomElement& element, Email& email )
@@ -300,7 +300,7 @@ bool ScalixBase::loadAttribute( TQDomElement& element )
else if ( tagName == "pilot-sync-id" )
setPilotSyncId( element.text().toULong() );
else if ( tagName == "pilot-sync-status" )
- setPilotSyncStatus( element.text().toInt() );
+ setPilotSynctqStatus( element.text().toInt() );
else
return false;
@@ -320,8 +320,8 @@ bool ScalixBase::saveAttributes( TQDomElement& element ) const
writeString( element, "sensitivity", sensitivityToString( sensitivity() ) );
if ( hasPilotSyncId() )
writeString( element, "pilot-sync-id", TQString::number( pilotSyncId() ) );
- if ( hasPilotSyncStatus() )
- writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) );
+ if ( hasPilotSynctqStatus() )
+ writeString( element, "pilot-sync-status", TQString::number( pilotSynctqStatus() ) );
return true;
}
diff --git a/kresources/scalix/shared/scalixbase.h b/kresources/scalix/shared/scalixbase.h
index 7bff80a4b..b837ab03e 100644
--- a/kresources/scalix/shared/scalixbase.h
+++ b/kresources/scalix/shared/scalixbase.h
@@ -93,9 +93,9 @@ public:
virtual bool hasPilotSyncId() const;
virtual unsigned long pilotSyncId() const;
- virtual void setPilotSyncStatus( int status );
- virtual bool hasPilotSyncStatus() const;
- virtual int pilotSyncStatus() const;
+ virtual void setPilotSynctqStatus( int status );
+ virtual bool hasPilotSynctqStatus() const;
+ virtual int pilotSynctqStatus() const;
// String - Date conversion methods
static TQString dateTimeToString( const TQDateTime& time );
@@ -166,9 +166,9 @@ protected:
TQString mTimeZoneId;
// KPilot synchronization stuff
- bool mHasPilotSyncId, mHasPilotSyncStatus;
+ bool mHasPilotSyncId, mHasPilotSynctqStatus;
unsigned long mPilotSyncId;
- int mPilotSyncStatus;
+ int mPilotSynctqStatus;
};
}