diff options
Diffstat (limited to 'plugins')
8 files changed, 30 insertions, 28 deletions
diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp index 57c546420..02b02e210 100644 --- a/plugins/kmail/bodypartformatter/attendeeselector.cpp +++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp @@ -28,8 +28,8 @@ #include <tqlayout.h> -AttendeeSelector::AttendeeSelector(TQWidget * parent) - : KDialogBase( parent, 0, true, i18n("Select Attendees"), Ok|Cancel, NoDefault, true ) +AttendeeSelector::AttendeeSelector(TQWidget * tqparent) + : KDialogBase( tqparent, 0, true, i18n("Select Attendees"), Ok|Cancel, NoDefault, true ) { ui = new AttendeeSelectorWidget( this ); setMainWidget( ui ); diff --git a/plugins/kmail/bodypartformatter/attendeeselector.h b/plugins/kmail/bodypartformatter/attendeeselector.h index eb843f1fb..8484d5b1d 100644 --- a/plugins/kmail/bodypartformatter/attendeeselector.h +++ b/plugins/kmail/bodypartformatter/attendeeselector.h @@ -30,8 +30,9 @@ class AttendeeSelectorWidget; class AttendeeSelector : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AttendeeSelector( TQWidget *parent = 0 ); + AttendeeSelector( TQWidget *tqparent = 0 ); TQStringList attendees() const; diff --git a/plugins/kmail/bodypartformatter/delegateselector.cpp b/plugins/kmail/bodypartformatter/delegateselector.cpp index 0f20da93a..b85edc9f8 100644 --- a/plugins/kmail/bodypartformatter/delegateselector.cpp +++ b/plugins/kmail/bodypartformatter/delegateselector.cpp @@ -28,8 +28,8 @@ #include <tqlabel.h> #include <tqvbox.h> -DelegateSelector::DelegateSelector(TQWidget * parent) - : KDialogBase( parent, 0, true, i18n("Select delegate"), Ok|Cancel, Ok, true ) +DelegateSelector::DelegateSelector(TQWidget * tqparent) + : KDialogBase( tqparent, 0, true, i18n("Select delegate"), Ok|Cancel, Ok, true ) { TQVBox *page = makeVBoxMainWidget(); diff --git a/plugins/kmail/bodypartformatter/delegateselector.h b/plugins/kmail/bodypartformatter/delegateselector.h index 8f1d87d13..c2be8950f 100644 --- a/plugins/kmail/bodypartformatter/delegateselector.h +++ b/plugins/kmail/bodypartformatter/delegateselector.h @@ -34,9 +34,10 @@ class TQCheckBox; class DelegateSelector : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DelegateSelector( TQWidget *parent = 0 ); + DelegateSelector( TQWidget *tqparent = 0 ); TQString delegate() const; bool rsvp() const; diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 66ed33c30..87d29875d 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.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. @@ -116,12 +116,12 @@ CalendarManager::CalendarManager() for ( CalendarResourceManager::ActiveIterator it = mgr->activeBegin(); it != mgr->activeEnd(); ++it ) { if ( (*it)->type() == "imap" || (*it)->type() == "kolab" ) { const TQStringList subResources = (*it)->subresources(); - TQMap<TQString, int> prefixSet; // KDE4: QSet + TQMap<TQString, int> prefixSet; // KDE4: TQSet for ( TQStringList::ConstIterator subIt = subResources.begin(); subIt != subResources.end(); ++subIt ) { if ( !(*subIt).tqcontains( "/.INBOX.directory/" ) ) // we don't care about shared folders continue; - prefixSet.insert( (*subIt).left( (*subIt).find( "/.INBOX.directory/" ) ), 0 ); + prefixSet.insert( (*subIt).left( (*subIt).tqfind( "/.INBOX.directory/" ) ), 0 ); } if ( prefixSet.count() > 1 ) multipleKolabResources = true; @@ -190,7 +190,7 @@ class Formatter : public KMail::Interface::BodyPartFormatter } }; -static TQString directoryForStatus( Attendee::PartStat status ) +static TQString directoryFortqStatus( Attendee::PartStat status ) { TQString dir; switch ( status ) { @@ -310,7 +310,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler true, // RSVP, otherwise we would not be here status, myself ? myself->role() : heuristicalRole( incidence ), - myself ? myself->uid() : TQString::null ); + myself ? myself->uid() : TQString() ); if ( myself ) { newMyself->setDelegate( myself->delegate() ); newMyself->setDelegator( myself->delegator() ); @@ -333,7 +333,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler bool mail( Incidence* incidence, KMail::Callback& callback, Attendee::PartStat status, Scheduler::Method method = Scheduler::Reply, - const TQString &to = TQString::null, MailType type = Answer ) const + const TQString &to = TQString(), MailType type = Answer ) const { ICalFormat format; format.setTimeZone( KPimPrefs::timezone(), false ); @@ -367,7 +367,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler TQString recv = to; if ( recv.isEmpty() ) recv = incidence->organizer().fullName(); - TQString statusString = directoryForStatus( status ); //it happens to return the right strings + TQString statusString = directoryFortqStatus( status ); //it happens to return the right strings return callback.mailICal( recv, msg, subject, statusString, type != Forward ); } @@ -375,7 +375,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler { TQString error; TQCString dcopService; - int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService ); + int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/Organizer", TQString(), TQString(), &error, &dcopService ); if ( result == 0 ) { // OK, so korganizer (or kontact) is running. Now ensure the object we want is available // [that's not the case when kontact was already running, but korganizer not loaded into it...] @@ -567,7 +567,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler } // First, save it for KOrganizer to handle - TQString dir = directoryForStatus( status ); + TQString dir = directoryFortqStatus( status ); if ( dir.isEmpty() ) return true; // unknown status if ( status != Attendee::Delegated ) // we do that below for delegated incidences @@ -632,7 +632,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler true, // RSVP, otherwise we would not be here status, heuristicalRole( incidence ), - TQString::null ); + TQString() ); incidence->clearAttendees(); incidence->addAttendee( newMyself ); ok = mail( incidence, callback, status, Scheduler::Reply ); @@ -649,7 +649,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler if ( status == Attendee::Delegated ) { incidence = icalToString( iCal ); myself = findMyself( incidence, receiver ); - myself->seStatus( status ); + myself->setqStatus( status ); myself->setDelegate( delegateString ); TQString name, email; KPIM::getNameAndMail( delegateString, name, email ); @@ -932,7 +932,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler } } - return TQString::null; + return TQString(); } }; diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index 3fd76b8e5..014493a96 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.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. @@ -221,7 +221,7 @@ namespace { // get the saveas file name KURL saveAsUrl = KFileDialog::getSaveURL( fileName, - TQString::null, 0, + TQString(), 0, i18n( "Save Business Card" ) ); if ( saveAsUrl.isEmpty() || ( TQFileInfo( saveAsUrl.path() ).exists() && diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp index 26c366ab1..6da849bd1 100644 --- a/plugins/kmail/bodypartformatter/text_xdiff.cpp +++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp @@ -19,11 +19,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/plugins/kmail/bodypartformatter/ui_attendeeselector.ui b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui index 54efee6c0..d929a46d7 100644 --- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui +++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AttendeeSelectorWidget</class> <author>Volker Krause <vkrause@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AttendeeSelectorWidget</cstring> </property> |