From kde-commits Tue Jun 30 20:52:48 2015 From: Montel Laurent Date: Tue, 30 Jun 2015 20:52:48 +0000 To: kde-commits Subject: [kdepim] akregator: Use new connect api Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=143569758110096 Git commit dd02f2c954510354a5fe52f1a040300c5801950c by Montel Laurent. Committed on 30/06/2015 at 20:52. Pushed by mlaurent into branch 'master'. Use new connect api M +8 -8 akregator/configuration/akregator_config_appearance.cpp M +6 -6 akregator/src/actionmanagerimpl.cpp M +4 -3 akregator/src/tabwidget.h http://commits.kde.org/kdepim/dd02f2c954510354a5fe52f1a040300c5801950c diff --git a/akregator/configuration/akregator_config_appearance.cpp b/akre= gator/configuration/akregator_config_appearance.cpp index a9715a0..2f7903a 100644 --- a/akregator/configuration/akregator_config_appearance.cpp +++ b/akregator/configuration/akregator_config_appearance.cpp @@ -42,16 +42,16 @@ KCMAkregatorAppearanceConfig::KCMAkregatorAppearanceCon= fig(QWidget *parent, cons QVBoxLayout *layout =3D new QVBoxLayout(this); layout->addWidget(m_widget); = - connect(m_ui.kcfg_UseCustomColors, SIGNAL(toggled(bool)), m_ui.kcfg_Co= lorUnreadArticles, SLOT(setEnabled(bool))); - connect(m_ui.kcfg_UseCustomColors, SIGNAL(toggled(bool)), m_ui.kcfg_Co= lorNewArticles, SLOT(setEnabled(bool))); - connect(m_ui.kcfg_UseCustomColors, SIGNAL(toggled(bool)), m_ui.lbl_new= Articles, SLOT(setEnabled(bool))); - connect(m_ui.kcfg_UseCustomColors, SIGNAL(toggled(bool)), m_ui.lbl_unr= eadArticles, SLOT(setEnabled(bool))); + connect(m_ui.kcfg_UseCustomColors, &QAbstractButton::toggled, m_ui.kcf= g_ColorUnreadArticles, &QWidget::setEnabled); + connect(m_ui.kcfg_UseCustomColors, &QAbstractButton::toggled, m_ui.kcf= g_ColorNewArticles, &QWidget::setEnabled); + connect(m_ui.kcfg_UseCustomColors, &QAbstractButton::toggled, m_ui.lbl= _newArticles, &QWidget::setEnabled); + connect(m_ui.kcfg_UseCustomColors, &QAbstractButton::toggled, m_ui.lbl= _unreadArticles, &QWidget::setEnabled); = - connect(m_ui.slider_minimumFontSize, SIGNAL(valueChanged(int)), m_ui.k= cfg_MinimumFontSize , SLOT(setValue(int))); - connect(m_ui.slider_mediumFontSize, SIGNAL(valueChanged(int)), m_ui.kc= fg_MediumFontSize , SLOT(setValue(int))); + connect(m_ui.slider_minimumFontSize, &QAbstractSlider::valueChanged, m= _ui.kcfg_MinimumFontSize , &QSpinBox::setValue); + connect(m_ui.slider_mediumFontSize, &QAbstractSlider::valueChanged, m_= ui.kcfg_MediumFontSize , &QSpinBox::setValue); = - connect(m_ui.slider_minimumFontSize, SIGNAL(sliderMoved(int)), m_ui.kc= fg_MinimumFontSize , SLOT(setValue(int))); - connect(m_ui.slider_mediumFontSize, SIGNAL(sliderMoved(int)), m_ui.kcf= g_MediumFontSize , SLOT(setValue(int))); + connect(m_ui.slider_minimumFontSize, &QAbstractSlider::sliderMoved, m_= ui.kcfg_MinimumFontSize , &QSpinBox::setValue); + connect(m_ui.slider_mediumFontSize, &QAbstractSlider::sliderMoved, m_u= i.kcfg_MediumFontSize , &QSpinBox::setValue); = connect(m_ui.kcfg_MinimumFontSize, SIGNAL(valueChanged(int)), m_ui.sli= der_minimumFontSize, SLOT(setValue(int))); connect(m_ui.kcfg_MediumFontSize, SIGNAL(valueChanged(int)), m_ui.slid= er_mediumFontSize, SLOT(setValue(int))); diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmana= gerimpl.cpp index b1057c6..fec0b86 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -565,29 +565,29 @@ void ActionManagerImpl::initTabWidget(TabWidget *tabW= idget) action =3D coll->addAction(QStringLiteral("tab_detach")); action->setIcon(QIcon::fromTheme(QStringLiteral("tab-detach"))); action->setText(i18n("Detach Tab")); - connect(action, SIGNAL(triggered(bool)), d->tabWidget, SLOT(slotDetach= Tab())); + connect(action, &QAction::triggered, d->tabWidget, &TabWidget::slotDet= achTab); coll->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::SHIFT + Q= t::Key_B)); = action =3D coll->addAction(QStringLiteral("tab_copylinkaddress")); action->setText(i18n("Copy Link Address")); - connect(action, SIGNAL(triggered(bool)), d->tabWidget, SLOT(slotCopyLi= nkAddress())); + connect(action, &QAction::triggered, d->tabWidget, &TabWidget::slotCop= yLinkAddress); = action =3D coll->addAction(QStringLiteral("tab_remove")); action->setIcon(QIcon::fromTheme(QStringLiteral("tab-close"))); action->setText(i18n("Close Tab")); - connect(action, SIGNAL(triggered(bool)), d->tabWidget, SLOT(slotCloseT= ab())); + connect(action, &QAction::triggered, d->tabWidget, &TabWidget::slotClo= seTab); coll->setDefaultShortcuts(action, KStandardShortcut::close()); = action =3D coll->addAction(QStringLiteral("inc_font_sizes")); action->setIcon(QIcon::fromTheme(QStringLiteral("format-font-size-more= "))); action->setText(i18n("Enlarge Font")); - connect(action, SIGNAL(triggered(bool)), d->tabWidget, SLOT(slotFrameZ= oomIn())); + connect(action, &QAction::triggered, d->tabWidget, &TabWidget::slotFra= meZoomIn); coll->setDefaultShortcut(action, QKeySequence::ZoomIn); = action =3D coll->addAction(QStringLiteral("dec_font_sizes")); action->setIcon(QIcon::fromTheme(QStringLiteral("format-font-size-less= "))); action->setText(i18n("Shrink Font")); - connect(action, SIGNAL(triggered(bool)), d->tabWidget, SLOT(slotFrameZ= oomOut())); + connect(action, &QAction::triggered, d->tabWidget, &TabWidget::slotFra= meZoomOut); coll->setDefaultShortcut(action, QKeySequence::ZoomOut); = QString actionname; @@ -596,7 +596,7 @@ void ActionManagerImpl::initTabWidget(TabWidget *tabWid= get) action =3D new QAction(i18n("Activate Tab %1", i), this); coll->addAction(actionname, action); coll->setDefaultShortcut(action, QKeySequence(QStringLiteral("Alt+= %1").arg(i))); - connect(action, SIGNAL(triggered(bool)), d->tabWidget, SLOT(slotAc= tivateTab())); + connect(action, &QAction::triggered, d->tabWidget, &TabWidget::slo= tActivateTab); } = } diff --git a/akregator/src/tabwidget.h b/akregator/src/tabwidget.h index f073deb..f7292a3 100644 --- a/akregator/src/tabwidget.h +++ b/akregator/src/tabwidget.h @@ -58,6 +58,9 @@ public Q_SLOTS: void slotFrameZoomOut(); void slotReloadAllTabs(); void slotActivateTab(); + void slotDetachTab(); + void slotCopyLinkAddress(); + void slotCloseTab(); Q_SIGNALS: void signalCurrentFrameChanged(int); void signalRemoveFrameRequest(int); @@ -71,9 +74,7 @@ private: = private Q_SLOTS: void initiateDrag(int tab); - void slotDetachTab(); - void slotCopyLinkAddress(); - void slotCloseTab(); + void slotCloseRequest(int index); void contextMenu(int item, const QPoint &p); void slotTabChanged(int index);