diff options
Diffstat (limited to 'kresources/scalix')
44 files changed, 171 insertions, 153 deletions
diff --git a/kresources/scalix/kabc/contact.cpp b/kresources/scalix/kabc/contact.cpp index 06c67442..b8abb42a 100644 --- a/kresources/scalix/kabc/contact.cpp +++ b/kresources/scalix/kabc/contact.cpp @@ -71,7 +71,7 @@ TQString Contact::toXml( const KABC::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 KABC::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 @@ KABC::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 @@ KABC::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/kresources/scalix/kabc/resourcescalix.cpp b/kresources/scalix/kabc/resourcescalix.cpp index 55b2ed2e..e9193c4b 100644 --- a/kresources/scalix/kabc/resourcescalix.cpp +++ b/kresources/scalix/kabc/resourcescalix.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -80,7 +80,7 @@ static const char* s_inlineMimeType = "application/scalix-properties"; KABC::ResourceScalix::ResourceScalix( const KConfig *config ) : KPIM::ResourceABC( config ), Scalix::ResourceScalixBase( "ResourceScalix-KABC" ), - mCachedSubresource( TQString::null ), mLocked( false ) + mCachedSubresource( TQString() ), mLocked( false ) { setType( "scalix" ); } @@ -149,7 +149,7 @@ KABC::Ticket * KABC::ResourceScalix::requestSaveTicket() void KABC::ResourceScalix::releaseSaveTicket( Ticket* ticket ) { mLocked = false; - mCachedSubresource = TQString::null; + mCachedSubresource = TQString(); delete ticket; } @@ -317,7 +317,7 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr ) const TQString uid = addr.uid(); TQString subResource; TQ_UINT32 sernum; - if ( mUidMap.find( uid ) != mUidMap.end() ) { + if ( mUidMap.tqfind( uid ) != mUidMap.end() ) { subResource = mUidMap[ uid ].resource(); if ( !subresourceWritable( subResource ) ) { kdWarning() << "Wow! Something tried to update a non-writable addressee! Fix this caller: " << kdBacktrace() << endl; @@ -359,7 +359,7 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr ) kdDebug(5650) << "kmailUpdate returned, now sernum=" << sernum << " for uid=" << uid << endl; mUidMap[ uid ] = StorageReference( subResource, sernum ); // This is ugly, but it's faster than doing - // mAddrMap.find(addr.uid()), which would give the same :-( + // mAddrMap.tqfind(addr.uid()), which would give the same :-( // Reason for this: The Changed attribute of Addressee should // be mutable const_cast<Addressee&>(addr).setChanged( false ); @@ -392,7 +392,7 @@ void KABC::ResourceScalix::insertAddressee( const Addressee& addr ) void KABC::ResourceScalix::removeAddressee( const Addressee& addr ) { const TQString uid = addr.uid(); - if ( mUidMap.find( uid ) == mUidMap.end() ) return; + if ( mUidMap.tqfind( uid ) == mUidMap.end() ) return; //kdDebug(5650) << k_funcinfo << uid << endl; const TQString resource = mUidMap[ uid ].resource(); if ( !subresourceWritable( resource ) ) { @@ -455,7 +455,7 @@ void KABC::ResourceScalix::fromKMailDelIncidence( const TQString& type, mUidsPendingDeletion.remove( uid ); } else if ( mUidsPendingUpdate.tqcontains( uid ) ) { // It's good to know if was deleted, but we are waiting on a new one to - // tqreplace it, so let's just sit tight. + // replace it, so let's just sit tight. } else { // We didn't trigger this, so KMail did, remove the reference to the uid mAddrMap.remove( uid ); @@ -593,7 +593,7 @@ TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) c } kdDebug(5650) << "subresourceLabel( " << subresource << " ): not found!\n"; - return TQString::null; + return TQString(); } void KABC::ResourceScalix::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight ) diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h index 70eb7c92..b7dd6d5e 100644 --- a/kresources/scalix/kabc/resourcescalix.h +++ b/kresources/scalix/kabc/resourcescalix.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -54,6 +54,7 @@ class KDE_EXPORT ResourceScalix : public KPIM::ResourceABC, public Scalix::ResourceScalixBase { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kresources/scalix/kabc/resourcescalix_plugin.cpp b/kresources/scalix/kabc/resourcescalix_plugin.cpp index a5f289a7..c6fe224c 100644 --- a/kresources/scalix/kabc/resourcescalix_plugin.cpp +++ b/kresources/scalix/kabc/resourcescalix_plugin.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kresources/scalix/kabc/scalix.desktop b/kresources/scalix/kabc/scalix.desktop index b91af247..97212513 100644 --- a/kresources/scalix/kabc/scalix.desktop +++ b/kresources/scalix/kabc/scalix.desktop @@ -16,7 +16,7 @@ Name[nds]=Adressbook op Scalix-Server över KMail Name[nl]=Adresboek op Scalix-server via KMail Name[pl]=Książka adresowa na serwerze Scalix za pośrednictwem KMaila Name[ru]=Адресная книга на сервере Scalix через KMail -Name[sk]=Adresár na Scalix serveri pomocou KMail +Name[sk]=Adresár na Scalix serveri potqmocou KMail Name[sr]=Адресар на Scalix серверу преко KMail-а Name[sr@Latn]=Adresar na Scalix serveru preko KMail-a Name[sv]=Adressbok på Scalix-server via Kmail diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp index 1d74c570..8c84977a 100644 --- a/kresources/scalix/kcal/resourcescalix.cpp +++ b/kresources/scalix/kcal/resourcescalix.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -249,7 +249,7 @@ void ResourceScalix::removeIncidences( const TQCString& incidenceType ) // better call event(uid), todo(uid) etc. directly. // A faster but hackish way would probably be to check the type of the resource, - // like mEventSubResources.find( it.data().resource() ) != mEventSubResources.end() ? + // like mEventSubResources.tqfind( it.data().resource() ) != mEventSubResources.end() ? const TQString& uid = it.key(); if ( incidenceType == "Event" && mCalendar.event( uid ) ) mUidMap.remove( it ); @@ -268,7 +268,7 @@ bool ResourceScalix::doSave() void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase ) { if ( incidencebase->isReadOnly() ) return; // Should not happen (TM) - incidencebase->setSyncStatus( KCal::Event::SYNCMOD ); + 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. @@ -482,7 +482,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _ } } /* Check if there are updates for this uid pending and if so process them. */ - if ( KCal::IncidenceBase *update = mPendingUpdates.find( uid ) ) { + if ( KCal::IncidenceBase *update = mPendingUpdates.tqfind( uid ) ) { mSilent = false; // we do want to tell KMail mPendingUpdates.remove( uid ); incidenceUpdated( update ); @@ -507,7 +507,7 @@ bool ResourceScalix::addEvent( KCal::Event* event ) if ( mUidMap.tqcontains( event->uid() ) ) return true; //noop else - return addIncidence( event, TQString::null, 0 ); + return addIncidence( event, TQString(), 0 ); } bool ResourceScalix::addEvent( KCal::Event *event, const TQString &subresource ) @@ -575,7 +575,7 @@ bool ResourceScalix::addTodo( KCal::Todo* todo ) if ( mUidMap.tqcontains( todo->uid() ) ) return true; //noop else - return addIncidence( todo, TQString::null, 0 ); + return addIncidence( todo, TQString(), 0 ); } bool ResourceScalix::addTodo( KCal::Todo *todo, const TQString &subresource ) @@ -609,7 +609,7 @@ bool ResourceScalix::addJournal( KCal::Journal* journal ) if ( mUidMap.tqcontains( journal->uid() ) ) return true; //noop else - return addIncidence( journal, TQString::null, 0 ); + return addIncidence( journal, TQString(), 0 ); } bool ResourceScalix::addJournal( KCal::Journal *journal, const TQString &subresource ) @@ -693,7 +693,7 @@ void ResourceScalix::fromKMailDelIncidence( const TQString& type, mUidsPendingDeletion.remove( uid ); } else if ( mUidsPendingUpdate.tqcontains( uid ) ) { // It's good to know if was deleted, but we are waiting on a new one to - // tqreplace it, so let's just sit tight. + // replace it, so let's just sit tight. } else { // We didn't trigger this, so KMail did, remove the reference to the uid KCal::Incidence* incidence = mCalendar.incidence( uid ); @@ -804,7 +804,7 @@ TQStringList ResourceScalix::subresources() const + mJournalSubResources.keys() ); } -const QString +const TQString ResourceScalix::labelForSubresource( const TQString& subresource ) const { if ( mEventSubResources.tqcontains( subresource ) ) diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h index e00909c7..67ecac36 100644 --- a/kresources/scalix/kcal/resourcescalix.h +++ b/kresources/scalix/kcal/resourcescalix.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -51,6 +51,7 @@ class KDE_EXPORT ResourceScalix : public KCal::ResourceCalendar, public Scalix::ResourceScalixBase { Q_OBJECT + TQ_OBJECT friend struct TemporarySilencer; public: @@ -194,11 +195,11 @@ private: ICalFormat mFormat; /** - This map tqcontains the association between a new added incidence + This map contains the association between a new added incidence and the subresource it belongs to. That's needed to return the correct mapping in subresourceIdentifier(). - We can't trust on mUidMap here, because it tqcontains only non-pending uids. + We can't trust on mUidMap here, because it contains only non-pending uids. */ TQMap<TQString, TQString> mNewIncidencesMap; int mProgressDialogIncidenceLimit; diff --git a/kresources/scalix/kcal/resourcescalix_plugin.cpp b/kresources/scalix/kcal/resourcescalix_plugin.cpp index a36f5bf2..728dc280 100644 --- a/kresources/scalix/kcal/resourcescalix_plugin.cpp +++ b/kresources/scalix/kcal/resourcescalix_plugin.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kresources/scalix/kcal/scalix.desktop b/kresources/scalix/kcal/scalix.desktop index 1c468cca..2d87bfcb 100644 --- a/kresources/scalix/kcal/scalix.desktop +++ b/kresources/scalix/kcal/scalix.desktop @@ -17,7 +17,7 @@ Name[nl]=Agenda op Scalix-server via KMail Name[pl]=Kalendarz na serwerze Scalix za pośrednictwem KMaila Name[pt_BR]=Calendário em Servidor Scalix via KMail Name[ru]=Календарь на сервере Scalix через KMail -Name[sk]=Kalendár na Scalix serveri pomocou KMail +Name[sk]=Kalendár na Scalix serveri potqmocou KMail Name[sr]=Календар на Scalix серверу преко KMail-а Name[sr@Latn]=Kalendar na Scalix serveru preko KMail-a Name[sv]=Kalender på Scalix-server via Kmail diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp index 2a0c06cd..c3a8f99b 100644 --- a/kresources/scalix/kioslave/scalix.cpp +++ b/kresources/scalix/kioslave/scalix.cpp @@ -139,7 +139,7 @@ void Scalix::publishFreeBusy( const KURL &url ) requestUser = path.mid( lastSlash + 1 ); // extract calendar name - int secondSlash = path.find( '/', 1 ); + int secondSlash = path.tqfind( '/', 1 ); if ( secondSlash != -1 ) calendar = path.mid( secondSlash + 1, lastSlash - secondSlash - 1 ); diff --git a/kresources/scalix/kioslave/scalix.h b/kresources/scalix/kioslave/scalix.h index 25a2fdea..16f60be7 100644 --- a/kresources/scalix/kioslave/scalix.h +++ b/kresources/scalix/kioslave/scalix.h @@ -29,6 +29,7 @@ class Scalix : public TQObject, public KIO::SlaveBase { Q_OBJECT + TQ_OBJECT public: Scalix( const TQCString &protocol, const TQCString &pool, const TQCString &app ); diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp index 5afd6402..b9d5b54c 100644 --- a/kresources/scalix/knotes/resourcescalix.cpp +++ b/kresources/scalix/knotes/resourcescalix.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -154,7 +154,7 @@ bool ResourceScalix::save() bool ResourceScalix::addNote( KCal::Journal* journal ) { - return addNote( journal, TQString::null, 0 ); + return addNote( journal, TQString(), 0 ); } KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& subresource, diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h index dc8517b6..fc1309b9 100644 --- a/kresources/scalix/knotes/resourcescalix.h +++ b/kresources/scalix/knotes/resourcescalix.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -53,6 +53,7 @@ class KDE_EXPORT ResourceScalix : public ResourceNotes, public ResourceScalixBase { Q_OBJECT + TQ_OBJECT public: ResourceScalix( const KConfig* ); diff --git a/kresources/scalix/knotes/resourcescalix_plugin.cpp b/kresources/scalix/knotes/resourcescalix_plugin.cpp index 222d5ed6..1cb83556 100644 --- a/kresources/scalix/knotes/resourcescalix_plugin.cpp +++ b/kresources/scalix/knotes/resourcescalix_plugin.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kresources/scalix/knotes/scalix.desktop b/kresources/scalix/knotes/scalix.desktop index a573bee8..82c34afa 100644 --- a/kresources/scalix/knotes/scalix.desktop +++ b/kresources/scalix/knotes/scalix.desktop @@ -16,7 +16,7 @@ Name[nds]=Notizen op Scalix-Server över KMail Name[nl]=Notities op Scalix-server via KMail Name[pl]=Notatki na serwerze Scalix za pośrednictwem KMaila Name[ru]=Заметки на сервере Scalix через KMail -Name[sk]=Poznámky na Scalix serveri pomocou KMail +Name[sk]=Poznámky na Scalix serveri potqmocou KMail Name[sr]=Белешке на Scalix серверу преко KMail-а Name[sr@Latn]=Beleške na Scalix serveru preko KMail-a Name[sv]=Anteckningar på Scalix-server via Kmail diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp index d0a9644e..70ab3734 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 1cadb592..a515fe89 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 7f5e2e5a..2edff628 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 32b29d46..cdfef591 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 e62c89ee..3d266580 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 e253f1f3..12f27b77 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 1e9e6300..243d3c8d 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 24ce1c02..84574456 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 6af08c4d..35f5d1c0 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 9d822af1..bcccd280 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 0e40f3ae..04351395 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 4616e11c..8d7375da 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 90d7195a..386280ad 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 f7a9ee63..6aba51c7 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 e77536ec..f547c078 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 19b9c3b6..7b07612c 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 def14a84..36f5923b 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 401d4de1..d56e8954 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 148379d7..8e536b28 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 e75d3fdd..53a163b8 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 99f912f1..a461a086 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(); diff --git a/kresources/scalix/shared/kmailconnection.cpp b/kresources/scalix/shared/kmailconnection.cpp index 60ea25ee..5a157048 100644 --- a/kresources/scalix/shared/kmailconnection.cpp +++ b/kresources/scalix/shared/kmailconnection.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -75,8 +75,8 @@ bool KMailConnection::connectToKMail() 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 ) { kdError(5650) << "Couldn't connect to the IMAP resource backend\n"; // TODO: You might want to show "error" (if not empty) here, diff --git a/kresources/scalix/shared/kmailconnection.h b/kresources/scalix/shared/kmailconnection.h index 3d34d5c6..6eab8ff1 100644 --- a/kresources/scalix/shared/kmailconnection.h +++ b/kresources/scalix/shared/kmailconnection.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -49,6 +49,7 @@ class ResourceScalixBase; */ class KMailConnection : public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP // These are the methods called by KMail when the resource changes diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp index 9bd0afb8..c9c7ee11 100644 --- a/kresources/scalix/shared/resourcescalixbase.cpp +++ b/kresources/scalix/shared/resourcescalixbase.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -155,7 +155,7 @@ TQString ResourceScalixBase::findWritableResource( const ResourceMap& resources if ( possible.isEmpty() ) { // None found!! kdWarning(5650) << "No writable resource found!" << endl; KMessageBox::error( 0, i18n( "No writable resource was found, saving will not be possible. Reconfigure KMail first." ) ); - return TQString::null; + return TQString(); } if ( possible.count() == 1 ) // Just one found @@ -167,7 +167,7 @@ TQString ResourceScalixBase::findWritableResource( const ResourceMap& resources "Please select the one you want to write to." ), possible.keys() ); if ( chosenLabel.isEmpty() ) // cancelled - return TQString::null; + return TQString(); return possible[chosenLabel]; } diff --git a/kresources/scalix/shared/resourcescalixbase.h b/kresources/scalix/shared/resourcescalixbase.h index e402e427..82c6e471 100644 --- a/kresources/scalix/shared/resourcescalixbase.h +++ b/kresources/scalix/shared/resourcescalixbase.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp index e9a5ab8c..64400e4f 100644 --- a/kresources/scalix/shared/scalixbase.cpp +++ b/kresources/scalix/shared/scalixbase.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,7 +45,7 @@ ScalixBase::ScalixBase( const TQString& tz ) : 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() ); @@ -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; } @@ -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/kresources/scalix/shared/scalixbase.h b/kresources/scalix/shared/scalixbase.h index 2db064f7..b837ab03 100644 --- a/kresources/scalix/shared/scalixbase.h +++ b/kresources/scalix/shared/scalixbase.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -53,8 +53,8 @@ class ScalixBase { public: struct Email { public: - Email( const TQString& name = TQString::null, - const TQString& email = TQString::null ) + Email( const TQString& name = TQString(), + const TQString& email = TQString() ) : displayName( name ), smtpAddress( email ) { } @@ -65,7 +65,7 @@ public: enum Sensitivity { Public = 0, Private = 1, Confidential = 2 }; - explicit ScalixBase( const TQString& timezone = TQString::null ); + explicit ScalixBase( const TQString& timezone = TQString() ); virtual ~ScalixBase(); // Return a string identifying this type @@ -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 ); @@ -115,7 +115,7 @@ public: bool load( const TQString& xml ); bool load( TQFile& xml ); - // Load this QDomDocument + // Load this TQDomDocument virtual bool loadXML( const TQDomDocument& xml ) = 0; // Serialize this object to an XML string @@ -166,9 +166,9 @@ protected: TQString mTimeZoneId; // KPilot synchronization stuff - bool mHasPilotSyncId, mHasPilotSyncStatus; + bool mHasPilotSyncId, mHasPilotSynctqStatus; unsigned long mPilotSyncId; - int mPilotSyncStatus; + int mPilotSynctqStatus; }; } diff --git a/kresources/scalix/shared/subresource.cpp b/kresources/scalix/shared/subresource.cpp index 02c9e40f..bd3fdd8a 100644 --- a/kresources/scalix/shared/subresource.cpp +++ b/kresources/scalix/shared/subresource.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kresources/scalix/shared/subresource.h b/kresources/scalix/shared/subresource.h index d7c575da..3fcb6b03 100644 --- a/kresources/scalix/shared/subresource.h +++ b/kresources/scalix/shared/subresource.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -46,7 +46,7 @@ namespace Scalix { */ class SubResource { public: - // This is just for QMap + // This is just for TQMap SubResource() {} SubResource( bool active, bool writable, const TQString& label, @@ -86,7 +86,7 @@ typedef TQMap<TQString, SubResource> ResourceMap; */ class StorageReference { public: - // Just for QMap + // Just for TQMap StorageReference() {} StorageReference( const TQString& resource, TQ_UINT32 sernum ); |