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

List:       kde-commits
Subject:    [calligra] krita: Move the paintop options model and widget to krita/ui
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2013-08-30 9:08:55
Message-ID: E1VFKhL-0000AP-VS () scm ! kde ! org
[Download RAW message or body]

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/paintop=
s/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/pa=
intops/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/p=
aintops/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/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
     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/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;
  *
  * 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.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 @@
 #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, OptionInfo=
ToQStringConverter> Bas
 /**
  * This model can be use to show a list of visible composite op in a list =
view.
  */
-class PAINTOP_EXPORT KisPaintOpOptionListModel : public BaseOptionCategori=
zedListModel
+class KRITAUI_EXPORT KisPaintOpOptionListModel : public BaseOptionCategori=
zedListModel
 {
 public:
     KisPaintOpOptionListModel(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.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 KisPaintOpSettingsWi=
dget
+class KRITAUI_EXPORT KisPaintOpOptionsWidget : public KisPaintOpSettingsWi=
dget
 {
-
     Q_OBJECT
 =

 public:
[prev in list] [next in list] [prev in thread] [next in thread]