summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2014-11-23 07:52:32 +0100
committerMontel Laurent <[email protected]>2014-11-23 07:52:32 +0100
commitb0b8ccd682953740044247a0ccb31fa864dd133e (patch)
treeff9ea51710f53a7d6e06ca92d8d4402e1c5a75e6
parent0f667258ddf00d8187a459819178d1873a6b05fd (diff)
Port to new connect api
-rw-r--r--tests/kipiimagecollectionselector.cpp3
-rw-r--r--tests/kipiinterface.cpp6
-rw-r--r--tests/kipisetup.cpp3
-rw-r--r--tests/kipitestmainwindow.cpp3
-rw-r--r--tests/kipitestpluginloader.cpp3
-rw-r--r--tests/kipiuploadwidget.cpp3
-rw-r--r--tests/main.cpp3
7 files changed, 8 insertions, 16 deletions
diff --git a/tests/kipiimagecollectionselector.cpp b/tests/kipiimagecollectionselector.cpp
index a3b34b9..74cbfda 100644
--- a/tests/kipiimagecollectionselector.cpp
+++ b/tests/kipiimagecollectionselector.cpp
@@ -59,8 +59,7 @@ KipiImageCollectionSelector::KipiImageCollectionSelector(KipiInterface* const in
setLayout(layout);
- connect(m_listWidget, SIGNAL(itemSelectionChanged()),
- this, SLOT(on_m_listWidget_itemSelectionChanged()));
+ connect(m_listWidget, &QListWidget::itemSelectionChanged, this, &KipiImageCollectionSelector::on_m_listWidget_itemSelectionChanged);
// add all albums to the list widget:
m_allAlbums = m_interface->allAlbums();
diff --git a/tests/kipiinterface.cpp b/tests/kipiinterface.cpp
index 5498708..3c5da5e 100644
--- a/tests/kipiinterface.cpp
+++ b/tests/kipiinterface.cpp
@@ -216,11 +216,9 @@ void KipiInterface::thumbnails(const QList<QUrl>& list, int)
KIO::PreviewJob *job = KIO::filePreview(QList<QUrl>() << url, 256);
#endif
- connect(job, SIGNAL(gotPreview(KFileItem,QPixmap)),
- this, SLOT(slotGotKDEPreview(KFileItem,QPixmap)));
+ connect(job, &KIO::PreviewJob::gotPreview, this, &KipiInterface::slotGotKDEPreview);
- connect(job, SIGNAL(failed(KFileItem)),
- this, SLOT(slotFailedKDEPreview(KFileItem)));
+ connect(job, &KIO::PreviewJob::failed, this, &KipiInterface::slotFailedKDEPreview);
}
}
diff --git a/tests/kipisetup.cpp b/tests/kipisetup.cpp
index 6c38d83..e630261 100644
--- a/tests/kipisetup.cpp
+++ b/tests/kipisetup.cpp
@@ -127,8 +127,7 @@ KipiSetup::KipiSetup(QWidget* const parent)
setCurrentPage(page);
- connect(d->pluginFilter, SIGNAL(userTextChanged(QString)),
- this, SLOT(slotFilterChanged(QString)));
+ connect(d->pluginFilter, &KLineEdit::userTextChanged, this, &KipiSetup::slotFilterChanged);
#endif
}
diff --git a/tests/kipitestmainwindow.cpp b/tests/kipitestmainwindow.cpp
index 6bf0f0d..7a93475 100644
--- a/tests/kipitestmainwindow.cpp
+++ b/tests/kipitestmainwindow.cpp
@@ -174,8 +174,7 @@ void KipiTestMainWindow::slotConfToolbars()
saveMainWindowSettings(grp);
KEditToolBar dlg(factory(), this);
- connect(&dlg, SIGNAL(newToolBarConfig()),
- this, SLOT(slotNewToolbarConfig()));
+ connect(&dlg, &KEditToolBar::newToolBarConfig, this, &KipiTestMainWindow::slotNewToolbarConfig);
dlg.exec();
}
diff --git a/tests/kipitestpluginloader.cpp b/tests/kipitestpluginloader.cpp
index ad22cf0..0efa6b3 100644
--- a/tests/kipitestpluginloader.cpp
+++ b/tests/kipitestpluginloader.cpp
@@ -146,8 +146,7 @@ void KipiTestPluginLoader::loadPlugins()
d->kipiPluginLoader->setIgnoredPluginsList(ignores);
d->kipiPluginLoader->init();
- connect(d->kipiPluginLoader, SIGNAL(replug()),
- this, SLOT(slotKipiPluginsPlug()));
+ connect(d->kipiPluginLoader, &PluginLoader::replug, this, &KipiTestPluginLoader::slotKipiPluginsPlug);
d->kipiPluginLoader->loadPlugins();
}
diff --git a/tests/kipiuploadwidget.cpp b/tests/kipiuploadwidget.cpp
index 5ad091a..4162e99 100644
--- a/tests/kipiuploadwidget.cpp
+++ b/tests/kipiuploadwidget.cpp
@@ -58,8 +58,7 @@ KipiUploadWidget::KipiUploadWidget(KipiInterface* const interface, QWidget* cons
setLayout(layout);
- connect(m_listWidget, SIGNAL(itemSelectionChanged()),
- this, SLOT(slotItemSelectionChanged()));
+ connect(m_listWidget, &QListWidget::itemSelectionChanged, this, &KipiUploadWidget::slotItemSelectionChanged);
// add all albums to the list widget:
m_allAlbums = m_interface->allAlbums();
diff --git a/tests/main.cpp b/tests/main.cpp
index 41fefab..61c975b 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -132,8 +132,7 @@ int main(int argc, char* argv[])
}
KipiTestMainWindow* mainWindow = new KipiTestMainWindow(listSelectedImages, listSelectedAlbums, listAllAlbums);
- QObject::connect(mainWindow, SIGNAL(destroyed(QObject*)),
- &app, SLOT(quit()));
+ QObject::connect(mainWindow, &KipiTestMainWindow::destroyed, &app, &KApplication::quit);
app.setTopWidget(mainWindow);