[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/petrovic/text-tools] /: merge master into branch
From:       Scott Petrovic <null () kde ! org>
Date:       2017-08-01 1:46:37
Message-ID: E1dcMGb-0004xO-Qb () code ! kde ! org
[Download RAW message or body]

Git commit 2cf3552ccd523caa41ad0264fbd8d32a0d040942 by Scott Petrovic.
Committed on 27/07/2017 at 23:19.
Pushed by scottpetrovic into branch 'petrovic/text-tools'.

merge master into branch

M  +6    -2    3rdparty/README.md
M  +3    -3    libs/flake/KoShapeManager.cpp
M  +0    -47   libs/flake/KoToolManager.cpp
M  +12   -88   libs/flake/KoToolProxy.cpp
M  +2    -2    libs/flake/commands/KoShapeGroupCommand.cpp
M  +5    -4    libs/flake/commands/KoShapeUngroupCommand.cpp
M  +2    -2    libs/flake/svg/SvgWriter.cpp
M  +1    -1    libs/flake/tests/TestShapePainting.cpp
M  +1    -1    libs/ui/flake/kis_shape_layer.cc
M  +2    -2    plugins/tools/defaulttool/connectionTool/ConnectionTool.cpp
M  +8    -8    plugins/tools/defaulttool/defaulttool/DefaultTool.cpp

https://commits.kde.org/krita/2cf3552ccd523caa41ad0264fbd8d32a0d040942

diff --cc libs/flake/commands/KoShapeGroupCommand.cpp
index a0246921b7c,06643e776bb..d39425d1df7
--- a/libs/flake/commands/KoShapeGroupCommand.cpp
+++ b/libs/flake/commands/KoShapeGroupCommand.cpp
@@@ -27,10 -27,10 +27,10 @@@
  #include <klocalizedstring.h>
  
  // static
 -KoShapeGroupCommand * KoShapeGroupCommand::createCommand(KoShapeGroup *container, \
const QList<KoShape *> &shapes, KUndo2Command *parent)  +KoShapeGroupCommand * \
KoShapeGroupCommand::createCommand(KoShapeContainer *container, const QList<KoShape \
*> &shapes, KUndo2Command *parent)  {
      QList<KoShape*> orderedShapes(shapes);
-     qSort(orderedShapes.begin(), orderedShapes.end(), KoShape::compareShapeZIndex);
+     std::sort(orderedShapes.begin(), orderedShapes.end(), \
KoShape::compareShapeZIndex);  if (!orderedShapes.isEmpty()) {
          KoShape * top = orderedShapes.last();
          container->setParent(top->parent());
diff --cc libs/flake/commands/KoShapeUngroupCommand.cpp
index d9fc9d48482,90b3d69bd88..151d900591f
--- a/libs/flake/commands/KoShapeUngroupCommand.cpp
+++ b/libs/flake/commands/KoShapeUngroupCommand.cpp
@@@ -37,9 -37,9 +37,10 @@@ KoShapeUngroupCommand::KoShapeUngroupCo
      d->shapes = orderdShapes;
  
      QList<KoShape*> ancestors = d->container->parent()? \
                d->container->parent()->shapes(): topLevelShapes;
-     if (!ancestors.isEmpty()) {
-         qSort(ancestors.begin(), ancestors.end(), KoShape::compareShapeZIndex);
-         QList<KoShape*>::const_iterator it(qFind(ancestors, d->container));
++
+     if (ancestors.count()) {
+         std::sort(ancestors.begin(), ancestors.end(), KoShape::compareShapeZIndex);
+         QList<KoShape*>::const_iterator it(std::find(ancestors.constBegin(), \
ancestors.constEnd(), d->container));  
          Q_ASSERT(it != ancestors.constEnd());
          for (; it != ancestors.constEnd(); ++it) {
diff --cc plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
index bb3b4bf1f69,ec8ec26a605..177ab50035d
--- a/plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
+++ b/plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
@@@ -1035,10 -993,9 +1035,10 @@@ void DefaultTool::selectionUngroup(
      if (!selection) return;
  
      QList<KoShape *> selectedShapes = selection->selectedEditableShapes();
-     qSort(selectedShapes.begin(), selectedShapes.end(), \
KoShape::compareShapeZIndex); +     std::sort(selectedShapes.begin(), \
selectedShapes.end(), KoShape::compareShapeZIndex);  
      KUndo2Command *cmd = 0;
 +    QList<KoShape*> newShapes;
  
      // add a ungroup command for each found shape container to the macro command
      Q_FOREACH (KoShape *shape, selectedShapes) {


[prev in list] [next in list] [prev in thread] [next in thread]