diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
| commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
| tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kontact/plugins/kmail | |
| parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
| download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip | |
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
Diffstat (limited to 'kontact/plugins/kmail')
| -rw-r--r-- | kontact/plugins/kmail/kcmkmailsummary.cpp | 2 | ||||
| -rw-r--r-- | kontact/plugins/kmail/kmail_plugin.cpp | 2 | ||||
| -rw-r--r-- | kontact/plugins/kmail/summarywidget.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index ae776555..1c1812ce 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 55a192e3..51fceaa6 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 b7228342..2f67846a 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<KURLLabel*>( obj ); + KURLLabel* label = static_cast<KURLLabel*>( 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() ); } |