[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: Re: [calligra] krita: Move the paintop options model and widget to krita/ui
From: Lukast dev <lukast.dev () gmail ! com>
Date: 2013-08-31 20:56:36
Message-ID: CAKdU0rMqdLweUFywqSrGDsu0mzS96s9evS4574SBkzMNYmwY5g () mail ! gmail ! com
[Download RAW message or body]
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 <boud@valdyas.org>
> 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 <kis_paintop_option.h>
> #include <krita_export.h>
>
> -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<KisOptionInfo,
> 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:
>
[Attachment #3 (text/html)]
<div dir="ltr"><div>Hi Boud, </div><div><br></div>I get this crash <a \
href="http://pastebin.com/gWzh7xSC">http://pastebin.com/gWzh7xSC</a> <div>and this \
crash <a href="http://pastebin.com/qpPm36gG">http://pastebin.com/qpPm36gG</a> , does \
it work for you on Linux?</div> <div><br></div><div>Lukas</div></div><div \
class="gmail_extra"><br><br><div class="gmail_quote">2013/8/30 Boudewijn Rempt <span \
dir="ltr"><<a href="mailto:boud@valdyas.org" \
target="_blank">boud@valdyas.org</a>></span><br> <blockquote class="gmail_quote" \
style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Git commit \
84b682d4647a9f4b55ae02f842149f6935601aa1 by Boudewijn Rempt.<br> <div \
class="im">Committed on 30/08/2013 at 08:56.<br> </div>Pushed by rempt into branch \
'master'.<br> <div class="im"><br>
Move the paintop options model and widget to krita/ui<br>
<br>
This "fixes" the build on Windows. The templated stuff across dll \
boundaries<br> was just too much for msvc2012. Fortunately, this move is not a really \
big<br> problem.<br>
<br>
M +0 -3 krita/plugins/paintops/libpaintop/CMakeLists.txt<br>
M +6 -0 krita/ui/CMakeLists.txt<br>
R +0 -0 krita/ui/kis_paintop_option.cpp [from: \
krita/plugins/paintops/libpaintop/kis_paintop_option.cpp - 100% similarity]<br> R +1 \
-1 krita/ui/kis_paintop_option.h [from: \
krita/plugins/paintops/libpaintop/kis_paintop_option.h - 097% similarity]<br> R +0 \
-0 krita/ui/kis_paintop_options_model.cpp [from: \
krita/plugins/paintops/libpaintop/kis_paintop_options_model.cpp - 100% \
similarity]<br> R +3 -3 krita/ui/kis_paintop_options_model.h [from: \
krita/plugins/paintops/libpaintop/kis_paintop_options_model.h - 092% similarity]<br> \
R +0 -0 krita/ui/kis_paintop_options_widget.cpp [from: \
krita/plugins/paintops/libpaintop/kis_paintop_options_widget.cpp - 100% \
similarity]<br> R +1 -2 krita/ui/kis_paintop_options_widget.h [from: \
krita/plugins/paintops/libpaintop/kis_paintop_options_widget.h - 096% similarity]<br> \
<br> </div><a href="http://commits.kde.org/calligra/84b682d4647a9f4b55ae02f842149f6935601aa1" \
target="_blank">http://commits.kde.org/calligra/84b682d4647a9f4b55ae02f842149f6935601aa1</a><br>
<div class="im"><br>
diff --git a/krita/plugins/paintops/libpaintop/CMakeLists.txt \
b/krita/plugins/paintops/libpaintop/CMakeLists.txt<br> index 3fc77e7..e3a603a \
100644<br>
--- a/krita/plugins/paintops/libpaintop/CMakeLists.txt<br>
+++ b/krita/plugins/paintops/libpaintop/CMakeLists.txt<br>
@@ -24,9 +24,6 @@ set(kritalibpaintop_LIB_SRCS<br>
kis_multi_sensors_model_p.cpp<br>
kis_multi_sensors_selector.cpp<br>
kis_paint_action_type_option.cpp<br>
- kis_paintop_option.cpp<br>
- kis_paintop_options_model.cpp<br>
- kis_paintop_options_widget.cpp<br>
kis_precision_option.cpp<br>
kis_pressure_darken_option.cpp<br>
kis_pressure_hsv_option.cpp<br>
diff --git a/krita/ui/CMakeLists.txt b/krita/ui/CMakeLists.txt<br>
</div>index 3cb731b..450c92a 100644<br>
<div class="im">--- a/krita/ui/CMakeLists.txt<br>
+++ b/krita/ui/CMakeLists.txt<br>
@@ -98,6 +98,9 @@ set(kritaui_LIB_SRCS<br>
kis_painting_assistant.cc<br>
kis_painting_assistants_manager.cc<br>
kis_paintop_box.cc<br>
+ kis_paintop_option.cpp<br>
+ kis_paintop_options_model.cpp<br>
+ kis_paintop_options_widget.cpp<br>
kis_palette_manager.cpp<br>
kis_popup_palette.cpp<br>
kis_png_converter.cpp<br>
</div>@@ -380,4 +383,7 @@ install( FILES<br>
<div class="HOEnZb"><div class="h5"> # kis_tool_types.h<br>
# KoInputDevice.h<br>
# canvas/kis_perspective_grid_manager.h<br>
+ kis_paintop_option.h<br>
+ kis_paintop_options_model.h<br>
+ kis_paintop_options_widget.h<br>
DESTINATION ${INCLUDE_INSTALL_DIR}/krita)<br>
diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_option.cpp \
b/krita/ui/kis_paintop_option.cpp<br> similarity index 100%<br>
rename from krita/plugins/paintops/libpaintop/kis_paintop_option.cpp<br>
rename to krita/ui/kis_paintop_option.cpp<br>
diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_option.h \
b/krita/ui/kis_paintop_option.h<br> similarity index 97%<br>
rename from krita/plugins/paintops/libpaintop/kis_paintop_option.h<br>
rename to krita/ui/kis_paintop_option.h<br>
index 6706abc..4688083 100644<br>
--- a/krita/plugins/paintops/libpaintop/kis_paintop_option.h<br>
+++ b/krita/ui/kis_paintop_option.h<br>
@@ -35,7 +35,7 @@ class QString;<br>
*<br>
* Options are disabled by default.<br>
*/<br>
-class PAINTOP_EXPORT KisPaintOpOption : public QObject<br>
+class KRITAUI_EXPORT KisPaintOpOption : public QObject<br>
{<br>
Q_OBJECT<br>
public:<br>
diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_options_model.cpp \
b/krita/ui/kis_paintop_options_model.cpp<br> similarity index 100%<br>
rename from krita/plugins/paintops/libpaintop/kis_paintop_options_model.cpp<br>
rename to krita/ui/kis_paintop_options_model.cpp<br>
diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_options_model.h \
b/krita/ui/kis_paintop_options_model.h<br> similarity index 92%<br>
rename from krita/plugins/paintops/libpaintop/kis_paintop_options_model.h<br>
rename to krita/ui/kis_paintop_options_model.h<br>
index d959ac4..1ea4e71 100644<br>
--- a/krita/plugins/paintops/libpaintop/kis_paintop_options_model.h<br>
+++ b/krita/ui/kis_paintop_options_model.h<br>
@@ -25,7 +25,7 @@<br>
#include <kis_paintop_option.h><br>
#include <krita_export.h><br>
<br>
-struct PAINTOP_EXPORT KisOptionInfo<br>
+struct KRITAUI_EXPORT KisOptionInfo<br>
{<br>
KisOptionInfo() { }<br>
KisOptionInfo(KisPaintOpOption* o, int i): option(o), index(i) { }<br>
@@ -34,7 +34,7 @@ struct PAINTOP_EXPORT KisOptionInfo<br>
int index;<br>
};<br>
<br>
-struct PAINTOP_EXPORT OptionInfoToQStringConverter {<br>
+struct KRITAUI_EXPORT OptionInfoToQStringConverter {<br>
QString operator() (const KisOptionInfo &info) {<br>
return info.option->label();<br>
}<br>
@@ -45,7 +45,7 @@ typedef KisCategorizedListModel<KisOptionInfo, \
OptionInfoToQStringConverter> Bas<br> /**<br>
* This model can be use to show a list of visible composite op in a list view.<br>
*/<br>
-class PAINTOP_EXPORT KisPaintOpOptionListModel : public \
BaseOptionCategorizedListModel<br> +class KRITAUI_EXPORT KisPaintOpOptionListModel : \
public BaseOptionCategorizedListModel<br> {<br>
public:<br>
KisPaintOpOptionListModel(QObject *parent);<br>
diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_options_widget.cpp \
b/krita/ui/kis_paintop_options_widget.cpp<br> similarity index 100%<br>
rename from krita/plugins/paintops/libpaintop/kis_paintop_options_widget.cpp<br>
rename to krita/ui/kis_paintop_options_widget.cpp<br>
diff --git a/krita/plugins/paintops/libpaintop/kis_paintop_options_widget.h \
b/krita/ui/kis_paintop_options_widget.h<br> similarity index 96%<br>
rename from krita/plugins/paintops/libpaintop/kis_paintop_options_widget.h<br>
rename to krita/ui/kis_paintop_options_widget.h<br>
index ae62d04..59e7401 100644<br>
--- a/krita/plugins/paintops/libpaintop/kis_paintop_options_widget.h<br>
+++ b/krita/ui/kis_paintop_options_widget.h<br>
@@ -33,9 +33,8 @@ class QListWidgetItem;<br>
* the effect of tablet pressure, tilt and rotation and<br>
* other paintop settings.<br>
*/<br>
-class PAINTOP_EXPORT KisPaintOpOptionsWidget : public KisPaintOpSettingsWidget<br>
+class KRITAUI_EXPORT KisPaintOpOptionsWidget : public KisPaintOpSettingsWidget<br>
{<br>
-<br>
Q_OBJECT<br>
<br>
public:<br>
</div></div></blockquote></div><br></div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic