Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2015-01-21 22:08:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ark (Old) and /work/SRC/openSUSE:Factory/.ark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ark" Changes: -------- --- /work/SRC/openSUSE:Factory/ark/ark.changes 2015-01-08 23:15:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ark.new/ark.changes 2015-01-21 22:08:32.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 12 19:41:32 UTC 2015 - [email protected] + +- Update to KDE Applications 14.12.1 + * KDE Applications 14.12.1 + * See https://www.kde.org/announcements/announce-applications-14.12.1.php + +------------------------------------------------------------------- Old: ---- ark-14.12.0.tar.xz New: ---- ark-14.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.z70Cb8/_old 2015-01-21 22:08:33.000000000 +0100 +++ /var/tmp/diff_new_pack.z70Cb8/_new 2015-01-21 22:08:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ark # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ark -Version: 14.12.0 +Version: 14.12.1 Release: 0 Summary: KDE Archiver Tool License: GPL-2.0+ ++++++ ark-14.12.0.tar.xz -> ark-14.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-14.12.0/app/batchextract.cpp new/ark-14.12.1/app/batchextract.cpp --- old/ark-14.12.0/app/batchextract.cpp 2014-11-24 00:37:06.000000000 +0100 +++ new/ark-14.12.1/app/batchextract.cpp 2014-12-30 00:32:36.000000000 +0100 @@ -46,8 +46,8 @@ #include <QTimer> #include <QWeakPointer> -BatchExtract::BatchExtract() - : KCompositeJob(0), +BatchExtract::BatchExtract(QObject* parent) + : KCompositeJob(parent), m_autoSubfolder(false), m_preservePaths(true), m_openDestinationAfterExtraction(false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-14.12.0/app/batchextract.h new/ark-14.12.1/app/batchextract.h --- old/ark-14.12.0/app/batchextract.h 2014-11-24 00:37:06.000000000 +0100 +++ new/ark-14.12.1/app/batchextract.h 2014-12-30 00:32:36.000000000 +0100 @@ -59,7 +59,7 @@ /** * Creates a new BatchExtract object. */ - BatchExtract(); + explicit BatchExtract(QObject* parent = 0); /** * Destroys a BatchExtract object. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-14.12.0/app/extractHereDndPlugin.cpp new/ark-14.12.1/app/extractHereDndPlugin.cpp --- old/ark-14.12.0/app/extractHereDndPlugin.cpp 2014-11-24 00:37:06.000000000 +0100 +++ new/ark-14.12.1/app/extractHereDndPlugin.cpp 2014-12-30 00:32:36.000000000 +0100 @@ -49,7 +49,6 @@ batchJob->start(); kDebug() << "Started job"; - } ExtractHereDndPlugin::ExtractHereDndPlugin(QObject* parent, const QVariantList&) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-14.12.0/app/main.cpp new/ark-14.12.1/app/main.cpp --- old/ark-14.12.0/app/main.cpp 2014-11-24 00:37:06.000000000 +0100 +++ new/ark-14.12.1/app/main.cpp 2014-12-30 00:32:36.000000000 +0100 @@ -110,18 +110,14 @@ //session restoring if (application.isSessionRestored()) { - MainWindow* window = NULL; - - if (KMainWindow::canBeRestored(1)) { - window = new MainWindow; - window->restore(1); - if (!window->loadPart()) { - delete window; - window = NULL; - } + if (!KMainWindow::canBeRestored(1)) { + return -1; } - if (window == NULL) { + MainWindow* window = new MainWindow; + window->restore(1); + if (!window->loadPart()) { + delete window; return -1; } } else { //new ark window (no restored session) @@ -129,7 +125,7 @@ KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); if (args->isSet("add") || args->isSet("add-to")) { - AddToArchive *addToArchiveJob = new AddToArchive; + AddToArchive *addToArchiveJob = new AddToArchive(&application); application.connect(addToArchiveJob, SIGNAL(result(KJob*)), SLOT(quit()), Qt::QueuedConnection); if (args->isSet("changetofirstpath")) { @@ -157,7 +153,7 @@ addToArchiveJob->start(); } else if (args->isSet("batch")) { - BatchExtract *batchJob = new BatchExtract; + BatchExtract *batchJob = new BatchExtract(&application); application.connect(batchJob, SIGNAL(result(KJob*)), SLOT(quit()), Qt::QueuedConnection); for (int i = 0; i < args->count(); ++i) { @@ -190,6 +186,7 @@ } else { MainWindow *window = new MainWindow; if (!window->loadPart()) { // if loading the part fails + delete window; return -1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-14.12.0/app/mainwindow.h new/ark-14.12.1/app/mainwindow.h --- old/ark-14.12.0/app/mainwindow.h 2014-11-24 00:37:06.000000000 +0100 +++ new/ark-14.12.1/app/mainwindow.h 2014-12-30 00:32:36.000000000 +0100 @@ -32,7 +32,7 @@ { Q_OBJECT public: - MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = 0); ~MainWindow(); bool loadPart(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-14.12.0/kerfuffle/addtoarchive.h new/ark-14.12.1/kerfuffle/addtoarchive.h --- old/ark-14.12.0/kerfuffle/addtoarchive.h 2014-11-24 00:37:06.000000000 +0100 +++ new/ark-14.12.1/kerfuffle/addtoarchive.h 2014-12-30 00:32:36.000000000 +0100 @@ -52,7 +52,7 @@ Q_OBJECT public: - AddToArchive(QObject *parent = 0); + explicit AddToArchive(QObject *parent = 0); ~AddToArchive(); bool showAddDialog(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-14.12.0/kerfuffle/extractiondialog.h new/ark-14.12.1/kerfuffle/extractiondialog.h --- old/ark-14.12.0/kerfuffle/extractiondialog.h 2014-11-24 00:37:06.000000000 +0100 +++ new/ark-14.12.1/kerfuffle/extractiondialog.h 2014-12-30 00:32:36.000000000 +0100 @@ -41,7 +41,7 @@ { Q_OBJECT public: - ExtractionDialog(QWidget *parent = 0); + explicit ExtractionDialog(QWidget *parent = 0); virtual ~ExtractionDialog(); void setShowSelectedFiles(bool); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-14.12.0/part/archivemodel.h new/ark-14.12.1/part/archivemodel.h --- old/ark-14.12.0/part/archivemodel.h 2014-11-24 00:37:06.000000000 +0100 +++ new/ark-14.12.1/part/archivemodel.h 2014-12-30 00:32:36.000000000 +0100 @@ -42,7 +42,7 @@ { Q_OBJECT public: - ArchiveModel(const QString &dbusPathName, QObject *parent = 0); + explicit ArchiveModel(const QString &dbusPathName, QObject *parent = 0); ~ArchiveModel(); QVariant data(const QModelIndex &index, int role) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-14.12.0/part/archiveview.h new/ark-14.12.1/part/archiveview.h --- old/ark-14.12.0/part/archiveview.h 2014-11-24 00:37:06.000000000 +0100 +++ new/ark-14.12.1/part/archiveview.h 2014-12-30 00:32:36.000000000 +0100 @@ -29,7 +29,7 @@ Q_OBJECT public: - ArchiveView(QWidget *parent = 0); + explicit ArchiveView(QWidget *parent = 0); virtual void dragEnterEvent(class QDragEnterEvent * event); virtual void dropEvent(class QDropEvent * event); virtual void dragMoveEvent(class QDragMoveEvent * event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-14.12.0/part/jobtracker.h new/ark-14.12.1/part/jobtracker.h --- old/ark-14.12.0/part/jobtracker.h 2014-11-24 00:37:06.000000000 +0100 +++ new/ark-14.12.1/part/jobtracker.h 2014-12-30 00:32:36.000000000 +0100 @@ -33,7 +33,7 @@ Q_OBJECT public: - JobTrackerWidget(QWidget *parent = 0); + explicit JobTrackerWidget(QWidget *parent = 0); }; class JobTracker: public KAbstractWidgetJobTracker @@ -41,7 +41,7 @@ Q_OBJECT public: - JobTracker(QWidget *parent = 0); + explicit JobTracker(QWidget *parent = 0); ~JobTracker(); virtual QWidget *widget(KJob *); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-14.12.0/part/part.cpp new/ark-14.12.1/part/part.cpp --- old/ark-14.12.0/part/part.cpp 2014-11-24 00:37:06.000000000 +0100 +++ new/ark-14.12.1/part/part.cpp 2014-12-30 00:32:36.000000000 +0100 @@ -226,7 +226,7 @@ this, SLOT(selectionChanged())); //TODO: fix an actual eventhandler - connect(m_view, SIGNAL(activated(const QModelIndex &)), + connect(m_view, SIGNAL(activated(QModelIndex)), this, SLOT(slotPreviewWithInternalViewer())); connect(m_view, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(slotShowContextMenu())); @@ -948,6 +948,10 @@ void Part::slotShowContextMenu() { + if (!factory()) { + return; + } + KMenu *popup = static_cast<KMenu *>(factory()->container(QLatin1String("context_menu"), this)); popup->popup(QCursor::pos()); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
