Commit 33f15abf authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau

Merge branch '5.1'

# Conflicts:
#	plugins/quickopen/expandingtree/expandingdelegate.cpp
#	plugins/quickopen/expandingtree/expandingwidgetmodel.cpp
#	plugins/quickopen/quickopenmodel.cpp
#	shell/runcontroller.cpp
#	shell/sessionlock.cpp
parents 5b0858dc 06857e65
......@@ -115,7 +115,7 @@ RenameAssistant::~RenameAssistant()
QString RenameAssistant::title() const
{
return tr("Rename");
return i18n("Rename");
}
bool RenameAssistant::isUseful() const
......
......@@ -819,7 +819,7 @@ DocumentChangeTracker* BackgroundParser::trackerForUrl(const KDevelop::IndexedSt
return nullptr;
}
if ( !isValidURL(url) ) {
qWarning() << "Tracker requested for invalild URL:" << url.toUrl();
qCWarning(LANGUAGE) << "Tracker requested for invalild URL:" << url.toUrl();
}
Q_ASSERT(isValidURL(url));
......
......@@ -150,7 +150,7 @@ bool CodeGeneratorBase::execute()
TopDUContext * documentChain = DUChain::self()->chainForDocument(document);
if(!documentChain)
{
setErrorText(i18n("Could not find the chain for the selected document: %1").arg(document.url()));
setErrorText(i18n("Could not find the chain for the selected document: %1", document.url()));
return false;
}
d->context = documentChain->findContextIncluding(d->range);
......
......@@ -304,7 +304,7 @@ void OutputModel::activate( const QModelIndex& index )
KDevelop::IDocumentController *docCtrl = KDevelop::ICore::self()->documentController();
QUrl url = item.url;
if (item.url.isEmpty()) {
qWarning() << "trying to open empty url";
qCWarning(OUTPUTVIEW) << "trying to open empty url";
return;
}
if(url.isRelative()) {
......
......@@ -209,7 +209,7 @@ QString AppWizardPlugin::createProject(const ApplicationInfo& info)
{
QFileInfo templateInfo(info.appTemplate);
if (!templateInfo.exists()) {
qWarning() << "Project app template does not exist:" << info.appTemplate;
qCWarning(PLUGIN_APPWIZARD) << "Project app template does not exist:" << info.appTemplate;
return QString();
}
......@@ -225,7 +225,7 @@ QString AppWizardPlugin::createProject(const ApplicationInfo& info)
}
if(templateArchive.isEmpty()) {
qWarning() << "Template name does not exist in the template list";
qCWarning(PLUGIN_APPWIZARD) << "Template name does not exist in the template list";
return QString();
}
......
......@@ -141,7 +141,7 @@ void CodeUtilsPlugin::documentDeclaration()
QString fileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kdevcodeutils/templates/" + templateName + ".txt");
if (fileName.isEmpty())
{
qWarning() << "No suitable template found" << fileName;
qCWarning(PLUGIN_CODEUTILS) << "No suitable template found" << fileName;
return;
}
......
......@@ -400,7 +400,7 @@ QString ContextBrowserHintProvider::textHint(View* view, const KTextEditor::Curs
{
m_plugin->m_mouseHoverCursor = KTextEditor::Cursor(cursor);
if(!view) {
qWarning() << "could not cast to view";
qCWarning(PLUGIN_CONTEXTBROWSER) << "could not cast to view";
}else{
m_plugin->m_mouseHoverDocument = view->document()->url();
m_plugin->m_updateViews << view;
......@@ -1388,7 +1388,7 @@ void ContextBrowserPlugin::doNavigate(NavigationActionType action)
{
KTextEditor::View* view = qobject_cast<KTextEditor::View*>(sender());
if(!view) {
qWarning() << "sender is not a view";
qCWarning(PLUGIN_CONTEXTBROWSER) << "sender is not a view";
return;
}
KTextEditor::CodeCompletionInterface* iface = qobject_cast<KTextEditor::CodeCompletionInterface*>(view);
......
......@@ -123,7 +123,7 @@ void DocumentSwitcherPlugin::walk(const int from, const int to)
Sublime::MainWindow* window = qobject_cast<Sublime::MainWindow*>( KDevelop::ICore::self()->uiController()->activeMainWindow() );
if( !window || !documentLists.contains( window ) || !documentLists[window].contains( window->area() ) )
{
qWarning() << "This should not happen, tried to walk through document list of an unknown mainwindow!";
qCWarning(PLUGIN_DOCUMENTSWITCHER) << "This should not happen, tried to walk through document list of an unknown mainwindow!";
return;
}
QModelIndex idx;
......
......@@ -106,7 +106,7 @@ QStringList ExecutePlugin::arguments( KDevelop::ILaunchConfiguration* cfg, QStri
"this is not supported currently. Aborting start.", cfg->name() );
}
args = QStringList();
qWarning() << "Launch Configuration:" << cfg->name() << "arguments have meta characters";
qCWarning(PLUGIN_EXECUTE) << "Launch Configuration:" << cfg->name() << "arguments have meta characters";
}
return args;
}
......@@ -184,7 +184,7 @@ QUrl ExecutePlugin::executable( KDevelop::ILaunchConfiguration* cfg, QString& er
if( executable.isEmpty() )
{
err = i18n("No valid executable specified");
qWarning() << "Launch Configuration:" << cfg->name() << "no valid executable set";
qCWarning(PLUGIN_EXECUTE) << "Launch Configuration:" << cfg->name() << "no valid executable set";
} else
{
KShell::Errors err_;
......@@ -202,7 +202,7 @@ QUrl ExecutePlugin::executable( KDevelop::ILaunchConfiguration* cfg, QString& er
"executable for the launch configuration '%1', "
"this is not supported currently. Aborting start.", cfg->name() );
}
qWarning() << "Launch Configuration:" << cfg->name() << "executable has meta characters";
qCWarning(PLUGIN_EXECUTE) << "Launch Configuration:" << cfg->name() << "executable has meta characters";
}
}
return executable;
......
......@@ -53,13 +53,6 @@ GrepOutputDelegate::~GrepOutputDelegate()
m_self = nullptr;
}
QColor GrepOutputDelegate::blendColor(QColor color1, QColor color2, double blend) const
{
return QColor(color1.red() * blend + color2.red() * (1-blend),
color1.green() * blend + color2.green() * (1-blend),
color1.blue() * blend + color2.blue() * (1-blend));
}
void GrepOutputDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
{
// there is no function in QString to left-trim. A call to remove this this regexp does the job
......
......@@ -36,7 +36,6 @@ public:
QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
private:
static GrepOutputDelegate* m_self;
QColor blendColor(QColor color1, QColor color2, double blend) const;
};
#endif
......
......@@ -249,7 +249,7 @@ void PatchReviewPlugin::updateKompareModel() {
patchFile = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
bool ret = KIO::copy(m_patch->file(), QUrl::fromLocalFile(patchFile), KIO::HideProgressInfo)->exec();
if( !ret ) {
qWarning() << "Problem while downloading: " << m_patch->file() << "to" << patchFile;
qCWarning(PLUGIN_PATCHREVIEW) << "Problem while downloading: " << m_patch->file() << "to" << patchFile;
patchFile.clear();
}
}
......
......@@ -348,7 +348,7 @@ QList<QTextLayout::FormatRange> ExpandingDelegate::highlightingFromVariantList(c
for (int i = 0; i + 2 < customHighlights.count(); i += 3) {
if (!customHighlights[i].canConvert(QVariant::Int) || !customHighlights[i + 1].canConvert(QVariant::Int) || !customHighlights[i + 2].canConvert<QTextFormat>()) {
qWarning() << "Unable to convert triple to custom formatting.";
qCWarning(PLUGIN_QUICKOPEN) << "Unable to convert triple to custom formatting.";
continue;
}
......@@ -358,7 +358,7 @@ QList<QTextLayout::FormatRange> ExpandingDelegate::highlightingFromVariantList(c
format.format = customHighlights[i + 2].value<QTextFormat>().toCharFormat();
if (!format.format.isValid()) {
qWarning() << "Format is not valid";
qCWarning(PLUGIN_QUICKOPEN) << "Format is not valid";
}
ret << format;
......
......@@ -530,7 +530,7 @@ QList<QVariant> mergeCustomHighlighting(int leftSize, const QList<QVariant>& lef
for (int a = 0; a < 2; a++) {
++testIt;
if (testIt == right.constEnd()) {
qWarning() << "Length of input is not multiple of 3";
qCWarning(PLUGIN_QUICKOPEN) << "Length of input is not multiple of 3";
break;
}
}
......@@ -554,17 +554,17 @@ QList<QVariant> mergeCustomHighlighting(int leftSize, const QList<QVariant>& lef
QList<QVariant> mergeCustomHighlighting(QStringList strings, QList<QVariantList> highlights, int grapBetweenStrings)
{
if (strings.isEmpty()) {
qWarning() << "List of strings is empty";
qCWarning(PLUGIN_QUICKOPEN) << "List of strings is empty";
return QList<QVariant>();
}
if (highlights.isEmpty()) {
qWarning() << "List of highlightings is empty";
qCWarning(PLUGIN_QUICKOPEN) << "List of highlightings is empty";
return QList<QVariant>();
}
if (strings.count() != highlights.count()) {
qWarning() << "Length of string-list is " << strings.count() << " while count of highlightings is " << highlights.count() << ", should be same";
qCWarning(PLUGIN_QUICKOPEN) << "Length of string-list is " << strings.count() << " while count of highlightings is " << highlights.count() << ", should be same";
return QList<QVariant>();
}
......
......@@ -476,7 +476,7 @@ bool QuickOpenModel::execute(const QModelIndex& index, QString& filterText)
{
qCDebug(PLUGIN_QUICKOPEN) << "executing model";
if (!index.isValid()) {
qWarning() << "Invalid index executed";
qCWarning(PLUGIN_QUICKOPEN) << "Invalid index executed";
return false;
}
......@@ -485,7 +485,7 @@ bool QuickOpenModel::execute(const QModelIndex& index, QString& filterText)
if (item) {
return item->execute(filterText);
} else {
qWarning() << "Got no item for row " << index.row() << " ";
qCWarning(PLUGIN_QUICKOPEN) << "Got no item for row " << index.row() << " ";
}
return false;
......
......@@ -111,7 +111,7 @@ void BuilderJobPrivate::addJob( BuilderJob::BuildType t, ProjectBaseItem* item )
qCDebug(PROJECT) << "project item for the project:" << item->project()->projectItem()->text();
if( !item->project()->buildSystemManager() )
{
qWarning() << "no buildsystem manager for:" << item->text() << item->project()->name();
qCWarning(PROJECT) << "no buildsystem manager for:" << item->text() << item->project()->name();
return;
}
qCDebug(PROJECT) << "got build system manager";
......
......@@ -144,7 +144,7 @@ void FileManagerListJob::handleResults(const KIO::UDSEntryList& entriesIn)
{
auto waited = m_subTimer.elapsed();
m_subWaited += waited;
qDebug() << "TIME FOR SUB JOB:" << waited << m_subWaited;
qCDebug(PROJECT) << "TIME FOR SUB JOB:" << waited << m_subWaited;
}
#endif
......@@ -154,7 +154,7 @@ void FileManagerListJob::handleResults(const KIO::UDSEntryList& entriesIn)
emitResult();
#ifdef TIME_IMPORT_JOB
qDebug() << "TIME FOR LISTJOB:" << m_timer.elapsed();
qCDebug(PROJECT) << "TIME FOR LISTJOB:" << m_timer.elapsed();
#endif
} else {
emit nextJob();
......
......@@ -17,6 +17,7 @@
Boston, MA 02110-1301, USA.
*/
#include "debug.h"
#include "helper.h"
#include "path.h"
......@@ -51,7 +52,7 @@ bool KDevelop::removeUrl(const KDevelop::IProject* project, const QUrl& url, con
auto job = KIO::stat(url, KIO::StatJob::DestinationSide, 0);
KJobWidgets::setWindow(job, window);
if (!job->exec()) {
qWarning() << "tried to remove non-existing url:" << url << project << isFolder;
qCWarning(PROJECT) << "tried to remove non-existing url:" << url << project << isFolder;
return true;
}
......
......@@ -35,6 +35,7 @@
#include "interfaces/iprojectfilemanager.h"
#include <serialization/indexedstring.h>
#include "debug.h"
#include "path.h"
namespace KDevelop
......@@ -426,7 +427,7 @@ void ProjectBaseItem::appendRow( ProjectBaseItem* item )
}
if( item->parent() ) {
// Proper way is to first removeRow() on the original parent, then appendRow on this one
qWarning() << "Ignoring double insertion of item" << item;
qCWarning(PROJECT) << "Ignoring double insertion of item" << item;
return;
}
// this is too slow... O(n) and thankfully not a problem anyways
......
......@@ -20,6 +20,8 @@
*/
#include "configdialog.h"
#include "debug.h"
#include <QCloseEvent>
#include <QDebug>
#include <QPushButton>
......@@ -29,7 +31,6 @@
#include <KLocalizedString>
#include <KTextEditor/ConfigPage>
#include <iplugin.h>
#include <configpage.h>
#include <icore.h>
......@@ -184,7 +185,7 @@ void ConfigDialog::onPageChanged()
{
QObject* from = sender();
if (from && from != currentPage()->widget()) {
qWarning() << "Settings in config page" << from << "changed, while" << currentPage()->widget() << "is currently selected. This case is not implemented yet.";
qCWarning(SHELL) << "Settings in config page" << from << "changed, while" << currentPage()->widget() << "is currently selected. This case is not implemented yet.";
return;
// TODO: add a QHash<ConfigPage*, bool> as a member to make sure the apply button is always correct
......
......@@ -159,7 +159,7 @@ bool CorePrivate::initialize(Core::Setup mode, QString session )
"Please make sure QT_PLUGIN_PATH is set correctly.</p>"
"Refer to <a href=\"https://community.kde.org/Frameworks/Building#Runtime_setup\">this article</a> for more information."),
QMessageBox::Abort, QMessageBox::Abort);
qWarning() << "Could not find any plugins, aborting";
qCWarning(SHELL) << "Could not find any plugins, aborting";
return false;
}
}
......
......@@ -191,7 +191,7 @@ QList< IDocumentationProvider* > DocumentationController::documentationProviders
{
IDocumentationProviderProvider *docProvider=p->extension<IDocumentationProviderProvider>();
if (!docProvider) {
qWarning() << "plugin" << p << "does not implement ProviderProvider extension, rerun kbuildsycoca5";
qCWarning(SHELL) << "plugin" << p << "does not implement ProviderProvider extension, rerun kbuildsycoca5";
continue;
}
ret.append(docProvider->providers());
......@@ -201,7 +201,7 @@ QList< IDocumentationProvider* > DocumentationController::documentationProviders
{
IDocumentationProvider *doc=p->extension<IDocumentationProvider>();
if (!doc) {
qWarning() << "plugin" << p << "does not implement Provider extension, rerun kbuildsycoca5";
qCWarning(SHELL) << "plugin" << p << "does not implement Provider extension, rerun kbuildsycoca5";
continue;
}
ret.append(doc);
......@@ -214,13 +214,13 @@ void KDevelop::DocumentationController::showDocumentation(const IDocumentation::
{
QWidget* w = ICore::self()->uiController()->findToolView(i18n("Documentation"), m_factory, KDevelop::IUiController::CreateAndRaise);
if(!w) {
qWarning() << "Could not add documentation toolview";
qCWarning(SHELL) << "Could not add documentation toolview";
return;
}
DocumentationView* view = dynamic_cast<DocumentationView*>(w);
if( !view ) {
qWarning() << "Could not cast toolview" << w << "to DocumentationView class!";
qCWarning(SHELL) << "Could not cast toolview" << w << "to DocumentationView class!";
return;
}
view->showDocumentation(doc);
......
......@@ -802,9 +802,9 @@ bool KDevelop::DocumentController::saveSomeDocuments(const QList< IDocument * >
if( !DocumentController::isEmptyDocumentUrl(doc->url()) && !doc->save(mode) )
{
if( doc )
qWarning() << "!! Could not save document:" << doc->url();
qCWarning(SHELL) << "!! Could not save document:" << doc->url();
else
qWarning() << "!! Could not save document as its NULL";
qCWarning(SHELL) << "!! Could not save document as its NULL";
}
// TODO if (!ret) showErrorDialog() ?
}
......@@ -915,7 +915,7 @@ void DocumentController::closeAllOtherDocuments()
Sublime::View* activeView = mw->activeView();
if (!activeView) {
qWarning() << "Shouldn't there always be an active view when this function is called?";
qCWarning(SHELL) << "Shouldn't there always be an active view when this function is called?";
return;
}
......
......@@ -119,7 +119,7 @@ void LanguageControllerPrivate::addLanguageSupport(ILanguageSupport* languageSup
if (mime.isValid()) {
mimeTypeCache.insert(mime, languageSupport);
} else {
qWarning() << "could not create mime-type" << mimeTypeName;
qCWarning(SHELL) << "could not create mime-type" << mimeTypeName;
}
}
}
......@@ -224,7 +224,7 @@ ILanguageSupport* LanguageController::language(const QString &name) const
supports = Core::self()->pluginController()->allPluginsForExtension(KEY_ILanguageSupport(), constraints);
if (key == keys[1]) {
for (auto support : supports) {
qWarning() << "Plugin" << Core::self()->pluginController()->pluginInfo(support).name() << " has deprecated (since 5.1) metadata key \"X-KDevelop-Language\", needs porting to: \"X-KDevelop-Languages\": ["<<name<<"]'";
qCWarning(SHELL) << "Plugin" << Core::self()->pluginController()->pluginInfo(support).name() << " has deprecated (since 5.1) metadata key \"X-KDevelop-Language\", needs porting to: \"X-KDevelop-Languages\": ["<<name<<"]'";
}
}
if (!supports.isEmpty()) {
......
......@@ -292,7 +292,7 @@ KTextEditor::View *PartController::activeView()
KTextEditor::Document *PartController::createDocument()
{
// NOTE: not implemented
qWarning() << "WARNING: interface call not implemented";
qCWarning(SHELL) << "WARNING: interface call not implemented";
return nullptr;
}
......@@ -300,7 +300,7 @@ bool PartController::closeDocument(KTextEditor::Document *doc)
{
Q_UNUSED(doc)
// NOTE: not implemented
qWarning() << "WARNING: interface call not implemented";
qCWarning(SHELL) << "WARNING: interface call not implemented";
return false;
}
......@@ -308,7 +308,7 @@ KTextEditor::View *PartController::createView(KTextEditor::Document *doc)
{
Q_UNUSED(doc)
// NOTE: not implemented
qWarning() << "WARNING: interface call not implemented";
qCWarning(SHELL) << "WARNING: interface call not implemented";
return nullptr;
}
......@@ -316,7 +316,7 @@ bool PartController::closeView(KTextEditor::View *view)
{
Q_UNUSED(view)
// NOTE: not implemented
qWarning() << "WARNING: interface call not implemented";
qCWarning(SHELL) << "WARNING: interface call not implemented";
return false;
}
//END KTextEditor::MdiContainer
......
......@@ -274,7 +274,7 @@ PluginController::PluginController(Core *core)
foundPlugins.insert(meta.pluginId());
return true;
} else {
qWarning() << "Plugin" << meta.fileName() << "is installed into the kdevplatform plugin directory, but does not have"
qCWarning(SHELL) << "Plugin" << meta.fileName() << "is installed into the kdevplatform plugin directory, but does not have"
" \"KDevelop/Plugin\" set as the service type. This plugin will not be loaded.";
return false;
}
......@@ -496,12 +496,12 @@ IPlugin *PluginController::loadPluginInternal( const QString &pluginId )
if ( !isEnabled( info ) ) {
// Do not load disabled plugins
qWarning() << "Not loading plugin named" << pluginId << "because it has been disabled!";
qCWarning(SHELL) << "Not loading plugin named" << pluginId << "because it has been disabled!";
return nullptr;
}
if ( !hasMandatoryProperties( info ) ) {
qWarning() << "Unable to load plugin named" << pluginId << "because not all mandatory properties are set.";
qCWarning(SHELL) << "Unable to load plugin named" << pluginId << "because not all mandatory properties are set.";
return nullptr;
}
......@@ -522,7 +522,7 @@ IPlugin *PluginController::loadPluginInternal( const QString &pluginId )
// this would happen if we'd skip this step here and directly loadDependencies.
QStringList missingInterfaces;
if ( !hasUnresolvedDependencies( info, missingInterfaces ) ) {
qWarning() << "Can't load plugin" << pluginId
qCWarning(SHELL) << "Can't load plugin" << pluginId
<< "some of its required dependencies could not be fulfilled:"
<< missingInterfaces.join(QStringLiteral(","));
return nullptr;
......@@ -531,7 +531,7 @@ IPlugin *PluginController::loadPluginInternal( const QString &pluginId )
// now ensure all dependencies are loaded
QString failedDependency;
if( !loadDependencies( info, failedDependency ) ) {
qWarning() << "Can't load plugin" << pluginId
qCWarning(SHELL) << "Can't load plugin" << pluginId
<< "because a required dependency could not be loaded:" << failedDependency;
return nullptr;
}
......@@ -543,7 +543,7 @@ IPlugin *PluginController::loadPluginInternal( const QString &pluginId )
KPluginLoader loader(info.fileName());
auto factory = loader.factory();
if (!factory) {
qWarning() << "Can't load plugin" << pluginId
qCWarning(SHELL) << "Can't load plugin" << pluginId
<< "because a factory to load the plugin could not be obtained:" << loader.errorString();
return nullptr;
}
......
......@@ -314,7 +314,7 @@ public:
i18n( "Could not load %1, a project with the same name '%2' is already open.",
projectFile.pathOrUrl(), name ) );
qWarning() << "Trying to open a project with a name that is already used by another open project";
qCWarning(SHELL) << "Trying to open a project with a name that is already used by another open project";
return true;
}
return false;
......@@ -522,7 +522,7 @@ void Project::close()
{
Q_ASSERT(d->topItem);
if (d->topItem->row() == -1) {
qWarning() << "Something went wrong. ProjectFolderItem detached. Project closed during reload?";
qCWarning(SHELL) << "Something went wrong. ProjectFolderItem detached. Project closed during reload?";
return;
}
......
......@@ -856,7 +856,7 @@ void ProjectController::projectImportingFinished( IProject* project )
{
if( !project )
{
qWarning() << "OOOPS: 0-pointer project";
qCWarning(SHELL) << "OOOPS: 0-pointer project";
return;
}
IPlugin *managerPlugin = project->managerPlugin();
......@@ -1019,7 +1019,7 @@ void ProjectController::addProject(IProject* project)
{
Q_ASSERT(project);
if (d->m_projects.contains(project)) {
qWarning() << "Project already tracked by this project controller:" << project;
qCWarning(SHELL) << "Project already tracked by this project controller:" << project;
return;
}
......
......@@ -302,7 +302,7 @@ public:
return it.value();
} else
{
qWarning() << "couldn't find type for id:" << id << ". Known types:" << launchConfigurationTypes.keys();
qCWarning(SHELL) << "couldn't find type for id:" << id << ". Known types:" << launchConfigurationTypes.keys();
}
return nullptr;
......@@ -591,7 +591,7 @@ void KDevelop::RunController::registerJob(KJob * job)
if (!(job->capabilities() & KJob::Killable)) {
// see e.g. https://bugs.kde.org/show_bug.cgi?id=314187
qWarning() << "non-killable job" << job << "registered - this might lead to crashes on shutdown.";
qCWarning(SHELL) << "non-killable job" << job << "registered - this might lead to crashes on shutdown.";
}
if (!d->jobs.contains(job)) {
......@@ -687,7 +687,7 @@ void KDevelop::RunController::stopAllProcesses()
if (job->capabilities() & KJob::Killable) {
job->kill(KJob::EmitResult);
} else {
qWarning() << "cannot stop non-killable job: " << job;
qCWarning(SHELL) << "cannot stop non-killable job: " << job;
}
}
}
......@@ -733,7 +733,7 @@ void RunController::jobDestroyed(QObject* job)
{
KJob* kjob = static_cast<KJob*>(job);
if (d->jobs.contains(kjob)) {
qWarning() << "job destroyed without emitting finished signal!";
qCWarning(SHELL) << "job destroyed without emitting finished signal!";
unregisterJob(kjob);
}
}
......@@ -885,7 +885,7 @@ void KDevelop::RunController::executeDefaultLaunch(const QString& runMode)
if (auto dl = defaultLaunch()) {
execute(runMode, dl);
} else {
qWarning() << "no default launch!";
qCWarning(SHELL) << "no default launch!";
}
}
......
......@@ -21,12 +21,13 @@
#include "sessionlock.h"
#include "debug.h"
#include "sessioncontroller.h"
#include <QDebug>
#include <KLocalizedString>
#include <KMessageBox>
#include <QDebug>
#include <QDBusConnectionInterface>
#include <QFile>
#include <QDir>
......@@ -171,7 +172,8 @@ QString SessionLock::handleLockedSession(const QString& sessionName, const QStri
out << i18nc( "@info:shell", "Running %1 instance (PID: %2) detected, making this one visible instead of starting a new one", runInfo.holderApp, runInfo.holderPid ) << endl;
return QString();
} else {
qWarning() << i18nc("@info:shell", "Running %1 instance (PID: %2) is apparently hung", runInfo.holderApp, runInfo.holderPid);
qCWarning(SHELL) << i18nc("@info:shell", "Running %1 instance (PID: %2) is apparently hung", runInfo.holderApp, runInfo.holderPid);
qCWarning(SHELL) << i18nc("@info:shell", "running %1 instance (PID: %2) is apparently hung", runInfo.holderApp, runInfo.holderPid);
}
}
......
......@@ -63,7 +63,7 @@ PluginPreferences::PluginPreferences(QWidget* parent)
QString category = info.category();
if (!categories.contains(category)) {
if (!category.isEmpty()) {
qWarning() << "unknown category for plugin" << info.name() << ":" << info.category();