diff --git a/commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp b/commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp --- a/commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp +++ b/commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp @@ -55,7 +55,7 @@ switch (type) { case kpEffectBlurSharpen::Blur: return i18n ("Soften"); case kpEffectBlurSharpen::Sharpen: return i18n ("Sharpen"); - default: return QString(); + default: return {}; } } diff --git a/commands/imagelib/effects/kpEffectReduceColorsCommand.cpp b/commands/imagelib/effects/kpEffectReduceColorsCommand.cpp --- a/commands/imagelib/effects/kpEffectReduceColorsCommand.cpp +++ b/commands/imagelib/effects/kpEffectReduceColorsCommand.cpp @@ -61,7 +61,7 @@ } return i18n ("Reduce to 256 Color"); - default: return QString(); + default: return {}; } } diff --git a/commands/imagelib/transforms/kpTransformFlipCommand.cpp b/commands/imagelib/transforms/kpTransformFlipCommand.cpp --- a/commands/imagelib/transforms/kpTransformFlipCommand.cpp +++ b/commands/imagelib/transforms/kpTransformFlipCommand.cpp @@ -74,7 +74,7 @@ else { qCCritical(kpLogCommands) << "kpTransformFlipCommand::name() not asked to flip"; - return QString(); + return {}; } #endif diff --git a/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp b/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp --- a/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp +++ b/commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp @@ -125,7 +125,7 @@ } } - return QString (); + return {}; } // public virtual [base kpCommand] diff --git a/document/kpDocumentSaveOptions.cpp b/document/kpDocumentSaveOptions.cpp --- a/document/kpDocumentSaveOptions.cpp +++ b/document/kpDocumentSaveOptions.cpp @@ -166,7 +166,7 @@ // public static QString kpDocumentSaveOptions::invalidMimeType () { - return QString(); + return {}; } //--------------------------------------------------------------------- diff --git a/document/kpDocument_Open.cpp b/document/kpDocument_Open.cpp --- a/document/kpDocument_Open.cpp +++ b/document/kpDocument_Open.cpp @@ -107,7 +107,7 @@ kpUrlFormatter::PrettyFilename (url))); } - return QImage (); + return {}; } QMimeDatabase db; @@ -137,7 +137,7 @@ i18n ("Could not open \"%1\" - unsupported image format.\n" "The file may be corrupt.", kpUrlFormatter::PrettyFilename (url))); - return QImage (); + return {}; } #if DEBUG_KP_DOCUMENT diff --git a/imagelib/transforms/kpTransformCrop_ImageSelection.cpp b/imagelib/transforms/kpTransformCrop_ImageSelection.cpp --- a/imagelib/transforms/kpTransformCrop_ImageSelection.cpp +++ b/imagelib/transforms/kpTransformCrop_ImageSelection.cpp @@ -54,7 +54,7 @@ ~SetDocumentToSelectionImageCommand () override; /* (uninteresting child of macro cmd) */ - QString name () const override { return QString(); } + QString name () const override { return {}; } kpCommandSize::SizeType size () const override { diff --git a/lgpl/generic/kpColorCollection.cpp b/lgpl/generic/kpColorCollection.cpp --- a/lgpl/generic/kpColorCollection.cpp +++ b/lgpl/generic/kpColorCollection.cpp @@ -474,7 +474,7 @@ kpColorCollection::color(int index) const { if ((index < 0) || (index >= count())) - return QColor(); + return {}; return d->colorList[index].color; } @@ -494,7 +494,7 @@ kpColorCollection::name(int index) const { if ((index < 0) || (index >= count())) - return QString(); + return {}; return d->colorList[index].name; } diff --git a/mainWindow/kpMainWindow_File.cpp b/mainWindow/kpMainWindow_File.cpp --- a/mainWindow/kpMainWindow_File.cpp +++ b/mainWindow/kpMainWindow_File.cpp @@ -474,7 +474,7 @@ return fd.selectedUrls(); } - return QList(); + return {}; } //--------------------------------------------------------------------- @@ -831,7 +831,7 @@ if (mimeTypes.isEmpty ()) { qCCritical(kpLogMainWindow) << "No output mimetypes!"; - return QUrl (); + return {}; } #define MIME_TYPE_IS_VALID() (!fdSaveOptions.mimeTypeIsInvalid () && \ @@ -958,7 +958,7 @@ return fd.selectedUrl (); } - return QUrl (); + return {}; #undef SETUP_READ_CFG } diff --git a/tools/selection/kpAbstractSelectionTool.cpp b/tools/selection/kpAbstractSelectionTool.cpp --- a/tools/selection/kpAbstractSelectionTool.cpp +++ b/tools/selection/kpAbstractSelectionTool.cpp @@ -618,7 +618,7 @@ { case None: // NOP. - return QVariant (); + return {}; case Create: return operationCreate (op, data1, data2); @@ -631,7 +631,7 @@ default: Q_ASSERT (!"Unhandled draw type"); - return QVariant (); + return {}; } } diff --git a/tools/selection/kpAbstractSelectionTool_Create.cpp b/tools/selection/kpAbstractSelectionTool_Create.cpp --- a/tools/selection/kpAbstractSelectionTool_Create.cpp +++ b/tools/selection/kpAbstractSelectionTool_Create.cpp @@ -296,5 +296,5 @@ } - return QVariant (); + return {}; } diff --git a/tools/selection/kpAbstractSelectionTool_Move.cpp b/tools/selection/kpAbstractSelectionTool_Move.cpp --- a/tools/selection/kpAbstractSelectionTool_Move.cpp +++ b/tools/selection/kpAbstractSelectionTool_Move.cpp @@ -401,7 +401,7 @@ break; } - return QVariant (); + return {}; } //--------------------------------------------------------------------- diff --git a/tools/selection/kpAbstractSelectionTool_ResizeScale.cpp b/tools/selection/kpAbstractSelectionTool_ResizeScale.cpp --- a/tools/selection/kpAbstractSelectionTool_ResizeScale.cpp +++ b/tools/selection/kpAbstractSelectionTool_ResizeScale.cpp @@ -444,7 +444,7 @@ } - return QVariant (); + return {}; } //--------------------------------------------------------------------- diff --git a/tools/selection/text/kpToolText_SelectText.cpp b/tools/selection/text/kpToolText_SelectText.cpp --- a/tools/selection/text/kpToolText_SelectText.cpp +++ b/tools/selection/text/kpToolText_SelectText.cpp @@ -133,5 +133,5 @@ } - return QVariant (); + return {}; } diff --git a/views/kpView_Selections.cpp b/views/kpView_Selections.cpp --- a/views/kpView_Selections.cpp +++ b/views/kpView_Selections.cpp @@ -161,7 +161,7 @@ { const int atomicLength = selectionResizeHandleAtomicSize (); if (atomicLength <= 0) { - return QRegion (); + return {}; } diff --git a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp --- a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp +++ b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp @@ -114,7 +114,7 @@ // public virtual [base kpEffectWidgetBase] QString kpEffectBlurSharpenWidget::caption () const { - return QString(); + return {}; } diff --git a/widgets/imagelib/effects/kpEffectEmbossWidget.cpp b/widgets/imagelib/effects/kpEffectEmbossWidget.cpp --- a/widgets/imagelib/effects/kpEffectEmbossWidget.cpp +++ b/widgets/imagelib/effects/kpEffectEmbossWidget.cpp @@ -67,7 +67,7 @@ // public virtual [base kpEffectWidgetBase] QString kpEffectEmbossWidget::caption () const { - return QString(); + return {}; } diff --git a/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp b/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp --- a/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp +++ b/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp @@ -90,7 +90,7 @@ QString kpEffectToneEnhanceWidget::caption () const { // TODO: Why doesn't this have a caption? Ditto for the other effects. - return QString(); + return {}; } diff --git a/widgets/imagelib/effects/kpEffectWidgetBase.cpp b/widgets/imagelib/effects/kpEffectWidgetBase.cpp --- a/widgets/imagelib/effects/kpEffectWidgetBase.cpp +++ b/widgets/imagelib/effects/kpEffectWidgetBase.cpp @@ -42,7 +42,7 @@ // public QString kpEffectWidgetBase::caption () const { - return QString(); + return {}; } diff --git a/widgets/toolbars/options/kpToolWidgetBase.cpp b/widgets/toolbars/options/kpToolWidgetBase.cpp --- a/widgets/toolbars/options/kpToolWidgetBase.cpp +++ b/widgets/toolbars/options/kpToolWidgetBase.cpp @@ -135,7 +135,7 @@ QList kpToolWidgetBase::spreadOutElements (const QList &sizes, int max) { if (sizes.count () == 0) { - return QList (); + return {}; } if (sizes.count () == 1) diff --git a/widgets/toolbars/options/kpToolWidgetFillStyle.cpp b/widgets/toolbars/options/kpToolWidgetFillStyle.cpp --- a/widgets/toolbars/options/kpToolWidgetFillStyle.cpp +++ b/widgets/toolbars/options/kpToolWidgetFillStyle.cpp @@ -124,7 +124,7 @@ return i18n ("Fill with Foreground Color"); default: - return QString(); + return {}; } }