Commit a832a4d2 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

normalize signals/slots

svn path=/trunk/KDE/kdeutils/ark/; revision=1244154
parent 6646133e
......@@ -92,8 +92,8 @@ void BatchExtract::addExtraction(Kerfuffle::Archive* archive)
m_fileNames[job] = qMakePair(archive->fileName(), destination);
connect(job, SIGNAL(percent(KJob*, unsigned long)),
this, SLOT(forwardProgress(KJob *, unsigned long)));
connect(job, SIGNAL(percent(KJob*,ulong)),
this, SLOT(forwardProgress(KJob*,ulong)));
connect(job, SIGNAL(userQuery(Kerfuffle::Query*)),
this, SLOT(slotUserQuery(Kerfuffle::Query*)));
}
......
......@@ -151,7 +151,7 @@ void MainWindow::setupActions()
m_openAction = KStandardAction::open(this, SLOT(openArchive()), actionCollection());
KStandardAction::quit(this, SLOT(quit()), actionCollection());
m_recentFilesAction = KStandardAction::openRecent(this, SLOT(openUrl(const KUrl&)), actionCollection());
m_recentFilesAction = KStandardAction::openRecent(this, SLOT(openUrl(KUrl)), actionCollection());
m_recentFilesAction->setToolBarMode(KRecentFilesAction::MenuMode);
m_recentFilesAction->setToolButtonPopupMode(QToolButton::DelayedPopup);
m_recentFilesAction->setIconText(i18nc("action, to open an archive", "Open"));
......
......@@ -346,7 +346,7 @@ bool CliInterface::runProcess(const QString& programName, const QStringList& arg
m_process->setProgram(programPath, arguments);
connect(m_process, SIGNAL(readyReadStandardOutput()), SLOT(readStdout()), Qt::DirectConnection);
connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(processFinished(int, QProcess::ExitStatus)), Qt::DirectConnection);
connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), SLOT(processFinished(int,QProcess::ExitStatus)), Qt::DirectConnection);
m_stdOutData.clear();
......
......@@ -167,8 +167,8 @@ ListJob::ListJob(ReadOnlyArchiveInterface *interface, QObject *parent)
, m_isPasswordProtected(false)
, m_extractedFilesSize(0)
{
connect(this, SIGNAL(newEntry(const ArchiveEntry&)),
this, SLOT(onNewEntry(const ArchiveEntry&)));
connect(this, SIGNAL(newEntry(ArchiveEntry)),
this, SLOT(onNewEntry(ArchiveEntry)));
}
void ListJob::doWork()
......
......@@ -258,8 +258,8 @@ QList<Kerfuffle::ArchiveEntry> JobsTest::listEntries(JSONArchiveInterface *iface
m_entries.clear();
Kerfuffle::ListJob *listJob = new Kerfuffle::ListJob(iface, this);
connect(listJob, SIGNAL(newEntry(const ArchiveEntry&)),
SLOT(slotNewEntry(const ArchiveEntry&)));
connect(listJob, SIGNAL(newEntry(ArchiveEntry)),
SLOT(slotNewEntry(ArchiveEntry)));
startAndWaitForResult(listJob);
......
......@@ -873,11 +873,11 @@ KJob* ArchiveModel::setArchive(Kerfuffle::Archive *archive)
if (m_archive) {
job = m_archive->list(); // TODO: call "open" or "create"?
connect(job, SIGNAL(newEntry(const ArchiveEntry&)),
this, SLOT(slotNewEntryFromSetArchive(const ArchiveEntry&)));
connect(job, SIGNAL(newEntry(ArchiveEntry)),
this, SLOT(slotNewEntryFromSetArchive(ArchiveEntry)));
connect(job, SIGNAL(result(KJob *)),
this, SLOT(slotLoadingFinished(KJob *)));
connect(job, SIGNAL(result(KJob*)),
this, SLOT(slotLoadingFinished(KJob*)));
connect(job, SIGNAL(userQuery(Kerfuffle::Query*)),
this, SLOT(slotUserQuery(Kerfuffle::Query*)));
......@@ -915,8 +915,8 @@ AddJob* ArchiveModel::addFiles(const QStringList & filenames, const CompressionO
if (!m_archive->isReadOnly()) {
AddJob *job = m_archive->addFiles(filenames, options);
connect(job, SIGNAL(newEntry(const ArchiveEntry&)),
this, SLOT(slotNewEntry(const ArchiveEntry&)));
connect(job, SIGNAL(newEntry(ArchiveEntry)),
this, SLOT(slotNewEntry(ArchiveEntry)));
connect(job, SIGNAL(userQuery(Kerfuffle::Query*)),
this, SLOT(slotUserQuery(Kerfuffle::Query*)));
......@@ -931,8 +931,8 @@ DeleteJob* ArchiveModel::deleteFiles(const QList<QVariant> & files)
Q_ASSERT(m_archive);
if (!m_archive->isReadOnly()) {
DeleteJob *job = m_archive->deleteFiles(files);
connect(job, SIGNAL(entryRemoved(const QString &)),
this, SLOT(slotEntryRemoved(const QString &)));
connect(job, SIGNAL(entryRemoved(QString)),
this, SLOT(slotEntryRemoved(QString)));
connect(job, SIGNAL(finished(KJob*)),
this, SLOT(slotCleanupEmptyDirs()));
......
......@@ -33,12 +33,12 @@ ArchiveView::ArchiveView(QWidget *parent)
: QTreeView(parent)
, m_mouseButtons(Qt::NoButton)
{
connect(this, SIGNAL(pressed(const QModelIndex&)),
connect(this, SIGNAL(pressed(QModelIndex)),
SLOT(updateMouseButtons()));
connect(this, SIGNAL(clicked(const QModelIndex&)),
SLOT(slotClicked(const QModelIndex&)));
connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
SLOT(slotDoubleClicked(const QModelIndex&)));
connect(this, SIGNAL(clicked(QModelIndex)),
SLOT(slotClicked(QModelIndex)));
connect(this, SIGNAL(doubleClicked(QModelIndex)),
SLOT(slotDoubleClicked(QModelIndex)));
}
// FIXME: this is a workaround taken from Dolphin until QTBUG-1067 is resolved
......
......@@ -170,8 +170,8 @@ bool ArkViewer::viewInInternalViewer(const QString& filename)
if (m_part.data()->browserExtension()) {
connect(m_part.data()->browserExtension(),
SIGNAL(openUrlRequestDelayed(KUrl, KParts::OpenUrlArguments, KParts::BrowserArguments)),
SLOT(slotOpenUrlRequestDelayed(KUrl, KParts::OpenUrlArguments, KParts::BrowserArguments)));
SIGNAL(openUrlRequestDelayed(KUrl,KParts::OpenUrlArguments,KParts::BrowserArguments)),
SLOT(slotOpenUrlRequestDelayed(KUrl,KParts::OpenUrlArguments,KParts::BrowserArguments)));
}
// #235546
......
......@@ -106,12 +106,12 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList& args)
connect(m_model, SIGNAL(loadingStarted()),
this, SLOT(slotLoadingStarted()));
connect(m_model, SIGNAL(loadingFinished(KJob *)),
this, SLOT(slotLoadingFinished(KJob *)));
connect(m_model, SIGNAL(droppedFiles(const QStringList&, const QString&)),
this, SLOT(slotAddFiles(const QStringList&, const QString&)));
connect(m_model, SIGNAL(error(const QString&, const QString&)),
this, SLOT(slotError(const QString&, const QString&)));
connect(m_model, SIGNAL(loadingFinished(KJob*)),
this, SLOT(slotLoadingFinished(KJob*)));
connect(m_model, SIGNAL(droppedFiles(QStringList,QString)),
this, SLOT(slotAddFiles(QStringList,QString)));
connect(m_model, SIGNAL(error(QString,QString)),
this, SLOT(slotError(QString,QString)));
connect(this, SIGNAL(busy()),
this, SLOT(setBusyGui()));
......@@ -199,7 +199,7 @@ void Part::extractSelectedFilesTo(const QString& localPath)
registerJob(job);
connect(job, SIGNAL(result(KJob*)),
this, SLOT(slotExtractionDone(KJob *)));
this, SLOT(slotExtractionDone(KJob*)));
job->start();
}
......@@ -210,16 +210,16 @@ void Part::setupView()
m_view->setSortingEnabled(true);
connect(m_view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
connect(m_view->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
this, SLOT(updateActions()));
connect(m_view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
connect(m_view->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
this, SLOT(selectionChanged()));
//TODO: fix an actual eventhandler
connect(m_view, SIGNAL(itemTriggered(const QModelIndex &)),
this, SLOT(slotPreview(const QModelIndex &)));
connect(m_view, SIGNAL(itemTriggered(QModelIndex)),
this, SLOT(slotPreview(QModelIndex)));
connect(m_model, SIGNAL(columnsInserted(const QModelIndex &, int, int)),
connect(m_model, SIGNAL(columnsInserted(QModelIndex,int,int)),
this, SLOT(adjustColumns()));
}
......@@ -347,7 +347,7 @@ void Part::slotQuickExtractFiles(QAction *triggeredAction)
registerJob(job);
connect(job, SIGNAL(result(KJob*)),
this, SLOT(slotExtractionDone(KJob *)));
this, SLOT(slotExtractionDone(KJob*)));
job->start();
}
......@@ -634,7 +634,7 @@ void Part::slotExtractFiles()
registerJob(job);
connect(job, SIGNAL(result(KJob*)),
this, SLOT(slotExtractionDone(KJob *)));
this, SLOT(slotExtractionDone(KJob*)));
job->start();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment