From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: Enable kdepim compilation under Qt4 This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kontact/interfaces/core.cpp | 8 +- kontact/interfaces/summary.cpp | 4 +- kontact/plugins/akregator/akregator_plugin.cpp | 2 +- .../plugins/kaddressbook/kaddressbook_plugin.cpp | 4 +- kontact/plugins/karm/karm_plugin.cpp | 2 +- kontact/plugins/kitchensync/kitchensync_plugin.cpp | 2 +- kontact/plugins/kmail/kcmkmailsummary.cpp | 2 +- kontact/plugins/kmail/kmail_plugin.cpp | 2 +- kontact/plugins/kmail/summarywidget.cpp | 6 +- kontact/plugins/knode/knode_plugin.cpp | 2 +- kontact/plugins/knotes/knotes_part.cpp | 2 +- kontact/plugins/knotes/knotes_part_p.h | 2 +- kontact/plugins/knotes/knotes_plugin.cpp | 2 +- kontact/plugins/knotes/knotetip.cpp | 8 +- kontact/plugins/knotes/summarywidget.cpp | 4 +- kontact/plugins/korganizer/journalplugin.cpp | 2 +- kontact/plugins/korganizer/kcmkorgsummary.cpp | 4 +- kontact/plugins/korganizer/korganizerplugin.cpp | 12 +-- kontact/plugins/korganizer/summarywidget.cpp | 10 +-- kontact/plugins/korganizer/todoplugin.cpp | 12 +-- kontact/plugins/korganizer/todosummarywidget.cpp | 6 +- kontact/plugins/kpilot/kpilot_plugin.cpp | 2 +- kontact/plugins/kpilot/summarywidget.cpp | 2 +- kontact/plugins/newsticker/kcmkontactknt.cpp | 2 +- kontact/plugins/newsticker/newsticker_plugin.cpp | 2 +- kontact/plugins/newsticker/summarywidget.cpp | 4 +- kontact/plugins/specialdates/kcmsdsummary.cpp | 6 +- kontact/plugins/specialdates/sdsummarywidget.cpp | 6 +- .../plugins/specialdates/specialdates_plugin.cpp | 2 +- kontact/plugins/summary/kcmkontactsummary.cpp | 2 +- kontact/plugins/summary/summaryview_part.cpp | 24 ++--- kontact/plugins/summary/summaryview_plugin.cpp | 2 +- kontact/plugins/test/test_plugin.cpp | 2 +- kontact/plugins/weather/summarywidget.cpp | 16 ++-- kontact/plugins/weather/weather_plugin.cpp | 2 +- kontact/src/aboutdialog.cpp | 6 +- kontact/src/iconsidepane.cpp | 8 +- kontact/src/kcmkontact.cpp | 2 +- kontact/src/main.cpp | 2 +- kontact/src/mainwindow.cpp | 100 ++++++++++----------- kontact/src/profiledialog.cpp | 8 +- kontact/src/profilemanager.cpp | 2 +- 42 files changed, 150 insertions(+), 150 deletions(-) (limited to 'kontact') diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index b77fabd25..d47058276 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -66,12 +66,12 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) KParts::ReadOnlyPart *part = KParts::ComponentFactory:: createPartInstanceFromLibrary - ( libname, this, 0, this, "kontact", TQStringList(), &error ); + ( libname, this, 0, TQT_TQOBJECT(this), "kontact", TQStringList(), &error ); KParts::ReadOnlyPart *pimPart = dynamic_cast( part ); if ( pimPart ) { mParts.insert( libname, pimPart ); - TQObject::connect( pimPart, TQT_SIGNAL( destroyed( TQObject * ) ), + QObject::connect( pimPart, TQT_SIGNAL( destroyed( TQObject * ) ), TQT_SLOT( slotPartDestroyed( TQObject * ) ) ); } else { // TODO move to KParts::ComponentFactory @@ -86,10 +86,10 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) d->lastErrorMessage = KLibLoader::self()->lastErrorMessage(); break; case KParts::ComponentFactory::ErrNoFactory: - d->lastErrorMessage = i18n( "Program error: the library %1 does not provide a factory." ).arg( libname ); + d->lastErrorMessage = i18n( "Program error: the library %1 does not provide a factory." ).tqarg( libname ); break; case KParts::ComponentFactory::ErrNoComponent: - d->lastErrorMessage = i18n( "Program error: the library %1 does not support creating components of the specified type" ).arg( libname ); + d->lastErrorMessage = i18n( "Program error: the library %1 does not support creating components of the specified type" ).tqarg( libname ); break; } kdWarning(5601) << d->lastErrorMessage << endl; diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp index 0f4c048cd..4fa495bf1 100644 --- a/kontact/interfaces/summary.cpp +++ b/kontact/interfaces/summary.cpp @@ -82,14 +82,14 @@ void Summary::mousePressEvent( TQMouseEvent *event ) void Summary::mouseMoveEvent( TQMouseEvent *event ) { - if ( (event->state() & LeftButton) && + if ( (event->state() & Qt::LeftButton) && (event->pos() - mDragStartPoint).manhattanLength() > 4 ) { TQDragObject *drag = new TQTextDrag( "", this, "SummaryWidgetDrag" ); TQPixmap pm = TQPixmap::grabWidget( this ); if ( pm.width() > 300 ) - pm = pm.convertToImage().smoothScale( 300, 300, TQImage::ScaleMin ); + pm = pm.convertToImage().smoothScale( 300, 300, TQ_ScaleMin ); TQPainter painter; painter.begin( &pm ); diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp index d0ef181f9..37b85be08 100644 --- a/kontact/plugins/akregator/akregator_plugin.cpp +++ b/kontact/plugins/akregator/akregator_plugin.cpp @@ -49,7 +49,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_akregator, PluginFactory( "kontact_akregator" ) ) Plugin::Plugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, core, "akregator" ), m_stub(0) + : Kontact::Plugin( core, TQT_TQOBJECT(core), "akregator" ), m_stub(0) { setInstance( PluginFactory::instance() ); diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index 8fafeb984..db1d80caf 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -52,7 +52,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kaddressbookplugin, KAddressbookPluginFactory( "kontact_kaddressbookplugin" ) ) KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, core, "kaddressbook" ), + : Kontact::Plugin( core, TQT_TQOBJECT(core), "kaddressbook" ), mStub( 0 ) { setInstance( KAddressbookPluginFactory::instance() ); @@ -171,7 +171,7 @@ void KAddressbookPlugin::processDropEvent( TQDropEvent *event ) } KMessageBox::sorry( core(), i18n( "Cannot handle drop events of type '%1'." ) - .arg( event->format() ) ); + .tqarg( event->format() ) ); } diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp index 0f3fa946d..5e5ecbb67 100644 --- a/kontact/plugins/karm/karm_plugin.cpp +++ b/kontact/plugins/karm/karm_plugin.cpp @@ -37,7 +37,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_karm, KarmPluginFactory( "kontact_karm" ) ) KarmPlugin::KarmPlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, core, "KArm" ) + : Kontact::Plugin( core, TQT_TQOBJECT(core), "KArm" ) { setInstance( KarmPluginFactory::instance() ); (void)dcopClient(); diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp index 90ce22db5..677972d30 100644 --- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp +++ b/kontact/plugins/kitchensync/kitchensync_plugin.cpp @@ -43,7 +43,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kitchensync, KitchenSyncPluginFactory( "kontact_kitchensync" ) ) KitchenSyncPlugin::KitchenSyncPlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, core, "KitchenSync" ) + : Kontact::Plugin( core, TQT_TQOBJECT(core), "KitchenSync" ) { setInstance( KitchenSyncPluginFactory::instance() ); } diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index ae7765553..1c1812cec 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -113,7 +113,7 @@ void KCMKMailSummary::initFolders() mFolderMap.insert( *it, new TQListViewItem( mFolderView, displayName ) ); } else { - const int pos = (*it).findRev( '/' ); + const int pos = (*it).tqfindRev( '/' ); const TQString tqparentFolder = (*it).left( pos ); mFolderMap.insert( *it, new TQCheckListItem( mFolderMap[ tqparentFolder ], diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 55a192e3e..51fceaa61 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -56,7 +56,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kmailplugin, KMailPluginFactory( "kontact_kmailplugin" ) ) KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, core, "kmail" ), + : Kontact::Plugin( core, TQT_TQOBJECT(core), "kmail" ), mStub( 0 ) { setInstance( KMailPluginFactory::instance() ); diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index b72283421..2f67846ac 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -142,7 +142,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders ) TQLabel *label = new TQLabel( TQString( i18n("%1: number of unread messages " "%2: total number of messages", "%1 / %2") ) - .arg( numUnreadMsg ).arg( numMsg ), this ); + .tqarg( numUnreadMsg ).tqarg( numMsg ), this ); label->tqsetAlignment( AlignLeft ); label->show(); mLayout->addWidget( label, counter, 2 ); @@ -164,9 +164,9 @@ void SummaryWidget::updateFolderList( const TQStringList& folders ) bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { - KURLLabel* label = static_cast( obj ); + KURLLabel* label = static_cast( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) ); + emit message( i18n( "Open Folder: \"%1\"" ).tqarg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp index d78e1e29b..365e30d09 100644 --- a/kontact/plugins/knode/knode_plugin.cpp +++ b/kontact/plugins/knode/knode_plugin.cpp @@ -45,7 +45,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knodeplugin, KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, core, "knode" ), mStub(0) + : Kontact::Plugin( core, TQT_TQOBJECT(core), "knode" ), mStub(0) { setInstance( KNodePluginFactory::instance() ); diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index a7864c423..b4b0f7786 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -201,7 +201,7 @@ TQString KNotesPart::newNote( const TQString& name, const TQString& text ) TQString KNotesPart::newNoteFromClipboard( const TQString& name ) { - const TQString& text = KApplication::clipboard()->text(); + const TQString& text = KApplication::tqclipboard()->text(); return newNote( name, text ); } diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index 7665426c6..9f8a4bb83 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -144,7 +144,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient mNoteEdit->setFocus(); KXMLGUIBuilder builder( page ); - KXMLGUIFactory factory( &builder, this ); + KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) ); factory.addClient( this ); mTool = static_cast(factory.container( "note_tool", this )); diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp index 0fe265524..a72f14b7e 100644 --- a/kontact/plugins/knotes/knotes_plugin.cpp +++ b/kontact/plugins/knotes/knotes_plugin.cpp @@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knotesplugin, KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringList & ) - : Kontact::Plugin( core, core, "knotes" ), + : Kontact::Plugin( core, TQT_TQOBJECT(core), "knotes" ), mAboutData( 0 ) { setInstance( KNotesPluginFactory::instance() ); diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp index afa21fb40..9e2609fc2 100644 --- a/kontact/plugins/knotes/knotetip.cpp +++ b/kontact/plugins/knotes/knotetip.cpp @@ -75,7 +75,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item ) mNoteIVI = item; if ( !mNoteIVI ) { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); if ( isVisible() ) { setFilter( false ); hide(); @@ -104,7 +104,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item ) resize( w, TQMIN( h, desk.height() / 2 - 20 ) ); hide(); - killTimers(); + TQT_TQOBJECT(this)->killTimers(); setFilter( true ); startTimer( 600 ); // delay showing the tooltip for 0.7 sec } @@ -121,7 +121,7 @@ void KNoteTip::resizeEvent( TQResizeEvent *ev ) void KNoteTip::timerEvent( TQTimerEvent * ) { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); if ( !isVisible() ) { startTimer( 15000 ); // show the tooltip for 15 sec @@ -144,7 +144,7 @@ bool KNoteTip::eventFilter( TQObject *, TQEvent *e ) case TQEvent::FocusIn: case TQEvent::FocusOut: case TQEvent::Wheel: - killTimers(); + TQT_TQOBJECT(this)->killTimers(); setFilter( false ); hide(); default: diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index 611425b9d..c0e1ef402 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -138,9 +138,9 @@ void KNotesSummaryWidget::urlClicked( const TQString &/*uid*/ ) bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { - KURLLabel* label = static_cast( obj ); + KURLLabel* label = static_cast( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) ); + emit message( i18n( "Read Note: \"%1\"" ).tqarg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp index a14785a7e..87347f189 100644 --- a/kontact/plugins/korganizer/journalplugin.cpp +++ b/kontact/plugins/korganizer/journalplugin.cpp @@ -43,7 +43,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_journalplugin, JournalPluginFactory( "kontact_journalplugin" ) ) JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, core, "korganizer" ), + : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ), mIface( 0 ) { setInstance( JournalPluginFactory::instance() ); diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index e07bd4411..9e698a2bd 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -92,7 +92,7 @@ void KCMKOrgSummary::initGUI() { TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - mCalendarGroup = new TQButtonGroup( 0, Vertical, i18n( "Appointments" ), this ); + mCalendarGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Appointments" ), this ); TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->tqlayout(), KDialog::spacingHint() ); @@ -124,7 +124,7 @@ void KCMKOrgSummary::initGUI() tqlayout->addWidget( mCalendarGroup ); - mTodoGroup = new TQButtonGroup( 2, Horizontal, i18n( "To-dos" ), this ); + mTodoGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "To-dos" ), this ); new TQRadioButton( i18n( "Show all to-dos" ), mTodoGroup ); new TQRadioButton( i18n( "Show today's to-dos only" ), mTodoGroup ); diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index 2a712c8cc..d626c9519 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -57,7 +57,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_korganizerplugin, KOrganizerPluginFactory( "kontact_korganizerplugin" ) ) KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, core, "korganizer" ), + : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ), mIface( 0 ) { @@ -195,7 +195,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event ) KCal::Incidence *i = incidences.first(); TQString summary; if ( dynamic_cast( i ) ) - summary = i18n( "Note: %1" ).arg( i->summary() ); + summary = i18n( "Note: %1" ).tqarg( i->summary() ); else summary = i->summary(); interface()->openEventEditor( summary, i->description(), TQString() ); @@ -219,22 +219,22 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event ) i18n("Drops of multiple mails are not supported." ) ); } else { KPIM::MailSummary mail = mails.first(); - TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() ) - .arg( mail.to() ).arg( mail.subject() ); + TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() ) + .tqarg( mail.to() ).tqarg( mail.subject() ); KTempFile tf; tf.setAutoDelete( true ); TQString uri = TQString::tqfromLatin1("kmail:") + TQString::number( mail.serialNumber() ); tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) ); tf.close(); - interface()->openEventEditor( i18n("Mail: %1").arg( mail.subject() ), txt, + interface()->openEventEditor( i18n("Mail: %1").tqarg( mail.subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822" ); } return; } KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.") - .arg( event->format() ) ); + .tqarg( event->format() ) ); } bool KOrganizerPlugin::queryClose() const { diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 1409c37b3..649f366c9 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -191,7 +191,7 @@ void SummaryWidget::updateView() // Fill Event Summary Field TQString newtext = ev->summary(); if ( ev->isMultiDay() && !ev->doesFloat() ) { - newtext.append( TQString(" (%1/%2)").arg( dayof ).arg( span ) ); + newtext.append( TQString(" (%1/%2)").tqarg( dayof ).tqarg( span ) ); } KURLLabel *urlLabel = new KURLLabel( this ); @@ -225,8 +225,8 @@ void SummaryWidget::updateView() } } datestr = i18n( "Time from - to", "%1 - %2" ) - .arg( KGlobal::locale()->formatTime( sST ) ) - .arg( KGlobal::locale()->formatTime( sET ) ); + .tqarg( KGlobal::locale()->formatTime( sST ) ) + .tqarg( KGlobal::locale()->formatTime( sET ) ); label = new TQLabel( datestr, this ); label->tqsetAlignment( AlignLeft | AlignVCenter ); mLayout->addWidget( label, counter, 3 ); @@ -286,9 +286,9 @@ void SummaryWidget::popupMenu( const TQString &uid ) bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { - KURLLabel* label = static_cast( obj ); + KURLLabel* label = static_cast( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) ); + emit message( i18n( "Edit Appointment: \"%1\"" ).tqarg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index cefd8bbe7..6b6238bfe 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_todoplugin, TodoPluginFactory( "kontact_todoplugin" ) ) TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& ) - : Kontact::Plugin( core, core, "korganizer" ), + : Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ), mIface( 0 ) { setInstance( TodoPluginFactory::instance() ); @@ -187,7 +187,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event ) KCal::Incidence *i = incidences.first(); TQString summary; if ( dynamic_cast( i ) ) - summary = i18n( "Note: %1" ).arg( i->summary() ); + summary = i18n( "Note: %1" ).tqarg( i->summary() ); else summary = i->summary(); interface()->openTodoEditor( summary, i->description(), TQString() ); @@ -210,8 +210,8 @@ void TodoPlugin::processDropEvent( TQDropEvent *event ) i18n("Drops of multiple mails are not supported." ) ); } else { KPIM::MailSummary mail = mails.first(); - TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() ) - .arg( mail.to() ).arg( mail.subject() ); + TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() ) + .tqarg( mail.to() ).tqarg( mail.subject() ); KTempFile tf; tf.setAutoDelete( true ); @@ -219,14 +219,14 @@ void TodoPlugin::processDropEvent( TQDropEvent *event ) mail.messageId(); tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) ); tf.close(); - interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ), + interface()->openTodoEditor( i18n("Mail: %1").tqarg( mail.subject() ), txt, uri, tf.name(), TQStringList(), "message/rfc822", false ); } return; } KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.") - .arg( event->format() ) ); + .tqarg( event->format() ) ); } #include "todoplugin.moc" diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 7bd1be11a..1109f314a 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -211,7 +211,7 @@ void TodoSummaryWidget::removeTodo( const TQString &uid ) void TodoSummaryWidget::completeTodo( const TQString &uid ) { KCal::Todo *todo = mCalendar->todo( uid ); - IncidenceChanger *changer = new IncidenceChanger( mCalendar, this ); + IncidenceChanger *changer = new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) ); if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) { KCal::Todo *oldTodo = todo->clone(); todo->setCompleted( TQDateTime::tqcurrentDateTime() ); @@ -251,9 +251,9 @@ void TodoSummaryWidget::popupMenu( const TQString &uid ) bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { - KURLLabel* label = static_cast( obj ); + KURLLabel* label = static_cast( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) ); + emit message( i18n( "Edit To-do: \"%1\"" ).tqarg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp index 88e9d7886..402d1e21a 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.cpp +++ b/kontact/plugins/kpilot/kpilot_plugin.cpp @@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kpilotplugin, KPilotPluginFactory( "kontact_kpilotplugin" ) ) KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& ) - : Kontact::Plugin( core, core, "kpilot" ), mAboutData( 0 ) + : Kontact::Plugin( core, TQT_TQOBJECT(core), "kpilot" ), mAboutData( 0 ) { setInstance( KPilotPluginFactory::instance() ); // TODO: Make sure kpilotDaemon is running! diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index 3e7577132..a0dafaa29 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -202,7 +202,7 @@ void SummaryWidget::showSyncLog( const TQString &filename ) TQFile f(filename); if ( !f.open( IO_ReadOnly ) ) { - KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).arg( filename ) ); + KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).tqarg( filename ) ); return; } diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 07a8aebd0..18a8871e6 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -356,7 +356,7 @@ void KCMKontactKNT::initGUI() mSelectedNews->setFullWidth( true ); tqlayout->addWidget( mSelectedNews, 0, 2 ); - TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical, + TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, i18n( "News Feed Settings" ), this ); TQGridLayout *boxLayout = new TQGridLayout( box->tqlayout(), 2, 3, diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp index 24f30a851..4b187ea47 100644 --- a/kontact/plugins/newsticker/newsticker_plugin.cpp +++ b/kontact/plugins/newsticker/newsticker_plugin.cpp @@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_newstickerplugin, NewsTickerPluginFactory( "kontact_newstickerplugin" ) ) NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& ) - : Kontact::Plugin( core, core, name ) + : Kontact::Plugin( core, TQT_TQOBJECT(core), name ) { setInstance( NewsTickerPluginFactory::instance() ); } diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index adfc65fb6..3667d402c 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -300,13 +300,13 @@ void SummaryWidget::rmbMenu( const TQString& url ) menu.insertItem( i18n( "Copy URL to Clipboard" ) ); int id = menu.exec( TQCursor::pos() ); if ( id != -1 ) - kapp->clipboard()->setText( url, TQClipboard::Clipboard ); + kapp->tqclipboard()->setText( url, TQClipboard::Clipboard ); } bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { - KURLLabel* label = static_cast( obj ); + KURLLabel* label = static_cast( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) emit message( label->url() ); if ( e->type() == TQEvent::Leave ) diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index b3a671277..3c3420820 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -87,7 +87,7 @@ void KCMSDSummary::initGUI() { TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() ); - mDaysGroup = new TQButtonGroup( 0, Vertical, i18n( "Special Dates Summary" ), this ); + mDaysGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Special Dates Summary" ), this ); TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->tqlayout(), KDialog::spacingHint() ); @@ -119,7 +119,7 @@ void KCMSDSummary::initGUI() tqlayout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 ); - mCalendarGroup = new TQButtonGroup( 1, Horizontal, i18n( "Special Dates From Calendar" ), this ); + mCalendarGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Calendar" ), this ); mShowBirthdaysFromCal = new TQCheckBox( i18n( "Show birthdays" ), mCalendarGroup ); mShowAnniversariesFromCal = new TQCheckBox( i18n( "Show anniversaries" ), mCalendarGroup ); @@ -127,7 +127,7 @@ void KCMSDSummary::initGUI() mShowSpecialsFromCal = new TQCheckBox( i18n( "Show special occasions" ), mCalendarGroup ); - mContactGroup = new TQButtonGroup( 1, Horizontal, i18n( "Special Dates From Contact List" ), this ); + mContactGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Contact List" ), this ); mShowBirthdaysFromKAB = new TQCheckBox( i18n( "Show birthdays" ), mContactGroup ); mShowAnniversariesFromKAB = new TQCheckBox( i18n( "Show anniversaries" ), mContactGroup ); diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index cd4e40d76..136454adf 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -250,7 +250,7 @@ void SDSummaryWidget::updateView() TQString anniversaryAsString = (*it).custom( "KADDRESSBOOK" , "X-Anniversary" ); if ( !anniversaryAsString.isEmpty() ) { - TQDate anniversary = TQDate::fromString( anniversaryAsString, TQt::ISODate ); + TQDate anniversary = TQDate::fromString( anniversaryAsString, Qt::ISODate ); if ( anniversary.isValid() && mShowAnniversariesFromKAB ) { SDEntry entry; entry.type = IncidenceTypeContact; @@ -593,9 +593,9 @@ void SDSummaryWidget::popupMenu( const TQString &uid ) bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) { if ( obj->inherits( "KURLLabel" ) ) { - KURLLabel* label = static_cast( obj ); + KURLLabel* label = static_cast( TQT_TQWIDGET(obj) ); if ( e->type() == TQEvent::Enter ) - emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) ); + emit message( i18n( "Mail to:\"%1\"" ).tqarg( label->text() ) ); if ( e->type() == TQEvent::Leave ) emit message( TQString() ); } diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp index 9d0b60cf5..316f94a77 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.cpp +++ b/kontact/plugins/specialdates/specialdates_plugin.cpp @@ -38,7 +38,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_specialdatesplugin, SpecialdatesPluginFactory( "kontact_specialdatesplugin" ) ) SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, const TQStringList& ) - : Kontact::Plugin( core, core, name ), + : Kontact::Plugin( core, TQT_TQOBJECT(core), name ), mAboutData( 0 ) { setInstance( SpecialdatesPluginFactory::instance() ); diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index ba78c226a..1f7164f80 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -120,7 +120,7 @@ void KCMKontactSummary::load() { KTrader::OfferList offers = KTrader::self()->query( TQString::tqfromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); TQStringList activeSummaries; diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index f28ce79ec..5b53b8b6b 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -136,8 +136,8 @@ void SummaryViewPart::updateWidgets() KPIM::IdentityManager idm( true, this ); const KPIM::Identity &id = idm.defaultIdentity(); - TQString currentUser = i18n( "Summary for %1" ).arg( id.fullName() ); - mUsernameLabel->setText( TQString::tqfromLatin1( "%1" ).arg( currentUser ) ); + TQString currentUser = i18n( "Summary for %1" ).tqarg( id.fullName() ); + mUsernameLabel->setText( TQString::tqfromLatin1( "%1" ).tqarg( currentUser ) ); mSummaries.clear(); @@ -247,18 +247,18 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in return; if ( target == mFrame ) { - if ( mLeftColumn->findWidget( widget ) == -1 && mRightColumn->findWidget( widget ) == -1 ) + if ( mLeftColumn->tqfindWidget( widget ) == -1 && mRightColumn->tqfindWidget( widget ) == -1 ) return; } else { - if ( mLeftColumn->findWidget( target ) == -1 && mRightColumn->findWidget( target ) == -1 || - mLeftColumn->findWidget( widget ) == -1 && mRightColumn->findWidget( widget ) == -1 ) + if ( mLeftColumn->tqfindWidget( target ) == -1 && mRightColumn->tqfindWidget( target ) == -1 || + mLeftColumn->tqfindWidget( widget ) == -1 && mRightColumn->tqfindWidget( widget ) == -1 ) return; } - if ( mLeftColumn->findWidget( widget ) != -1 ) { + if ( mLeftColumn->tqfindWidget( widget ) != -1 ) { mLeftColumn->remove( widget ); mLeftColumnSummaries.remove( widgetName( widget ) ); - } else if ( mRightColumn->findWidget( widget ) != -1 ) { + } else if ( mRightColumn->tqfindWidget( widget ) != -1 ) { mRightColumn->remove( widget ); mRightColumnSummaries.remove( widgetName( widget ) ); } @@ -286,7 +286,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in return; } - int targetPos = mLeftColumn->findWidget( target ); + int targetPos = mLeftColumn->tqfindWidget( target ); if ( targetPos != -1 ) { if ( tqalignment == TQt::AlignBottom ) targetPos++; @@ -294,7 +294,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in mLeftColumn->insertWidget( targetPos, widget ); mLeftColumnSummaries.insert( mLeftColumnSummaries.at( targetPos ), widgetName( widget ) ); } else { - targetPos = mRightColumn->findWidget( target ); + targetPos = mRightColumn->tqfindWidget( target ); if ( tqalignment == TQt::AlignBottom ) targetPos++; @@ -311,13 +311,13 @@ void SummaryViewPart::slotTextChanged() void SummaryViewPart::slotAdjustPalette() { - mMainWidget->setPaletteBackgroundColor( kapp->palette().active().base() ); + mMainWidget->setPaletteBackgroundColor( kapp->tqpalette().active().base() ); } void SummaryViewPart::setDate( const TQDate& newDate ) { TQString date( "%1" ); - date = date.arg( KGlobal::locale()->formatDate( newDate ) ); + date = date.tqarg( KGlobal::locale()->formatDate( newDate ) ); mDateLabel->setText( date ); } @@ -364,7 +364,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core ) mMainWidget = new TQFrame( sv->viewport() ); sv->addChild( mMainWidget ); mMainWidget->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - sv->setFocusPolicy( TQWidget::StrongFocus ); + sv->setFocusPolicy( Qt::StrongFocus ); setWidget( sv ); mMainLayout = new TQVBoxLayout( mMainWidget,KDialog::marginHint(), diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp index 555d79544..74b8e3d76 100644 --- a/kontact/plugins/summary/summaryview_plugin.cpp +++ b/kontact/plugins/summary/summaryview_plugin.cpp @@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_summaryplugin, SummaryViewFactory( "kontact_summaryplugin" ) ) SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringList& ) - : Kontact::Plugin( core, core, name), + : Kontact::Plugin( core, TQT_TQOBJECT(core), name), mAboutData( 0 ), mPart( 0 ) { setInstance( SummaryViewFactory::instance() ); diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp index 4e033fcd1..bf5d00577 100644 --- a/kontact/plugins/test/test_plugin.cpp +++ b/kontact/plugins/test/test_plugin.cpp @@ -35,7 +35,7 @@ typedef KGenericFactory< TestPlugin, Kontact::Core > TestPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkptestplugin, TestPluginFactory( "kptestplugin" ) ) TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const TQStringList &) - : Kontact::Plugin(_core, _core, name) + : Kontact::Plugin(_core, TQT_TQOBJECT(_core), name) { setInstance(TestPluginFactory::instance()); diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index bc468e844..926f70a73 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -101,7 +101,7 @@ void SummaryWidget::updateView() for ( it = dataList.begin(); it != dataList.end(); ++it ) { TQString cover; for ( uint i = 0; i < (*it).cover().count(); ++i ) - cover += TQString( "- %1\n" ).arg( (*it).cover()[ i ] ); + cover += TQString( "- %1\n" ).tqarg( (*it).cover()[ i ] ); TQImage img; img = (*it).icon(); @@ -121,7 +121,7 @@ void SummaryWidget::updateView() this, TQT_SLOT( showReport( const TQString& ) ) ); TQLabel* label = new TQLabel( this ); - label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) ); + label->setText( TQString( "%1 (%2)" ).tqarg( (*it).name() ).tqarg( (*it).temperature() ) ); TQFont font = label->font(); font.setBold( true ); label->setFont( font ); @@ -133,12 +133,12 @@ void SummaryWidget::updateView() labelText = TQString( "%1: %2
" "%3: %4
" "%5: %6" ) - .arg( i18n( "Last updated on" ) ) - .arg( (*it).date() ) - .arg( i18n( "Wind Speed" ) ) - .arg( (*it).windSpeed() ) - .arg( i18n( "Rel. Humidity" ) ) - .arg( (*it).relativeHumidity() ); + .tqarg( i18n( "Last updated on" ) ) + .tqarg( (*it).date() ) + .tqarg( i18n( "Wind Speed" ) ) + .tqarg( (*it).windSpeed() ) + .tqarg( i18n( "Rel. Humidity" ) ) + .tqarg( (*it).relativeHumidity() ); TQToolTip::add( label, labelText.tqreplace( " ", " " ) ); diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp index d42a24f61..9d9f5dfde 100644 --- a/kontact/plugins/weather/weather_plugin.cpp +++ b/kontact/plugins/weather/weather_plugin.cpp @@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_weatherplugin, WeatherPluginFactory( "kontact_weatherplugin" ) ) WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& ) - : Kontact::Plugin( core, core, name ), mAboutData( 0 ) + : Kontact::Plugin( core, TQT_TQOBJECT(core), name ), mAboutData( 0 ) { setInstance( WeatherPluginFactory::instance() ); } diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index e7fef654a..02e48e771 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -81,7 +81,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon, text += "

" + about->programName() + "
"; - text += i18n( "Version %1

" ).arg( about->version() ); + text += i18n( "Version %1

" ).tqarg( about->version() ); if ( !about->shortDescription().isEmpty() ) { text += "

" + about->shortDescription() + "
" + @@ -163,13 +163,13 @@ void AboutDialog::addLicenseText( const KAboutData *about ) TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( "signature", KIcon::Desktop, 48 ); - TQString title = i18n( "%1 License" ).arg( about->programName() ); + TQString title = i18n( "%1 License" ).tqarg( about->programName() ); TQFrame *topFrame = addPage( title, TQString(), pixmap ); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); KTextBrowser *textBrowser = new KTextBrowser( topFrame ); - textBrowser->setText( TQString( "

%1
" ).arg( about->license() ) ); + textBrowser->setText( TQString( "
%1
" ).tqarg( about->license() ) ); topLayout->addWidget( textBrowser ); } diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index 7e4d027ed..fa19c1f7c 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -175,7 +175,7 @@ void EntryItem::paint( TQPainter *p ) if ( isCurrent() || isSelected() || mPaintActive ) brush = box->tqcolorGroup().brush( TQColorGroup::Highlight ); else - brush = box->tqcolorGroup().highlight().light( 115 ); + brush = TQBrush(box->tqcolorGroup().highlight().light( 115 )); p->fillRect( 1, 0, w - 2, h - 1, brush ); TQPen pen = p->pen(); TQPen oldPen = pen; @@ -223,7 +223,7 @@ void EntryItem::paint( TQPainter *p ) } if ( plugin()->disabled() ) { - p->setPen( box->palette().disabled().text( ) ); + p->setPen( box->tqpalette().disabled().text( ) ); } else if ( isCurrent() || isSelected() || mHasHover ) { p->setPen( box->tqcolorGroup().highlight().dark(115) ); p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1), @@ -265,7 +265,7 @@ Navigator::Navigator( IconSidePane *tqparent, const char *name ) setHScrollBarMode( TQScrollView::AlwaysOff ); setAcceptDrops( true ); - setFocusPolicy( NoFocus ); + setFocusPolicy( Qt::NoFocus ); connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ), TQT_SLOT( slotExecuted( TQListBoxItem* ) ) ); @@ -275,7 +275,7 @@ Navigator::Navigator( IconSidePane *tqparent, const char *name ) TQT_SLOT( slotMouseOn( TQListBoxItem * ) ) ); connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( slotMouseOff() ) ); - mMapper = new TQSignalMapper( this ); + mMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( shortCutSelected( int ) ) ); TQToolTip::remove( this ); diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 2e7c61f83..fbdd4a045 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -115,7 +115,7 @@ void PluginSelection::readConfig() { const KTrader::OfferList offers = KTrader::self()->query( TQString::tqfromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); int activeComponent = 0; mPluginCombo->clear(); diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 760ea846e..8d2f3623f 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -77,7 +77,7 @@ static void listPlugins() KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options KTrader::OfferList offers = KTrader::self()->query( TQString::tqfromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr service = (*it); // skip summary only plugins diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 0e56f918a..df9631405 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -96,7 +96,7 @@ class SettingsDialogWrapper : public KSettings::Dialog void fixButtonLabel( TQWidget *widget ) { TQObject *object = widget->child( "KJanusWidget::buttonBelowList" ); - TQPushButton *button = static_cast( object ); + TQPushButton *button = static_cast( TQT_TQWIDGET(object) ); if ( button ) button->setText( i18n( "Select Components ..." ) ); } @@ -125,7 +125,7 @@ void MainWindow::initGUI() KTrader::OfferList offers = KTrader::self()->query( TQString::tqfromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) ); mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" ); KPluginInfo::List::Iterator it; @@ -133,10 +133,10 @@ void MainWindow::initGUI() (*it)->load(); KAction *action = new KAction( (*it)->name(), (*it)->icon(), KShortcut(), - this, TQT_SLOT(slotActionTriggered()), + TQT_TQOBJECT(this), TQT_SLOT(slotActionTriggered()), actionCollection(), (*it)->pluginName().latin1() ); action->setName( (*it)->pluginName().latin1() ); - action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) ); + action->setWhatsThis( i18n( "Switch to plugin %1" ).tqarg( (*it)->name() ) ); TQVariant hasPartProp = (*it)->property( "X-KDE-KontactPluginHasPart" ); if ( !hasPartProp.isValid() || hasPartProp.toBool() ) { @@ -144,8 +144,8 @@ void MainWindow::initGUI() } } - KStdAction::keyBindings( this, TQT_SLOT( configureShortcuts() ), actionCollection() ); - KStdAction::configureToolbars( this, TQT_SLOT( configureToolbars() ), actionCollection() ); + KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( configureToolbars() ), actionCollection() ); setXMLFile( "kontactui.rc" ); setStandardToolBarMenuEnabled( true ); @@ -175,7 +175,7 @@ void MainWindow::initObject() mSidePane->updatePlugins(); } - KSettings::Dispatcher::self()->registerInstance( instance(), this, + KSettings::Dispatcher::self()->registerInstance( instance(), TQT_TQOBJECT(this), TQT_SLOT( updateConfig() ) ); loadSettings(); @@ -267,7 +267,7 @@ void MainWindow::initWidgets() initAboutScreen(); TQString loading = i18n( "

%1

" ) - .arg( i18n("Loading Kontact...") ); + .tqarg( i18n("Loading Kontact...") ); paintAboutScreen( loading ); @@ -290,11 +290,11 @@ void MainWindow::paintAboutScreen( const TQString& msg ) { TQString location = locate( "data", "kontact/about/main.html" ); TQString content = KPIM::kFileToString( location ); - content = content.arg( locate( "data", "libkdepim/about/kde_infopage.css" ) ); + content = content.tqarg( locate( "data", "libkdepim/about/kde_infopage.css" ) ); if ( kapp->reverseLayout() ) - content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) ); + content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) ); else - content = content.arg( "" ); + content = content.tqarg( "" ); mIntroPart->begin( KURL( location ) ); @@ -302,8 +302,8 @@ void MainWindow::paintAboutScreen( const TQString& msg ) TQString catchPhrase( i18n( "Get Organized!" ) ); TQString quickDescription( i18n( "The KDE Personal Information Management Suite" ) ); - mIntroPart->write( content.arg( TQFont().pointSize() + 2 ).arg( appName ) - .arg( catchPhrase ).arg( quickDescription ).arg( msg ) ); + mIntroPart->write( content.tqarg( TQFont().pointSize() + 2 ).tqarg( appName ) + .tqarg( catchPhrase ).tqarg( quickDescription ).tqarg( msg ) ); mIntroPart->end(); } @@ -313,7 +313,7 @@ void MainWindow::initAboutScreen() mPartsStack->addWidget( introbox ); mPartsStack->raiseWidget( introbox ); mIntroPart = new KHTMLPart( introbox ); - mIntroPart->widget()->setFocusPolicy( WheelFocus ); + mIntroPart->widget()->setFocusPolicy( Qt::WheelFocus ); // Let's better be paranoid and disable plugins (it defaults to enabled): mIntroPart->setPluginsEnabled( false ); mIntroPart->setJScriptEnabled( false ); // just make this explicit @@ -333,9 +333,9 @@ void MainWindow::initAboutScreen() void MainWindow::setupActions() { - KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() ); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() ); mNewActions = new KToolBarPopupAction( KGuiItem( i18n( "New" ), "" ), - KStdAccel::shortcut(KStdAccel::New), this, TQT_SLOT( slotNewClicked() ), + KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewClicked() ), actionCollection(), "action_new" ); KConfig* const cfg = Prefs::self()->config(); @@ -344,18 +344,18 @@ void MainWindow::setupActions() if ( mSyncActionsEnabled ) { mSyncActions = new KToolBarPopupAction( KGuiItem( i18n( "Synchronize" ), "kitchensync" ), - KStdAccel::shortcut(KStdAccel::Reload), this, TQT_SLOT( slotSyncClicked() ), + KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotSyncClicked() ), actionCollection(), "action_sync" ); } - new KAction( i18n( "Configure Kontact..." ), "configure", 0, this, TQT_SLOT( slotPreferences() ), + new KAction( i18n( "Configure Kontact..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPreferences() ), actionCollection(), "settings_configure_kontact" ); - new KAction( i18n( "Configure &Profiles..." ), 0, this, TQT_SLOT( slotConfigureProfiles() ), + new KAction( i18n( "Configure &Profiles..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureProfiles() ), actionCollection(), "settings_configure_kontact_profiles" ); - new KAction( i18n( "&Kontact Introduction" ), 0, this, TQT_SLOT( slotShowIntroduction() ), + new KAction( i18n( "&Kontact Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowIntroduction() ), actionCollection(), "help_introduction" ); - new KAction( i18n( "&Tip of the Day" ), 0, this, TQT_SLOT( slotShowTip() ), + new KAction( i18n( "&Tip of the Day" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection(), "help_tipofday" ); KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" ); @@ -543,7 +543,7 @@ void MainWindow::loadPlugins() kdDebug(5600) << "Loading Plugin: " << (*it)->name() << endl; Kontact::Plugin *plugin = KParts::ComponentFactory::createInstanceFromService( - (*it)->service(), this ); + (*it)->service(), TQT_TQOBJECT(this) ); if ( !plugin ) continue; @@ -629,7 +629,7 @@ void MainWindow::updateShortcuts() ++it; if ( isPluginLoadedByAction( action ) ) { loadedActions.append( action ); - TQString shortcut = TQString( "CTRL+%1" ).arg( i ); + TQString shortcut = TQString( "CTRL+%1" ).tqarg( i ); action->setShortcut( KShortcut( shortcut ) ); i++; } else { @@ -763,7 +763,7 @@ void MainWindow::slotSyncClicked() KToolBar* Kontact::MainWindow::findToolBar(const char* name) { // like KMainWindow::toolBar, but which doesn't create the toolbar if not found - return static_cast(child(name, "KToolBar")); + return static_cast(TQT_TQWIDGET(child(name, "KToolBar"))); } void MainWindow::slotActionTriggered() @@ -794,7 +794,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) if ( !part ) { KApplication::restoreOverrideCursor(); KMessageBox::error( this, i18n( "Cannot load part for %1." ) - .arg( plugin->title() ) + .tqarg( plugin->title() ) + "\n" + lastErrorMessage() ); plugin->setDisabled( true ); mSidePane->updatePlugins(); @@ -848,7 +848,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) topDock()->moveDockWindow( navigatorToolBar, -1 ); } - setCaption( i18n( "Plugin dependent window title" ,"%1 - Kontact" ).arg( plugin->title() ) ); + setCaption( i18n( "Plugin dependent window title" ,"%1 - Kontact" ).tqarg( plugin->title() ) ); if ( newAction ) { mNewActions->setIcon( newAction->icon() ); @@ -1178,30 +1178,30 @@ TQString MainWindow::introductionString() "%1
%1" "" "

Skip this introduction

" ) - .arg( kapp->aboutData()->version() ) - .arg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) ) - .arg( "exec:/help?kontact" ) - .arg( iconSize ) - .arg( iconSize ) - .arg( handbook_icon_path ) - .arg( "exec:/help?kontact" ) - .arg( i18n( "Read Manual" ) ) - .arg( i18n( "Learn more about Kontact and its components" ) ) - .arg( "http://kontact.org" ) - .arg( iconSize ) - .arg( iconSize ) - .arg( html_icon_path ) - .arg( "http://kontact.org" ) - .arg( i18n( "Visit Kontact Website" ) ) - .arg( i18n( "Access online resources and tutorials" ) ) - .arg( "exec:/gwwizard" ) - .arg( iconSize ) - .arg( iconSize ) - .arg( wizard_icon_path ) - .arg( "exec:/gwwizard" ) - .arg( i18n( "Configure Kontact as Groupware Client" ) ) - .arg( i18n( "Prepare Kontact for use in corporate networks" ) ) - .arg( "exec:/switch" ); + .tqarg( kapp->aboutData()->version() ) + .tqarg( i18n( "Kontact handles your e-mail, addressbook, calendar, to-do list and more." ) ) + .tqarg( "exec:/help?kontact" ) + .tqarg( iconSize ) + .tqarg( iconSize ) + .tqarg( handbook_icon_path ) + .tqarg( "exec:/help?kontact" ) + .tqarg( i18n( "Read Manual" ) ) + .tqarg( i18n( "Learn more about Kontact and its components" ) ) + .tqarg( "http://kontact.org" ) + .tqarg( iconSize ) + .tqarg( iconSize ) + .tqarg( html_icon_path ) + .tqarg( "http://kontact.org" ) + .tqarg( i18n( "Visit Kontact Website" ) ) + .tqarg( i18n( "Access online resources and tutorials" ) ) + .tqarg( "exec:/gwwizard" ) + .tqarg( iconSize ) + .tqarg( iconSize ) + .tqarg( wizard_icon_path ) + .tqarg( "exec:/gwwizard" ) + .tqarg( i18n( "Configure Kontact as Groupware Client" ) ) + .tqarg( i18n( "Prepare Kontact for use in corporate networks" ) ) + .tqarg( "exec:/switch" ); return info; } diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index cb28d1194..bc3bff990 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -140,7 +140,7 @@ void Kontact::ProfileDialog::profileLoaded( const TQString& id ) const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( id ); if ( profile.isNull() ) return; - KMessageBox::information( this, i18n("The profile \"%1\" was successfully loaded. Some profile settings require a restart to get activated.").arg( profile.name() ), i18n("Profile Loaded") ); + KMessageBox::information( this, i18n("The profile \"%1\" was successfully loaded. Some profile settings require a restart to get activated.").tqarg( profile.name() ), i18n("Profile Loaded") ); } void Kontact::ProfileDialog::saveToSelectedProfile() @@ -148,7 +148,7 @@ void Kontact::ProfileDialog::saveToSelectedProfile() const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( selectedProfile() ); if ( profile.isNull() ) return; - if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The profile \"%1\" will be overwritten with the current settings. Are you sure?").arg( profile.name() ), i18n("Save to Profile"), KStdGuiItem::overwrite(), KStdGuiItem::cancel() ) ) + if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("The profile \"%1\" will be overwritten with the current settings. Are you sure?").tqarg( profile.name() ), i18n("Save to Profile"), KStdGuiItem::overwrite(), KStdGuiItem::cancel() ) ) return; Kontact::ProfileManager::self()->saveToProfile( profile.id() ); } @@ -158,7 +158,7 @@ void Kontact::ProfileDialog::deleteSelectedProfile() const Kontact::Profile profile = Kontact::ProfileManager::self()->profileById( selectedProfile() ); if ( profile.isNull() ) return; - if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("Do you really want to delete the profile \"%1\"? All profile settings will be lost!").arg( profile.name() ), i18n("Delete Profile"), KStdGuiItem::del(), KStdGuiItem::cancel() ) ) + if ( KMessageBox::Yes != KMessageBox::warningYesNo( this, i18n("Do you really want to delete the profile \"%1\"? All profile settings will be lost!").tqarg( profile.name() ), i18n("Delete Profile"), KStdGuiItem::del(), KStdGuiItem::cancel() ) ) return; Kontact::ProfileManager::self()->removeProfile( profile ); } @@ -175,7 +175,7 @@ void Kontact::ProfileDialog::exportSelectedProfile() const Kontact::ProfileManager::ExportError error = Kontact::ProfileManager::self()->exportProfileToDirectory( id, path ); if ( error == Kontact::ProfileManager::SuccessfulExport ) { - KMessageBox::information( this, i18n("The profile \"%1\" was successfully exported.").arg( profile.name() ), i18n("Profile Exported") ); + KMessageBox::information( this, i18n("The profile \"%1\" was successfully exported.").tqarg( profile.name() ), i18n("Profile Exported") ); } else { diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index deed6f37a..005779414 100644 --- a/kontact/src/profilemanager.cpp +++ b/kontact/src/profilemanager.cpp @@ -152,7 +152,7 @@ void Kontact::ProfileManager::writeConfig() const Kontact::Profile Kontact::ProfileManager::readFromConfiguration( const TQString& configFile, bool isLocal ) { KConfig profileCfg( configFile, true /*read-only*/, false /*no KDE global*/ ); - const TQString configDir = configFile.left( configFile.findRev( TQDir::separator(), -1 ) ); + const TQString configDir = configFile.left( configFile.tqfindRev( TQDir::separator(), -1 ) ); profileCfg.setGroup( "Kontact Profile" ); const TQString id = profileCfg.readEntry( "Identifier" ); Kontact::Profile profile( id ); -- cgit v1.2.1