From kde-commits Sat Aug 31 20:56:36 2013 From: Lukast dev Date: Sat, 31 Aug 2013 20:56:36 +0000 To: kde-commits Subject: Re: [calligra] krita: Move the paintop options model and widget to krita/ui Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=137798260724743 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--001a11c2b01c2c3e0b04e544930c" --001a11c2b01c2c3e0b04e544930c Content-Type: text/plain; charset=ISO-8859-1 Hi Boud, I get this crash http://pastebin.com/gWzh7xSC and this crash http://pastebin.com/qpPm36gG , does it work for you on Linux? Lukas 2013/8/30 Boudewijn Rempt > Git commit 84b682d4647a9f4b55ae02f842149f6935601aa1 by Boudewijn Rempt. > Committed on 30/08/2013 at 08:56. > Pushed by rempt into branch 'master'. > > Move the paintop options model and widget to krita/ui > > This "fixes" the build on Windows. The templated stuff across dll > boundaries > was just too much for msvc2012. Fortunately, this move is not a really big > problem. > > M +0 -3 krita/plugins/paintops/libpaintop/CMakeLists.txt > M +6 -0 krita/ui/CMakeLists.txt > R +0 -0 krita/ui/kis_paintop_option.cpp [from: > krita/plugins/paintops/libpaintop/kis_paintop_option.cpp - 100% similarity] > R +1 -1 krita/ui/kis_paintop_option.h [from: > krita/plugins/paintops/libpaintop/kis_paintop_option.h - 097% similarity] > R +0 -0 krita/ui/kis_paintop_options_model.cpp [from: > krita/plugins/paintops/libpaintop/kis_paintop_options_model.cpp - 100% > similarity] > R +3 -3 krita/ui/kis_paintop_options_model.h [from: > krita/plugins/paintops/libpaintop/kis_paintop_options_model.h - 092% > similarity] > R +0 -0 krita/ui/kis_paintop_options_widget.cpp [from: > krita/plugins/paintops/libpaintop/kis_paintop_options_widget.cpp - 100% > similarity] > R +1 -2 krita/ui/kis_paintop_options_widget.h [from: > krita/plugins/paintops/libpaintop/kis_paintop_options_widget.h - 096% > similarity] > > http://commits.kde.org/calligra/84b682d4647a9f4b55ae02f842149f6935601aa1 > > diff --git a/krita/plugins/paintops/libpaintop/CMakeLists.txt > b/krita/plugins/paintops/libpaintop/CMakeLists.txt > index 3fc77e7..e3a603a 100644 > --- a/krita/plugins/paintops/libpaintop/CMakeLists.txt > +++ b/krita/plugins/paintops/libpaintop/CMakeLists.txt > @@ -24,9 +24,6 @@ set(kritalibpaintop_LIB_SRCS > kis_multi_sensors_model_p.cpp > kis_multi_sensors_selector.cpp > kis_paint_action_type_option.cpp > - kis_paintop_option.cpp > - kis_paintop_options_model.cpp > - kis_paintop_options_widget.cpp > kis_precision_option.cpp > kis_pressure_darken_option.cpp > kis_pressure_hsv_option.cpp > diff --git a/krita/ui/CMakeLists.txt b/krita/ui/CMakeLists.txt > index 3cb731b..450c92a 100644 > --- a/krita/ui/CMakeLists.txt > +++ b/krita/ui/CMakeLists.txt > @@ -98,6 +98,9 @@ set(kritaui_LIB_SRCS > kis_painting_assistant.cc > kis_painting_assistants_manager.cc > kis_paintop_box.cc > + kis_paintop_option.cpp > + kis_paintop_options_model.cpp > + kis_paintop_options_widget.cpp > kis_palette_manager.cpp > kis_popup_palette.cpp > kis_png_converter.cpp > @@ -380,4 +383,7 @@ install( FILES > # kis_tool_types.h > # KoInputDevice.h > # canvas/kis_perspective_grid_manager.h > + kis_paintop_option.h > + kis_paintop_options_model.h > + kis_paintop_options_widget.h > DESTINATION ${INCLUDE_INSTALL_DIR}/krita) > diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_option.cpp > b/krita/ui/kis_paintop_option.cpp > similarity index 100% > rename from krita/plugins/paintops/libpaintop/kis_paintop_option.cpp > rename to krita/ui/kis_paintop_option.cpp > diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_option.h > b/krita/ui/kis_paintop_option.h > similarity index 97% > rename from krita/plugins/paintops/libpaintop/kis_paintop_option.h > rename to krita/ui/kis_paintop_option.h > index 6706abc..4688083 100644 > --- a/krita/plugins/paintops/libpaintop/kis_paintop_option.h > +++ b/krita/ui/kis_paintop_option.h > @@ -35,7 +35,7 @@ class QString; > * > * Options are disabled by default. > */ > -class PAINTOP_EXPORT KisPaintOpOption : public QObject > +class KRITAUI_EXPORT KisPaintOpOption : public QObject > { > Q_OBJECT > public: > diff --git > a/krita/plugins/paintops/libpaintop/kis_paintop_options_model.cpp > b/krita/ui/kis_paintop_options_model.cpp > similarity index 100% > rename from krita/plugins/paintops/libpaintop/kis_paintop_options_model.cpp > rename to krita/ui/kis_paintop_options_model.cpp > diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_options_model.h > b/krita/ui/kis_paintop_options_model.h > similarity index 92% > rename from krita/plugins/paintops/libpaintop/kis_paintop_options_model.h > rename to krita/ui/kis_paintop_options_model.h > index d959ac4..1ea4e71 100644 > --- a/krita/plugins/paintops/libpaintop/kis_paintop_options_model.h > +++ b/krita/ui/kis_paintop_options_model.h > @@ -25,7 +25,7 @@ > #include > #include > > -struct PAINTOP_EXPORT KisOptionInfo > +struct KRITAUI_EXPORT KisOptionInfo > { > KisOptionInfo() { } > KisOptionInfo(KisPaintOpOption* o, int i): option(o), index(i) { } > @@ -34,7 +34,7 @@ struct PAINTOP_EXPORT KisOptionInfo > int index; > }; > > -struct PAINTOP_EXPORT OptionInfoToQStringConverter { > +struct KRITAUI_EXPORT OptionInfoToQStringConverter { > QString operator() (const KisOptionInfo &info) { > return info.option->label(); > } > @@ -45,7 +45,7 @@ typedef KisCategorizedListModel OptionInfoToQStringConverter> Bas > /** > * This model can be use to show a list of visible composite op in a list > view. > */ > -class PAINTOP_EXPORT KisPaintOpOptionListModel : public > BaseOptionCategorizedListModel > +class KRITAUI_EXPORT KisPaintOpOptionListModel : public > BaseOptionCategorizedListModel > { > public: > KisPaintOpOptionListModel(QObject *parent); > diff --git > a/krita/plugins/paintops/libpaintop/kis_paintop_options_widget.cpp > b/krita/ui/kis_paintop_options_widget.cpp > similarity index 100% > rename from > krita/plugins/paintops/libpaintop/kis_paintop_options_widget.cpp > rename to krita/ui/kis_paintop_options_widget.cpp > diff --git > a/krita/plugins/paintops/libpaintop/kis_paintop_options_widget.h > b/krita/ui/kis_paintop_options_widget.h > similarity index 96% > rename from krita/plugins/paintops/libpaintop/kis_paintop_options_widget.h > rename to krita/ui/kis_paintop_options_widget.h > index ae62d04..59e7401 100644 > --- a/krita/plugins/paintops/libpaintop/kis_paintop_options_widget.h > +++ b/krita/ui/kis_paintop_options_widget.h > @@ -33,9 +33,8 @@ class QListWidgetItem; > * the effect of tablet pressure, tilt and rotation and > * other paintop settings. > */ > -class PAINTOP_EXPORT KisPaintOpOptionsWidget : public > KisPaintOpSettingsWidget > +class KRITAUI_EXPORT KisPaintOpOptionsWidget : public > KisPaintOpSettingsWidget > { > - > Q_OBJECT > > public: > --001a11c2b01c2c3e0b04e544930c Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Hi Boud,=A0

I get this crash=A0http://pastebin.com/gWzh7xSC=A0<= div>and this crash=A0http://pasteb= in.com/qpPm36gG=A0, does it work for you on Linux?

Lukas


2013/8/30 Boudewijn Rempt <boud@valdyas.org>=
Git commit 84b682d4647a9f4b55ae02f842149f693= 5601aa1 by Boudewijn Rempt.
Committed on 30/08/2013 at 08:56.
Pushed by rempt into branch 'master'.

Move the paintop options model and widget to krita/ui

This "fixes" the build on Windows. The templated stuff across dll= boundaries
was just too much for msvc2012. Fortunately, this move is not a really big<= br> problem.

M =A0+0 =A0 =A0-3 =A0 =A0krita/plugins/paintops/libpaintop/CMakeLists.txt M =A0+6 =A0 =A0-0 =A0 =A0krita/ui/CMakeLists.txt
R =A0+0 =A0 =A0-0 =A0 =A0krita/ui/kis_paintop_option.cpp [from: krita/plugi= ns/paintops/libpaintop/kis_paintop_option.cpp - 100% similarity]
R =A0+1 =A0 =A0-1 =A0 =A0krita/ui/kis_paintop_option.h [from: krita/plugins= /paintops/libpaintop/kis_paintop_option.h - 097% similarity]
R =A0+0 =A0 =A0-0 =A0 =A0krita/ui/kis_paintop_options_model.cpp [from: krit= a/plugins/paintops/libpaintop/kis_paintop_options_model.cpp - 100% similari= ty]
R =A0+3 =A0 =A0-3 =A0 =A0krita/ui/kis_paintop_options_model.h [from: krita/= plugins/paintops/libpaintop/kis_paintop_options_model.h - 092% similarity]<= br> R =A0+0 =A0 =A0-0 =A0 =A0krita/ui/kis_paintop_options_widget.cpp [from: kri= ta/plugins/paintops/libpaintop/kis_paintop_options_widget.cpp - 100% simila= rity]
R =A0+1 =A0 =A0-2 =A0 =A0krita/ui/kis_paintop_options_widget.h [from: krita= /plugins/paintops/libpaintop/kis_paintop_options_widget.h - 096% similarity= ]

http://commits.kde.org/calligra/84b682d46= 47a9f4b55ae02f842149f6935601aa1

diff --git a/krita/plugins/paintops/libpaintop/CMakeLists.txt b/krita/plugi= ns/paintops/libpaintop/CMakeLists.txt
index 3fc77e7..e3a603a 100644
--- a/krita/plugins/paintops/libpaintop/CMakeLists.txt
+++ b/krita/plugins/paintops/libpaintop/CMakeLists.txt
@@ -24,9 +24,6 @@ set(kritalibpaintop_LIB_SRCS
=A0 =A0 =A0kis_multi_sensors_model_p.cpp
=A0 =A0 =A0kis_multi_sensors_selector.cpp
=A0 =A0 =A0kis_paint_action_type_option.cpp
- =A0 =A0kis_paintop_option.cpp
- =A0 =A0kis_paintop_options_model.cpp
- =A0 =A0kis_paintop_options_widget.cpp
=A0 =A0 =A0kis_precision_option.cpp
=A0 =A0 =A0kis_pressure_darken_option.cpp
=A0 =A0 =A0kis_pressure_hsv_option.cpp
diff --git a/krita/ui/CMakeLists.txt b/krita/ui/CMakeLists.txt
index 3cb731b..450c92a 100644
--- a/krita/ui/CMakeLists.txt
+++ b/krita/ui/CMakeLists.txt
@@ -98,6 +98,9 @@ set(kritaui_LIB_SRCS
=A0 =A0 =A0kis_painting_assistant.cc
=A0 =A0 =A0kis_painting_assistants_manager.cc
=A0 =A0 =A0kis_paintop_box.cc
+ =A0 =A0kis_paintop_option.cpp
+ =A0 =A0kis_paintop_options_model.cpp
+ =A0 =A0kis_paintop_options_widget.cpp
=A0 =A0 =A0kis_palette_manager.cpp
=A0 =A0 =A0kis_popup_palette.cpp
=A0 =A0 =A0kis_png_converter.cpp
@@ -380,4 +383,7 @@ install( FILES
=A0# =A0 =A0kis_tool_types.h
=A0# =A0 =A0KoInputDevice.h
=A0# =A0 =A0canvas/kis_perspective_grid_manager.h
+ =A0 =A0kis_paintop_option.h
+ =A0 =A0kis_paintop_options_model.h
+ =A0 =A0kis_paintop_options_widget.h
=A0 =A0 DESTINATION ${INCLUDE_INSTALL_DIR}/krita)
diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_option.cpp b/kri= ta/ui/kis_paintop_option.cpp
similarity index 100%
rename from krita/plugins/paintops/libpaintop/kis_paintop_option.cpp
rename to krita/ui/kis_paintop_option.cpp
diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_option.h b/krita= /ui/kis_paintop_option.h
similarity index 97%
rename from krita/plugins/paintops/libpaintop/kis_paintop_option.h
rename to krita/ui/kis_paintop_option.h
index 6706abc..4688083 100644
--- a/krita/plugins/paintops/libpaintop/kis_paintop_option.h
+++ b/krita/ui/kis_paintop_option.h
@@ -35,7 +35,7 @@ class QString;
=A0 *
=A0 * Options are disabled by default.
=A0 */
-class PAINTOP_EXPORT KisPaintOpOption : public QObject
+class KRITAUI_EXPORT KisPaintOpOption : public QObject
=A0{
=A0 =A0 =A0Q_OBJECT
=A0public:
diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_options_model.cp= p b/krita/ui/kis_paintop_options_model.cpp
similarity index 100%
rename from krita/plugins/paintops/libpaintop/kis_paintop_options_model.cpp=
rename to krita/ui/kis_paintop_options_model.cpp
diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_options_model.h = b/krita/ui/kis_paintop_options_model.h
similarity index 92%
rename from krita/plugins/paintops/libpaintop/kis_paintop_options_model.h rename to krita/ui/kis_paintop_options_model.h
index d959ac4..1ea4e71 100644
--- a/krita/plugins/paintops/libpaintop/kis_paintop_options_model.h
+++ b/krita/ui/kis_paintop_options_model.h
@@ -25,7 +25,7 @@
=A0#include <kis_paintop_option.h>
=A0#include <krita_export.h>

-struct PAINTOP_EXPORT KisOptionInfo
+struct KRITAUI_EXPORT KisOptionInfo
=A0{
=A0 =A0 =A0KisOptionInfo() { }
=A0 =A0 =A0KisOptionInfo(KisPaintOpOption* o, int i): option(o), index(i) {= }
@@ -34,7 +34,7 @@ struct PAINTOP_EXPORT KisOptionInfo
=A0 =A0 =A0int =A0 =A0 =A0 =A0 =A0 =A0 =A0 index;
=A0};

-struct PAINTOP_EXPORT OptionInfoToQStringConverter {
+struct KRITAUI_EXPORT OptionInfoToQStringConverter {
=A0 =A0 =A0QString operator() (const KisOptionInfo &info) {
=A0 =A0 =A0 =A0 =A0return info.option->label();
=A0 =A0 =A0}
@@ -45,7 +45,7 @@ typedef KisCategorizedListModel<KisOptionInfo, OptionI= nfoToQStringConverter> Bas
=A0/**
=A0 * This model can be use to show a list of visible composite op in a lis= t view.
=A0 */
-class PAINTOP_EXPORT KisPaintOpOptionListModel : public BaseOptionCategori= zedListModel
+class KRITAUI_EXPORT KisPaintOpOptionListModel : public BaseOptionCategori= zedListModel
=A0{
=A0public:
=A0 =A0 =A0KisPaintOpOptionListModel(QObject *parent);
diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_options_widget.c= pp b/krita/ui/kis_paintop_options_widget.cpp
similarity index 100%
rename from krita/plugins/paintops/libpaintop/kis_paintop_options_widget.cp= p
rename to krita/ui/kis_paintop_options_widget.cpp
diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_options_widget.h= b/krita/ui/kis_paintop_options_widget.h
similarity index 96%
rename from krita/plugins/paintops/libpaintop/kis_paintop_options_widget.h<= br> rename to krita/ui/kis_paintop_options_widget.h
index ae62d04..59e7401 100644
--- a/krita/plugins/paintops/libpaintop/kis_paintop_options_widget.h
+++ b/krita/ui/kis_paintop_options_widget.h
@@ -33,9 +33,8 @@ class QListWidgetItem;
=A0 * the effect of tablet pressure, tilt and rotation and
=A0 * other paintop settings.
=A0 */
-class PAINTOP_EXPORT KisPaintOpOptionsWidget : public KisPaintOpSettingsWi= dget
+class KRITAUI_EXPORT KisPaintOpOptionsWidget : public KisPaintOpSettingsWi= dget
=A0{
-
=A0 =A0 =A0Q_OBJECT

=A0public:

--001a11c2b01c2c3e0b04e544930c--