[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] akregator: Use new connect api
From:       Montel Laurent <montel () kde ! org>
Date:       2015-06-30 20:52:48
Message-ID: E1ZA2WO-0005cx-Lh () scm ! kde ! org
[Download RAW message or body]

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/akregator/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::KCMAkregatorAppearanceConfig(QWidget \
*parent, cons  QVBoxLayout *layout = new QVBoxLayout(this);
     layout->addWidget(m_widget);
 
-    connect(m_ui.kcfg_UseCustomColors, SIGNAL(toggled(bool)), \
                m_ui.kcfg_ColorUnreadArticles, SLOT(setEnabled(bool)));
-    connect(m_ui.kcfg_UseCustomColors, SIGNAL(toggled(bool)), \
                m_ui.kcfg_ColorNewArticles, SLOT(setEnabled(bool)));
-    connect(m_ui.kcfg_UseCustomColors, SIGNAL(toggled(bool)), m_ui.lbl_newArticles, \
                SLOT(setEnabled(bool)));
-    connect(m_ui.kcfg_UseCustomColors, SIGNAL(toggled(bool)), \
m_ui.lbl_unreadArticles, SLOT(setEnabled(bool))); +    \
connect(m_ui.kcfg_UseCustomColors, &QAbstractButton::toggled, \
m_ui.kcfg_ColorUnreadArticles, &QWidget::setEnabled); +    \
connect(m_ui.kcfg_UseCustomColors, &QAbstractButton::toggled, \
m_ui.kcfg_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.kcfg_MinimumFontSize , SLOT(setValue(int)));
-    connect(m_ui.slider_mediumFontSize, SIGNAL(valueChanged(int)), \
m_ui.kcfg_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.kcfg_MinimumFontSize , SLOT(setValue(int)));
-    connect(m_ui.slider_mediumFontSize, SIGNAL(sliderMoved(int)), \
m_ui.kcfg_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_ui.kcfg_MediumFontSize , &QSpinBox::setValue);  
     connect(m_ui.kcfg_MinimumFontSize, SIGNAL(valueChanged(int)), \
                m_ui.slider_minimumFontSize, SLOT(setValue(int)));
     connect(m_ui.kcfg_MediumFontSize, SIGNAL(valueChanged(int)), \
                m_ui.slider_mediumFontSize, SLOT(setValue(int)));
diff --git a/akregator/src/actionmanagerimpl.cpp \
b/akregator/src/actionmanagerimpl.cpp index b1057c6..fec0b86 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -565,29 +565,29 @@ void ActionManagerImpl::initTabWidget(TabWidget *tabWidget)
     action = 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(slotDetachTab()));
+    connect(action, &QAction::triggered, d->tabWidget, &TabWidget::slotDetachTab);
     coll->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::SHIFT + \
Qt::Key_B));  
     action = coll->addAction(QStringLiteral("tab_copylinkaddress"));
     action->setText(i18n("Copy Link Address"));
-    connect(action, SIGNAL(triggered(bool)), d->tabWidget, \
SLOT(slotCopyLinkAddress())); +    connect(action, &QAction::triggered, d->tabWidget, \
&TabWidget::slotCopyLinkAddress);  
     action = 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(slotCloseTab()));
+    connect(action, &QAction::triggered, d->tabWidget, &TabWidget::slotCloseTab);
     coll->setDefaultShortcuts(action, KStandardShortcut::close());
 
     action = 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(slotFrameZoomIn()));
+    connect(action, &QAction::triggered, d->tabWidget, &TabWidget::slotFrameZoomIn);
     coll->setDefaultShortcut(action, QKeySequence::ZoomIn);
 
     action = 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(slotFrameZoomOut())); +    connect(action, &QAction::triggered, d->tabWidget, \
&TabWidget::slotFrameZoomOut);  coll->setDefaultShortcut(action, \
QKeySequence::ZoomOut);  
     QString actionname;
@@ -596,7 +596,7 @@ void ActionManagerImpl::initTabWidget(TabWidget *tabWidget)
         action = 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(slotActivateTab())); +        connect(action, &QAction::triggered, d->tabWidget, \
&TabWidget::slotActivateTab);  }
 
 }
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);


[prev in list] [next in list] [prev in thread] [next in thread]