summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2015-03-17 08:08:04 (GMT)
committerMontel Laurent <montel@kde.org>2015-03-17 08:13:17 (GMT)
commitae30a7fc5124cdb88979b1f2c94228152357c39d (patch)
tree7be060a7d8da3a49eb08f40977bcc3557d382136
parent3580f0089b30ed5916b769d23029abcab6c60ad1 (diff)
USe new connect api
-rw-r--r--active/components/documentitem.cpp4
-rw-r--r--active/components/pageitem.cpp2
-rw-r--r--ui/pageviewutils.cpp2
-rw-r--r--ui/presentationsearchbar.cpp2
-rw-r--r--ui/presentationwidget.cpp4
5 files changed, 7 insertions, 7 deletions
diff --git a/active/components/documentitem.cpp b/active/components/documentitem.cpp
index 95ead1f..7472e74 100644
--- a/active/components/documentitem.cpp
+++ b/active/components/documentitem.cpp
@@ -39,8 +39,8 @@ DocumentItem::DocumentItem(QObject *parent)
m_document = new Okular::Document(0);
m_tocModel = new TOCModel(m_document, this);
- connect(m_document, SIGNAL(searchFinished(int,Okular::Document::SearchStatus)),
- this, SLOT(searchFinished(int,Okular::Document::SearchStatus)));
+ connect(m_document, &Okular::Document::searchFinished,
+ this, &DocumentItem::searchFinished);
connect(m_document->bookmarkManager(), SIGNAL(bookmarksChanged(QUrl)),
this, SIGNAL(bookmarkedPagesChanged()));
connect(m_document->bookmarkManager(), SIGNAL(bookmarksChanged(QUrl)),
diff --git a/active/components/pageitem.cpp b/active/components/pageitem.cpp
index feb3039..5b54a62 100644
--- a/active/components/pageitem.cpp
+++ b/active/components/pageitem.cpp
@@ -51,7 +51,7 @@ PageItem::PageItem(QQuickItem *parent)
m_redrawTimer = new QTimer(this);
m_redrawTimer->setInterval(REDRAW_TIMEOUT);
m_redrawTimer->setSingleShot(true);
- connect(m_redrawTimer, SIGNAL(timeout()), this, SLOT(delayedRedraw()));
+ connect(m_redrawTimer, &QTimer::timeout, this, &PageItem::delayedRedraw);
}
diff --git a/ui/pageviewutils.cpp b/ui/pageviewutils.cpp
index fe756cc..2442e9f 100644
--- a/ui/pageviewutils.cpp
+++ b/ui/pageviewutils.cpp
@@ -499,7 +499,7 @@ PageViewToolBar::PageViewToolBar( PageView * parent, QWidget * anchorWidget )
// create the animation timer
d->animTimer = new QTimer( this );
- connect( d->animTimer, SIGNAL(timeout()), this, SLOT(slotAnimate()) );
+ connect( d->animTimer, &QTimer::timeout, this, &PageViewToolBar::slotAnimate );
// apply a filter to get notified when anchor changes geometry
d->anchorWidget->installEventFilter( this );
diff --git a/ui/presentationsearchbar.cpp b/ui/presentationsearchbar.cpp
index 6885269..7414233 100644
--- a/ui/presentationsearchbar.cpp
+++ b/ui/presentationsearchbar.cpp
@@ -80,7 +80,7 @@ PresentationSearchBar::PresentationSearchBar( Okular::Document *document, QWidge
m_anchor->installEventFilter( this );
- connect( closeBtn, SIGNAL(clicked()), this, SLOT(close()) );
+ connect( closeBtn, &QAbstractButton::clicked, this, &QWidget::close );
connect(findNextBtn, &QPushButton::clicked, m_search, &SearchLineEdit::findNext);
}
diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp
index 350fdd7..29c2cd4 100644
--- a/ui/presentationwidget.cpp
+++ b/ui/presentationwidget.cpp
@@ -1417,8 +1417,8 @@ void PresentationWidget::slotDelayedEvents()
if ( m_screenSelect )
{
m_screenSelect->setCurrentItem( m_screen );
- connect( m_screenSelect->selectableActionGroup(), SIGNAL(triggered(QAction*)),
- this, SLOT(chooseScreen(QAction*)) );
+ connect( m_screenSelect->selectableActionGroup(), &QActionGroup::triggered,
+ this, &PresentationWidget::chooseScreen );
}
// show widget and take control