Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit a046e33b authored by Michael Abrahams's avatar Michael Abrahams

Move kis_icon_utils to libs/widgetutils

This required several changes to file inclusion and linking.  In
particular, libs/widgetutils now requires krita/libglobal, and libglobal
does not depend on libs/widgetutils.
parent fe4e51a4
......@@ -56,7 +56,7 @@
#include <KisImportExportManager.h>
#include <KoToolManager.h>
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include "filter/kis_filter.h"
#include "filter/kis_filter_registry.h"
......
......@@ -22,7 +22,7 @@
#include "kis_debug.h"
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include "kis_selection.h"
#include "filter/kis_filter_configuration.h"
#include "kis_processing_information.h"
......
......@@ -23,7 +23,7 @@
#include "kis_debug.h"
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoCompositeOpRegistry.h>
#include "kis_image.h"
......
......@@ -19,7 +19,7 @@
#include "kis_base_node.h"
#include <klocalizedstring.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoProperties.h>
#include <KoColorSpace.h>
#include <KoCompositeOpRegistry.h>
......
......@@ -22,7 +22,7 @@
#include <klocalizedstring.h>
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoColorSpace.h>
#include <KoCompositeOpRegistry.h>
......
......@@ -20,7 +20,7 @@
#include "kis_effect_mask.h"
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
KisEffectMask::KisEffectMask()
......
......@@ -18,7 +18,7 @@
*/
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoCompositeOpRegistry.h>
#include "kis_layer.h"
......
......@@ -21,7 +21,7 @@
#include "kis_group_layer.h"
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoCompositeOpRegistry.h>
#include <KoColorSpace.h>
#include <KoColor.h>
......
......@@ -29,7 +29,7 @@
#include <QMutexLocker>
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoProperties.h>
#include <KoCompositeOpRegistry.h>
#include <KoColorSpace.h>
......
......@@ -25,7 +25,7 @@
#include <klocalizedstring.h>
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoColorSpace.h>
#include <KoColorProfile.h>
#include <KoCompositeOpRegistry.h>
......
......@@ -32,7 +32,7 @@
#include "kis_pixel_selection.h"
#include "kis_undo_adapter.h"
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include "kis_thread_safe_signal_compressor.h"
......
......@@ -18,7 +18,7 @@
*/
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoCompositeOpRegistry.h>
#include "kis_layer.h"
......
......@@ -21,7 +21,7 @@
#include "kis_debug.h"
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoColor.h>
#include <KoColorSpace.h>
#include <KoCompositeOpRegistry.h>
......
......@@ -7,14 +7,13 @@ include_directories(${KOWIDGETS_INCLUDES})
set(kritaglobal_LIB_SRCS
kis_assert.cpp
kis_debug.cpp
kis_icon_utils.cpp
)
add_library(kritaglobal SHARED ${kritaglobal_LIB_SRCS} )
generate_export_header(kritaglobal BASE_NAME kritaglobal)
target_link_libraries(kritaglobal kritawidgets Qt5::Concurrent Qt5::Core Qt5::Gui)
target_link_libraries(kritaglobal LINK_INTERFACE_LIBRARIES kritawidgets Qt5::Concurrent Qt5::Concurrent Qt5::Core Qt5::Gui)
target_link_libraries(kritaglobal Qt5::Concurrent Qt5::Core Qt5::Gui Qt5::Widgets KF5::I18n)
target_link_libraries(kritaglobal LINK_INTERFACE_LIBRARIES Qt5::Concurrent Qt5::Core Qt5::Gui KF5::I18n)
set_target_properties(kritaglobal PROPERTIES
VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION}
......
......@@ -20,11 +20,11 @@
#define __KIS_ASSERT_H
#include <QtGlobal>
#include <kritaimage_export.h>
#include <kritaglobal_export.h>
KRITAIMAGE_EXPORT void kis_assert_exception(const char *assertion, const char *file, int line);
KRITAIMAGE_EXPORT void kis_assert_recoverable(const char *assertion, const char *file, int line);
KRITAIMAGE_EXPORT void kis_assert_x_exception(const char *assertion, const char *where, const char *what, const char *file, int line);
KRITAGLOBAL_EXPORT void kis_assert_exception(const char *assertion, const char *file, int line);
KRITAGLOBAL_EXPORT void kis_assert_recoverable(const char *assertion, const char *file, int line);
KRITAGLOBAL_EXPORT void kis_assert_x_exception(const char *assertion, const char *where, const char *what, const char *file, int line);
/**
......
......@@ -31,7 +31,7 @@
#include <QMessageBox>
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoFileDialog.h>
#include <KoViewConverter.h>
#include <KoPointerEvent.h>
......
......@@ -23,7 +23,7 @@
#include "kis_painting_assistant.h"
#include "ui_AssistantsToolOptions.h"
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
class KisCanvas2;
......
......@@ -14,6 +14,6 @@ set( extensions_plugin_PART_SRCS
add_library(krita_colorspaces_extensions MODULE ${extensions_plugin_PART_SRCS} )
kcoreaddons_desktop_to_json(krita_colorspaces_extensions krita_colorspaces_extensions_plugin.desktop)
target_link_libraries(krita_colorspaces_extensions kritapigment kritaglobal ${OPENEXR_LIBRARIES} KF5::I18n )
target_link_libraries(krita_colorspaces_extensions kritapigment kritaglobal ${OPENEXR_LIBRARIES} KF5::I18n KF5::CoreAddons)
install( TARGETS krita_colorspaces_extensions DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR} )
......@@ -31,7 +31,7 @@
#include <KoDialog.h>
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <QMessageBox>
......
......@@ -25,7 +25,7 @@
#include <klocalizedstring.h>
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoUpdater.h>
#include <KoResourceServerProvider.h>
#include <KoFileDialog.h>
......
......@@ -33,7 +33,7 @@
#include <kis_debug.h>
#include <KoCanvasResourceManager.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include "kis_color_selector_ring.h"
#include "kis_color_selector_triangle.h"
......
......@@ -27,7 +27,7 @@
#include <kconfiggroup.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include "KoColorSpace.h"
#include "KoColorSpaceRegistry.h"
#include "KoColorProfile.h"
......
......@@ -29,7 +29,7 @@
#include <klocalizedstring.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include "KoColor.h"
#include "kis_canvas2.h"
#include "kis_image.h"
......
......@@ -22,7 +22,7 @@
#include "kis_canvas2.h"
#include "kis_image.h"
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include "KisViewManager.h"
#include "kis_action_manager.h"
#include "kis_image_animation_interface.h"
......
......@@ -31,7 +31,7 @@
#include <klocalizedstring.h>
#include <kactioncollection.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoCanvasBase.h>
#include <KoFileDialog.h>
......
......@@ -17,7 +17,7 @@
#include "compositionmodel.h"
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <QAction>
#include <klocalizedstring.h>
......
......@@ -46,7 +46,7 @@
#include <kis_debug.h>
#include <klocalizedstring.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KisDocumentSectionView.h>
#include <KoColorSpace.h>
#include <KoCompositeOpRegistry.h>
......
......@@ -65,7 +65,7 @@
#include <QMenu>
#include <kis_types.h>
#include <klocalizedstring.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include "kis_canvas2.h"
#ifndef QT_NO_UNDOVIEW
......
......@@ -17,7 +17,7 @@
#include "image_strip_scene.h"
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <QApplication>
#include <QDir>
......
......@@ -24,7 +24,7 @@
#include <KoCanvasBase.h>
#include <KoColorSpaceRegistry.h>
#include <KoColor.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <QFileSystemModel>
#include <QImageReader>
......
......@@ -31,7 +31,7 @@
#include <KoResourceServerProvider.h>
#include <KoColorSpaceRegistry.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <kis_layer.h>
#include <kis_node_manager.h>
#include <kis_config.h>
......
......@@ -29,7 +29,7 @@
#include <klocalizedstring.h>
#include <kactioncollection.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoCanvasBase.h>
#include <KoResourceItemChooser.h>
......
......@@ -19,7 +19,7 @@
#include <QAction>
#include <klocalizedstring.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
TasksetModel::TasksetModel(QObject* parent): QAbstractTableModel(parent)
{
......
......@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <kis_gmic_input_output_widget.h>
......
......@@ -25,7 +25,7 @@
#include <QApplication>
#include <QMessageBox>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <QMetaType>
#include <klocalizedstring.h>
......
......@@ -22,7 +22,7 @@
#include "kcanvaspreview.h"
#include <KoUnit.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <kis_size_group.h>
#include <klocalizedstring.h>
......
......@@ -32,7 +32,7 @@
#include <kis_meta_data_value.h>
#include <kis_meta_data_schema.h>
#include <kis_meta_data_schema_registry.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include "kis_entry_editor.h"
#include <QTableView>
#include "kis_meta_data_model.h"
......
......@@ -23,7 +23,7 @@
#include <klocalizedstring.h>
#include <kis_debug.h>
#include <kpluginfactory.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <kis_image.h>
#include <kis_types.h>
#include <KisViewManager.h>
......
......@@ -29,7 +29,7 @@
#include <QPixmap>
#include <QMessageBox>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include "kis_action.h"
#define ICON_SIZE 48
......
......@@ -31,7 +31,7 @@
#include <KisImportExportManager.h>
#include <KoDocumentInfo.h>
#include <KoFileDialog.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoResource.h>
#include <KoResourceServer.h>
#include <KoResourceServerProvider.h>
......
......@@ -24,7 +24,7 @@
#include <klocalizedstring.h>
#include <kis_debug.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
DlgRotateImage::DlgRotateImage(QWidget * parent,
const char * name)
......
......@@ -25,7 +25,7 @@
#include <klocalizedstring.h>
#include <kis_debug.h>
#include <kpluginfactory.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <kundo2magicstring.h>
#include <kis_image.h>
#include <kis_types.h>
......
......@@ -35,7 +35,7 @@
#include <KoResourceItemChooser.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include "kis_brush_registry.h"
#include "kis_brush_server.h"
#include "widgets/kis_slider_spin_box.h"
......
......@@ -18,7 +18,7 @@
#include "kis_compositeop_option.h"
#include <klocalizedstring.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <kis_cmb_composite.h>
#include <KoCompositeOpRegistry.h>
......
......@@ -26,7 +26,7 @@
#include "KoToolFactoryBase.h"
#include <flake/kis_node_shape.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <QKeySequence>
#include <kconfig.h>
......
......@@ -29,7 +29,7 @@
#include "kis_tool.h"
#include <flake/kis_node_shape.h>
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <QKeySequence>
class KoResource;
......
......@@ -28,7 +28,7 @@
#include "KoToolFactoryBase.h"
#include "flake/kis_node_shape.h"
#include <kis_tool_ellipse_base.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
......
......@@ -24,7 +24,7 @@
#include "kis_tool_paint.h"
#include <flake/kis_node_shape.h>
#include <KoIcon.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <QPoint>
#include <kconfig.h>
#include <kconfiggroup.h>
......
......@@ -33,7 +33,7 @@
#include <kis_types.h>
#include <kis_gradient_painter.h>
#include <flake/kis_node_shape.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <kconfig.h>
#include <kconfiggroup.h>
......
......@@ -33,7 +33,7 @@
#include "KoToolFactoryBase.h"
#include "flake/kis_node_shape.h"
#include "kis_signal_compressor.h"
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <KoIcon.h>
class QPoint;
......
......@@ -29,7 +29,7 @@
#include "kis_types.h"
#include "KoToolFactoryBase.h"
#include "flake/kis_node_shape.h"
#include <kis_icon_utils.h>
#include <kis_icon.h>
class QPointF;
class QWidget;
......
......@@ -25,7 +25,7 @@
#include <kis_types.h>
#include <kis_tool.h>
#include <flake/kis_node_shape.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <QKeySequence>
#include <QWidget>
#include <QGroupBox>
......
......@@ -21,7 +21,7 @@
#define __KIS_TOOL_MULTIHAND_H
#include "kis_tool_brush.h"
#include <kis_icon_utils.h>
#include <kis_icon.h>
class QPushButton;
class QCheckBox;
......
......@@ -25,7 +25,7 @@
#include "flake/kis_node_shape.h"
#include "kis_tool_shape.h"
#include "kis_delegated_tool.h"
#include <kis_icon_utils.h>
#include <kis_icon.h>
class KoCanvasBase;
class KisToolPath;
......
......@@ -25,7 +25,7 @@
#include "flake/kis_node_shape.h"
#include "kis_tool_shape.h"
#include "kis_delegated_tool.h"
#include <kis_icon_utils.h>
#include <kis_icon.h>
class KoCanvasBase;
class KisToolPencil;
......
......@@ -29,7 +29,7 @@
#include "KoToolFactoryBase.h"
#include "flake/kis_node_shape.h"
#include <kis_tool_rectangle_base.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
class QRect;
......
......@@ -25,7 +25,7 @@
#include "KoToolFactoryBase.h"
#include "kis_tool_select_base.h"
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <kconfig.h>
#include <kconfiggroup.h>
......
......@@ -30,7 +30,7 @@
#include "kis_selection_tool_config_widget_helper.h"
#include <KoIcon.h>
#include <QKeySequence>
#include <kis_icon_utils.h>
#include <kis_icon.h>
class __KisToolSelectEllipticalLocal : public KisToolEllipseBase
{
......
......@@ -27,7 +27,7 @@
#include <QPoint>
#include <KoToolFactoryBase.h>
#include "krita/ui/tool/kis_tool_select_base.h"
#include <kis_icon_utils.h>
#include <kis_icon.h>
class QPainterPath;
......
......@@ -25,7 +25,7 @@
#include "kis_tool_select_base.h"
#include "kis_delegated_tool.h"
#include <kis_icon_utils.h>
#include <kis_icon.h>
class KoCanvasBase;
class KisToolSelectPath;
......
......@@ -28,7 +28,7 @@
#include "kis_tool_polyline_base.h"
#include <kis_tool_select_base.h>
#include "kis_selection_tool_config_widget_helper.h"
#include <kis_icon_utils.h>
#include <kis_icon.h>
class __KisToolSelectPolygonalLocal : public KisToolPolylineBase
......
......@@ -27,7 +27,7 @@
#include "kis_tool_rectangle_base.h"
#include <kis_tool_select_base.h>
#include "kis_selection_tool_config_widget_helper.h"
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <QKeySequence>
......
......@@ -20,7 +20,7 @@
#define KIS_TOOL_SELECT_SIMILAR_H_
#include <KoToolFactoryBase.h>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <kconfig.h>
#include "kis_tool_select_base.h"
#include <kconfiggroup.h>
......
......@@ -24,7 +24,7 @@
#include <QPoint>
#include <QPainterPath>
#include <kis_icon_utils.h>
#include <kis_icon.h>
#include <kconfig.h>
#include <kconfiggroup.h>
......