Hello community, here is the log from the commit of package krunner for openSUSE:Factory checked in at 2015-02-16 15:03:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krunner (Old) and /work/SRC/openSUSE:Factory/.krunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krunner" Changes: -------- --- /work/SRC/openSUSE:Factory/krunner/krunner.changes 2015-01-29 12:49:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.krunner.new/krunner.changes 2015-02-16 17:32:18.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Feb 8 18:15:04 UTC 2015 - [email protected] + +- Update to 5.7.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.7.0.php + +------------------------------------------------------------------- Old: ---- krunner-5.6.0.tar.xz New: ---- krunner-5.7.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krunner.spec ++++++ --- /var/tmp/diff_new_pack.HLcigq/_old 2015-02-16 17:32:19.000000000 +0100 +++ /var/tmp/diff_new_pack.HLcigq/_new 2015-02-16 17:32:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package krunner # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX 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,12 +17,13 @@ %define lname libKF5Runner5 +%define _tar_path 5.7 Name: krunner -Version: 5.6.0 +Version: %{_tar_path}.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.6.0 +BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{kf5_version} BuildRequires: kcoreaddons-devel >= %{kf5_version} @@ -40,7 +41,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/5.6/portingAids/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/portingAids/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ krunner-5.6.0.tar.xz -> krunner-5.7.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/CMakeLists.txt new/krunner-5.7.0/CMakeLists.txt --- old/krunner-5.6.0/CMakeLists.txt 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/CMakeLists.txt 2015-02-08 16:24:03.000000000 +0100 @@ -3,7 +3,7 @@ project(KRunner) # ECM setup -find_package(ECM 1.6.0 REQUIRED NO_MODULE) +find_package(ECM 1.7.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) @@ -15,8 +15,8 @@ include(KDECompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "5.6.0") # handled by release scripts -set(KF5_DEP_VERSION "5.6.0") # handled by release scripts +set(KF5_VERSION "5.7.0") # handled by release scripts +set(KF5_DEP_VERSION "5.7.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KRUNNER diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/examples/runner/plasma-runner-example-homefiles.desktop new/krunner-5.7.0/examples/runner/plasma-runner-example-homefiles.desktop --- old/krunner-5.6.0/examples/runner/plasma-runner-example-homefiles.desktop 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/examples/runner/plasma-runner-example-homefiles.desktop 2015-02-08 16:24:03.000000000 +0100 @@ -17,6 +17,7 @@ Name[ia]=Files de domo Name[it]=File della home Name[ko]=홈 파일 +Name[lt]=Namų failai Name[nb]=Hjemmefiler Name[nds]=Tohuus-Dateien Name[nl]=Persoonlijke bestanden @@ -55,6 +56,7 @@ Comment[ia]=Parte de un tutorial demonstrante como crear Plugin de Runner Comment[it]=Partedi una guida che dimostra come creare estensioni di KRunner Comment[ko]=실행기 플러그인을 만드는 튜토리얼의 일부 +Comment[lt]=Dalis mokymo programos demonstruojanti kaip kurti Runner įskiepius Comment[nb]=Del av en veiledning som viser hvordan Runner-moduler kan lages Comment[nds]=Deel vun en Lehrprogramm dat wiest, wodennig een KRunner-Modulen schrifft. Comment[nl]=Deel van een inleiding die demonstreert hoe Runner-plug-ins te maken diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/po/ja/plasma_runner_example_homefiles.po new/krunner-5.7.0/po/ja/plasma_runner_example_homefiles.po --- old/krunner-5.6.0/po/ja/plasma_runner_example_homefiles.po 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/po/ja/plasma_runner_example_homefiles.po 2015-02-08 16:24:03.000000000 +0100 @@ -6,7 +6,7 @@ "PO-Revision-Date: 2013-09-13 00:14-0700\n" "Last-Translator: Japanese KDE translation team <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" -"Language: \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/CMakeLists.txt new/krunner-5.7.0/src/CMakeLists.txt --- old/krunner-5.6.0/src/CMakeLists.txt 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/src/CMakeLists.txt 2015-02-08 16:24:03.000000000 +0100 @@ -2,12 +2,12 @@ add_library(KF5Runner abstractrunner.cpp -# scripting/runnerscript.cpp runnerjobs.cpp querymatch.cpp runnercontext.cpp runnermanager.cpp - runnersyntax.cpp) + runnersyntax.cpp + krunner_debug.cpp) generate_export_header(KF5Runner BASE_NAME KRunner) add_library(KF5::Runner ALIAS KF5Runner) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/abstractrunner.cpp new/krunner-5.7.0/src/abstractrunner.cpp --- old/krunner-5.6.0/src/abstractrunner.cpp 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/src/abstractrunner.cpp 2015-02-08 16:24:03.000000000 +0100 @@ -26,8 +26,9 @@ #include <QMutex> #include <QMutexLocker> #include <QTimer> - #include <QDebug> + +#include "krunner_debug.h" #include <kplugininfo.h> #include <ksharedconfig.h> #include <kservicetypetrader.h> @@ -38,7 +39,6 @@ #include "abstractrunner_p.h" #include "querymatch.h" #include "runnercontext.h" -#include "scripting/runnerscript.h" namespace Plasma { @@ -138,7 +138,7 @@ // we punish runners that return too slowly, even if they don't bring // back matches #ifndef NDEBUG - // qDebug() << id() << "runner is too slow, putting it on the back burner."; + // qCDebug(KRUNNER) << id() << "runner is too slow, putting it on the back burner."; #endif d->fastRuns = 0; setSpeed(SlowSpeed); @@ -151,7 +151,7 @@ // we reward slowed runners who bring back matches fast enough // 3 times in a row #ifndef NDEBUG - // qDebug() << id() << "runner is faster than we thought, kicking it up a notch"; + // qCDebug(KRUNNER) << id() << "runner is faster than we thought, kicking it up a notch"; #endif setSpeed(NormalSpeed); } @@ -383,26 +383,6 @@ const QString api = runnerDescription.property("X-Plasma-API").toString(); } -// put all setup routines for script here. at this point we can assume that -// package exists and that we have a script engine -void AbstractRunnerPrivate::setupScriptSupport() -{ - if (!package) { - return; - } - -#ifndef NDEBUG - // qDebug() << "setting up script support, package is in" << package->path() - // << ", main script is" << package->filePath("mainscript"); -#endif - - // FIXME: Replace with ki18n functionality once semantics is clear. - // const QString translationsPath = package->filePath("translations"); - // if (!translationsPath.isEmpty()) { - // KGlobal::dirs()->addResourceDir("locale", translationsPath); - // } -} - } // Plasma namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/abstractrunner_p.h new/krunner-5.7.0/src/abstractrunner_p.h --- old/krunner-5.6.0/src/abstractrunner_p.h 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/src/abstractrunner_p.h 2015-02-08 16:24:03.000000000 +0100 @@ -36,7 +36,6 @@ ~AbstractRunnerPrivate(); void init(const KService::Ptr service); void init(const QString &path); - void setupScriptSupport(); AbstractRunner::Priority priority; AbstractRunner::Speed speed; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/declarative/CMakeLists.txt new/krunner-5.7.0/src/declarative/CMakeLists.txt --- old/krunner-5.6.0/src/declarative/CMakeLists.txt 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/src/declarative/CMakeLists.txt 2015-02-08 16:24:03.000000000 +0100 @@ -3,6 +3,7 @@ set(runnermodel_SRCS runnermodel.cpp runnermodelplugin.cpp + krunner_debug.cpp ) add_library(runnermodelplugin SHARED ${runnermodel_SRCS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/declarative/krunner_debug.cpp new/krunner-5.7.0/src/declarative/krunner_debug.cpp --- old/krunner-5.6.0/src/declarative/krunner_debug.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/krunner-5.7.0/src/declarative/krunner_debug.cpp 2015-02-08 16:24:03.000000000 +0100 @@ -0,0 +1,23 @@ +/* This file is part of the KDE project + Copyright (C) 2014 Luca Beltrame <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "krunner_debug.h" +Q_LOGGING_CATEGORY(KRUNNER, "org.kde.krunner") + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/declarative/krunner_debug.h new/krunner-5.7.0/src/declarative/krunner_debug.h --- old/krunner-5.6.0/src/declarative/krunner_debug.h 1970-01-01 01:00:00.000000000 +0100 +++ new/krunner-5.7.0/src/declarative/krunner_debug.h 2015-02-08 16:24:03.000000000 +0100 @@ -0,0 +1,27 @@ +/* This file is part of the KDE project + Copyright (C) 2014 Luca Beltrame <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef KRUNNER_DEBUG_H +#define KRUNNER_DEBUG_H + +#include <QLoggingCategory> +Q_DECLARE_LOGGING_CATEGORY(KRUNNER) + +#endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/declarative/runnermodel.cpp new/krunner-5.7.0/src/declarative/runnermodel.cpp --- old/krunner-5.6.0/src/declarative/runnermodel.cpp 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/src/declarative/runnermodel.cpp 2015-02-08 16:24:03.000000000 +0100 @@ -22,9 +22,10 @@ #include <QIcon> #include <QAction> #include <QTimer> - #include <QDebug> +#include "krunner_debug.h" + #include <KRunner/RunnerManager> RunnerModel::RunnerModel(QObject *parent) @@ -90,7 +91,7 @@ m_manager->setSingleMode(allowedRunners.count() == 1); } else { m_pendingRunnersList = allowedRunners; - // qDebug() << "runners set" << m_pendingRunnersList.count(); + // qCDebug(KRUNNER) << "runners set" << m_pendingRunnersList.count(); } // to trigger single runner fun! @@ -120,7 +121,7 @@ if (!index.isValid() || index.parent().isValid() || index.column() > 0 || index.row() < 0 || index.row() >= m_matches.count()) { // index requested must be valid, but we have no child items! - //qDebug() << "invalid index requested"; + //qCDebug(KRUNNER) << "invalid index requested"; return QVariant(); } @@ -177,10 +178,10 @@ return; } - //qDebug() << "!!!!!!!!!!!!!" << m_pendingQuery << m_manager; + //qCDebug(KRUNNER) << "!!!!!!!!!!!!!" << m_pendingQuery << m_manager; if (createManager() || m_pendingQuery != m_manager->query()) { - //qDebug() << "running query" << m_pendingQuery << m_manager; + //qCDebug(KRUNNER) << "running query" << m_pendingQuery << m_manager; m_manager->launchQuery(m_pendingQuery, m_singleRunnerId); emit queryChanged(); m_running = true; @@ -210,7 +211,7 @@ void RunnerModel::matchesChanged(const QList<Plasma::QueryMatch> &matches) { - //qDebug() << "got matches:" << matches.count(); + //qCDebug(KRUNNER) << "got matches:" << matches.count(); bool fullReset = false; int oldCount = m_matches.count(); int newCount = matches.count(); @@ -250,5 +251,4 @@ emit runningChanged(false); } -#include "runnermodel.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/declarative/runnermodelplugin.cpp new/krunner-5.7.0/src/declarative/runnermodelplugin.cpp --- old/krunner-5.6.0/src/declarative/runnermodelplugin.cpp 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/src/declarative/runnermodelplugin.cpp 2015-02-08 16:24:03.000000000 +0100 @@ -20,21 +20,21 @@ #include "runnermodelplugin.h" #include <QtQml> - #include <QDebug> +#include "krunner_debug.h" + #include <KRunner/QueryMatch> #include "runnermodel.h" void RunnerModelPlugin::registerTypes(const char *uri) { - qWarning() << "Using deprecated import org.kde.runnermodel, please port to org.kde.plasma.core"; + qCWarning(KRUNNER) << "Using deprecated import org.kde.runnermodel, please port to org.kde.plasma.core"; Q_ASSERT(uri == QLatin1String("org.kde.runnermodel")); qmlRegisterType<RunnerModel>(uri, 2, 0, "RunnerModel"); qmlRegisterInterface<Plasma::QueryMatch>("QueryMatch"); qRegisterMetaType<Plasma::QueryMatch *>("QueryMatch"); } -#include "runnermodelplugin.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/krunner_debug.cpp new/krunner-5.7.0/src/krunner_debug.cpp --- old/krunner-5.6.0/src/krunner_debug.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/krunner-5.7.0/src/krunner_debug.cpp 2015-02-08 16:24:03.000000000 +0100 @@ -0,0 +1,23 @@ +/* This file is part of the KDE project + Copyright (C) 2014 Luca Beltrame <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "krunner_debug.h" +Q_LOGGING_CATEGORY(KRUNNER, "org.kde.krunner") + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/krunner_debug.h new/krunner-5.7.0/src/krunner_debug.h --- old/krunner-5.6.0/src/krunner_debug.h 1970-01-01 01:00:00.000000000 +0100 +++ new/krunner-5.7.0/src/krunner_debug.h 2015-02-08 16:24:03.000000000 +0100 @@ -0,0 +1,27 @@ +/* This file is part of the KDE project + Copyright (C) 2014 Luca Beltrame <[email protected]> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef KRUNNER_DEBUG_H +#define KRUNNER_DEBUG_H + +#include <QLoggingCategory> +Q_DECLARE_LOGGING_CATEGORY(KRUNNER) + +#endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/querymatch.cpp new/krunner-5.7.0/src/querymatch.cpp --- old/krunner-5.6.0/src/querymatch.cpp 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/src/querymatch.cpp 2015-02-08 16:24:03.000000000 +0100 @@ -26,9 +26,10 @@ #include <QStringList> #include <QVariant> #include <QWeakPointer> - #include <QDebug> +#include "krunner_debug.h" + #include "abstractrunner.h" namespace Plasma @@ -95,7 +96,7 @@ QueryMatch::QueryMatch(AbstractRunner *runner) : d(new QueryMatchPrivate(runner)) { -// qDebug() << "new match created"; +// qCDebug(KRUNNER) << "new match created"; } QueryMatch::QueryMatch(const QueryMatch &other) @@ -315,7 +316,7 @@ void QueryMatch::run(const RunnerContext &context) const { - //qDebug() << "we run the term" << context->query() << "whose type is" << context->mimetype(); + //qCDebug(KRUNNER) << "we run the term" << context->query() << "whose type is" << context->mimetype(); if (d->runner) { d->runner.data()->run(context, *this); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/runnercontext.cpp new/krunner-5.7.0/src/runnercontext.cpp --- old/krunner-5.6.0/src/runnercontext.cpp 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/src/runnercontext.cpp 2015-02-08 16:24:03.000000000 +0100 @@ -27,9 +27,10 @@ #include <QFile> #include <QFileInfo> #include <QSharedData> +#include <QDebug> #include <kconfiggroup.h> -#include <QDebug> +#include "krunner_debug.h" #include <qmimedatabase.h> #include <kshell.h> #include <qstandardpaths.h> @@ -59,35 +60,35 @@ */ bool correctLastComponentCase(const QString &path, QString &correctCasePath, const bool mustBeDir) { - //qDebug() << "Correcting " << path; + //qCDebug(KRUNNER) << "Correcting " << path; // If the file already exists then no need to search for it. if (QFile::exists(path)) { correctCasePath = path; - //qDebug() << "Correct path is" << correctCasePath; + //qCDebug(KRUNNER) << "Correct path is" << correctCasePath; return true; } const QFileInfo pathInfo(path); const QDir fileDir = pathInfo.dir(); - //qDebug() << "Directory is" << fileDir; + //qCDebug(KRUNNER) << "Directory is" << fileDir; const QString filename = pathInfo.fileName(); - //qDebug() << "Filename is" << filename; + //qCDebug(KRUNNER) << "Filename is" << filename; - //qDebug() << "searching for a" << (mustBeDir ? "directory" : "directory/file"); + //qCDebug(KRUNNER) << "searching for a" << (mustBeDir ? "directory" : "directory/file"); const QStringList matchingFilenames = fileDir.entryList(QStringList(filename), mustBeDir ? QDir::Dirs : QDir::NoFilter); if (matchingFilenames.empty()) { - //qDebug() << "No matches found!!\n"; + //qCDebug(KRUNNER) << "No matches found!!\n"; return false; } else { /*if (matchingFilenames.size() > 1) { #ifndef NDEBUG - // qDebug() << "Found multiple matches!!\n"; + // qCDebug(KRUNNER) << "Found multiple matches!!\n"; #endif }*/ @@ -97,7 +98,7 @@ correctCasePath = fileDir.path() + QDir::separator() + matchingFilenames[0]; } - //qDebug() << "Correct path is" << correctCasePath; + //qCDebug(KRUNNER) << "Correct path is" << correctCasePath; return true; } } @@ -125,7 +126,7 @@ const bool mustBeDir = components.back().isEmpty(); - //qDebug() << "Components are" << components; + //qCDebug(KRUNNER) << "Components are" << components; if (mustBeDir) { components.pop_back(); @@ -141,7 +142,7 @@ const QString tmp = components[0] + QDir::separator() + components[1]; if (!correctLastComponentCase(tmp, correctPath, components.size() > 2 || mustBeDir)) { - //qDebug() << "search was not successful"; + //qCDebug(KRUNNER) << "search was not successful"; return false; } @@ -171,7 +172,7 @@ q(p.q), singleRunnerQueryMode(false) { - //qDebug() << "¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿boo yeah" << type; + //qCDebug(KRUNNER) << "¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿boo yeah" << type; } ~RunnerContextPrivate() @@ -218,13 +219,13 @@ // but if a path doesn't have any slashes // it's too ambiguous to be sure we're in a filesystem context path = QDir::cleanPath(url.toLocalFile()); - //qDebug()<< "slash check" << path; + //qCDebug(KRUNNER)<< "slash check" << path; if (hasProtocol || ((path.indexOf('/') != -1 || path.indexOf('\\') != -1))) { QString correctCasePath; if (correctPathCase(path, correctCasePath)) { path = correctCasePath; QFileInfo info(path); - //qDebug()<< "correct cas epath is" << correctCasePath << info.isSymLink() << + //qCDebug(KRUNNER)<< "correct cas epath is" << correctCasePath << info.isSymLink() << // info.isDir() << info.isFile(); if (info.isSymLink()) { @@ -247,7 +248,7 @@ } } - //qDebug() << "term2type" << term << type; + //qCDebug(KRUNNER) << "term2type" << term << type; } void invalidate() @@ -335,7 +336,7 @@ d->mimeType.clear(); d->type = UnknownType; d->singleRunnerQueryMode = false; - //qDebug() << "match count" << d->matches.count(); + //qCDebug(KRUNNER) << "match count" << d->matches.count(); } void RunnerContext::setQuery(const QString &term) @@ -405,13 +406,13 @@ d->matches.append(match); #ifndef NDEBUG if (d->matchesById.contains(match.id())) { - // qDebug() << "Duplicate match id " << match.id() << "from" << match.runner()->name(); + // qCDebug(KRUNNER) << "Duplicate match id " << match.id() << "from" << match.runner()->name(); } #endif d->matchesById.insert(match.id(), &d->matches.at(d->matches.size() - 1)); } UNLOCK(d); - //qDebug()<< "add matches"; + //qCDebug(KRUNNER)<< "add matches"; // A copied searchContext may share the d pointer, // we always want to sent the signal of the object that created // the d pointer @@ -438,7 +439,7 @@ d->matches.append(m); d->matchesById.insert(m.id(), &d->matches.at(d->matches.size() - 1)); UNLOCK(d); - //qDebug()<< "added match" << match->text(); + //qCDebug(KRUNNER)<< "added match" << match->text(); emit d->q->matchesChanged(); return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/runnerjobs.cpp new/krunner-5.7.0/src/runnerjobs.cpp --- old/krunner-5.6.0/src/runnerjobs.cpp 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/src/runnerjobs.cpp 2015-02-08 16:24:03.000000000 +0100 @@ -22,6 +22,7 @@ #include <QTimer> #include <QMutexLocker> #include <QDebug> +#include "krunner_debug.h" #include "runnermanager.h" #include "querymatch.h" @@ -49,7 +50,7 @@ QSharedPointer<FindMatchesJob> aJob(job.dynamicCast<FindMatchesJob>()); if (QTimer *t = aJob->delayTimer()) { // If the timer is active, the required delay has not been reached - //qDebug() << "delayed timer" << aJob->runner()->name() << !t->isActive(); + //qCDebug(KRUNNER) << "delayed timer" << aJob->runner()->name() << !t->isActive(); return !t->isActive(); // DATA RACE! (with QTimer start/stop from runnermanager.cpp) } @@ -152,7 +153,7 @@ void FindMatchesJob::run(ThreadWeaver::JobPointer, ThreadWeaver::Thread*) { -// qDebug() << "Running match for " << m_runner->objectName() +// qCDebug(KRUNNER) << "Running match for " << m_runner->objectName() // << " in Thread " << thread()->id() << endl; if (m_context.isValid()) { m_runner->performMatch(m_context); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/runnermanager.cpp new/krunner-5.7.0/src/runnermanager.cpp --- old/krunner-5.6.0/src/runnermanager.cpp 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/src/runnermanager.cpp 2015-02-08 16:24:03.000000000 +0100 @@ -26,6 +26,7 @@ #include <QCoreApplication> #include <qstandardpaths.h> #include <QDebug> +#include "krunner_debug.h" #include <ksharedconfig.h> #include <kplugininfo.h> @@ -104,7 +105,7 @@ //This entry allows to define a hard upper limit independent of the number of processors. const int maxThreads = config.readEntry("maxThreads", 16); const int numThreads = qMin(maxThreads, 2 + ((numProcs - 1) * 2)); - //qDebug() << "setting up" << numThreads << "threads for" << numProcs << "processors"; + //qCDebug(KRUNNER) << "setting up" << numThreads << "threads for" << numProcs << "processors"; if (numThreads > Queue::instance()->maximumNumberOfThreads()) { Queue::instance()->setMaximumNumberOfThreads(numThreads); } @@ -187,7 +188,7 @@ QMutableListIterator<KPluginInfo> it(offers); while (it.hasNext()) { KPluginInfo &description = it.next(); - qDebug() << "Loading runner: " << description.pluginName(); + qCDebug(KRUNNER) << "Loading runner: " << description.pluginName(); QString tryExec = description.property("TryExec").toString(); if (!tryExec.isEmpty() && QStandardPaths::findExecutable(tryExec).isEmpty()) { @@ -228,18 +229,18 @@ } if (enabledCategories.isEmpty() || !allCategoriesDisabled) { - qDebug() << "Loaded:" << runnerName; + qCDebug(KRUNNER) << "Loaded:" << runnerName; runners.insert(runnerName, runner); } else { runners.remove(runnerName); deadRunners.insert(runner); - qDebug() << "Categories not enabled. Removing runner: " << runnerName; + qCDebug(KRUNNER) << "Categories not enabled. Removing runner: " << runnerName; } } } else if (loaded) { //Remove runner deadRunners.insert(runners.take(runnerName)); - qDebug() << "Plugin disabled. Removing runner: " << runnerName; + qCDebug(KRUNNER) << "Plugin disabled. Removing runner: " << runnerName; } } @@ -285,7 +286,7 @@ } #ifndef NDEBUG - // qDebug() << "All runners loaded, total:" << runners.count(); + // qCDebug(KRUNNER) << "All runners loaded, total:" << runners.count(); #endif } @@ -307,18 +308,18 @@ runner = service->createInstance<AbstractRunner>(q, args, &error); if (!runner) { #ifndef NDEBUG - // qDebug() << "Failed to load runner:" << service->name() << ". error reported:" << error; + // qCDebug(KRUNNER) << "Failed to load runner:" << service->name() << ". error reported:" << error; #endif } } } else { - //qDebug() << "got a script runner known as" << api; + //qCDebug(KRUNNER) << "got a script runner known as" << api; runner = new AbstractRunner(service, q); } if (runner) { #ifndef NDEBUG - // qDebug() << "================= loading runner:" << service->name() << "================="; + // qCDebug(KRUNNER) << "================= loading runner:" << service->name() << "================="; #endif QObject::connect(runner, SIGNAL(matchingSuspended(bool)), q, SLOT(runnerMatchingSuspended(bool))); runner->init(); @@ -339,7 +340,7 @@ } if (deferredRun.isEnabled() && runJob->runner() == deferredRun.runner()) { - //qDebug() << "job actually done, running now **************"; + //qCDebug(KRUNNER) << "job actually done, running now **************"; QueryMatch tmpRun = deferredRun; deferredRun = QueryMatch(0); tmpRun.run(context); @@ -360,7 +361,7 @@ void checkTearDown() { - //qDebug() << prepped << teardownRequested << searchJobs.count() << oldSearchJobs.count(); + //qCDebug(KRUNNER) << prepped << teardownRequested << searchJobs.count() << oldSearchJobs.count(); if (!prepped || !teardownRequested) { return; @@ -658,7 +659,7 @@ for (auto it = d->searchJobs.constBegin(); it != d->searchJobs.constEnd(); ++it) { if ((*it)->runner() == runner && !(*it)->isFinished()) { #ifndef NDEBUG - // qDebug() << "deferred run"; + // qCDebug(KRUNNER) << "deferred run"; #endif d->deferredRun = match; return; @@ -736,7 +737,7 @@ emit runner->prepare(); #ifdef MEASURE_PREPTIME #ifndef NDEBUG - // qDebug() << t.elapsed() << runner->name(); + // qCDebug(KRUNNER) << t.elapsed() << runner->name(); #endif #endif } @@ -791,7 +792,7 @@ } reset(); -// qDebug() << "runners searching for" << term << "on" << runnerName; +// qCDebug(KRUNNER) << "runners searching for" << term << "on" << runnerName; d->context.setQuery(term); d->context.setEnabledCategories(d->enabledCategories); @@ -837,7 +838,7 @@ d->searchJobs.clear(); if (d->deferredRun.isEnabled()) { - //qDebug() << "job actually done, running now **************"; + //qCDebug(KRUNNER) << "job actually done, running now **************"; QueryMatch tmpRun = d->deferredRun; d->deferredRun = QueryMatch(0); tmpRun.run(d->context); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/scripting/runnerscript.cpp new/krunner-5.7.0/src/scripting/runnerscript.cpp --- old/krunner-5.6.0/src/scripting/runnerscript.cpp 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/src/scripting/runnerscript.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,194 +0,0 @@ -/* - * Copyright 2007 by Aaron Seigo <[email protected]> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details - * - * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "scripting/runnerscript.h" - -#include "abstractrunner.h" -#include "plasma/package.h" -// #include "private/dataenginemanager_p.h" -#include "private/abstractrunner_p.h" - -namespace Plasma -{ - -class RunnerScriptPrivate -{ -public: - RunnerScriptPrivate() - : runner(0) - { - } - - AbstractRunner *runner; -}; - -RunnerScript::RunnerScript(QObject *parent) - : ScriptEngine(parent), - d(new RunnerScriptPrivate) -{ -} - -RunnerScript::~RunnerScript() -{ - delete d; -} - -void RunnerScript::setRunner(AbstractRunner *runner) -{ - d->runner = runner; - connect(runner, SIGNAL(prepare()), this, SIGNAL(prepare())); - connect(runner, SIGNAL(teardown()), this, SIGNAL(teardown())); -} - -AbstractRunner *RunnerScript::runner() const -{ - return d->runner; -} - -void RunnerScript::match(Plasma::RunnerContext &search) -{ - Q_UNUSED(search); -} - -void RunnerScript::run(const Plasma::RunnerContext &search, const Plasma::QueryMatch &action) -{ - Q_UNUSED(search); - Q_UNUSED(action); -} - -DataEngine *RunnerScript::dataEngine(const QString &name) -{ - if (d->runner) { - return d->runner->dataEngine(name); - } - - return 0; -} - -KConfigGroup RunnerScript::config() const -{ - if (d->runner) { - return d->runner->config(); - } - return KConfigGroup(); -} - -void RunnerScript::setIgnoredTypes(RunnerContext::Types types) -{ - if (d->runner) { - d->runner->setIgnoredTypes(types); - } -} - -void RunnerScript::setHasRunOptions(bool hasRunOptions) -{ - if (d->runner) { - d->runner->setHasRunOptions(hasRunOptions); - } -} - -void RunnerScript::setSpeed(AbstractRunner::Speed newSpeed) -{ - if (d->runner) { - d->runner->setSpeed(newSpeed); - } -} - -void RunnerScript::setPriority(AbstractRunner::Priority newPriority) -{ - if (d->runner) { - d->runner->setPriority(newPriority); - } -} - -QAction* RunnerScript::addAction(const QString &id, const QIcon &icon, const QString &text) -{ - if (d->runner) { - return d->runner->addAction(id, icon, text); - } - return 0; -} - -void RunnerScript::addAction(const QString &id, QAction *action) -{ - if (d->runner) { - d->runner->addAction(id, action); - } -} - -void RunnerScript::removeAction(const QString &id) -{ - if (d->runner) { - d->runner->removeAction(id); - } -} - -QAction* RunnerScript::action(const QString &id) const -{ - if (d->runner) { - return d->runner->action(id); - } - return 0; -} - -QHash<QString, QAction*> RunnerScript::actions() const -{ - if (d->runner) { - return d->runner->actions(); - } - return QHash<QString, QAction*>(); -} - -void RunnerScript::clearActions() -{ - if (d->runner) { - d->runner->clearActions(); - } -} - -void RunnerScript::addSyntax(const RunnerSyntax &syntax) -{ - if (d->runner) { - d->runner->addSyntax(syntax); - } -} - -void RunnerScript::setSyntaxes(const QList<RunnerSyntax> &syns) -{ - if (d->runner) { - d->runner->setSyntaxes(syns); - } -} - -Package RunnerScript::package() const -{ - return d->runner ? d->runner->package() : Package(); -} - -KPluginInfo RunnerScript::description() const -{ - return d->runner ? d->runner->d->runnerDescription : KPluginInfo(); -} - -QString RunnerScript::mainScript() const -{ - return package().filePath("mainscript"); -} - -} // Plasma namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krunner-5.6.0/src/scripting/runnerscript.h new/krunner-5.7.0/src/scripting/runnerscript.h --- old/krunner-5.6.0/src/scripting/runnerscript.h 2015-01-03 13:13:27.000000000 +0100 +++ new/krunner-5.7.0/src/scripting/runnerscript.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,134 +0,0 @@ -/* - * Copyright 2007 by Aaron Seigo <[email protected]> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details - * - * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef PLASMA_RUNNERSCRIPT_H -#define PLASMA_RUNNERSCRIPT_H - -#include <kplugininfo.h> - -#include "krunner_export.h" -#include <abstractrunner.h> -#include <plasma/scripting/scriptengine.h> - -namespace Plasma -{ - -class RunnerScriptPrivate; - -/** - * @class RunnerScript plasma/scripting/runnerscript.h <Plasma/Scripting/RunnerScript> - * - * @short Provides a restricted interface for scripting a runner. - */ -class KRUNNER_EXPORT RunnerScript : public ScriptEngine -{ - Q_OBJECT - -public: - /** - * Default constructor for a RunnerScript. - * Subclasses should not attempt to access the Plasma::AbstractRunner - * associated with this RunnerScript in the constructor. All - * such set up that requires the AbstractRunner itself should be done - * in the init() method. - */ - explicit RunnerScript(QObject *parent = 0); - ~RunnerScript(); - - /** - * Sets the Plasma::AbstractRunner associated with this RunnerScript - */ - void setRunner(AbstractRunner *runner); - - /** - * Returns the Plasma::AbstractRunner associated with this script component - */ - AbstractRunner *runner() const; - - /** - * Called when the script should create QueryMatch instances through - * RunnerContext::addInformationalMatch, RunnerContext::addExactMatch, and - * RunnerContext::addPossibleMatch. - */ - virtual void match(Plasma::RunnerContext &search); - - /** - * Called whenever an exact or possible match associated with this - * runner is triggered. - */ - virtual void run(const Plasma::RunnerContext &search, const Plasma::QueryMatch &action); - - -Q_SIGNALS: - void prepare(); - void teardown(); - void createRunOptions(QWidget *widget); - void reloadConfiguration(); - void actionsForMatch(const Plasma::QueryMatch &match, QList<QAction*>* actions); - -protected: - /** - * @return absolute path to the main script file for this plasmoid - */ - QString mainScript() const; - - /** - * @return the Package associated with this plasmoid which can - * be used to request resources, such as images and - * interface files. - */ - Package package() const; - - /** - * @return the KPluginInfo associated with this plasmoid - */ - KPluginInfo description() const; - - /** - * @return a Plasma::DataEngine matchin name - * @since 4.4 - */ - DataEngine *dataEngine(const QString &name); - - KConfigGroup config() const; - void setIgnoredTypes(RunnerContext::Types types); - void setHasRunOptions(bool hasRunOptions); - void setSpeed(AbstractRunner::Speed newSpeed); - void setPriority(AbstractRunner::Priority newPriority); - QAction* addAction(const QString &id, const QIcon &icon, const QString &text); - void addAction(const QString &id, QAction *action); - void removeAction(const QString &id); - QAction* action(const QString &id) const; - QHash<QString, QAction*> actions() const; - void clearActions(); - void addSyntax(const RunnerSyntax &syntax); - void setSyntaxes(const QList<RunnerSyntax> &syns); - -private: - friend class AbstractRunner; - - RunnerScriptPrivate *const d; -}; - -#define K_EXPORT_PLASMA_RUNNERSCRIPTENGINE(libname, classname) \ -K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) - -} //Plasma namespace - -#endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
