Port to qt5

wilder-work
Montel Laurent 12 years ago
parent 45f45b3621
commit 7fdfeadc88
  1. 2
      collectionpage/collectionquotapage_p.cpp
  2. 4
      tag/tagactionmanager.cpp
  3. 4
      tag/tagactionmanager.h

@ -74,6 +74,6 @@ void QuotaWidget::setQuotaInfo( qint64 current, qint64 maxValue )
{
mProgressBar->setMaximum( maxValue );
mProgressBar->setValue( current );
mUsage->setText(i18n("%1 of %2 used", KLocale::global()->formatByteSize( qMax( 0LL, current ) ), KGlobal::locale()->formatByteSize( qMax( 0LL, maxValue ) ) ) );
mUsage->setText(i18n("%1 of %2 used", KLocale::global()->formatByteSize( qMax( 0LL, current ) ), KLocale::global()->formatByteSize( qMax( 0LL, maxValue ) ) ) );
}

@ -217,7 +217,7 @@ void TagActionManager::createTagActions(const QList<MailCommon::Tag::Ptr> &tags)
mMessageActions->messageStatusMenu()->menu()->addAction( mSeparatorNewTagAction );
if (!mNewTagAction) {
mNewTagAction = new KAction( i18n( "Add new tag..." ), this );
mNewTagAction = new QAction( i18n( "Add new tag..." ), this );
connect( mNewTagAction, SIGNAL(triggered(bool)),
this, SLOT(newTagActionClicked()) );
}
@ -231,7 +231,7 @@ void TagActionManager::createTagActions(const QList<MailCommon::Tag::Ptr> &tags)
mMessageActions->messageStatusMenu()->menu()->addAction( mSeparatorMoreAction );
if (!mMoreAction) {
mMoreAction = new KAction( i18n( "More..." ), this );
mMoreAction = new QAction( i18n( "More..." ), this );
connect( mMoreAction, SIGNAL(triggered(bool)),
this, SIGNAL(tagMoreActionClicked()) );
}

@ -127,8 +127,8 @@ private:
QAction *mSeparatorMoreAction;
QAction *mSeparatorNewTagAction;
KAction *mMoreAction;
KAction *mNewTagAction;
QAction *mMoreAction;
QAction *mNewTagAction;
// Maps the id of a tag to the action of a tag.
// Contains all existing tags
QMap<qint64,KToggleAction*> mTagActions;

Loading…
Cancel
Save