From 00d7dded88d3b363a1e3d7528a01188a385a4a48 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 30 Mar 2006 08:49:59 +0000 Subject: [PATCH] qt3to4 svn path=/trunk/koffice/; revision=524300 --- .../cmyk_u16/kis_cmyk_u16_colorspace.cc | 42 ++-- .../cmyk_u8/kis_cmyk_colorspace.cc | 2 +- .../gray_u16/kis_gray_u16_colorspace.cc | 14 +- .../gray_u8/kis_gray_colorspace.cc | 6 +- .../lms_f32/kis_lms_f32_colorspace.cc | 14 +- .../rgb_f16half/kis_rgb_f16half_colorspace.cc | 68 +++---- .../kis_rgb_f16half_colorspace_tester.cc | 2 +- .../rgb_f32/kis_rgb_f32_colorspace.cc | 68 +++---- .../kis_strategy_colorspace_rgb_f32_tester.cc | 2 +- .../rgb_u16/kis_rgb_u16_colorspace.cc | 46 ++--- .../kis_strategy_colorspace_rgb_u16_tester.cc | 2 +- .../colorspaces/rgb_u8/kis_rgb_colorspace.cc | 14 +- krita/colorspaces/wet/kis_wet_colorspace.cc | 10 +- .../colorspaces/wet/kis_wet_palette_widget.cc | 11 +- krita/colorspaces/wet/wet_plugin.cc | 2 +- .../wetsticky/kis_wet_sticky_colorspace.cc | 76 ++++---- krita/core/kis_alpha_mask.cc | 2 +- krita/core/kis_autogradient_resource.cc | 18 +- krita/core/kis_boundary.cc | 6 +- krita/core/kis_brush.cc | 184 +++++++++--------- krita/core/kis_convolution_painter.cc | 10 +- krita/core/kis_fill_painter.cc | 4 +- krita/core/kis_filter_config_widget.cc | 2 +- krita/core/kis_filter_registry.cc | 2 +- krita/core/kis_gradient_painter.cc | 26 +-- krita/core/kis_histogram.cc | 4 +- krita/core/kis_image.cc | 4 +- krita/core/kis_imagepipe_brush.cc | 20 +- krita/core/kis_paint_device.cc | 12 +- krita/core/kis_painter.cc | 4 +- krita/core/kis_palette.cc | 6 +- krita/core/kis_pattern.cc | 9 +- krita/core/kis_rotate_visitor.cc | 2 +- krita/core/kis_selection.cc | 4 +- krita/core/tiles/kis_tileddatamanager.cc | 2 +- .../colorspaces/kis_alpha_colorspace.cc | 2 +- .../colorspaces/kis_lab_colorspace.cc | 2 +- .../colorspaces/kis_xyz_colorspace.cc | 2 +- krita/kritacolor/kis_abstract_colorspace.cc | 14 +- .../kis_basic_histogram_producers.cc | 18 +- krita/kritacolor/kis_color.cc | 8 +- .../kis_colorspace_factory_registry.cc | 8 +- krita/kritacolor/kis_histogram_producer.cc | 8 +- krita/plugins/filters/bumpmap/bumpmap.cc | 10 +- krita/plugins/filters/cimg/kis_cimg_filter.cc | 6 +- .../filters/cimg/kis_cimgconfig_widget.cc | 6 +- .../kis_brightness_contrast_filter.cc | 6 +- .../colorsfilters/kis_perchannel_filter.cc | 17 +- ...convolution_filter_configuration_widget.cc | 4 +- .../filters/cubismfilter/kis_polygon.cc | 2 +- .../oilpaintfilter/kis_oilpaint_filter.cc | 6 +- .../pixelizefilter/kis_pixelize_filter.cc | 4 +- .../kis_small_tiles_filter.cc | 2 +- .../paintops/defaultpaintops/kis_brushop.cc | 4 +- .../tools/defaulttools/kis_tool_brush.cc | 6 +- .../defaulttools/kis_tool_colorpicker.cc | 14 +- .../tools/defaulttools/kis_tool_duplicate.cc | 2 +- .../tools/defaulttools/kis_tool_fill.cc | 8 +- .../tools/defaulttools/kis_tool_gradient.cc | 4 +- .../tools/defaulttools/kis_tool_line.cc | 4 +- .../tools/defaulttools/kis_tool_move.cc | 2 + .../tools/defaulttools/kis_tool_text.cc | 8 +- .../selectiontools/kis_tool_select_brush.cc | 4 +- .../kis_tool_select_contiguous.cc | 11 +- .../kis_tool_select_elliptical.cc | 4 +- .../selectiontools/kis_tool_select_eraser.cc | 4 +- .../selectiontools/kis_tool_select_outline.cc | 8 +- .../kis_tool_select_polygonal.cc | 12 +- .../kis_tool_select_rectangular.cc | 4 +- .../plugins/tools/tool_crop/kis_tool_crop.cc | 10 +- .../tools/tool_filter/kis_tool_filter.cc | 4 +- .../tools/tool_polygon/kis_tool_polygon.cc | 6 +- .../tools/tool_polyline/kis_tool_polyline.cc | 2 + .../kis_tool_selectsimilar.cc | 9 +- .../plugins/tools/tool_star/kis_tool_star.cc | 4 +- .../viewplugins/colorrange/dlg_colorrange.cc | 2 +- .../colorspaceconversion.cc | 2 +- .../dlg_colorspaceconversion.cc | 6 +- .../viewplugins/dropshadow/dlg_dropshadow.cc | 4 +- .../filtersgallery/kis_dlg_filtersgallery.cc | 6 +- .../viewplugins/histogram/dlg_histogram.cc | 2 +- .../histogram/kis_histogram_widget.cc | 2 +- .../kis_accumulating_producer.cc | 4 +- .../viewplugins/imagesize/dlg_imagesize.cc | 2 +- .../viewplugins/imagesize/dlg_layersize.cc | 2 +- .../modify_selection/dlg_border_selection.cc | 2 +- .../modify_selection/dlg_grow_selection.cc | 2 +- .../modify_selection/dlg_shrink_selection.cc | 2 +- .../viewplugins/performancetest/perftest.cc | 4 +- .../rotateimage/dlg_rotateimage.cc | 2 +- .../separate_channels/dlg_separate.cc | 4 +- .../kis_channel_separator.cc | 10 +- .../viewplugins/variations/dlg_variations.cc | 2 + krita/ui/imageviewer.cc | 5 +- krita/ui/kcurve.cc | 15 +- krita/ui/kis_autobrush.cc | 3 + krita/ui/kis_birdeye_box.cc | 7 +- krita/ui/kis_brush_chooser.cc | 7 +- krita/ui/kis_canvas.cc | 13 +- krita/ui/kis_canvas_painter.cc | 43 ++-- krita/ui/kis_clipboard.cc | 12 +- krita/ui/kis_color_cup.cc | 12 +- krita/ui/kis_controlframe.cc | 20 +- krita/ui/kis_custom_brush.cc | 9 +- krita/ui/kis_custom_image_widget.cc | 6 +- krita/ui/kis_custom_pattern.cc | 3 + krita/ui/kis_dlg_adj_layer_props.cc | 11 +- krita/ui/kis_dlg_adjustment_layer.cc | 12 +- krita/ui/kis_dlg_apply_profile.cc | 6 +- krita/ui/kis_dlg_image_properties.cc | 12 +- krita/ui/kis_dlg_layer_properties.cc | 4 +- krita/ui/kis_dlg_new_layer.cc | 6 +- krita/ui/kis_dlg_preferences.cc | 18 +- krita/ui/kis_doc.cc | 12 +- krita/ui/kis_double_widget.cc | 6 +- krita/ui/kis_filter_manager.cc | 6 +- krita/ui/kis_filters_listview.cc | 10 +- krita/ui/kis_gradient_chooser.cc | 4 +- krita/ui/kis_gradient_slider_widget.cc | 16 +- krita/ui/kis_histogram_view.cc | 19 +- krita/ui/kis_icon_item.cc | 2 + krita/ui/kis_iconwidget.cc | 4 +- krita/ui/kis_input_device.cc | 4 +- krita/ui/kis_int_spinbox.cc | 9 +- krita/ui/kis_itemchooser.cc | 4 +- krita/ui/kis_label_cursor_pos.cc | 2 +- krita/ui/kis_label_progress.cc | 9 +- krita/ui/kis_layerbox.cc | 20 +- krita/ui/kis_layerlist.cc | 8 +- krita/ui/kis_multi_bool_filter_widget.cc | 4 +- krita/ui/kis_multi_double_filter_widget.cc | 4 +- krita/ui/kis_multi_integer_filter_widget.cc | 4 +- krita/ui/kis_opengl_canvas.cc | 9 + krita/ui/kis_opengl_canvas_painter.cc | 25 +-- krita/ui/kis_paintop_box.cc | 18 +- krita/ui/kis_palette_view.cc | 6 +- krita/ui/kis_palette_widget.cc | 6 +- krita/ui/kis_part_layer.cc | 6 +- krita/ui/kis_part_layer_handler.cc | 2 + krita/ui/kis_pattern_chooser.cc | 4 +- krita/ui/kis_previewdialog.cc | 10 +- krita/ui/kis_previewwidget.cc | 6 +- krita/ui/kis_qpaintdevice_canvas.cc | 9 + krita/ui/kis_qpaintdevice_canvas_painter.cc | 23 ++- krita/ui/kis_resource_mediator.cc | 6 +- krita/ui/kis_resourceserver.cc | 6 +- krita/ui/kis_ruler.cc | 6 +- krita/ui/kis_selection_manager.cc | 4 +- krita/ui/kis_selection_options.cc | 4 +- krita/ui/kis_text_brush.cc | 2 + krita/ui/kis_tool_dummy.cc | 2 +- krita/ui/kis_tool_freehand.cc | 4 +- krita/ui/kis_tool_manager.cc | 2 +- krita/ui/kis_tool_non_paint.cc | 3 + krita/ui/kis_tool_paint.cc | 16 +- krita/ui/kis_tool_shape.cc | 4 +- krita/ui/kis_view.cc | 51 +++-- 157 files changed, 933 insertions(+), 691 deletions(-) diff --git a/krita/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc b/krita/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc index 2128e73daf..1ec8206c28 100644 --- a/krita/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc +++ b/krita/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc @@ -69,10 +69,10 @@ void KisCmykU16ColorSpace::mixColors(const quint8 **colors, const quint8 *weight quint32 alpha = pixel->alpha; quint32 alphaTimesWeight = UINT16_MULT(alpha, UINT8_TO_UINT16(*weights)); - totalCyan += UINT16_MULT(pixel->cyan, alphaTimesWeight); - totalMagenta += UINT16_MULT(pixel->magenta, alphaTimesWeight); - totalYellow += UINT16_MULT(pixel->yellow, alphaTimesWeight); - totalBlack += UINT16_MULT(pixel->black, alphaTimesWeight); + totalCyan += UINT16_MULT(pixel->Qt::cyan, alphaTimesWeight); + totalMagenta += UINT16_MULT(pixel->Qt::magenta, alphaTimesWeight); + totalYellow += UINT16_MULT(pixel->Qt::yellow, alphaTimesWeight); + totalBlack += UINT16_MULT(pixel->Qt::black, alphaTimesWeight); newAlpha += alphaTimesWeight; weights++; @@ -92,10 +92,10 @@ void KisCmykU16ColorSpace::mixColors(const quint8 **colors, const quint8 *weight totalBlack = UINT16_DIVIDE(totalBlack, newAlpha); } - dstPixel->cyan = totalCyan; - dstPixel->magenta = totalMagenta; - dstPixel->yellow = totalYellow; - dstPixel->black = totalBlack; + dstPixel->Qt::cyan = totalCyan; + dstPixel->Qt::magenta = totalMagenta; + dstPixel->Qt::yellow = totalYellow; + dstPixel->Qt::black = totalBlack; } void KisCmykU16ColorSpace::convolveColors(quint8** colors, qint32* kernelValues, KisChannelInfo::enumChannelFlags channelFlags, quint8 *dst, qint32 factor, qint32 offset, qint32 nColors) const @@ -109,10 +109,10 @@ void KisCmykU16ColorSpace::convolveColors(quint8** colors, qint32* kernelValues, qint32 weight = *kernelValues; if (weight != 0) { - totalCyan += pixel->cyan * weight; - totalMagenta += pixel->magenta * weight; - totalYellow += pixel->yellow * weight; - totalK += pixel->black * weight; + totalCyan += pixel->Qt::cyan * weight; + totalMagenta += pixel->Qt::magenta * weight; + totalYellow += pixel->Qt::yellow * weight; + totalK += pixel->Qt::black * weight; totalAlpha += pixel->alpha * weight; } colors++; @@ -122,10 +122,10 @@ void KisCmykU16ColorSpace::convolveColors(quint8** colors, qint32* kernelValues, Pixel * p = reinterpret_cast< Pixel *>( dst ); if (channelFlags & KisChannelInfo::FLAG_COLOR) { - p->cyan = CLAMP( ( totalCyan / factor) + offset, 0, quint16_MAX); - p->magenta = CLAMP( ( totalMagenta / factor) + offset, 0, quint16_MAX); - p->yellow = CLAMP( ( totalYellow / factor) + offset, 0, quint16_MAX); - p->black = CLAMP( ( totalK / factor) + offset, 0, quint16_MAX); + p->Qt::cyan = CLAMP( ( totalCyan / factor) + offset, 0, quint16_MAX); + p->Qt::magenta = CLAMP( ( totalMagenta / factor) + offset, 0, quint16_MAX); + p->Qt::yellow = CLAMP( ( totalYellow / factor) + offset, 0, quint16_MAX); + p->Qt::black = CLAMP( ( totalK / factor) + offset, 0, quint16_MAX); } if (channelFlags & KisChannelInfo::FLAG_ALPHA) { p->alpha = CLAMP((totalAlpha/ factor) + offset, 0, quint16_MAX); @@ -140,10 +140,10 @@ void KisCmykU16ColorSpace::invertColor(quint8 * src, qint32 nPixels) while (nPixels--) { Pixel * p = reinterpret_cast< Pixel *>( src ); - p->cyan = quint16_MAX - p->cyan; - p->magenta = quint16_MAX - p->magenta; - p->yellow = quint16_MAX - p->yellow; - p->black = quint16_MAX - p->black; + p->Qt::cyan = quint16_MAX - p->Qt::cyan; + p->Qt::magenta = quint16_MAX - p->Qt::magenta; + p->Qt::yellow = quint16_MAX - p->Qt::yellow; + p->Qt::black = quint16_MAX - p->Qt::black; src += psize; } } @@ -176,7 +176,7 @@ void KisCmykU16ColorSpace::applyAdjustment(const quint8 *src, quint8 *dst, KisCo delete [] tmp; } -QValueVector KisCmykU16ColorSpace::channels() const +Q3ValueVector KisCmykU16ColorSpace::channels() const { return m_channels; } diff --git a/krita/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc b/krita/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc index 2cff15822e..14dc52cbcb 100644 --- a/krita/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc +++ b/krita/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc @@ -174,7 +174,7 @@ void KisCmykColorSpace::applyAdjustment(const quint8 *src, quint8 *dst, KisColor delete [] tmp; } -QValueVector KisCmykColorSpace::channels() const +Q3ValueVector KisCmykColorSpace::channels() const { return m_channels; } diff --git a/krita/colorspaces/gray_u16/kis_gray_u16_colorspace.cc b/krita/colorspaces/gray_u16/kis_gray_u16_colorspace.cc index 70072bee87..81c6ccfdc0 100644 --- a/krita/colorspaces/gray_u16/kis_gray_u16_colorspace.cc +++ b/krita/colorspaces/gray_u16/kis_gray_u16_colorspace.cc @@ -70,7 +70,7 @@ void KisGrayU16ColorSpace::mixColors(const quint8 **colors, const quint8 *weight quint32 alpha = pixel->alpha; quint32 alphaTimesWeight = UINT16_MULT(alpha, UINT8_TO_UINT16(*weights)); - totalGray += UINT16_MULT(pixel->gray, alphaTimesWeight); + totalGray += UINT16_MULT(pixel->Qt::gray, alphaTimesWeight); newAlpha += alphaTimesWeight; weights++; @@ -87,7 +87,7 @@ void KisGrayU16ColorSpace::mixColors(const quint8 **colors, const quint8 *weight totalGray = UINT16_DIVIDE(totalGray, newAlpha); } - dstPixel->gray = totalGray; + dstPixel->Qt::gray = totalGray; } void KisGrayU16ColorSpace::convolveColors(quint8** colors, qint32* kernelValues, KisChannelInfo::enumChannelFlags channelFlags, quint8 *dst, @@ -102,7 +102,7 @@ void KisGrayU16ColorSpace::convolveColors(quint8** colors, qint32* kernelValues, qint32 weight = *kernelValues; if (weight != 0) { - totalGray += pixel->gray * weight; + totalGray += pixel->Qt::gray * weight; totalAlpha += pixel->alpha * weight; } colors++; @@ -112,7 +112,7 @@ void KisGrayU16ColorSpace::convolveColors(quint8** colors, qint32* kernelValues, Pixel * p = reinterpret_cast< Pixel *>( dst ); if (channelFlags & KisChannelInfo::FLAG_COLOR) { - p->gray = CLAMP( ( totalGray / factor) + offset, 0, quint16_MAX); + p->Qt::gray = CLAMP( ( totalGray / factor) + offset, 0, quint16_MAX); } if (channelFlags & KisChannelInfo::FLAG_ALPHA) { p->alpha = CLAMP((totalAlpha/ factor) + offset, 0, quint16_MAX); @@ -127,7 +127,7 @@ void KisGrayU16ColorSpace::invertColor(quint8 * src, qint32 nPixels) while (nPixels--) { Pixel * p = reinterpret_cast< Pixel *>( src ); - p->gray = quint16_MAX - p->gray; + p->Qt::gray = quint16_MAX - p->Qt::gray; src += psize; } } @@ -137,11 +137,11 @@ void KisGrayU16ColorSpace::invertColor(quint8 * src, qint32 nPixels) quint8 KisGrayU16ColorSpace::intensity8(const quint8 * src) const { const Pixel * p = reinterpret_cast( src ); - return UINT16_TO_UINT8(p->gray); + return UINT16_TO_UINT8(p->Qt::gray); } -QValueVector KisGrayU16ColorSpace::channels() const +Q3ValueVector KisGrayU16ColorSpace::channels() const { return m_channels; } diff --git a/krita/colorspaces/gray_u8/kis_gray_colorspace.cc b/krita/colorspaces/gray_u8/kis_gray_colorspace.cc index f38accdb63..c858e21c37 100644 --- a/krita/colorspaces/gray_u8/kis_gray_colorspace.cc +++ b/krita/colorspaces/gray_u8/kis_gray_colorspace.cc @@ -61,13 +61,13 @@ KisGrayColorSpace::~KisGrayColorSpace() void KisGrayColorSpace::setPixel(quint8 *pixel, quint8 gray, quint8 alpha) const { - pixel[PIXEL_GRAY] = gray; + pixel[PIXEL_GRAY] = Qt::gray; pixel[PIXEL_GRAY_ALPHA] = alpha; } void KisGrayColorSpace::getPixel(const quint8 *pixel, quint8 *gray, quint8 *alpha) const { - *gray = pixel[PIXEL_GRAY]; + *Qt::gray = pixel[PIXEL_GRAY]; *alpha = pixel[PIXEL_GRAY_ALPHA]; } @@ -175,7 +175,7 @@ quint8 KisGrayColorSpace::intensity8(const quint8 * src) const return src[PIXEL_GRAY]; } -QValueVector KisGrayColorSpace::channels() const +Q3ValueVector KisGrayColorSpace::channels() const { return m_channels; } diff --git a/krita/colorspaces/lms_f32/kis_lms_f32_colorspace.cc b/krita/colorspaces/lms_f32/kis_lms_f32_colorspace.cc index 2ceb608138..237a14411a 100644 --- a/krita/colorspaces/lms_f32/kis_lms_f32_colorspace.cc +++ b/krita/colorspaces/lms_f32/kis_lms_f32_colorspace.cc @@ -87,18 +87,18 @@ void KisLmsF32ColorSpace::fromQColor(const QColor& c, quint8 *dstU8, KisProfile { Pixel *dst = reinterpret_cast(dstU8); - dst->longWave = computeLong(c.red(),c.green(),c.blue()); - dst->middleWave = computeMiddle(c.red(),c.green(),c.blue()); - dst->shortWave = computeShort(c.red(),c.green(),c.blue()); + dst->longWave = computeLong(c.Qt::red(),c.Qt::green(),c.Qt::blue()); + dst->middleWave = computeMiddle(c.Qt::red(),c.Qt::green(),c.Qt::blue()); + dst->shortWave = computeShort(c.Qt::red(),c.Qt::green(),c.Qt::blue()); } void KisLmsF32ColorSpace::fromQColor(const QColor& c, quint8 opacity, quint8 *dstU8, KisProfile * /*profile*/) { Pixel *dst = reinterpret_cast(dstU8); - dst->longWave = computeLong(c.red(),c.green(),c.blue()); - dst->middleWave = computeMiddle(c.red(),c.green(),c.blue()); - dst->shortWave = computeShort(c.red(),c.green(),c.blue()); + dst->longWave = computeLong(c.Qt::red(),c.Qt::green(),c.Qt::blue()); + dst->middleWave = computeMiddle(c.Qt::red(),c.Qt::green(),c.Qt::blue()); + dst->shortWave = computeShort(c.Qt::red(),c.Qt::green(),c.Qt::blue()); dst->alpha = UINT8_TO_FLOAT(opacity); } @@ -164,7 +164,7 @@ void KisLmsF32ColorSpace::mixColors(const quint8 **colors, const quint8 *weights dstPixel->shortWave = totalShort; } -QValueVector KisLmsF32ColorSpace::channels() const +Q3ValueVector KisLmsF32ColorSpace::channels() const { return m_channels; } diff --git a/krita/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc b/krita/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc index 230a5131c1..35814ac97f 100644 --- a/krita/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc +++ b/krita/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc @@ -67,9 +67,9 @@ void KisRgbF16HalfColorSpace::setPixel(quint8 *dst, half red, half green, half b { Pixel *dstPixel = reinterpret_cast(dst); - dstPixel->red = red; - dstPixel->green = green; - dstPixel->blue = blue; + dstPixel->Qt::red = Qt::red; + dstPixel->Qt::green = Qt::green; + dstPixel->Qt::blue = Qt::blue; dstPixel->alpha = alpha; } @@ -77,9 +77,9 @@ void KisRgbF16HalfColorSpace::getPixel(const quint8 *src, half *red, half *green { const Pixel *srcPixel = reinterpret_cast(src); - *red = srcPixel->red; - *green = srcPixel->green; - *blue = srcPixel->blue; + *Qt::red = srcPixel->Qt::red; + *Qt::green = srcPixel->Qt::green; + *Qt::blue = srcPixel->Qt::blue; *alpha = srcPixel->alpha; } @@ -87,18 +87,18 @@ void KisRgbF16HalfColorSpace::fromQColor(const QColor& c, quint8 *dstU8, KisProf { Pixel *dst = reinterpret_cast(dstU8); - dst->red = UINT8_TO_HALF(c.red()); - dst->green = UINT8_TO_HALF(c.green()); - dst->blue = UINT8_TO_HALF(c.blue()); + dst->Qt::red = UINT8_TO_HALF(c.Qt::red()); + dst->Qt::green = UINT8_TO_HALF(c.Qt::green()); + dst->Qt::blue = UINT8_TO_HALF(c.Qt::blue()); } void KisRgbF16HalfColorSpace::fromQColor(const QColor& c, quint8 opacity, quint8 *dstU8, KisProfile *) { Pixel *dst = reinterpret_cast(dstU8); - dst->red = UINT8_TO_HALF(c.red()); - dst->green = UINT8_TO_HALF(c.green()); - dst->blue = UINT8_TO_HALF(c.blue()); + dst->Qt::red = UINT8_TO_HALF(c.Qt::red()); + dst->Qt::green = UINT8_TO_HALF(c.Qt::green()); + dst->Qt::blue = UINT8_TO_HALF(c.Qt::blue()); dst->alpha = UINT8_TO_HALF(opacity); } @@ -106,14 +106,14 @@ void KisRgbF16HalfColorSpace::toQColor(const quint8 *srcU8, QColor *c, KisProfil { const Pixel *src = reinterpret_cast(srcU8); - c->setRgb(HALF_TO_UINT8(src->red), HALF_TO_UINT8(src->green), HALF_TO_UINT8(src->blue)); + c->setRgb(HALF_TO_UINT8(src->Qt::red), HALF_TO_UINT8(src->Qt::green), HALF_TO_UINT8(src->Qt::blue)); } void KisRgbF16HalfColorSpace::toQColor(const quint8 *srcU8, QColor *c, quint8 *opacity, KisProfile *) { const Pixel *src = reinterpret_cast(srcU8); - c->setRgb(HALF_TO_UINT8(src->red), HALF_TO_UINT8(src->green), HALF_TO_UINT8(src->blue)); + c->setRgb(HALF_TO_UINT8(src->Qt::red), HALF_TO_UINT8(src->Qt::green), HALF_TO_UINT8(src->Qt::blue)); *opacity = HALF_TO_UINT8(src->alpha); } @@ -122,9 +122,9 @@ quint8 KisRgbF16HalfColorSpace::difference(const quint8 *src1U8, const quint8 *s const Pixel *src1 = reinterpret_cast(src1U8); const Pixel *src2 = reinterpret_cast(src2U8); - return HALF_TO_UINT8(qMax(QABS(src2->red - src1->red), - qMax(QABS(src2->green - src1->green), - QABS(src2->blue - src1->blue)))); + return HALF_TO_UINT8(qMax(QABS(src2->Qt::red - src1->Qt::red), + qMax(QABS(src2->Qt::green - src1->Qt::green), + QABS(src2->Qt::blue - src1->Qt::blue)))); } void KisRgbF16HalfColorSpace::mixColors(const quint8 **colors, const quint8 *weights, quint32 nColors, quint8 *dst) const @@ -138,9 +138,9 @@ void KisRgbF16HalfColorSpace::mixColors(const quint8 **colors, const quint8 *wei half alpha = pixel->alpha; half alphaTimesWeight = alpha * UINT8_TO_HALF(*weights); - totalRed += pixel->red * alphaTimesWeight; - totalGreen += pixel->green * alphaTimesWeight; - totalBlue += pixel->blue * alphaTimesWeight; + totalRed += pixel->Qt::red * alphaTimesWeight; + totalGreen += pixel->Qt::green * alphaTimesWeight; + totalBlue += pixel->Qt::blue * alphaTimesWeight; newAlpha += alphaTimesWeight; weights++; @@ -159,9 +159,9 @@ void KisRgbF16HalfColorSpace::mixColors(const quint8 **colors, const quint8 *wei totalBlue = totalBlue / newAlpha; } - dstPixel->red = totalRed; - dstPixel->green = totalGreen; - dstPixel->blue = totalBlue; + dstPixel->Qt::red = totalRed; + dstPixel->Qt::green = totalGreen; + dstPixel->Qt::blue = totalBlue; } void KisRgbF16HalfColorSpace::convolveColors(quint8** colors, qint32 * kernelValues, KisChannelInfo::enumChannelFlags channelFlags, quint8 *dst, qint32 factor, qint32 offset, qint32 nColors) const @@ -175,9 +175,9 @@ void KisRgbF16HalfColorSpace::convolveColors(quint8** colors, qint32 * kernelVal half weight = *kernelValues; if (weight != 0) { - totalRed += pixel->red * UINT8_TO_HALF(weight); - totalGreen += pixel->green * UINT8_TO_HALF(weight); - totalBlue += pixel->blue * UINT8_TO_HALF(weight); + totalRed += pixel->Qt::red * UINT8_TO_HALF(weight); + totalGreen += pixel->Qt::green * UINT8_TO_HALF(weight); + totalBlue += pixel->Qt::blue * UINT8_TO_HALF(weight); totalAlpha += pixel->alpha * UINT8_TO_HALF(weight); } colors++; @@ -187,9 +187,9 @@ void KisRgbF16HalfColorSpace::convolveColors(quint8** colors, qint32 * kernelVal Pixel * p = reinterpret_cast< Pixel *>( dst ); if (channelFlags & KisChannelInfo::FLAG_COLOR) { - p->red = CLAMP( ( totalRed / factor) + offset, 0, HALF_MAX); - p->green = CLAMP( ( totalGreen / factor) + offset, 0, HALF_MAX); - p->blue = CLAMP( ( totalBlue / factor) + offset, 0, HALF_MAX); + p->Qt::red = CLAMP( ( totalRed / factor) + offset, 0, HALF_MAX); + p->Qt::green = CLAMP( ( totalGreen / factor) + offset, 0, HALF_MAX); + p->Qt::blue = CLAMP( ( totalBlue / factor) + offset, 0, HALF_MAX); } if (channelFlags & KisChannelInfo::FLAG_ALPHA) { p->alpha = CLAMP((totalAlpha/ factor) + offset, 0, HALF_MAX); @@ -204,9 +204,9 @@ void KisRgbF16HalfColorSpace::invertColor(quint8 * src, qint32 nPixels) while (nPixels--) { Pixel * p = reinterpret_cast< Pixel *>( src ); - p->red = 1.0 - p->red; - p->green = 1.0 - p->green; - p->blue = 1.0 - p->blue; + p->Qt::red = 1.0 - p->Qt::red; + p->Qt::green = 1.0 - p->Qt::green; + p->Qt::blue = 1.0 - p->Qt::blue; src += psize; } @@ -217,11 +217,11 @@ quint8 KisRgbF16HalfColorSpace::intensity8(const quint8 * src) const { const Pixel * p = reinterpret_cast( src ); - return HALF_TO_UINT8((p->red * 0.30 + p->green * 0.59 + p->blue * 0.11) + 0.5); + return HALF_TO_UINT8((p->Qt::red * 0.30 + p->Qt::green * 0.59 + p->Qt::blue * 0.11) + 0.5); } -QValueVector KisRgbF16HalfColorSpace::channels() const +Q3ValueVector KisRgbF16HalfColorSpace::channels() const { return m_channels; } diff --git a/krita/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc b/krita/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc index 56079cf99c..270818210d 100644 --- a/krita/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc +++ b/krita/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc @@ -79,7 +79,7 @@ void KisRgbF16HalfColorSpaceTester::testBasics() CHECK(cs->nColorChannels(), NUM_COLOUR_CHANNELS); CHECK(cs->pixelSize(), NUM_CHANNELS * CHANNEL_SIZE); - QValueVector channels = cs->channels(); + Q3ValueVector channels = cs->channels(); // Red CHECK(channels[0]->pos(), PIXEL_RED * CHANNEL_SIZE); diff --git a/krita/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc b/krita/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc index e3a62146a5..e04adead76 100644 --- a/krita/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc +++ b/krita/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc @@ -66,9 +66,9 @@ void KisRgbF32ColorSpace::setPixel(quint8 *dst, float red, float green, float bl { Pixel *dstPixel = reinterpret_cast(dst); - dstPixel->red = red; - dstPixel->green = green; - dstPixel->blue = blue; + dstPixel->Qt::red = Qt::red; + dstPixel->Qt::green = Qt::green; + dstPixel->Qt::blue = Qt::blue; dstPixel->alpha = alpha; } @@ -76,9 +76,9 @@ void KisRgbF32ColorSpace::getPixel(const quint8 *src, float *red, float *green, { const Pixel *srcPixel = reinterpret_cast(src); - *red = srcPixel->red; - *green = srcPixel->green; - *blue = srcPixel->blue; + *Qt::red = srcPixel->Qt::red; + *Qt::green = srcPixel->Qt::green; + *Qt::blue = srcPixel->Qt::blue; *alpha = srcPixel->alpha; } @@ -86,18 +86,18 @@ void KisRgbF32ColorSpace::fromQColor(const QColor& c, quint8 *dstU8, KisProfile { Pixel *dst = reinterpret_cast(dstU8); - dst->red = UINT8_TO_FLOAT(c.red()); - dst->green = UINT8_TO_FLOAT(c.green()); - dst->blue = UINT8_TO_FLOAT(c.blue()); + dst->Qt::red = UINT8_TO_FLOAT(c.Qt::red()); + dst->Qt::green = UINT8_TO_FLOAT(c.Qt::green()); + dst->Qt::blue = UINT8_TO_FLOAT(c.Qt::blue()); } void KisRgbF32ColorSpace::fromQColor(const QColor& c, quint8 opacity, quint8 *dstU8, KisProfile * /*profile*/) { Pixel *dst = reinterpret_cast(dstU8); - dst->red = UINT8_TO_FLOAT(c.red()); - dst->green = UINT8_TO_FLOAT(c.green()); - dst->blue = UINT8_TO_FLOAT(c.blue()); + dst->Qt::red = UINT8_TO_FLOAT(c.Qt::red()); + dst->Qt::green = UINT8_TO_FLOAT(c.Qt::green()); + dst->Qt::blue = UINT8_TO_FLOAT(c.Qt::blue()); dst->alpha = UINT8_TO_FLOAT(opacity); } @@ -105,14 +105,14 @@ void KisRgbF32ColorSpace::toQColor(const quint8 *srcU8, QColor *c, KisProfile * { const Pixel *src = reinterpret_cast(srcU8); - c->setRgb(FLOAT_TO_UINT8(src->red), FLOAT_TO_UINT8(src->green), FLOAT_TO_UINT8(src->blue)); + c->setRgb(FLOAT_TO_UINT8(src->Qt::red), FLOAT_TO_UINT8(src->Qt::green), FLOAT_TO_UINT8(src->Qt::blue)); } void KisRgbF32ColorSpace::toQColor(const quint8 *srcU8, QColor *c, quint8 *opacity, KisProfile * /*profile*/) { const Pixel *src = reinterpret_cast(srcU8); - c->setRgb(FLOAT_TO_UINT8(src->red), FLOAT_TO_UINT8(src->green), FLOAT_TO_UINT8(src->blue)); + c->setRgb(FLOAT_TO_UINT8(src->Qt::red), FLOAT_TO_UINT8(src->Qt::green), FLOAT_TO_UINT8(src->Qt::blue)); *opacity = FLOAT_TO_UINT8(src->alpha); } @@ -121,9 +121,9 @@ quint8 KisRgbF32ColorSpace::difference(const quint8 *src1U8, const quint8 *src2U const Pixel *src1 = reinterpret_cast(src1U8); const Pixel *src2 = reinterpret_cast(src2U8); - return FLOAT_TO_UINT8(qMax(QABS(src2->red - src1->red), - qMax(QABS(src2->green - src1->green), - QABS(src2->blue - src1->blue)))); + return FLOAT_TO_UINT8(qMax(QABS(src2->Qt::red - src1->Qt::red), + qMax(QABS(src2->Qt::green - src1->Qt::green), + QABS(src2->Qt::blue - src1->Qt::blue)))); } void KisRgbF32ColorSpace::mixColors(const quint8 **colors, const quint8 *weights, quint32 nColors, quint8 *dst) const @@ -137,9 +137,9 @@ void KisRgbF32ColorSpace::mixColors(const quint8 **colors, const quint8 *weights float alpha = pixel->alpha; float alphaTimesWeight = alpha * UINT8_TO_FLOAT(*weights); - totalRed += pixel->red * alphaTimesWeight; - totalGreen += pixel->green * alphaTimesWeight; - totalBlue += pixel->blue * alphaTimesWeight; + totalRed += pixel->Qt::red * alphaTimesWeight; + totalGreen += pixel->Qt::green * alphaTimesWeight; + totalBlue += pixel->Qt::blue * alphaTimesWeight; newAlpha += alphaTimesWeight; weights++; @@ -158,9 +158,9 @@ void KisRgbF32ColorSpace::mixColors(const quint8 **colors, const quint8 *weights totalBlue = totalBlue / newAlpha; } - dstPixel->red = totalRed; - dstPixel->green = totalGreen; - dstPixel->blue = totalBlue; + dstPixel->Qt::red = totalRed; + dstPixel->Qt::green = totalGreen; + dstPixel->Qt::blue = totalBlue; } void KisRgbF32ColorSpace::convolveColors(quint8** colors, qint32 * kernelValues, KisChannelInfo::enumChannelFlags channelFlags, quint8 *dst, qint32 factor, qint32 offset, qint32 nColors) const @@ -174,9 +174,9 @@ void KisRgbF32ColorSpace::convolveColors(quint8** colors, qint32 * kernelValues, float weight = *kernelValues; if (weight != 0) { - totalRed += pixel->red * weight; - totalGreen += pixel->green * weight; - totalBlue += pixel->blue * weight; + totalRed += pixel->Qt::red * weight; + totalGreen += pixel->Qt::green * weight; + totalBlue += pixel->Qt::blue * weight; totalAlpha += pixel->alpha * weight; } colors++; @@ -186,9 +186,9 @@ void KisRgbF32ColorSpace::convolveColors(quint8** colors, qint32 * kernelValues, Pixel * p = reinterpret_cast< Pixel *>( dst ); if (channelFlags & KisChannelInfo::FLAG_COLOR) { - p->red = CLAMP( ( totalRed / factor) + offset, 0, FLOAT_MAX); - p->green = CLAMP( ( totalGreen / factor) + offset, 0, FLOAT_MAX); - p->blue = CLAMP( ( totalBlue / factor) + offset, 0, FLOAT_MAX); + p->Qt::red = CLAMP( ( totalRed / factor) + offset, 0, FLOAT_MAX); + p->Qt::green = CLAMP( ( totalGreen / factor) + offset, 0, FLOAT_MAX); + p->Qt::blue = CLAMP( ( totalBlue / factor) + offset, 0, FLOAT_MAX); } if (channelFlags & KisChannelInfo::FLAG_ALPHA) { p->alpha = CLAMP((totalAlpha/ factor) + offset, 0, FLOAT_MAX); @@ -203,9 +203,9 @@ void KisRgbF32ColorSpace::invertColor(quint8 * src, qint32 nPixels) while (nPixels--) { Pixel * p = reinterpret_cast< Pixel *>( src ); - p->red = FLOAT_MAX - p->red; - p->green = FLOAT_MAX - p->green; - p->blue = FLOAT_MAX - p->blue; + p->Qt::red = FLOAT_MAX - p->Qt::red; + p->Qt::green = FLOAT_MAX - p->Qt::green; + p->Qt::blue = FLOAT_MAX - p->Qt::blue; src += psize; } @@ -215,12 +215,12 @@ quint8 KisRgbF32ColorSpace::intensity8(const quint8 * src) const { const Pixel * p = reinterpret_cast( src ); - return FLOAT_TO_UINT8((p->red * 0.30 + p->green * 0.59 + p->blue * 0.11) + 0.5); + return FLOAT_TO_UINT8((p->Qt::red * 0.30 + p->Qt::green * 0.59 + p->Qt::blue * 0.11) + 0.5); } -QValueVector KisRgbF32ColorSpace::channels() const +Q3ValueVector KisRgbF32ColorSpace::channels() const { return m_channels; } diff --git a/krita/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc b/krita/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc index b85c1f2e78..3fe0f7d6cf 100644 --- a/krita/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc +++ b/krita/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc @@ -74,7 +74,7 @@ void KisRgbF32ColorSpaceTester::testBasics() CHECK(cs->nColorChannels(), NUM_COLOUR_CHANNELS); CHECK(cs->pixelSize(), NUM_CHANNELS * CHANNEL_SIZE); - QValueVector channels = cs->channels(); + Q3ValueVector channels = cs->channels(); // Red CHECK(channels[0]->pos(), PIXEL_RED * CHANNEL_SIZE); diff --git a/krita/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc b/krita/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc index f00e749747..e11668b05f 100644 --- a/krita/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc +++ b/krita/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc @@ -65,9 +65,9 @@ void KisRgbU16ColorSpace::setPixel(quint8 *dst, quint16 red, quint16 green, quin { Pixel *dstPixel = reinterpret_cast(dst); - dstPixel->red = red; - dstPixel->green = green; - dstPixel->blue = blue; + dstPixel->Qt::red = Qt::red; + dstPixel->Qt::green = Qt::green; + dstPixel->Qt::blue = Qt::blue; dstPixel->alpha = alpha; } @@ -75,9 +75,9 @@ void KisRgbU16ColorSpace::getPixel(const quint8 *src, quint16 *red, quint16 *gre { const Pixel *srcPixel = reinterpret_cast(src); - *red = srcPixel->red; - *green = srcPixel->green; - *blue = srcPixel->blue; + *Qt::red = srcPixel->Qt::red; + *Qt::green = srcPixel->Qt::green; + *Qt::blue = srcPixel->Qt::blue; *alpha = srcPixel->alpha; } @@ -92,9 +92,9 @@ void KisRgbU16ColorSpace::mixColors(const quint8 **colors, const quint8 *weights quint32 alpha = pixel->alpha; quint32 alphaTimesWeight = UINT16_MULT(alpha, UINT8_TO_UINT16(*weights)); - totalRed += UINT16_MULT(pixel->red, alphaTimesWeight); - totalGreen += UINT16_MULT(pixel->green, alphaTimesWeight); - totalBlue += UINT16_MULT(pixel->blue, alphaTimesWeight); + totalRed += UINT16_MULT(pixel->Qt::red, alphaTimesWeight); + totalGreen += UINT16_MULT(pixel->Qt::green, alphaTimesWeight); + totalBlue += UINT16_MULT(pixel->Qt::blue, alphaTimesWeight); newAlpha += alphaTimesWeight; weights++; @@ -113,9 +113,9 @@ void KisRgbU16ColorSpace::mixColors(const quint8 **colors, const quint8 *weights totalBlue = UINT16_DIVIDE(totalBlue, newAlpha); } - dstPixel->red = totalRed; - dstPixel->green = totalGreen; - dstPixel->blue = totalBlue; + dstPixel->Qt::red = totalRed; + dstPixel->Qt::green = totalGreen; + dstPixel->Qt::blue = totalBlue; } @@ -131,9 +131,9 @@ void KisRgbU16ColorSpace::convolveColors(quint8** colors, qint32* kernelValues, qint32 weight = *kernelValues; if (weight != 0) { - totalRed += pixel->red * weight; - totalGreen += pixel->green * weight; - totalBlue += pixel->blue * weight; + totalRed += pixel->Qt::red * weight; + totalGreen += pixel->Qt::green * weight; + totalBlue += pixel->Qt::blue * weight; totalAlpha +=pixel->alpha * weight; } colors++; @@ -143,9 +143,9 @@ void KisRgbU16ColorSpace::convolveColors(quint8** colors, qint32* kernelValues, Pixel * p = reinterpret_cast< Pixel *>( dst ); if (channelFlags & KisChannelInfo::FLAG_COLOR) { - p->red = CLAMP( ( totalRed / factor) + offset, 0, quint16_MAX); - p->green = CLAMP( ( totalGreen / factor) + offset, 0, quint16_MAX); - p->blue = CLAMP( ( totalBlue / factor) + offset, 0, quint16_MAX); + p->Qt::red = CLAMP( ( totalRed / factor) + offset, 0, quint16_MAX); + p->Qt::green = CLAMP( ( totalGreen / factor) + offset, 0, quint16_MAX); + p->Qt::blue = CLAMP( ( totalBlue / factor) + offset, 0, quint16_MAX); } if (channelFlags & KisChannelInfo::FLAG_ALPHA) { p->alpha = CLAMP((totalAlpha/ factor) + offset, 0, quint16_MAX); @@ -160,9 +160,9 @@ void KisRgbU16ColorSpace::invertColor(quint8 * src, qint32 nPixels) while (nPixels--) { Pixel * p = reinterpret_cast< Pixel *>( src ); - p->red = quint16_MAX - p->red; - p->green = quint16_MAX - p->green; - p->blue = quint16_MAX - p->blue; + p->Qt::red = quint16_MAX - p->Qt::red; + p->Qt::green = quint16_MAX - p->Qt::green; + p->Qt::blue = quint16_MAX - p->Qt::blue; src += psize; } } @@ -171,11 +171,11 @@ quint8 KisRgbU16ColorSpace::intensity8(const quint8 * src) const { const Pixel * p = reinterpret_cast( src ); - return UINT16_TO_UINT8(static_cast((p->red * 0.30 + p->green * 0.59 + p->blue * 0.11) + 0.5)); + return UINT16_TO_UINT8(static_cast((p->Qt::red * 0.30 + p->Qt::green * 0.59 + p->Qt::blue * 0.11) + 0.5)); } -QValueVector KisRgbU16ColorSpace::channels() const +Q3ValueVector KisRgbU16ColorSpace::channels() const { return m_channels; } diff --git a/krita/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc b/krita/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc index 7108355a1a..73fc020e77 100644 --- a/krita/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc +++ b/krita/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc @@ -72,7 +72,7 @@ void KisRgbU16ColorSpaceTester::testBasics() CHECK(cs->nColorChannels(), NUM_COLOUR_CHANNELS); CHECK(cs->pixelSize(), NUM_CHANNELS * CHANNEL_SIZE); - QValueVector channels = cs->channels(); + Q3ValueVector channels = cs->channels(); // Red CHECK(channels[0]->pos(), PIXEL_RED * CHANNEL_SIZE); diff --git a/krita/colorspaces/rgb_u8/kis_rgb_colorspace.cc b/krita/colorspaces/rgb_u8/kis_rgb_colorspace.cc index 352b05fbf7..358f386943 100644 --- a/krita/colorspaces/rgb_u8/kis_rgb_colorspace.cc +++ b/krita/colorspaces/rgb_u8/kis_rgb_colorspace.cc @@ -62,17 +62,17 @@ KisRgbColorSpace::~KisRgbColorSpace() void KisRgbColorSpace::setPixel(quint8 *pixel, quint8 red, quint8 green, quint8 blue, quint8 alpha) const { - pixel[PIXEL_RED] = red; - pixel[PIXEL_GREEN] = green; - pixel[PIXEL_BLUE] = blue; + pixel[PIXEL_RED] = Qt::red; + pixel[PIXEL_GREEN] = Qt::green; + pixel[PIXEL_BLUE] = Qt::blue; pixel[PIXEL_ALPHA] = alpha; } void KisRgbColorSpace::getPixel(const quint8 *pixel, quint8 *red, quint8 *green, quint8 *blue, quint8 *alpha) const { - *red = pixel[PIXEL_RED]; - *green = pixel[PIXEL_GREEN]; - *blue = pixel[PIXEL_BLUE]; + *Qt::red = pixel[PIXEL_RED]; + *Qt::green = pixel[PIXEL_GREEN]; + *Qt::blue = pixel[PIXEL_BLUE]; *alpha = pixel[PIXEL_ALPHA]; } @@ -194,7 +194,7 @@ quint8 KisRgbColorSpace::intensity8(const quint8 * src) const return (quint8)((src[PIXEL_RED] * 0.30 + src[PIXEL_GREEN] * 0.59 + src[PIXEL_BLUE] * 0.11) + 0.5); } -QValueVector KisRgbColorSpace::channels() const +Q3ValueVector KisRgbColorSpace::channels() const { return m_channels; } diff --git a/krita/colorspaces/wet/kis_wet_colorspace.cc b/krita/colorspaces/wet/kis_wet_colorspace.cc index 330dfe8898..7551b13233 100644 --- a/krita/colorspaces/wet/kis_wet_colorspace.cc +++ b/krita/colorspaces/wet/kis_wet_colorspace.cc @@ -23,6 +23,8 @@ #include LCMS_HEADER #include +//Added by qt3to4: +#include #include #include @@ -178,7 +180,7 @@ void KisWetColorSpace::fromQColor(const QColor& c, quint8 *dst, KisProfile * /*p { WetPack* p = reinterpret_cast(dst); - int h = getH(c.red(), c.green(), c.blue()); + int h = getH(c.Qt::red(), c.Qt::green(), c.Qt::blue()); int delta = 256; int key = 0; QMap::Iterator it; @@ -274,7 +276,7 @@ void KisWetColorSpace::mixColors(const quint8 **/*colors*/, const quint8 */*weig { } -QValueVector KisWetColorSpace::channels() const +Q3ValueVector KisWetColorSpace::channels() const { return m_channels; } @@ -517,9 +519,9 @@ QString KisWetColorSpace::normalisedChannelValueText(const quint8 *U8_pixel, qui return QString().setNum(static_cast(pixel[channelPosition]) / UINT16_MAX); } -QValueList KisWetColorSpace::createBackgroundFilters() +Q3ValueList KisWetColorSpace::createBackgroundFilters() { - QValueList filterList; + Q3ValueList filterList; KisFilter * f = new WetPhysicsFilter(); filterList << f; return filterList; diff --git a/krita/colorspaces/wet/kis_wet_palette_widget.cc b/krita/colorspaces/wet/kis_wet_palette_widget.cc index 0ac0cd10f8..87d4bcfe4e 100644 --- a/krita/colorspaces/wet/kis_wet_palette_widget.cc +++ b/krita/colorspaces/wet/kis_wet_palette_widget.cc @@ -24,13 +24,16 @@ #include #include #include -#include +#include #include #include #include #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -50,9 +53,9 @@ KisWetPaletteWidget::KisWetPaletteWidget(QWidget *parent, const char *name) : su { m_subject = 0; - QVBoxLayout * vl = new QVBoxLayout(this, 0, -1, "main layout"); + Q3VBoxLayout * vl = new Q3VBoxLayout(this, 0, -1, "main layout"); - QGridLayout * l = new QGridLayout(vl, 2, 8, 2, "color wells grid"); + Q3GridLayout * l = new Q3GridLayout(vl, 2, 8, 2, "color wells grid"); KisColorCup * b; int WIDTH = 24; @@ -163,7 +166,7 @@ KisWetPaletteWidget::KisWetPaletteWidget(QWidget *parent, const char *name) : su b->setFixedSize(WIDTH, HEIGHT); connect(b, SIGNAL(changed(const QColor &)), SLOT(slotFGColorSelected(const QColor &))); - QGridLayout * g2 = new QGridLayout(vl, 2, 2); + Q3GridLayout * g2 = new Q3GridLayout(vl, 2, 2); QLabel * label = new QLabel(i18n("Paint strength:"), this); g2->addWidget(label, 0, 0); diff --git a/krita/colorspaces/wet/wet_plugin.cc b/krita/colorspaces/wet/wet_plugin.cc index e619d7ddce..21e5613bed 100644 --- a/krita/colorspaces/wet/wet_plugin.cc +++ b/krita/colorspaces/wet/wet_plugin.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/krita/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc b/krita/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc index 14094841f6..bb75ef5290 100644 --- a/krita/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc +++ b/krita/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc @@ -89,7 +89,7 @@ KisWetStickyColorSpace::KisWetStickyColorSpace() : setDefaultProfile( 0 ); #ifdef WSDEBUG - QValueVector_it it; + Q3ValueVector_it it; int i = 0; for (it = m_channels.begin(); it != m_channels.end(); ++it) { @@ -112,13 +112,13 @@ void KisWetStickyColorSpace::fromQColor(const QColor& c, quint8 *dst, KisProfile CELL_PTR p = (CELL_PTR) dst; quint8 r, g, b; - r = c.red(); - g = c.green(); - b = c.blue(); + r = c.Qt::red(); + g = c.Qt::green(); + b = c.Qt::blue(); - p -> red = r; - p -> green = g; - p -> blue = b; + p -> Qt::red = r; + p -> Qt::green = g; + p -> Qt::blue = b; p -> alpha = OPACITY_OPAQUE; rgb_to_hls(r, g, b, &p->hue, &p->lightness, &p->saturation); @@ -135,10 +135,10 @@ void KisWetStickyColorSpace::fromQColor(const QColor& c, quint8 *dst, KisProfile #ifdef WSDEBUG kDebug(DBG_AREA_CMS) << "qcolor: " - << " r: " << c.red() << " b: " << c.blue() << " g: " << c.red() - << " native color: (" << QString().setNum(p->red) << ", " - << QString().setNum(p->green) << ", " - << QString().setNum(p->blue) << ", " + << " r: " << c.Qt::red() << " b: " << c.Qt::blue() << " g: " << c.Qt::red() + << " native color: (" << QString().setNum(p->Qt::red) << ", " + << QString().setNum(p->Qt::green) << ", " + << QString().setNum(p->Qt::blue) << ", " << QString().setNum(p->alpha) << ") " << ", hls: (" << p->hue << ", " << p->lightness << ", " @@ -173,10 +173,10 @@ void KisWetStickyColorSpace::fromQColor(const QColor& c, quint8 opacity, quint8 #ifdef WSDEBUG kDebug(DBG_AREA_CMS) << "qcolor: " - << " r: " << c.red() << " b: " << c.blue() << " g: " << c.red() << " opacity: " << opacity - << " native color: (" << QString().setNum(p->red) << ", " - << QString().setNum(p->green) << ", " - << QString().setNum(p->blue) << ", " + << " r: " << c.Qt::red() << " b: " << c.Qt::blue() << " g: " << c.Qt::red() << " opacity: " << opacity + << " native color: (" << QString().setNum(p->Qt::red) << ", " + << QString().setNum(p->Qt::green) << ", " + << QString().setNum(p->Qt::blue) << ", " << QString().setNum(p->alpha) << ") " << ", hls: (" << p->hue << ", " << p->lightness << ", " @@ -188,11 +188,11 @@ void KisWetStickyColorSpace::toQColor(const quint8 *src, QColor *c, KisProfile * { CELL_PTR p = (CELL_PTR) src; - c -> setRgb(p -> red, - p -> green, - p -> blue); + c -> setRgb(p -> Qt::red, + p -> Qt::green, + p -> Qt::blue); #ifdef WSDEBUG - kDebug(DBG_AREA_CMS) << "Created qcolor from wet & sticky: " << " r: " << c->red() << " b: " << c->blue() << " g: " << c->red() << "\n"; + kDebug(DBG_AREA_CMS) << "Created qcolor from wet & sticky: " << " r: " << c->Qt::red() << " b: " << c->Qt::blue() << " g: " << c->Qt::red() << "\n"; #endif } @@ -207,7 +207,7 @@ void KisWetStickyColorSpace::toQColor(const quint8 *src, QColor *c, quint8 *opac *opacity = p -> alpha; #ifdef WSDEBUG - kDebug(DBG_AREA_CMS) << "Created qcolor from wet & sticky: " << " r: " << c->red() << " b: " << c->blue() << " g: " << c->red() << "\n"; + kDebug(DBG_AREA_CMS) << "Created qcolor from wet & sticky: " << " r: " << c->Qt::red() << " b: " << c->Qt::blue() << " g: " << c->Qt::red() << "\n"; #endif } @@ -260,7 +260,7 @@ quint16 KisWetStickyColorSpace::scaleToU16(const quint8 * srcPixel, qint32 chann } -QValueVector KisWetStickyColorSpace::channels() const +Q3ValueVector KisWetStickyColorSpace::channels() const { return m_channels; } @@ -312,9 +312,9 @@ QImage KisWetStickyColorSpace::convertToQImage(const quint8 *data, qint32 width, const quint8 PIXEL_ALPHA = 3; *( j + PIXEL_ALPHA ) = p -> alpha; - *( j + PIXEL_RED ) = p -> red; - *( j + PIXEL_GREEN ) = p -> green; - *( j + PIXEL_BLUE ) = p -> blue; + *( j + PIXEL_RED ) = p -> Qt::red; + *( j + PIXEL_GREEN ) = p -> Qt::green; + *( j + PIXEL_BLUE ) = p -> Qt::blue; p++; i++; @@ -338,9 +338,9 @@ bool KisWetStickyColorSpace::convertPixelsTo(const quint8 * src, KisProfile * / while ( i < numPixels ) { cp = (CELL_PTR) (src + i); - c.setRgb(cp -> red, - cp -> green, - cp -> blue); + c.setRgb(cp -> Qt::red, + cp -> Qt::green, + cp -> Qt::blue); dstColorSpace -> fromQColor(c, cp -> alpha, (dst + j), dstProfile); @@ -400,11 +400,11 @@ void KisWetStickyColorSpace::compositeOver(quint8 *dstRowStart, qint32 dstRowStr #ifdef WSDEBUG kDebug(DBG_AREA_CMS) << "Source: " << rows << ", " << columns << " color: " << - srcCell->red << ", " << srcCell->blue << ", " << srcCell->green << ", " << srcCell->alpha << ", " << srcCell->volume << "\n"; + srcCell->Qt::red << ", " << srcCell->Qt::blue << ", " << srcCell->Qt::green << ", " << srcCell->alpha << ", " << srcCell->volume << "\n"; kDebug(DBG_AREA_CMS) << "Destination: " << rows << ", " << columns << " color: " << - dstCell->red << ", " << dstCell->blue << ", " << dstCell->green << ", " << dstCell->alpha << ", " << dstCell->volume << "\n"; + dstCell->Qt::red << ", " << dstCell->Qt::blue << ", " << dstCell->Qt::green << ", " << dstCell->alpha << ", " << dstCell->volume << "\n"; #endif @@ -447,9 +447,9 @@ void KisWetStickyColorSpace::compositeOver(quint8 *dstRowStart, qint32 dstRowStr if (srcBlend == OPACITY_OPAQUE) { memcpy(dst, src, 3); //XXX: First three bytes for rgb? } else { - dstCell->red = UINT8_BLEND(srcCell->red, dstCell->red, srcBlend); - dstCell->green = UINT8_BLEND(srcCell->green, dstCell->green, srcBlend); - dstCell->blue = UINT8_BLEND(srcCell->blue, dstCell->blue, srcBlend); + dstCell->Qt::red = UINT8_BLEND(srcCell->Qt::red, dstCell->Qt::red, srcBlend); + dstCell->Qt::green = UINT8_BLEND(srcCell->Qt::green, dstCell->Qt::green, srcBlend); + dstCell->Qt::blue = UINT8_BLEND(srcCell->Qt::blue, dstCell->Qt::blue, srcBlend); } } } @@ -500,11 +500,11 @@ QString KisWetStickyColorSpace::channelValueText(const quint8 *U8_pixel, quint32 switch (channelIndex) { case BLUE_CHANNEL_INDEX: - return QString().setNum(pixel -> blue); + return QString().setNum(pixel -> Qt::blue); case GREEN_CHANNEL_INDEX: - return QString().setNum(pixel -> green); + return QString().setNum(pixel -> Qt::green); case RED_CHANNEL_INDEX: - return QString().setNum(pixel -> red); + return QString().setNum(pixel -> Qt::red); case ALPHA_CHANNEL_INDEX: return QString().setNum(pixel -> alpha); case HUE_CHANNEL_INDEX: @@ -556,11 +556,11 @@ QString KisWetStickyColorSpace::normalisedChannelValueText(const quint8 *U8_pixe switch (channelIndex) { case BLUE_CHANNEL_INDEX: - return QString().setNum(static_cast(pixel -> blue) / UINT8_MAX); + return QString().setNum(static_cast(pixel -> Qt::blue) / UINT8_MAX); case GREEN_CHANNEL_INDEX: - return QString().setNum(static_cast(pixel -> green) / UINT8_MAX); + return QString().setNum(static_cast(pixel -> Qt::green) / UINT8_MAX); case RED_CHANNEL_INDEX: - return QString().setNum(static_cast(pixel -> red) / UINT8_MAX); + return QString().setNum(static_cast(pixel -> Qt::red) / UINT8_MAX); case ALPHA_CHANNEL_INDEX: return QString().setNum(static_cast(pixel -> alpha) / UINT8_MAX); case HUE_CHANNEL_INDEX: diff --git a/krita/core/kis_alpha_mask.cc b/krita/core/kis_alpha_mask.cc index ad50bcca6d..893f592cf4 100644 --- a/krita/core/kis_alpha_mask.cc +++ b/krita/core/kis_alpha_mask.cc @@ -18,7 +18,7 @@ #include #include -#include +#include #include diff --git a/krita/core/kis_autogradient_resource.cc b/krita/core/kis_autogradient_resource.cc index f021222d64..23bcb7b550 100644 --- a/krita/core/kis_autogradient_resource.cc +++ b/krita/core/kis_autogradient_resource.cc @@ -31,9 +31,9 @@ void KisAutogradientResource::createSegment( int interpolation, int colorInterpo } -const QValueVector KisAutogradientResource::getHandlePositions() const +const Q3ValueVector KisAutogradientResource::getHandlePositions() const { - QValueVector handlePositions; + Q3ValueVector handlePositions; handlePositions.push_back(m_segments[0]->startOffset()); for (uint i = 0; i < m_segments.count(); i++) @@ -43,9 +43,9 @@ const QValueVector KisAutogradientResource::getHandlePositions() const return handlePositions; } -const QValueVector KisAutogradientResource::getMiddleHandlePositions() const +const Q3ValueVector KisAutogradientResource::getMiddleHandlePositions() const { - QValueVector middleHandlePositions; + Q3ValueVector middleHandlePositions; for (uint i = 0; i < m_segments.count(); i++) { @@ -56,7 +56,7 @@ const QValueVector KisAutogradientResource::getMiddleHandlePositions() c void KisAutogradientResource::moveSegmentStartOffset( KisGradientSegment* segment, double t) { - QValueVector::iterator it = qFind( m_segments.begin(), m_segments.end(), segment ); + Q3ValueVector::iterator it = qFind( m_segments.begin(), m_segments.end(), segment ); if ( it != m_segments.end() ) { if ( it == m_segments.begin() ) @@ -81,7 +81,7 @@ void KisAutogradientResource::moveSegmentStartOffset( KisGradientSegment* segmen void KisAutogradientResource::moveSegmentEndOffset( KisGradientSegment* segment, double t) { - QValueVector::iterator it = qFind( m_segments.begin(), m_segments.end(), segment ); + Q3ValueVector::iterator it = qFind( m_segments.begin(), m_segments.end(), segment ); if ( it != m_segments.end() ) { if ( it+1 == m_segments.end() ) @@ -120,7 +120,7 @@ void KisAutogradientResource::moveSegmentMiddleOffset( KisGradientSegment* segme void KisAutogradientResource::splitSegment( KisGradientSegment* segment ) { Q_ASSERT(segment != 0); - QValueVector::iterator it = qFind( m_segments.begin(), m_segments.end(), segment ); + Q3ValueVector::iterator it = qFind( m_segments.begin(), m_segments.end(), segment ); if ( it != m_segments.end() ) { KisGradientSegment* newSegment = new KisGradientSegment( @@ -140,7 +140,7 @@ void KisAutogradientResource::splitSegment( KisGradientSegment* segment ) void KisAutogradientResource::duplicateSegment( KisGradientSegment* segment ) { Q_ASSERT(segment != 0); - QValueVector::iterator it = qFind( m_segments.begin(), m_segments.end(), segment ); + Q3ValueVector::iterator it = qFind( m_segments.begin(), m_segments.end(), segment ); if ( it != m_segments.end() ) { double middlePostionPercentage = ( segment->middleOffset() - segment->startOffset() ) / segment->length(); @@ -181,7 +181,7 @@ KisGradientSegment* KisAutogradientResource::removeSegment( KisGradientSegment* Q_ASSERT(segment != 0); if( m_segments.count() < 2 ) return 0; - QValueVector::iterator it = qFind( m_segments.begin(), m_segments.end(), segment ); + Q3ValueVector::iterator it = qFind( m_segments.begin(), m_segments.end(), segment ); if ( it != m_segments.end() ) { double middlePostionPercentage; diff --git a/krita/core/kis_boundary.cc b/krita/core/kis_boundary.cc index 51f2d5c51e..054acf1f3a 100644 --- a/krita/core/kis_boundary.cc +++ b/krita/core/kis_boundary.cc @@ -17,6 +17,8 @@ */ #include #include +//Added by qt3to4: +#include #include "kis_colorspace.h" #include "kis_iterators_pixel.h" @@ -45,7 +47,7 @@ void KisBoundary::generateBoundary(int w, int h) { bool darkTop; bool darkBot; - m_horSegments.append(QValueList()); + m_horSegments.append(Q3ValueList()); while (!topIt.isDone()) { darkTop = cs->getAlpha(topIt.rawData()); @@ -66,7 +68,7 @@ void KisBoundary::generateBoundary(int w, int h) { bool darkLeft; bool darkRight; - m_vertSegments.append(QValueList()); + m_vertSegments.append(Q3ValueList()); while (!leftIt.isDone()) { darkLeft = cs->getAlpha(leftIt.rawData()); diff --git a/krita/core/kis_brush.cc b/krita/core/kis_brush.cc index 3144b6ac87..86deac1331 100644 --- a/krita/core/kis_brush.cc +++ b/krita/core/kis_brush.cc @@ -36,7 +36,9 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -295,7 +297,7 @@ bool KisBrush::save() bool KisBrush::saveToDevice(QIODevice* dev) const { GimpBrushHeader bh; - QCString utf8Name = name().utf8(); // Names in v2 brushes are in UTF-8 + Q3CString utf8Name = name().utf8(); // Names in v2 brushes are in UTF-8 char const* name = utf8Name.data(); int nameLength = qstrlen(name); int wrote; @@ -463,18 +465,18 @@ KisPaintDeviceSP KisBrush::image(KisColorSpace * /*colorSpace*/, const KisPaintI quint8 * p = iter.rawData(); QRgb pixel = outputImage.pixel(x, y); - int red = qRed(pixel); - int green = qGreen(pixel); - int blue = qBlue(pixel); + int Qt::red = qRed(pixel); + int Qt::green = qGreen(pixel); + int Qt::blue = qBlue(pixel); int alpha = qAlpha(pixel); // Scaled images are in pre-multiplied alpha form so // divide by alpha. // channel order is BGRA if (alpha != 0) { - p[2] = (red * 255) / alpha; - p[1] = (green * 255) / alpha; - p[0] = (blue * 255) / alpha; + p[2] = (Qt::red * 255) / alpha; + p[1] = (Qt::green * 255) / alpha; + p[0] = (Qt::blue * 255) / alpha; p[3] = alpha; } @@ -744,15 +746,15 @@ QImage KisBrush::scaleImage(const ScaledBrush *srcBrush, double scale, double su double b = 1 - yInterp; // Bi-linear interpolation. Image is pre-multiplied by alpha. - int red = static_cast(a * b * qRed(topLeft) + int Qt::red = static_cast(a * b * qRed(topLeft) + a * (1 - b) * qRed(bottomLeft) + (1 - a) * b * qRed(topRight) + (1 - a) * (1 - b) * qRed(bottomRight) + 0.5); - int green = static_cast(a * b * qGreen(topLeft) + int Qt::green = static_cast(a * b * qGreen(topLeft) + a * (1 - b) * qGreen(bottomLeft) + (1 - a) * b * qGreen(topRight) + (1 - a) * (1 - b) * qGreen(bottomRight) + 0.5); - int blue = static_cast(a * b * qBlue(topLeft) + int Qt::blue = static_cast(a * b * qBlue(topLeft) + a * (1 - b) * qBlue(bottomLeft) + (1 - a) * b * qBlue(topRight) + (1 - a) * (1 - b) * qBlue(bottomRight) + 0.5); @@ -761,28 +763,28 @@ QImage KisBrush::scaleImage(const ScaledBrush *srcBrush, double scale, double su + (1 - a) * b * qAlpha(topRight) + (1 - a) * (1 - b) * qAlpha(bottomRight) + 0.5); - if (red < 0) { - red = 0; + if (Qt::red < 0) { + Qt::red = 0; } else - if (red > 255) { - red = 255; + if (Qt::red > 255) { + Qt::red = 255; } - if (green < 0) { - green = 0; + if (Qt::green < 0) { + Qt::green = 0; } else - if (green > 255) { - green = 255; + if (Qt::green > 255) { + Qt::green = 255; } - if (blue < 0) { - blue = 0; + if (Qt::blue < 0) { + Qt::blue = 0; } else - if (blue > 255) { - blue = 255; + if (Qt::blue > 255) { + Qt::blue = 255; } if (alpha < 0) { @@ -793,7 +795,7 @@ QImage KisBrush::scaleImage(const ScaledBrush *srcBrush, double scale, double su alpha = 255; } - dstImage.setPixel(dstX, dstY, qRgba(red, green, blue, alpha)); + dstImage.setPixel(dstX, dstY, qRgba(Qt::red, Qt::green, Qt::blue, alpha)); } } @@ -855,21 +857,21 @@ QImage KisBrush::scaleImage(const QImage& srcImage, int width, int height) double a = 1 - xInterp; double b = 1 - yInterp; - int red; - int green; - int blue; + int Qt::red; + int Qt::green; + int Qt::blue; int alpha; if (srcImage.hasAlphaBuffer()) { - red = static_cast(a * b * qRed(topLeft) * qAlpha(topLeft) + Qt::red = static_cast(a * b * qRed(topLeft) * qAlpha(topLeft) + a * (1 - b) * qRed(bottomLeft) * qAlpha(bottomLeft) + (1 - a) * b * qRed(topRight) * qAlpha(topRight) + (1 - a) * (1 - b) * qRed(bottomRight) * qAlpha(bottomRight) + 0.5); - green = static_cast(a * b * qGreen(topLeft) * qAlpha(topLeft) + Qt::green = static_cast(a * b * qGreen(topLeft) * qAlpha(topLeft) + a * (1 - b) * qGreen(bottomLeft) * qAlpha(bottomLeft) + (1 - a) * b * qGreen(topRight) * qAlpha(topRight) + (1 - a) * (1 - b) * qGreen(bottomRight) * qAlpha(bottomRight) + 0.5); - blue = static_cast(a * b * qBlue(topLeft) * qAlpha(topLeft) + Qt::blue = static_cast(a * b * qBlue(topLeft) * qAlpha(topLeft) + a * (1 - b) * qBlue(bottomLeft) * qAlpha(bottomLeft) + (1 - a) * b * qBlue(topRight) * qAlpha(topRight) + (1 - a) * (1 - b) * qBlue(bottomRight) * qAlpha(bottomRight) + 0.5); @@ -879,49 +881,49 @@ QImage KisBrush::scaleImage(const QImage& srcImage, int width, int height) + (1 - a) * (1 - b) * qAlpha(bottomRight) + 0.5); if (alpha != 0) { - red /= alpha; - green /= alpha; - blue /= alpha; + Qt::red /= alpha; + Qt::green /= alpha; + Qt::blue /= alpha; } } else { - red = static_cast(a * b * qRed(topLeft) + Qt::red = static_cast(a * b * qRed(topLeft) + a * (1 - b) * qRed(bottomLeft) + (1 - a) * b * qRed(topRight) + (1 - a) * (1 - b) * qRed(bottomRight) + 0.5); - green = static_cast(a * b * qGreen(topLeft) + Qt::green = static_cast(a * b * qGreen(topLeft) + a * (1 - b) * qGreen(bottomLeft) + (1 - a) * b * qGreen(topRight) + (1 - a) * (1 - b) * qGreen(bottomRight) + 0.5); - blue = static_cast(a * b * qBlue(topLeft) + Qt::blue = static_cast(a * b * qBlue(topLeft) + a * (1 - b) * qBlue(bottomLeft) + (1 - a) * b * qBlue(topRight) + (1 - a) * (1 - b) * qBlue(bottomRight) + 0.5); alpha = 255; } - if (red < 0) { - red = 0; + if (Qt::red < 0) { + Qt::red = 0; } else - if (red > 255) { - red = 255; + if (Qt::red > 255) { + Qt::red = 255; } - if (green < 0) { - green = 0; + if (Qt::green < 0) { + Qt::green = 0; } else - if (green > 255) { - green = 255; + if (Qt::green > 255) { + Qt::green = 255; } - if (blue < 0) { - blue = 0; + if (Qt::blue < 0) { + Qt::blue = 0; } else - if (blue > 255) { - blue = 255; + if (Qt::blue > 255) { + Qt::blue = 255; } if (alpha < 0) { @@ -932,7 +934,7 @@ QImage KisBrush::scaleImage(const QImage& srcImage, int width, int height) alpha = 255; } - scaledImage.setPixel(dstX, dstY, qRgba(red, green, blue, alpha)); + scaledImage.setPixel(dstX, dstY, qRgba(Qt::red, Qt::green, Qt::blue, alpha)); } } @@ -1038,15 +1040,15 @@ QImage KisBrush::scaleSinglePixelImage(double scale, QRgb pixel, double subPixel QRgb bottomRight = (x < srcWidth && y < srcHeight) ? pixel : qRgba(0, 0, 0, 0); // Bi-linear interpolation. Images are in pre-multiplied form. - int red = static_cast(a * b * qRed(topLeft) + int Qt::red = static_cast(a * b * qRed(topLeft) + a * (1 - b) * qRed(bottomLeft) + (1 - a) * b * qRed(topRight) + (1 - a) * (1 - b) * qRed(bottomRight) + 0.5); - int green = static_cast(a * b * qGreen(topLeft) + int Qt::green = static_cast(a * b * qGreen(topLeft) + a * (1 - b) * qGreen(bottomLeft) + (1 - a) * b * qGreen(topRight) + (1 - a) * (1 - b) * qGreen(bottomRight) + 0.5); - int blue = static_cast(a * b * qBlue(topLeft) + int Qt::blue = static_cast(a * b * qBlue(topLeft) + a * (1 - b) * qBlue(bottomLeft) + (1 - a) * b * qBlue(topRight) + (1 - a) * (1 - b) * qBlue(bottomRight) + 0.5); @@ -1061,32 +1063,32 @@ QImage KisBrush::scaleSinglePixelImage(double scale, QRgb pixel, double subPixel // Apply to the colour channels too since we are // storing pre-multiplied by alpha. - red = static_cast(red * scale * scale + 0.5); - green = static_cast(green * scale * scale + 0.5); - blue = static_cast(blue * scale * scale + 0.5); + Qt::red = static_cast(Qt::red * scale * scale + 0.5); + Qt::green = static_cast(Qt::green * scale * scale + 0.5); + Qt::blue = static_cast(Qt::blue * scale * scale + 0.5); - if (red < 0) { - red = 0; + if (Qt::red < 0) { + Qt::red = 0; } else - if (red > 255) { - red = 255; + if (Qt::red > 255) { + Qt::red = 255; } - if (green < 0) { - green = 0; + if (Qt::green < 0) { + Qt::green = 0; } else - if (green > 255) { - green = 255; + if (Qt::green > 255) { + Qt::green = 255; } - if (blue < 0) { - blue = 0; + if (Qt::blue < 0) { + Qt::blue = 0; } else - if (blue > 255) { - blue = 255; + if (Qt::blue > 255) { + Qt::blue = 255; } if (alpha < 0) { @@ -1097,7 +1099,7 @@ QImage KisBrush::scaleSinglePixelImage(double scale, QRgb pixel, double subPixel alpha = 255; } - outputImage.setPixel(x, y, qRgba(red, green, blue, alpha)); + outputImage.setPixel(x, y, qRgba(Qt::red, Qt::green, Qt::blue, alpha)); } } @@ -1121,33 +1123,33 @@ QImage KisBrush::interpolate(const QImage& image1, const QImage& image2, double QRgb image2pixel = image2.pixel(x, y); // Images are in pre-multiplied alpha format. - int red = static_cast((1 - t) * qRed(image1pixel) + t * qRed(image2pixel) + 0.5); - int green = static_cast((1 - t) * qGreen(image1pixel) + t * qGreen(image2pixel) + 0.5); - int blue = static_cast((1 - t) * qBlue(image1pixel) + t * qBlue(image2pixel) + 0.5); + int Qt::red = static_cast((1 - t) * qRed(image1pixel) + t * qRed(image2pixel) + 0.5); + int Qt::green = static_cast((1 - t) * qGreen(image1pixel) + t * qGreen(image2pixel) + 0.5); + int Qt::blue = static_cast((1 - t) * qBlue(image1pixel) + t * qBlue(image2pixel) + 0.5); int alpha = static_cast((1 - t) * qAlpha(image1pixel) + t * qAlpha(image2pixel) + 0.5); - if (red < 0) { - red = 0; + if (Qt::red < 0) { + Qt::red = 0; } else - if (red > 255) { - red = 255; + if (Qt::red > 255) { + Qt::red = 255; } - if (green < 0) { - green = 0; + if (Qt::green < 0) { + Qt::green = 0; } else - if (green > 255) { - green = 255; + if (Qt::green > 255) { + Qt::green = 255; } - if (blue < 0) { - blue = 0; + if (Qt::blue < 0) { + Qt::blue = 0; } else - if (blue > 255) { - blue = 255; + if (Qt::blue > 255) { + Qt::blue = 255; } if (alpha < 0) { @@ -1158,7 +1160,7 @@ QImage KisBrush::interpolate(const QImage& image1, const QImage& image2, double alpha = 255; } - outputImage.setPixel(x, y, qRgba(red, green, blue, alpha)); + outputImage.setPixel(x, y, qRgba(Qt::red, Qt::green, Qt::blue, alpha)); } } @@ -1192,16 +1194,16 @@ KisBrush::ScaledBrush::ScaledBrush(KisAlphaMaskSP scaledMask, const QImage& scal QRgb pixel = m_image.pixel(x, y); - int red = qRed(pixel); - int green = qGreen(pixel); - int blue = qBlue(pixel); + int Qt::red = qRed(pixel); + int Qt::green = qGreen(pixel); + int Qt::blue = qBlue(pixel); int alpha = qAlpha(pixel); - red = (red * alpha) / 255; - green = (green * alpha) / 255; - blue = (blue * alpha) / 255; + Qt::red = (Qt::red * alpha) / 255; + Qt::green = (Qt::green * alpha) / 255; + Qt::blue = (Qt::blue * alpha) / 255; - m_image.setPixel(x, y, qRgba(red, green, blue, alpha)); + m_image.setPixel(x, y, qRgba(Qt::red, Qt::green, Qt::blue, alpha)); } } } diff --git a/krita/core/kis_convolution_painter.cc b/krita/core/kis_convolution_painter.cc index d3606ee12c..0a3f28e380 100644 --- a/krita/core/kis_convolution_painter.cc +++ b/krita/core/kis_convolution_painter.cc @@ -26,14 +26,16 @@ #include "qfontmetrics.h" #include "qpen.h" #include "qregion.h" -#include "qwmatrix.h" +#include "qmatrix.h" #include #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include #include #include @@ -141,7 +143,7 @@ void KisConvolutionPainter::applyMatrix(KisKernelSP kernel, qint32 x, qint32 y, // Iterate over all pixels in our rect, create a cache of pixels around the current pixel and convolve them in the colorstrategy. - QMemArray pixelPtrCache(kw * kh); + Q3MemArray pixelPtrCache(kw * kh); // pixelPtrCache.fill(0); // row == the y position of the pixel we want to change in the paint device @@ -234,7 +236,7 @@ void KisConvolutionPainter::applyMatrixRepeat(KisKernelSP kernel, qint32 x, qint // Iterate over all pixels in our rect, create a cache of pixels around the current pixel and convolve them in the colorstrategy. - QMemArray pixelPtrCache(kw * kh); + Q3MemArray pixelPtrCache(kw * kh); // row == the y position of the pixel we want to change in the paint device int row = y; diff --git a/krita/core/kis_fill_painter.cc b/krita/core/kis_fill_painter.cc index d86950641d..9249f7f81d 100644 --- a/krita/core/kis_fill_painter.cc +++ b/krita/core/kis_fill_painter.cc @@ -27,12 +27,12 @@ #include "qfontmetrics.h" #include "qpen.h" #include "qregion.h" -#include "qwmatrix.h" +#include "qmatrix.h" #include #include #include #include -#include +#include #include #include diff --git a/krita/core/kis_filter_config_widget.cc b/krita/core/kis_filter_config_widget.cc index e694189d02..50b819a3c1 100644 --- a/krita/core/kis_filter_config_widget.cc +++ b/krita/core/kis_filter_config_widget.cc @@ -19,7 +19,7 @@ #include "kis_filter_config_widget.h" -KisFilterConfigWidget::KisFilterConfigWidget(QWidget * parent, const char * name, WFlags f) +KisFilterConfigWidget::KisFilterConfigWidget(QWidget * parent, const char * name, Qt::WFlags f) : QWidget(parent, name, f) { } diff --git a/krita/core/kis_filter_registry.cc b/krita/core/kis_filter_registry.cc index 16027c8383..44f23eefba 100644 --- a/krita/core/kis_filter_registry.cc +++ b/krita/core/kis_filter_registry.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include -#include +#include #include #include diff --git a/krita/core/kis_gradient_painter.cc b/krita/core/kis_gradient_painter.cc index 3f7d9b91a5..0e0dddf310 100644 --- a/krita/core/kis_gradient_painter.cc +++ b/krita/core/kis_gradient_painter.cc @@ -26,12 +26,12 @@ #include "qfontmetrics.h" #include "qpen.h" #include "qregion.h" -#include "qwmatrix.h" +#include "qmatrix.h" #include #include #include #include -#include +#include #include #include @@ -579,7 +579,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart, m_gradient->colorAt(t, &color, &opacity); layer.setPixel(x - startx, y - starty, - qRgba(color.red(), color.green(), color.blue(), opacity)); + qRgba(color.Qt::red(), color.Qt::green(), color.Qt::blue(), opacity)); pixelsProcessed++; @@ -625,9 +625,9 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart, QColor color(*(pixelPos +2), *(pixelPos + 1), *pixelPos); quint8 opacity = *(pixelPos + 3); - double dRed = (color.red() * opacity - thisPixel.red() * thisPixelOpacity) / 65535.0; - double dGreen = (color.green() * opacity - thisPixel.green() * thisPixelOpacity) / 65535.0; - double dBlue = (color.blue() * opacity - thisPixel.blue() * thisPixelOpacity) / 65535.0; + double dRed = (color.Qt::red() * opacity - thisPixel.Qt::red() * thisPixelOpacity) / 65535.0; + double dGreen = (color.Qt::green() * opacity - thisPixel.Qt::green() * thisPixelOpacity) / 65535.0; + double dBlue = (color.Qt::blue() * opacity - thisPixel.Qt::blue() * thisPixelOpacity) / 65535.0; #define SQRT_3 1.7320508 @@ -669,19 +669,19 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart, m_gradient->colorAt(t, &color, &opacity); - totalRed += color.red(); - totalGreen += color.green(); - totalBlue += color.blue(); + totalRed += color.Qt::red(); + totalGreen += color.Qt::green(); + totalBlue += color.Qt::blue(); totalOpacity += opacity; } } - int red = totalRed / (numSamples * numSamples); - int green = totalGreen / (numSamples * numSamples); - int blue = totalBlue / (numSamples * numSamples); + int Qt::red = totalRed / (numSamples * numSamples); + int Qt::green = totalGreen / (numSamples * numSamples); + int Qt::blue = totalBlue / (numSamples * numSamples); int opacity = totalOpacity / (numSamples * numSamples); - layer.setPixel(x - startx, y - starty, qRgba(red, green, blue, opacity)); + layer.setPixel(x - startx, y - starty, qRgba(Qt::red, Qt::green, Qt::blue, opacity)); } pixelsProcessed++; diff --git a/krita/core/kis_histogram.cc b/krita/core/kis_histogram.cc index d8c16a2aa6..cc2ffeafd3 100644 --- a/krita/core/kis_histogram.cc +++ b/krita/core/kis_histogram.cc @@ -109,8 +109,8 @@ KisHistogram::Calculations KisHistogram::selectionCalculations() { return m_selectionCalculations.at(m_channel); } -QValueVector KisHistogram::calculateForRange(double from, double to) { - QValueVector calculations; +Q3ValueVector KisHistogram::calculateForRange(double from, double to) { + Q3ValueVector calculations; uint count = m_producer->channels().count(); for (uint i = 0; i < count; i++) { diff --git a/krita/core/kis_image.cc b/krita/core/kis_image.cc index e8a9ebf68f..54d8056466 100644 --- a/krita/core/kis_image.cc +++ b/krita/core/kis_image.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -1088,7 +1088,7 @@ bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP abo if (player != 0) { // XXX: This should also be done whenever a layer grows! - QValueVector actions = KisMetaRegistry::instance() -> + Q3ValueVector actions = KisMetaRegistry::instance() -> csRegistry()->paintDeviceActionsFor(player->paintDevice()->colorSpace()); for (uint i = 0; i < actions.count(); i++) { actions.at(i)->act(player.data()->paintDevice(), width(), height()); diff --git a/krita/core/kis_imagepipe_brush.cc b/krita/core/kis_imagepipe_brush.cc index deecf260ee..52843d3c7b 100644 --- a/krita/core/kis_imagepipe_brush.cc +++ b/krita/core/kis_imagepipe_brush.cc @@ -33,11 +33,13 @@ #include #include -#include +#include #include #include #include #include +//Added by qt3to4: +#include #include #include @@ -158,8 +160,8 @@ KisImagePipeBrush::KisImagePipeBrush(const QString& filename) : super(filename) } KisImagePipeBrush::KisImagePipeBrush(const QString& name, int w, int h, - QValueVector< QValueVector > devices, - QValueVector modes) + Q3ValueVector< Q3ValueVector > devices, + Q3ValueVector modes) : super("") { Q_ASSERT(devices.count() == modes.count()); @@ -207,7 +209,7 @@ bool KisImagePipeBrush::init() // XXX: This stuff is in utf-8, too. // The first line contains the name -- this means we look until we arrive at the first newline - QValueVector line1; + Q3ValueVector line1; quint32 i = 0; @@ -222,7 +224,7 @@ bool KisImagePipeBrush::init() // The second line contains the number of brushes, separated by a space from the parasite // XXX: This stuff is in utf-8, too. - QValueVector line2; + Q3ValueVector line2; while (m_data[i] != '\n' && i < m_data.size()) { line2.append(m_data[i]); i++; @@ -273,7 +275,7 @@ bool KisImagePipeBrush::save() bool KisImagePipeBrush::saveToDevice(QIODevice* dev) const { - QCString utf8Name = name().utf8(); // Names in v2 brushes are in UTF-8 + Q3CString utf8Name = name().utf8(); // Names in v2 brushes are in UTF-8 char const* name = utf8Name.data(); int len = qstrlen(name); @@ -434,10 +436,10 @@ KisImagePipeBrush* KisImagePipeBrush::clone() const { // The obvious way of cloning each brush in this one doesn't work for some reason... // XXX Multidimensionals not supported yet, change together with the constructor... - QValueVector< QValueVector > devices; - QValueVector modes; + Q3ValueVector< Q3ValueVector > devices; + Q3ValueVector modes; - devices.push_back(QValueVector()); + devices.push_back(Q3ValueVector()); modes.push_back(m_parasite.selection[0]); for (uint i = 0; i < m_brushes.count(); i++) { diff --git a/krita/core/kis_paint_device.cc b/krita/core/kis_paint_device.cc index 5870dc9cf1..56334f2807 100644 --- a/krita/core/kis_paint_device.cc +++ b/krita/core/kis_paint_device.cc @@ -17,11 +17,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include -#include +#include #include #include #include -#include +#include #include #include @@ -304,8 +304,8 @@ KisPaintDevice::~KisPaintDevice() { delete m_dcop; delete m_longRunningFilterTimer; - QValueList::iterator it; - QValueList::iterator end = m_longRunningFilters.end(); + Q3ValueList::iterator it; + Q3ValueList::iterator end = m_longRunningFilters.end(); for (it = m_longRunningFilters.begin(); it != end; ++it) { KisFilter * f = (*it); delete f; @@ -1147,8 +1147,8 @@ void KisPaintDevice::runBackgroundFilters() { QRect rc = exactBounds(); if (!m_longRunningFilters.isEmpty()) { - QValueList::iterator it; - QValueList::iterator end = m_longRunningFilters.end(); + Q3ValueList::iterator it; + Q3ValueList::iterator end = m_longRunningFilters.end(); for (it = m_longRunningFilters.begin(); it != end; ++it) { (*it)->process(this, this, 0, rc); } diff --git a/krita/core/kis_painter.cc b/krita/core/kis_painter.cc index 26701d1821..6df3562b4c 100644 --- a/krita/core/kis_painter.cc +++ b/krita/core/kis_painter.cc @@ -31,12 +31,12 @@ #include "qfontmetrics.h" #include "qpen.h" #include "qregion.h" -#include "qwmatrix.h" +#include "qmatrix.h" #include #include #include #include -#include +#include #include #include diff --git a/krita/core/kis_palette.cc b/krita/core/kis_palette.cc index 98ba580f20..473f9fd901 100644 --- a/krita/core/kis_palette.cc +++ b/krita/core/kis_palette.cc @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include @@ -275,8 +275,8 @@ void KisPalette::add(const KisPaletteEntry & c) void KisPalette::remove(const KisPaletteEntry & c) { - QValueVector::iterator it = m_colors.begin(); - QValueVector::iterator end = m_colors.end(); + Q3ValueVector::iterator it = m_colors.begin(); + Q3ValueVector::iterator end = m_colors.end(); while (it != end) { if ((*it) == c) { diff --git a/krita/core/kis_pattern.cc b/krita/core/kis_pattern.cc index 4e30cc1f25..87ae2c5c19 100644 --- a/krita/core/kis_pattern.cc +++ b/krita/core/kis_pattern.cc @@ -30,9 +30,12 @@ #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -105,7 +108,7 @@ bool KisPattern::save() // Version is 1 for now... GimpPatternHeader ph; - QCString utf8Name = name().utf8(); + Q3CString utf8Name = name().utf8(); char const* name = utf8Name.data(); int nameLength = qstrlen(name); @@ -160,7 +163,7 @@ bool KisPattern::init() // load Gimp patterns GimpPatternHeader bh; qint32 k; - QValueVector name; + Q3ValueVector name; if (sizeof(GimpPatternHeader) > m_data.size()) { return false; diff --git a/krita/core/kis_rotate_visitor.cc b/krita/core/kis_rotate_visitor.cc index bd954989af..a6b87913df 100644 --- a/krita/core/kis_rotate_visitor.cc +++ b/krita/core/kis_rotate_visitor.cc @@ -17,7 +17,7 @@ */ #include #include -#include +#include #include #include diff --git a/krita/core/kis_selection.cc b/krita/core/kis_selection.cc index 1018eb2af0..cbd18ef7b8 100644 --- a/krita/core/kis_selection.cc +++ b/krita/core/kis_selection.cc @@ -17,6 +17,8 @@ */ #include +//Added by qt3to4: +#include #include #include @@ -184,7 +186,7 @@ void KisSelection::paintUniformSelectionRegion(QImage img, const QRect& imageRec QRegion region = uniformRegion & QRegion(imageRect); if (!region.isEmpty()) { - QMemArray rects = region.rects(); + Q3MemArray rects = region.rects(); for (unsigned int i = 0; i < rects.count(); i++) { QRect r = rects[i]; diff --git a/krita/core/tiles/kis_tileddatamanager.cc b/krita/core/tiles/kis_tileddatamanager.cc index 7fce43643b..3eaf0ad33a 100644 --- a/krita/core/tiles/kis_tileddatamanager.cc +++ b/krita/core/tiles/kis_tileddatamanager.cc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include diff --git a/krita/kritacolor/colorspaces/kis_alpha_colorspace.cc b/krita/kritacolor/colorspaces/kis_alpha_colorspace.cc index 2741e0a6f0..22e500e43d 100644 --- a/krita/kritacolor/colorspaces/kis_alpha_colorspace.cc +++ b/krita/kritacolor/colorspaces/kis_alpha_colorspace.cc @@ -96,7 +96,7 @@ void KisAlphaColorSpace::mixColors(const quint8 **colors, const quint8 *weights, } } -QValueVector KisAlphaColorSpace::channels() const +Q3ValueVector KisAlphaColorSpace::channels() const { return m_channels; } diff --git a/krita/kritacolor/colorspaces/kis_lab_colorspace.cc b/krita/kritacolor/colorspaces/kis_lab_colorspace.cc index 538097b0b6..3c61db4175 100644 --- a/krita/kritacolor/colorspaces/kis_lab_colorspace.cc +++ b/krita/kritacolor/colorspaces/kis_lab_colorspace.cc @@ -166,7 +166,7 @@ void KisLabColorSpace::darken(const quint8 * src, quint8 * dst, qint32 shade, bo } -QValueVector KisLabColorSpace::channels() const +Q3ValueVector KisLabColorSpace::channels() const { return m_channels; } diff --git a/krita/kritacolor/colorspaces/kis_xyz_colorspace.cc b/krita/kritacolor/colorspaces/kis_xyz_colorspace.cc index ffa9c772b8..9257520967 100644 --- a/krita/kritacolor/colorspaces/kis_xyz_colorspace.cc +++ b/krita/kritacolor/colorspaces/kis_xyz_colorspace.cc @@ -59,7 +59,7 @@ KisXyzColorSpace::~KisXyzColorSpace() } -QValueVector KisXyzColorSpace::channels() const +Q3ValueVector KisXyzColorSpace::channels() const { return m_channels; } diff --git a/krita/kritacolor/kis_abstract_colorspace.cc b/krita/kritacolor/kis_abstract_colorspace.cc index 1905028fcd..7c0aac591b 100644 --- a/krita/kritacolor/kis_abstract_colorspace.cc +++ b/krita/kritacolor/kis_abstract_colorspace.cc @@ -121,9 +121,9 @@ KisAbstractColorSpace::~KisAbstractColorSpace() void KisAbstractColorSpace::fromQColor(const QColor& color, quint8 *dst, KisProfile * profile) { - m_qcolordata[2] = color.red(); - m_qcolordata[1] = color.green(); - m_qcolordata[0] = color.blue(); + m_qcolordata[2] = color.Qt::red(); + m_qcolordata[1] = color.Qt::green(); + m_qcolordata[0] = color.Qt::blue(); if (profile == 0) { @@ -530,9 +530,9 @@ void KisAbstractColorSpace::convolveColors(quint8** colors, qint32 * kernelValue QColor c; quint8 opacity; const_cast(this)->toQColor( *colors, &c, &opacity ); - totalRed += c.red() * weight; - totalGreen += c.green() * weight; - totalBlue += c.blue() * weight; + totalRed += c.Qt::red() * weight; + totalGreen += c.Qt::green() * weight; + totalBlue += c.Qt::blue() * weight; totalAlpha += opacity * weight; } colors++; @@ -636,7 +636,7 @@ void KisAbstractColorSpace::bitBlt(quint8 *dst, quint32 len = pixelSize() * rows * cols; // If our conversion cache is too small, extend it. - if (!m_conversionCache.resize( len, QGArray::SpeedOptim )) { + if (!m_conversionCache.resize( len, Q3GArray::SpeedOptim )) { kWarning() << "Could not allocate enough memory for the conversion!\n"; // XXX: We should do a slow, pixel by pixel bitblt here... abort(); diff --git a/krita/kritacolor/kis_basic_histogram_producers.cc b/krita/kritacolor/kis_basic_histogram_producers.cc index da78b71af6..77507036e8 100644 --- a/krita/kritacolor/kis_basic_histogram_producers.cc +++ b/krita/kritacolor/kis_basic_histogram_producers.cc @@ -66,7 +66,7 @@ void KisBasicHistogramProducer::makeExternalToInternal() { // This function assumes that the pixel is has no 'gaps'. That is to say: if we start // at byte 0, we can get to the end of the pixel by adding consecutive size()s of // the channels - QValueVector c = channels(); + Q3ValueVector c = channels(); uint count = c.count(); int currentPos = 0; @@ -351,7 +351,7 @@ KisGenericRGBHistogramProducer::KisGenericRGBHistogramProducer() m_channelsList.append(new KisChannelInfo(i18n("B"), 2, KisChannelInfo::COLOR, KisChannelInfo::UINT8, 1, QColor(0,0,255))); } -QValueVector KisGenericRGBHistogramProducer::channels() { +Q3ValueVector KisGenericRGBHistogramProducer::channels() { return m_channelsList; } @@ -377,9 +377,9 @@ void KisGenericRGBHistogramProducer::addRegionToBin(quint8 * pixels, quint8 * se while (nPixels > 0) { if ( !((m_skipUnselected && *selectionMask == 0) || (m_skipTransparent && cs->getAlpha(pixels) == OPACITY_TRANSPARENT)) ) { cs->toQColor(pixels, &c); - m_bins.at(0).at(c.red())++; - m_bins.at(1).at(c.green())++; - m_bins.at(2).at(c.blue())++; + m_bins.at(0).at(c.Qt::red())++; + m_bins.at(1).at(c.Qt::green())++; + m_bins.at(2).at(c.Qt::blue())++; m_count++; } @@ -394,9 +394,9 @@ void KisGenericRGBHistogramProducer::addRegionToBin(quint8 * pixels, quint8 * se if ( !(m_skipTransparent && cs->getAlpha(pixels) == OPACITY_TRANSPARENT)) { cs->toQColor(pixels, &c); - m_bins.at(0).at(c.red())++; - m_bins.at(1).at(c.green())++; - m_bins.at(2).at(c.blue())++; + m_bins.at(0).at(c.Qt::red())++; + m_bins.at(1).at(c.Qt::green())++; + m_bins.at(2).at(c.Qt::blue())++; m_count++; } @@ -429,7 +429,7 @@ KisGenericLabHistogramProducer::~KisGenericLabHistogramProducer() delete m_channelsList[2]; } -QValueVector KisGenericLabHistogramProducer::channels() { +Q3ValueVector KisGenericLabHistogramProducer::channels() { return m_channelsList; } diff --git a/krita/kritacolor/kis_color.cc b/krita/kritacolor/kis_color.cc index 2228242815..f0a7b64ac2 100644 --- a/krita/kritacolor/kis_color.cc +++ b/krita/kritacolor/kis_color.cc @@ -159,12 +159,12 @@ void KisColor::dump() const { //kDebug(DBG_AREA_CMS) << "KisColor (" << this << "), " << m_colorSpace->id().name() << "\n"; - QValueVector channels = m_colorSpace->channels(); + Q3ValueVector channels = m_colorSpace->channels(); - QValueVector::const_iterator begin = channels.begin(); - QValueVector::const_iterator end = channels.end(); + Q3ValueVector::const_iterator begin = channels.begin(); + Q3ValueVector::const_iterator end = channels.end(); - for (QValueVector::const_iterator it = begin; it != end; ++it) + for (Q3ValueVector::const_iterator it = begin; it != end; ++it) { KisChannelInfo * ch = (*it); // XXX: setNum always takes a byte. diff --git a/krita/kritacolor/kis_colorspace_factory_registry.cc b/krita/kritacolor/kis_colorspace_factory_registry.cc index b9d8e92083..6694471df4 100644 --- a/krita/kritacolor/kis_colorspace_factory_registry.cc +++ b/krita/kritacolor/kis_colorspace_factory_registry.cc @@ -107,15 +107,15 @@ KisProfile * KisColorSpaceFactoryRegistry::getProfileByName(const QString & nam return m_profileMap[name]; } -QValueVector KisColorSpaceFactoryRegistry::profilesFor(KisID id) +Q3ValueVector KisColorSpaceFactoryRegistry::profilesFor(KisID id) { return profilesFor(get(id)); } -QValueVector KisColorSpaceFactoryRegistry::profilesFor(KisColorSpaceFactory * csf) +Q3ValueVector KisColorSpaceFactoryRegistry::profilesFor(KisColorSpaceFactory * csf) { - QValueVector profiles; + Q3ValueVector profiles; QMap::Iterator it; for (it = m_profileMap.begin(); it != m_profileMap.end(); ++it) { @@ -139,7 +139,7 @@ void KisColorSpaceFactoryRegistry::addPaintDeviceAction(KisColorSpace* cs, m_paintDevActionMap[cs->id()].append(action); } -QValueVector +Q3ValueVector KisColorSpaceFactoryRegistry::paintDeviceActionsFor(KisColorSpace* cs) { return m_paintDevActionMap[cs->id()]; } diff --git a/krita/kritacolor/kis_histogram_producer.cc b/krita/kritacolor/kis_histogram_producer.cc index ae61e7cf29..78974ea6fc 100644 --- a/krita/kritacolor/kis_histogram_producer.cc +++ b/krita/kritacolor/kis_histogram_producer.cc @@ -18,6 +18,8 @@ #include "kis_histogram_producer.h" #include "kis_basic_histogram_producers.h" +//Added by qt3to4: +#include KisHistogramProducerFactoryRegistry* KisHistogramProducerFactoryRegistry::m_singleton = 0; @@ -41,7 +43,7 @@ KisIDList KisHistogramProducerFactoryRegistry::listKeysCompatibleWith( KisColorSpace* colorSpace) const { KisIDList list; - QValueList preferredList; + Q3ValueList preferredList; storageMap::const_iterator it = m_storage.begin(); storageMap::const_iterator endit = m_storage.end(); // O(n^2), can't this be done better? (But preferrably not by looking up the preferredness @@ -49,8 +51,8 @@ KisIDList KisHistogramProducerFactoryRegistry::listKeysCompatibleWith( while( it != endit ) { if (it->second->isCompatibleWith(colorSpace)) { float preferred = it->second->preferrednessLevelWith(colorSpace); - QValueList::iterator pit = preferredList.begin(); - QValueList::iterator pend = preferredList.end(); + Q3ValueList::iterator pit = preferredList.begin(); + Q3ValueList::iterator pend = preferredList.end(); KisIDList::iterator lit = list.begin(); while (pit != pend && preferred <= *pit) { diff --git a/krita/plugins/filters/bumpmap/bumpmap.cc b/krita/plugins/filters/bumpmap/bumpmap.cc index e19a999966..4d84a82752 100644 --- a/krita/plugins/filters/bumpmap/bumpmap.cc +++ b/krita/plugins/filters/bumpmap/bumpmap.cc @@ -33,10 +33,12 @@ #include #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include #include #include @@ -250,7 +252,7 @@ void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi // ---------------------- Load initial three bumpmap scanlines KisColorSpace * srcCs = src->colorSpace(); - QValueVector channels = srcCs->channels(); + Q3ValueVector channels = srcCs->channels(); // One byte per pixel, converted from the bumpmap layer. quint8 * bm_row1 = new quint8[bm_w]; @@ -473,7 +475,7 @@ QString KisBumpmapConfiguration::toString() return KisFilterConfiguration::toString(); } -KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter * filter, KisPaintDeviceSP dev, QWidget * parent, const char * name, WFlags f) +KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter * filter, KisPaintDeviceSP dev, QWidget * parent, const char * name, Qt::WFlags f) : KisFilterConfigWidget(parent, name, f), m_filter(filter), m_device(dev) @@ -482,7 +484,7 @@ KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter * filter, KisPaintDevic Q_ASSERT(m_device); m_page = new WdgBumpmap(this); - QHBoxLayout * l = new QHBoxLayout(this); + Q3HBoxLayout * l = new Q3HBoxLayout(this); Q_CHECK_PTR(l); l->add(m_page); diff --git a/krita/plugins/filters/cimg/kis_cimg_filter.cc b/krita/plugins/filters/cimg/kis_cimg_filter.cc index ce4c0200b0..de12ed3533 100644 --- a/krita/plugins/filters/cimg/kis_cimg_filter.cc +++ b/krita/plugins/filters/cimg/kis_cimg_filter.cc @@ -180,9 +180,9 @@ void KisCImgFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte qint32 x = it.x() - rect.x(); qint32 y = it.y() - rect.y(); - img(x, y, 0) = color.red(); - img(x, y, 1) = color.green(); - img(x, y, 2) = color.blue(); + img(x, y, 0) = color.Qt::red(); + img(x, y, 1) = color.Qt::green(); + img(x, y, 2) = color.Qt::blue(); ++it; } diff --git a/krita/plugins/filters/cimg/kis_cimgconfig_widget.cc b/krita/plugins/filters/cimg/kis_cimgconfig_widget.cc index 7b98c4cdb9..4042a8bb80 100644 --- a/krita/plugins/filters/cimg/kis_cimgconfig_widget.cc +++ b/krita/plugins/filters/cimg/kis_cimgconfig_widget.cc @@ -22,6 +22,8 @@ #include "qlayout.h" #include "qcheckbox.h" #include "qpushbutton.h" +//Added by qt3to4: +#include #include "knuminput.h" @@ -29,13 +31,13 @@ #include "kis_cimgconfig_widget.h" #include "kis_cimg_filter.h" -KisCImgconfigWidget::KisCImgconfigWidget(KisFilter* nfilter, QWidget * parent, const char * name, WFlags f) +KisCImgconfigWidget::KisCImgconfigWidget(KisFilter* nfilter, QWidget * parent, const char * name, Qt::WFlags f) : KisFilterConfigWidget(parent, name, f) { m_page = new WdgCImg(this); Q_CHECK_PTR(m_page); - QHBoxLayout * l = new QHBoxLayout(this); + Q3HBoxLayout * l = new Q3HBoxLayout(this); Q_CHECK_PTR(l); l->add(m_page); diff --git a/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc index 85f0b4e628..9fb0a2b81a 100644 --- a/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc +++ b/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc @@ -31,6 +31,8 @@ #include #include #include +//Added by qt3to4: +#include #include "kis_filter_config_widget.h" #include "kis_brightness_contrast_filter.h" @@ -245,13 +247,13 @@ void KisBrightnessContrastFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP setProgressDone(); } -KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f) +KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const char * name, Qt::WFlags f) : KisFilterConfigWidget(parent, name, f) { int i; int height; m_page = new WdgBrightnessContrast(this); - QHBoxLayout * l = new QHBoxLayout(this); + Q3HBoxLayout * l = new Q3HBoxLayout(this); Q_CHECK_PTR(l); //Hide these buttons and labels as they are not implemented in 1.5 diff --git a/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cc index 964296a1c4..450b61942d 100644 --- a/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cc +++ b/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cc @@ -23,6 +23,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include "kis_filter_configuration.h" #include "kis_filter_config_widget.h" @@ -39,7 +42,7 @@ KisPerChannelFilterConfiguration::KisPerChannelFilterConfiguration(int n) : KisFilterConfiguration( "perchannel", 1 ) { - curves = new QSortedList >[n]; + curves = new Q3SortedList >[n]; for(int i=0;i >[nTransfers]; + curves = new Q3SortedList >[nTransfers]; while (!curvesNode.isNull()) { QDomElement curvesElement = curvesNode.toElement(); if (!curvesElement.isNull() && @@ -128,7 +131,7 @@ QString KisPerChannelFilterConfiguration::toString() c.setAttribute("name", "curves"); for (int i = 0; i < nTransfers; ++i) { QDomElement t = doc.createElement("curve"); - QPtrList > curve = curves[i]; + Q3PtrList > curve = curves[i]; QString sCurve; QPair * pair; for ( pair = curve.first(); pair; pair = curve.next() ) { @@ -283,17 +286,17 @@ void KisPerChannelConfigWidget::setActiveChannel(int ch) m_page->kCurve->setPixmap(pix); } -KisPerChannelConfigWidget::KisPerChannelConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f) +KisPerChannelConfigWidget::KisPerChannelConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const char * name, Qt::WFlags f) : KisFilterConfigWidget(parent, name, f) { int i; int height; m_page = new WdgPerChannel(this); - QHBoxLayout * l = new QHBoxLayout(this); + Q3HBoxLayout * l = new Q3HBoxLayout(this); Q_CHECK_PTR(l); m_dev = dev; - m_curves = new QSortedList >[m_dev->colorSpace()->nColorChannels()]; + m_curves = new Q3SortedList >[m_dev->colorSpace()->nColorChannels()]; m_activeCh = 0; for(unsigned int ch=0; ch colorSpace()->nColorChannels(); ch++) { @@ -306,7 +309,7 @@ KisPerChannelConfigWidget::KisPerChannelConfigWidget(QWidget * parent, KisPaintD connect( m_page->kCurve, SIGNAL(modified()), SIGNAL(sigPleaseUpdatePreview())); // Fill in the channel chooser - QValueVector channels = dev->colorSpace()->channels(); + Q3ValueVector channels = dev->colorSpace()->channels(); for(unsigned int val=0; val < dev->colorSpace()->nColorChannels(); val++) m_page->cmbChannel->insertItem(channels.at(val)->name()); connect( m_page->cmbChannel, SIGNAL(activated(int)), this, SLOT(setActiveChannel(int))); diff --git a/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc b/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc index 51ad5e6270..364afad959 100644 --- a/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc +++ b/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc @@ -20,6 +20,8 @@ #include #include +//Added by qt3to4: +#include #include @@ -37,7 +39,7 @@ KisCustomConvolutionFilterConfigurationWidget::KisCustomConvolutionFilterConfigurationWidget( KisFilter* /*nfilter*/, QWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) { - QGridLayout *widgetLayout = new QGridLayout(this, 2, 1); + Q3GridLayout *widgetLayout = new Q3GridLayout(this, 2, 1); Q_CHECK_PTR(widgetLayout); // QPushButton *bnRefresh = new QPushButton(i18n("Refresh Preview"), this, "bnrefresh"); diff --git a/krita/plugins/filters/cubismfilter/kis_polygon.cc b/krita/plugins/filters/cubismfilter/kis_polygon.cc index 6f36b96dc7..00cfc4188d 100644 --- a/krita/plugins/filters/cubismfilter/kis_polygon.cc +++ b/krita/plugins/filters/cubismfilter/kis_polygon.cc @@ -22,7 +22,7 @@ */ #include -#include +#include #include diff --git a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc index 4c7b1a2bf7..9001a1eecf 100644 --- a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc +++ b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc @@ -169,9 +169,9 @@ uint KisOilPaintFilter::MostFrequentColor (KisPaintDeviceSP src, const QRect& bo // Swapping red and blue here is done because that gives the same // output as digikam, even though it might be interpreted as a bug // in both applications. - int b = c.red(); - int g = c.green(); - int r = c.blue(); + int b = c.Qt::red(); + int g = c.Qt::green(); + int r = c.Qt::blue(); I = (uint)(GetIntensity (r, g, b) * Scale); IntensityCount[I]++; diff --git a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter.cc b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter.cc index afa5c3c848..6cee16d147 100644 --- a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter.cc +++ b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter.cc @@ -26,6 +26,8 @@ #include #include +//Added by qt3to4: +#include #include #include @@ -82,7 +84,7 @@ void KisPixelizeFilter::pixelize(KisPaintDeviceSP src, KisPaintDeviceSP dst, int if (!dst) return; qint32 pixelSize = src->pixelSize(); - QMemArray average( pixelSize ); + Q3MemArray average( pixelSize ); qint32 count; diff --git a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc index bc2c07acee..bad9d8d2ae 100644 --- a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc +++ b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/krita/plugins/paintops/defaultpaintops/kis_brushop.cc b/krita/plugins/paintops/defaultpaintops/kis_brushop.cc index d4f35e1b70..1f9e48e117 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_brushop.cc +++ b/krita/plugins/paintops/defaultpaintops/kis_brushop.cc @@ -25,6 +25,8 @@ #include #include #include +//Added by qt3to4: +#include #include @@ -53,7 +55,7 @@ KisBrushOpSettings::KisBrushOpSettings(QWidget *parent) : super(parent) { m_optionsWidget = new QWidget(parent, "brush option widget"); - QHBoxLayout * l = new QHBoxLayout(m_optionsWidget); + Q3HBoxLayout * l = new Q3HBoxLayout(m_optionsWidget); l->setAutoAdd(true); m_pressureVariation = new QLabel(i18n("Pressure variation: "), m_optionsWidget); m_size = new QCheckBox(i18n("size"), m_optionsWidget); diff --git a/krita/plugins/tools/defaulttools/kis_tool_brush.cc b/krita/plugins/tools/defaulttools/kis_tool_brush.cc index fc7608bd6d..638c69949a 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_brush.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_brush.cc @@ -26,6 +26,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -137,7 +139,7 @@ void KisToolBrush::leave(QEvent */*e*/) { void KisToolBrush::slotSetPaintingMode( int mode ) { - if (mode == QButton::On) { + if (mode == QCheckBox::On) { // Direct painting m_paintIncremental = true; } @@ -154,7 +156,7 @@ QWidget* KisToolBrush::createOptionWidget(QWidget* parent) m_chkDirect->setChecked(true); connect(m_chkDirect, SIGNAL(stateChanged(int)), this, SLOT(slotSetPaintingMode(int))); - m_optionLayout = new QGridLayout(widget, 3, 2, 0, 6); + m_optionLayout = new Q3GridLayout(widget, 3, 2, 0, 6); Q_CHECK_PTR(m_optionLayout); super::addOptionWidgetLayout(m_optionLayout); diff --git a/krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc index ea85fa60c1..21d87d72ab 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc @@ -22,8 +22,10 @@ #include #include #include -#include +#include #include +//Added by qt3to4: +#include #include #include @@ -77,7 +79,7 @@ void KisToolColorPicker::update(KisCanvasSubject *subject) void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) { if (m_subject) { - if (e->button() != QMouseEvent::LeftButton && e->button() != QMouseEvent::RightButton) + if (e->button() != Qt::LeftButton && e->button() != Qt::RightButton) return; KisImageSP img; @@ -164,7 +166,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) displayPickedColor(); if (m_updateColor) { - if (e->button() == QMouseEvent::LeftButton) + if (e->button() == Qt::LeftButton) m_subject->setFGColor(m_pickedColor); else m_subject->setBGColor(m_pickedColor); @@ -190,7 +192,7 @@ void KisToolColorPicker::displayPickedColor() { if (m_pickedColor.data() && m_optionsWidget) { - QValueVector channels = m_pickedColor.colorSpace()->channels(); + Q3ValueVector channels = m_pickedColor.colorSpace()->channels(); m_optionsWidget->listViewChannels->clear(); for (int i = channels.count() - 1; i >= 0 ; --i) { @@ -202,7 +204,7 @@ void KisToolColorPicker::displayPickedColor() channelValueText = m_pickedColor.colorSpace()->channelValueText(m_pickedColor.data(), i); } - m_optionsWidget->listViewChannels->insertItem(new QListViewItem(m_optionsWidget->listViewChannels, + m_optionsWidget->listViewChannels->insertItem(new Q3ListViewItem(m_optionsWidget->listViewChannels, channels[i]->name(), channelValueText)); } @@ -248,7 +250,7 @@ QWidget* KisToolColorPicker::createOptionWidget(QWidget* parent) return m_optionsWidget; } - QValueList palettes = srv->resources(); + Q3ValueList palettes = srv->resources(); for(uint i = 0; i < palettes.count(); i++) { KisPalette* palette = dynamic_cast(*palettes.at(i)); diff --git a/krita/plugins/tools/defaulttools/kis_tool_duplicate.cc b/krita/plugins/tools/defaulttools/kis_tool_duplicate.cc index 7565c67498..228dfc0468 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_duplicate.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_duplicate.cc @@ -61,7 +61,7 @@ void KisToolDuplicate::activate() void KisToolDuplicate::buttonPress(KisButtonPressEvent *e) { - if (e->state() == Qt::ShiftButton) { + if (e->state() == Qt::ShiftModifier) { m_position = e->pos(); m_isOffsetNotUptodate = true; } else { diff --git a/krita/plugins/tools/defaulttools/kis_tool_fill.cc b/krita/plugins/tools/defaulttools/kis_tool_fill.cc index b3cd096a9a..4ab49ee101 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_fill.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_fill.cc @@ -141,7 +141,7 @@ void KisToolFill::buttonPress(KisButtonPressEvent *e) { if (!m_subject) return; if (!m_currentImage || !m_currentImage->activeDevice()) return; - if (e->button() != QMouseEvent::LeftButton) return; + if (e->button() != Qt::LeftButton) return; int x, y; x = e->pos().floorX(); y = e->pos().floorY(); @@ -192,21 +192,21 @@ void KisToolFill::slotSetUsePattern(int state) { if (state == QCheckBox::NoChange) return; - m_usePattern = (state == QButton::On); + m_usePattern = (state == QCheckBox::On); } void KisToolFill::slotSetSampleMerged(int state) { if (state == QCheckBox::NoChange) return; - m_sampleMerged = (state == QButton::On); + m_sampleMerged = (state == QCheckBox::On); } void KisToolFill::slotSetFillSelection(int state) { if (state == QCheckBox::NoChange) return; - m_fillOnlySelection = (state == QButton::On); + m_fillOnlySelection = (state == QCheckBox::On); } void KisToolFill::setup(KActionCollection *collection) diff --git a/krita/plugins/tools/defaulttools/kis_tool_gradient.cc b/krita/plugins/tools/defaulttools/kis_tool_gradient.cc index e8a6f392c7..e33957df43 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_gradient.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_gradient.cc @@ -91,7 +91,7 @@ void KisToolGradient::buttonPress(KisButtonPressEvent *e) return; } - if (e->button() == QMouseEvent::LeftButton) { + if (e->button() == Qt::LeftButton) { m_dragging = true; m_startPos = e->pos(); m_endPos = e->pos(); @@ -118,7 +118,7 @@ void KisToolGradient::move(KisMoveEvent *e) void KisToolGradient::buttonRelease(KisButtonReleaseEvent *e) { - if (m_dragging && e->button() == QMouseEvent::LeftButton) { + if (m_dragging && e->button() == Qt::LeftButton) { KisCanvasController *controller = m_subject->canvasController(); KisImageSP img = m_subject->currentImg(); diff --git a/krita/plugins/tools/defaulttools/kis_tool_line.cc b/krita/plugins/tools/defaulttools/kis_tool_line.cc index e22b6da696..3be8dcb2c3 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_line.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_line.cc @@ -87,7 +87,7 @@ void KisToolLine::buttonPress(KisButtonPressEvent *e) if (!m_subject->currentBrush()) return; - if (e->button() == QMouseEvent::LeftButton) { + if (e->button() == Qt::LeftButton) { m_dragging = true; //KisCanvasController *controller = m_subject->canvasController(); m_startPos = e->pos(); //controller->windowToView(e->pos()); @@ -116,7 +116,7 @@ void KisToolLine::move(KisMoveEvent *e) void KisToolLine::buttonRelease(KisButtonReleaseEvent *e) { - if (m_dragging && e->button() == QMouseEvent::LeftButton) { + if (m_dragging && e->button() == Qt::LeftButton) { m_dragging = false; KisCanvasController *controller = m_subject->canvasController(); KisImageSP img = m_subject->currentImg(); diff --git a/krita/plugins/tools/defaulttools/kis_tool_move.cc b/krita/plugins/tools/defaulttools/kis_tool_move.cc index 44adb812a2..f12c0f2b7c 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_move.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_move.cc @@ -21,6 +21,8 @@ #include #include +//Added by qt3to4: +#include #include #include #include diff --git a/krita/plugins/tools/defaulttools/kis_tool_text.cc b/krita/plugins/tools/defaulttools/kis_tool_text.cc index fc0b7257d6..7310da2e3e 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_text.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_text.cc @@ -26,7 +26,9 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -69,7 +71,7 @@ void KisToolText::update(KisCanvasSubject *subject) void KisToolText::buttonRelease(KisButtonReleaseEvent *e) { - if (m_subject && e->button() == QMouseEvent::LeftButton) { + if (m_subject && e->button() == Qt::LeftButton) { KisImageSP img = m_subject->currentImg(); bool ok; @@ -145,7 +147,7 @@ QWidget* KisToolText::createOptionWidget(QWidget* parent) m_lbFont = new QLabel(i18n("Font: "), widget); - QHBox *fontBox = new QHBox(widget); + Q3HBox *fontBox = new Q3HBox(widget); m_lbFontName = new KSqueezedTextLabel(QString(m_font.family() + ", %1") .arg(m_font.pointSize()), fontBox); m_btnMoreFonts = new QPushButton("...", fontBox); diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc b/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc index 933abdb616..a23b4aeca0 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc @@ -23,6 +23,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -146,7 +148,7 @@ QWidget* KisToolSelectBrush::createOptionWidget(QWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Brush")); - QVBoxLayout * l = dynamic_cast(m_optWidget->layout()); + Q3VBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); return m_optWidget; diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/krita/plugins/tools/selectiontools/kis_tool_select_contiguous.cc index b70765ae8c..b490546797 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_contiguous.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_contiguous.cc @@ -25,6 +25,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -87,7 +90,7 @@ void KisToolSelectContiguous::buttonPress(KisButtonPressEvent * e) KisPaintDeviceSP dev; QPoint pos; - if (e->button() != QMouseEvent::LeftButton && e->button() != QMouseEvent::RightButton) + if (e->button() != Qt::LeftButton && e->button() != Qt::RightButton) return; if (!(img = m_subject->currentImg())) @@ -187,12 +190,12 @@ QWidget* KisToolSelectContiguous::createOptionWidget(QWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Contiguous Area Selection")); - QVBoxLayout * l = dynamic_cast(m_optWidget->layout()); + Q3VBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->setSpacing( 6 ); connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); - QHBoxLayout * hbox = new QHBoxLayout(l); + Q3HBoxLayout * hbox = new Q3HBoxLayout(l); Q_CHECK_PTR(hbox); QLabel * lbl = new QLabel(i18n("Fuzziness: "), m_optWidget); @@ -226,7 +229,7 @@ void KisToolSelectContiguous::slotSetSampleMerged(int state) { if (state == QCheckBox::NoChange) return; - m_sampleMerged = (state == QButton::On); + m_sampleMerged = (state == QCheckBox::On); } #include "kis_tool_select_contiguous.moc" diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/krita/plugins/tools/selectiontools/kis_tool_select_elliptical.cc index 5adde7097b..4798dedfb3 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_elliptical.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_elliptical.cc @@ -22,6 +22,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -302,7 +304,7 @@ QWidget* KisToolSelectElliptical::createOptionWidget(QWidget* parent) connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); - QVBoxLayout * l = dynamic_cast(m_optWidget->layout()); + Q3VBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); return m_optWidget; diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/krita/plugins/tools/selectiontools/kis_tool_select_eraser.cc index 9adb7108cd..35c1709629 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_eraser.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_eraser.cc @@ -22,6 +22,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -130,7 +132,7 @@ QWidget* KisToolSelectEraser::createOptionWidget(QWidget* parent) Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Eraser")); - QVBoxLayout * l = dynamic_cast(m_optWidget->layout()); + Q3VBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); return m_optWidget; diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_outline.cc b/krita/plugins/tools/selectiontools/kis_tool_select_outline.cc index b2cc615405..b9b7b0245b 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_outline.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_outline.cc @@ -24,6 +24,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -82,7 +84,7 @@ void KisToolSelectOutline::update (KisCanvasSubject *subject) void KisToolSelectOutline::buttonPress(KisButtonPressEvent *event) { - if (event->button() == LeftButton) { + if (event->button() == Qt::LeftButton) { m_dragging = true; m_dragStart = event->pos(); @@ -108,7 +110,7 @@ void KisToolSelectOutline::buttonRelease(KisButtonReleaseEvent *event) if (!m_subject) return; - if (m_dragging && event->button() == LeftButton) { + if (m_dragging && event->button() == Qt::LeftButton) { m_dragging = false; deactivate(); @@ -271,7 +273,7 @@ QWidget* KisToolSelectOutline::createOptionWidget(QWidget* parent) connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); - QVBoxLayout * l = dynamic_cast(m_optWidget->layout()); + Q3VBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); return m_optWidget; diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/krita/plugins/tools/selectiontools/kis_tool_select_polygonal.cc index 0f89c4bd9d..818614a248 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_polygonal.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_polygonal.cc @@ -24,6 +24,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -91,7 +93,7 @@ void KisToolSelectPolygonal::update (KisCanvasSubject *subject) void KisToolSelectPolygonal::buttonPress(KisButtonPressEvent *event) { - if (event->button() == LeftButton) { + if (event->button() == Qt::LeftButton) { m_dragging = true; if (m_points.isEmpty()) @@ -104,7 +106,7 @@ void KisToolSelectPolygonal::buttonPress(KisButtonPressEvent *event) m_dragEnd = event->pos(); draw(); } - } else if (event->button() == LeftButton && event->state() == Qt::ShiftButton) { + } else if (event->button() == Qt::LeftButton && event->state() == Qt::ShiftModifier) { finish(); } } @@ -191,12 +193,12 @@ void KisToolSelectPolygonal::buttonRelease(KisButtonReleaseEvent *event) if (!m_subject) return; - if (m_dragging && event->button() == LeftButton) { + if (m_dragging && event->button() == Qt::LeftButton) { m_dragging = false; m_points.append (m_dragEnd); } - if (m_dragging && event->button() == RightButton) { + if (m_dragging && event->button() == Qt::RightButton) { } } @@ -290,7 +292,7 @@ QWidget* KisToolSelectPolygonal::createOptionWidget(QWidget* parent) connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); - QVBoxLayout * l = dynamic_cast(m_optWidget->layout()); + Q3VBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); return m_optWidget; diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/krita/plugins/tools/selectiontools/kis_tool_select_rectangular.cc index 05883c8112..4a6ae0d30b 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_rectangular.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_rectangular.cc @@ -25,6 +25,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -299,7 +301,7 @@ QWidget* KisToolSelectRectangular::createOptionWidget(QWidget* parent) connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); - QVBoxLayout * l = dynamic_cast(m_optWidget->layout()); + Q3VBoxLayout * l = dynamic_cast(m_optWidget->layout()); l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); return m_optWidget; diff --git a/krita/plugins/tools/tool_crop/kis_tool_crop.cc b/krita/plugins/tools/tool_crop/kis_tool_crop.cc index b924079abf..23107894af 100644 --- a/krita/plugins/tools/tool_crop/kis_tool_crop.cc +++ b/krita/plugins/tools/tool_crop/kis_tool_crop.cc @@ -28,6 +28,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -461,8 +463,8 @@ void KisToolCrop::paintOutlineWithHandles(KisCanvasPainter& gc, const QRect&) gc.drawLine(startx,endy + m_handleSize / 2 + 1, startx, controller->kiscanvas()->height()); gc.drawLine(endx,0,endx,starty - m_handleSize / 2); gc.drawLine(endx + m_handleSize / 2 + 1,starty, controller->kiscanvas()->width(), starty); - QMemArray rects = m_handlesRegion.rects (); - for (QMemArray ::ConstIterator it = rects.begin (); it != rects.end (); ++it) + Q3MemArray rects = m_handlesRegion.rects (); + for (Q3MemArray ::ConstIterator it = rects.begin (); it != rects.end (); ++it) { gc.fillRect (*it, Qt::black); } @@ -835,7 +837,7 @@ qint32 KisToolCrop::mouseOnHandle(QPoint currentViewPoint) { m_dx = startx - currentViewPoint.x() ; } - return Left; + return Qt::DockLeft; } else if ( toQRect ( endx - m_handleSize / 2.0 , starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) { @@ -843,7 +845,7 @@ qint32 KisToolCrop::mouseOnHandle(QPoint currentViewPoint) { m_dx = endx-currentViewPoint.x(); } - return Right; + return Qt::DockRight; } else if ( toQRect ( startx , starty, endx - startx , endy - starty ).contains( currentViewPoint ) ) { diff --git a/krita/plugins/tools/tool_filter/kis_tool_filter.cc b/krita/plugins/tools/tool_filter/kis_tool_filter.cc index 1cc1240f60..1543200a83 100644 --- a/krita/plugins/tools/tool_filter/kis_tool_filter.cc +++ b/krita/plugins/tools/tool_filter/kis_tool_filter.cc @@ -23,6 +23,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -120,7 +122,7 @@ QWidget* KisToolFilter::createOptionWidget(QWidget* parent) addOptionWidgetOption(m_cbFilter, lbFilter); - m_optionLayout = new QGridLayout(widget, 1, 1, 0, 6); + m_optionLayout = new Q3GridLayout(widget, 1, 1, 0, 6); Q_CHECK_PTR(m_optionLayout); super::addOptionWidgetLayout(m_optionLayout); diff --git a/krita/plugins/tools/tool_polygon/kis_tool_polygon.cc b/krita/plugins/tools/tool_polygon/kis_tool_polygon.cc index e09bce5a7e..515b3b380d 100644 --- a/krita/plugins/tools/tool_polygon/kis_tool_polygon.cc +++ b/krita/plugins/tools/tool_polygon/kis_tool_polygon.cc @@ -23,6 +23,8 @@ #include #include +//Added by qt3to4: +#include #include #include @@ -68,7 +70,7 @@ void KisToolPolygon::update (KisCanvasSubject *subject) void KisToolPolygon::buttonPress(KisButtonPressEvent *event) { if (m_currentImage) { - if (event->button() == LeftButton && event->state() != Qt::ShiftButton) { + if (event->button() == LeftButton && event->state() != Qt::ShiftModifier) { m_dragging = true; @@ -82,7 +84,7 @@ void KisToolPolygon::buttonPress(KisButtonPressEvent *event) m_dragEnd = event->pos(); draw(); } - } else if (event->button() == LeftButton && event->state() == Qt::ShiftButton) { + } else if (event->button() == LeftButton && event->state() == Qt::ShiftModifier) { finish(); } } diff --git a/krita/plugins/tools/tool_polyline/kis_tool_polyline.cc b/krita/plugins/tools/tool_polyline/kis_tool_polyline.cc index f1dc10f1df..51a8086b1e 100644 --- a/krita/plugins/tools/tool_polyline/kis_tool_polyline.cc +++ b/krita/plugins/tools/tool_polyline/kis_tool_polyline.cc @@ -23,6 +23,8 @@ #include #include +//Added by qt3to4: +#include #include #include diff --git a/krita/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/krita/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc index 937e6dcbd1..e1e3cd7936 100644 --- a/krita/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc +++ b/krita/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc @@ -24,6 +24,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -130,7 +133,7 @@ void KisToolSelectSimilar::buttonPress(KisButtonPressEvent *e) QPoint pos; quint8 opacity = OPACITY_OPAQUE; - if (e->button() != QMouseEvent::LeftButton && e->button() != QMouseEvent::RightButton) + if (e->button() != Qt::LeftButton && e->button() != Qt::RightButton) return; if (!(img = m_subject->currentImg())) @@ -232,7 +235,7 @@ QWidget* KisToolSelectSimilar::createOptionWidget(QWidget* parent) m_optWidget->setCaption(i18n("Similar Selection")); - QVBoxLayout * l = new QVBoxLayout(m_optWidget, 0, 6); + Q3VBoxLayout * l = new Q3VBoxLayout(m_optWidget, 0, 6); Q_CHECK_PTR(l); m_selectionOptionsWidget = new KisSelectionOptions(m_optWidget, m_subject); @@ -241,7 +244,7 @@ QWidget* KisToolSelectSimilar::createOptionWidget(QWidget* parent) l->addWidget(m_selectionOptionsWidget); connect (m_selectionOptionsWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); - QHBoxLayout * hbox = new QHBoxLayout(l); + Q3HBoxLayout * hbox = new Q3HBoxLayout(l); Q_CHECK_PTR(hbox); QLabel * lbl = new QLabel(i18n("Fuzziness: "), m_optWidget); diff --git a/krita/plugins/tools/tool_star/kis_tool_star.cc b/krita/plugins/tools/tool_star/kis_tool_star.cc index 7ae6c1fee6..07ff9fbfa1 100644 --- a/krita/plugins/tools/tool_star/kis_tool_star.cc +++ b/krita/plugins/tools/tool_star/kis_tool_star.cc @@ -24,6 +24,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -234,7 +236,7 @@ QWidget* KisToolStar::createOptionWidget(QWidget* parent) m_optWidget->ratioSpinBox->setValue(m_innerOuterRatio); - QGridLayout *optionLayout = new QGridLayout(widget, 1, 1); + Q3GridLayout *optionLayout = new Q3GridLayout(widget, 1, 1); super::addOptionWidgetLayout(optionLayout); optionLayout->addWidget(m_optWidget, 0, 0); diff --git a/krita/plugins/viewplugins/colorrange/dlg_colorrange.cc b/krita/plugins/viewplugins/colorrange/dlg_colorrange.cc index 44e3569cbb..554c7e205f 100644 --- a/krita/plugins/viewplugins/colorrange/dlg_colorrange.cc +++ b/krita/plugins/viewplugins/colorrange/dlg_colorrange.cc @@ -239,7 +239,7 @@ void DlgColorRange::updatePreview() qint32 x, y, w, h; m_dev->exactBounds(x, y, w, h); - QPixmap pix = QPixmap(m_selection->maskImage().smoothScale(350, 350, QImage::ScaleMin)); + QPixmap pix = QPixmap(m_selection->maskImage().smoothScale(350, 350, Qt::KeepAspectRatio)); m_subject->canvasController()->updateCanvas(); m_page->pixSelection->setPixmap(pix); } diff --git a/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc index 62528a0c01..2d0824a0d6 100644 --- a/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc +++ b/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc index b59fb5464d..00800bd719 100644 --- a/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc +++ b/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include @@ -79,8 +79,8 @@ void DlgColorSpaceConversion::fillCmbDestProfile(const KisID & s) { m_page->cmbDestProfile->clear(); - QValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor(s); - QValueVector ::iterator it; + Q3ValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor(s); + Q3ValueVector ::iterator it; for ( it = profileList.begin(); it != profileList.end(); ++it ) { m_page->cmbDestProfile->insertItem((*it)->productName()); diff --git a/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.cc index 6445393812..ac3f5a8163 100644 --- a/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.cc +++ b/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.cc @@ -20,10 +20,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc index 4d4ff48165..8c8fc8f3d7 100644 --- a/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc +++ b/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc @@ -20,7 +20,7 @@ */ #include "kis_dlg_filtersgallery.h" -#include +#include #include #include #include @@ -52,7 +52,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, QWidget* parent,const setMainWidget(m_widget); // Initialize filters list - connect(m_widget->filtersList , SIGNAL(selectionChanged(QIconViewItem*)), this, SLOT(selectionHasChanged(QIconViewItem* ))); + connect(m_widget->filtersList , SIGNAL(selectionChanged(Q3IconViewItem*)), this, SLOT(selectionHasChanged(Q3IconViewItem* ))); // Initialize configWidgetHolder m_widget->configWidgetHolder->setColumnLayout ( 0, Qt::Horizontal ); //m_widget->configWidgetHolder->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); @@ -74,7 +74,7 @@ KisDlgFiltersGallery::~KisDlgFiltersGallery() { } -void KisDlgFiltersGallery::selectionHasChanged ( QIconViewItem * item ) +void KisDlgFiltersGallery::selectionHasChanged ( Q3IconViewItem * item ) { KisFiltersIconViewItem* kisitem = (KisFiltersIconViewItem*) item; m_currentFilter = kisitem->filter(); diff --git a/krita/plugins/viewplugins/histogram/dlg_histogram.cc b/krita/plugins/viewplugins/histogram/dlg_histogram.cc index 0440c9db6b..166380e31f 100644 --- a/krita/plugins/viewplugins/histogram/dlg_histogram.cc +++ b/krita/plugins/viewplugins/histogram/dlg_histogram.cc @@ -17,7 +17,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 +#include #include #include #include diff --git a/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc b/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc index ca9d91f741..4aada1fd10 100644 --- a/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc +++ b/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc b/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc index f899f2af15..19fa7c9af7 100644 --- a/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc +++ b/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc @@ -21,6 +21,8 @@ #include #include #include +//Added by qt3to4: +#include #include "kis_accumulating_producer.h" @@ -71,7 +73,7 @@ void KisAccumulatingHistogramProducer::ThreadedProducer::run() { uint count = m_source->m_source->count(); // Talk about bad naming schemes... KisCachedHistogramObserver::Producers* source = m_source->m_source; - QValueVector& bins = m_source->m_bins; + Q3ValueVector& bins = m_source->m_bins; int channels = m_source->m_channels; int nrOfBins = m_source->m_nrOfBins; diff --git a/krita/plugins/viewplugins/imagesize/dlg_imagesize.cc b/krita/plugins/viewplugins/imagesize/dlg_imagesize.cc index 6cf7b44ce4..8582ba42ba 100644 --- a/krita/plugins/viewplugins/imagesize/dlg_imagesize.cc +++ b/krita/plugins/viewplugins/imagesize/dlg_imagesize.cc @@ -28,7 +28,7 @@ using namespace std; #include #include -#include +#include #include #include diff --git a/krita/plugins/viewplugins/imagesize/dlg_layersize.cc b/krita/plugins/viewplugins/imagesize/dlg_layersize.cc index a5278741b0..bc8bd6ed5f 100644 --- a/krita/plugins/viewplugins/imagesize/dlg_layersize.cc +++ b/krita/plugins/viewplugins/imagesize/dlg_layersize.cc @@ -29,7 +29,7 @@ using namespace std; #include #include -#include +#include #include #include diff --git a/krita/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/krita/plugins/viewplugins/modify_selection/dlg_border_selection.cc index 2f9c1a1137..bea69cfff6 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_border_selection.cc +++ b/krita/plugins/viewplugins/modify_selection/dlg_border_selection.cc @@ -28,7 +28,7 @@ using namespace std; #include #include -#include +#include #include #include diff --git a/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.cc index 22140d84d5..0e5d741ddc 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.cc +++ b/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.cc @@ -28,7 +28,7 @@ using namespace std; #include #include -#include +#include #include #include diff --git a/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc index c9ff6519e4..60f18360d5 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc +++ b/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc @@ -28,7 +28,7 @@ using namespace std; #include #include -#include +#include #include #include diff --git a/krita/plugins/viewplugins/performancetest/perftest.cc b/krita/plugins/viewplugins/performancetest/perftest.cc index 9debe52670..bbbf7b022b 100644 --- a/krita/plugins/viewplugins/performancetest/perftest.cc +++ b/krita/plugins/viewplugins/performancetest/perftest.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -220,7 +220,7 @@ void PerfTest::slotPerfTest() Q_CHECK_PTR(d); d->setCaption("Performance test results"); - QTextEdit * e = new QTextEdit(d); + Q3TextEdit * e = new Q3TextEdit(d); Q_CHECK_PTR(e); d->setMainWidget(e); e->setText(report); diff --git a/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.cc index 75a99b28b6..76dfe22f6f 100644 --- a/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.cc +++ b/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.cc @@ -26,7 +26,7 @@ using namespace std; -#include +#include #include #include #include diff --git a/krita/plugins/viewplugins/separate_channels/dlg_separate.cc b/krita/plugins/viewplugins/separate_channels/dlg_separate.cc index 760786ec14..1d4cf92c53 100644 --- a/krita/plugins/viewplugins/separate_channels/dlg_separate.cc +++ b/krita/plugins/viewplugins/separate_channels/dlg_separate.cc @@ -20,10 +20,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/krita/plugins/viewplugins/separate_channels/kis_channel_separator.cc b/krita/plugins/viewplugins/separate_channels/kis_channel_separator.cc index 852af6976d..218361d425 100644 --- a/krita/plugins/viewplugins/separate_channels/kis_channel_separator.cc +++ b/krita/plugins/viewplugins/separate_channels/kis_channel_separator.cc @@ -85,7 +85,7 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS quint32 numberOfChannels = src->nChannels(); KisColorSpace * srcCs = src->colorSpace(); - QValueVector channels = srcCs->channels(); + Q3ValueVector channels = srcCs->channels(); // Use the flattened image, if required switch(sourceOps) { @@ -99,15 +99,15 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS vKisPaintDeviceSP layers; - QValueVector::const_iterator begin = channels.begin(); - QValueVector::const_iterator end = channels.end(); + Q3ValueVector::const_iterator begin = channels.begin(); + Q3ValueVector::const_iterator end = channels.end(); QRect rect = src->exactBounds(); int i = 0; quint32 channelIndex = 0; - for (QValueVector::const_iterator it = begin; it != end; ++it, ++channelIndex) + for (Q3ValueVector::const_iterator it = begin; it != end; ++it, ++channelIndex) { KisChannelInfo * ch = (*it); @@ -238,7 +238,7 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS break; } - for (QValueVector::const_iterator it = begin; it != end; ++it) + for (Q3ValueVector::const_iterator it = begin; it != end; ++it) { KisChannelInfo * ch = (*it); diff --git a/krita/plugins/viewplugins/variations/dlg_variations.cc b/krita/plugins/viewplugins/variations/dlg_variations.cc index 7d81b0787f..861e74440a 100644 --- a/krita/plugins/viewplugins/variations/dlg_variations.cc +++ b/krita/plugins/viewplugins/variations/dlg_variations.cc @@ -22,6 +22,8 @@ #include "dlg_variations.h" #include "wdg_variations.h" +//Added by qt3to4: +#include DlgVariations::DlgVariations( QWidget * parent, diff --git a/krita/ui/imageviewer.cc b/krita/ui/imageviewer.cc index 490f345142..9cecd3d67d 100644 --- a/krita/ui/imageviewer.cc +++ b/krita/ui/imageviewer.cc @@ -24,13 +24,16 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include #include ImageViewer::ImageViewer(QWidget *widget, const char * name) - : QScrollView(widget, name) + : Q3ScrollView(widget, name) , m_isDragging(false) , m_image(QPixmap()) { diff --git a/krita/ui/kcurve.cc b/krita/ui/kcurve.cc index 8f713b1d27..e9ef2e8f50 100644 --- a/krita/ui/kcurve.cc +++ b/krita/ui/kcurve.cc @@ -31,6 +31,11 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include // KDE includes. @@ -42,7 +47,7 @@ #include "kcurve.h" -KCurve::KCurve(QWidget *parent, const char *name, WFlags f) +KCurve::KCurve(QWidget *parent, const char *name, Qt::WFlags f) : QWidget(parent, name, f) { m_grab_point = NULL; @@ -357,7 +362,7 @@ double KCurve::getCurveValue(double x) return getCurveValue(m_points, x); } -double KCurve::getCurveValue(QPtrList > &curve, double x) +double KCurve::getCurveValue(Q3PtrList > &curve, double x) { double t; QPair *p; @@ -411,9 +416,9 @@ double KCurve::getCurveValue(QPtrList > &curve, double x) return val; } -QPtrList > KCurve::getCurve() +Q3PtrList > KCurve::getCurve() { - QPtrList > outlist; + Q3PtrList > outlist; QPair *p; QPair *outpoint; @@ -427,7 +432,7 @@ QPtrList > KCurve::getCurve() return outlist; } -void KCurve::setCurve(QPtrList >inlist) +void KCurve::setCurve(Q3PtrList >inlist) { QPair *p; QPair *inpoint; diff --git a/krita/ui/kis_autobrush.cc b/krita/ui/kis_autobrush.cc index aa9d7db5e2..69300dbf48 100644 --- a/krita/ui/kis_autobrush.cc +++ b/krita/ui/kis_autobrush.cc @@ -24,6 +24,9 @@ #include #include #include +//Added by qt3to4: +#include +#include KisAutobrush::KisAutobrush(QWidget *parent, const char* name, const QString& caption) : KisWdgAutobrush(parent, name) diff --git a/krita/ui/kis_birdeye_box.cc b/krita/ui/kis_birdeye_box.cc index f10b8247ce..17054491fc 100644 --- a/krita/ui/kis_birdeye_box.cc +++ b/krita/ui/kis_birdeye_box.cc @@ -22,6 +22,9 @@ #include "qpixmap.h" #include "qpainter.h" #include "qimage.h" +//Added by qt3to4: +#include +#include #include "config.h" #include LCMS_HEADER #include "klocale.h" @@ -178,7 +181,7 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, QWidget* parent, const char* name) , m_view(view) , m_subject(view->canvasSubject()) { - QVBoxLayout * l = new QVBoxLayout(this); + Q3VBoxLayout * l = new Q3VBoxLayout(this); m_image = m_subject->currentImg(); @@ -193,7 +196,7 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, QWidget* parent, const char* name) l->addWidget(m_birdEyePanel); - QHBoxLayout * hl = new QHBoxLayout(l); + Q3HBoxLayout * hl = new Q3HBoxLayout(l); m_exposureLabel = new QLabel(i18n("Exposure:"), this); hl->addWidget(m_exposureLabel); diff --git a/krita/ui/kis_brush_chooser.cc b/krita/ui/kis_brush_chooser.cc index 88905aac83..d0d499a303 100644 --- a/krita/ui/kis_brush_chooser.cc +++ b/krita/ui/kis_brush_chooser.cc @@ -18,6 +18,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -41,12 +44,12 @@ KisBrushChooser::KisBrushChooser(QWidget *parent, const char *name) m_lbName = new QLabel(this); - QVBoxLayout *mainLayout = new QVBoxLayout(this, 2, -1, "main layout"); + Q3VBoxLayout *mainLayout = new Q3VBoxLayout(this, 2, -1, "main layout"); mainLayout->addWidget(m_lbName); mainLayout->addWidget(chooserWidget(), 10); - QGridLayout *spacingLayout = new QGridLayout( 2, 2); + Q3GridLayout *spacingLayout = new Q3GridLayout( 2, 2); mainLayout->addLayout(spacingLayout, 1); diff --git a/krita/ui/kis_canvas.cc b/krita/ui/kis_canvas.cc index 65069f12cd..3b1efca22f 100644 --- a/krita/ui/kis_canvas.cc +++ b/krita/ui/kis_canvas.cc @@ -59,6 +59,15 @@ **********************************************************************/ #include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include +#include #include "kis_canvas.h" #include "kis_cursor.h" @@ -1157,7 +1166,7 @@ void KisCanvas::createCanvasWidget(bool useOpenGL) Q_CHECK_PTR(m_canvasWidget); QWidget *widget = dynamic_cast(m_canvasWidget); - widget->setBackgroundMode(QWidget::NoBackground); + widget->setBackgroundMode(Qt::NoBackground); widget->setMouseTracking(true); widget->setAcceptDrops(true); m_canvasWidget->enableMoveEventCompressionHint(m_enableMoveEventCompressionHint); @@ -1332,7 +1341,7 @@ void KisCanvas::updateGeometry() dynamic_cast(m_canvasWidget)->updateGeometry(); } -void KisCanvas::setFocusPolicy(QWidget::FocusPolicy focusPolicy) +void KisCanvas::setFocusPolicy(Qt::FocusPolicy focusPolicy) { Q_ASSERT(m_canvasWidget); dynamic_cast(m_canvasWidget)->setFocusPolicy(focusPolicy); diff --git a/krita/ui/kis_canvas_painter.cc b/krita/ui/kis_canvas_painter.cc index d4cfb0653a..6ce4b14a27 100644 --- a/krita/ui/kis_canvas_painter.cc +++ b/krita/ui/kis_canvas_painter.cc @@ -19,6 +19,9 @@ #include "kis_canvas.h" #include "kis_canvas_painter.h" #include "kis_qpaintdevice_canvas_painter.h" +//Added by qt3to4: +#include +#include KisCanvasWidgetPainter::KisCanvasWidgetPainter() { @@ -241,12 +244,12 @@ QRect KisCanvasWidgetPainter::xForm(const QRect& r) const return r; } -QPointArray KisCanvasWidgetPainter::xForm(const QPointArray& pointArray) const +Q3PointArray KisCanvasWidgetPainter::xForm(const Q3PointArray& pointArray) const { return pointArray; } -QPointArray KisCanvasWidgetPainter::xForm(const QPointArray& pointArray, int /*index*/, int /*npoints*/) const +Q3PointArray KisCanvasWidgetPainter::xForm(const Q3PointArray& pointArray, int /*index*/, int /*npoints*/) const { return pointArray; } @@ -261,12 +264,12 @@ QRect KisCanvasWidgetPainter::xFormDev(const QRect& r) const return r; } -QPointArray KisCanvasWidgetPainter::xFormDev(const QPointArray& pointArray) const +Q3PointArray KisCanvasWidgetPainter::xFormDev(const Q3PointArray& pointArray) const { return pointArray; } -QPointArray KisCanvasWidgetPainter::xFormDev(const QPointArray& pointArray, int /*index*/, int /*npoints*/) const +Q3PointArray KisCanvasWidgetPainter::xFormDev(const Q3PointArray& pointArray, int /*index*/, int /*npoints*/) const { return pointArray; } @@ -305,7 +308,7 @@ void KisCanvasWidgetPainter::drawPoint(const QPoint& /*point*/) { } -void KisCanvasWidgetPainter::drawPoints(const QPointArray& /*pointArray*/, int /*index*/, int /*npoints*/) +void KisCanvasWidgetPainter::drawPoints(const Q3PointArray& /*pointArray*/, int /*index*/, int /*npoints*/) { } @@ -397,23 +400,23 @@ void KisCanvasWidgetPainter::drawChord(const QRect& /*r*/, int /*a*/, int /*alen { } -void KisCanvasWidgetPainter::drawLineSegments(const QPointArray& /*pointArray*/, int /*index*/, int /*nlines*/) +void KisCanvasWidgetPainter::drawLineSegments(const Q3PointArray& /*pointArray*/, int /*index*/, int /*nlines*/) { } -void KisCanvasWidgetPainter::drawPolyline(const QPointArray& /*pointArray*/, int /*index*/, int /*npoints*/) +void KisCanvasWidgetPainter::drawPolyline(const Q3PointArray& /*pointArray*/, int /*index*/, int /*npoints*/) { } -void KisCanvasWidgetPainter::drawPolygon(const QPointArray& /*pointArray*/, bool /*winding*/, int /*index*/, int /*npoints*/) +void KisCanvasWidgetPainter::drawPolygon(const Q3PointArray& /*pointArray*/, bool /*winding*/, int /*index*/, int /*npoints*/) { } -void KisCanvasWidgetPainter::drawConvexPolygon(const QPointArray& /*pointArray*/, int /*index*/, int /*npoints*/) +void KisCanvasWidgetPainter::drawConvexPolygon(const Q3PointArray& /*pointArray*/, int /*index*/, int /*npoints*/) { } -void KisCanvasWidgetPainter::drawCubicBezier(const QPointArray& /*pointArray*/, int /*index*/) +void KisCanvasWidgetPainter::drawCubicBezier(const Q3PointArray& /*pointArray*/, int /*index*/) { } @@ -929,7 +932,7 @@ QRect KisCanvasPainter::xForm(const QRect& r) const return r; } -QPointArray KisCanvasPainter::xForm(const QPointArray& pointArray) const +Q3PointArray KisCanvasPainter::xForm(const Q3PointArray& pointArray) const { if (m_canvasWidgetPainter != 0) { return m_canvasWidgetPainter->transformed(pointArray); @@ -937,7 +940,7 @@ QPointArray KisCanvasPainter::xForm(const QPointArray& pointArray) const return pointArray; } -QPointArray KisCanvasPainter::xForm(const QPointArray& pointArray, int index, int npoints) const +Q3PointArray KisCanvasPainter::xForm(const Q3PointArray& pointArray, int index, int npoints) const { if (m_canvasWidgetPainter != 0) { return m_canvasWidgetPainter->transformed(pointArray, index, npoints); @@ -961,7 +964,7 @@ QRect KisCanvasPainter::xFormDev(const QRect& r) const return r; } -QPointArray KisCanvasPainter::xFormDev(const QPointArray& pointArray) const +Q3PointArray KisCanvasPainter::xFormDev(const Q3PointArray& pointArray) const { if (m_canvasWidgetPainter != 0) { return m_canvasWidgetPainter->xFormDev(pointArray); @@ -969,7 +972,7 @@ QPointArray KisCanvasPainter::xFormDev(const QPointArray& pointArray) const return pointArray; } -QPointArray KisCanvasPainter::xFormDev(const QPointArray& pointArray, int index, int npoints) const +Q3PointArray KisCanvasPainter::xFormDev(const Q3PointArray& pointArray, int index, int npoints) const { if (m_canvasWidgetPainter != 0) { return m_canvasWidgetPainter->xFormDev(pointArray, index, npoints); @@ -1035,7 +1038,7 @@ void KisCanvasPainter::drawPoint(const QPoint& point) } } -void KisCanvasPainter::drawPoints(const QPointArray& pointArray, int index, int npoints) +void KisCanvasPainter::drawPoints(const Q3PointArray& pointArray, int index, int npoints) { if (m_canvasWidgetPainter != 0) { m_canvasWidgetPainter->drawPoints(pointArray, index, npoints); @@ -1196,35 +1199,35 @@ void KisCanvasPainter::drawChord(const QRect& r, int a, int alen) } } -void KisCanvasPainter::drawLineSegments(const QPointArray& pointArray, int index, int nlines) +void KisCanvasPainter::drawLineSegments(const Q3PointArray& pointArray, int index, int nlines) { if (m_canvasWidgetPainter != 0) { m_canvasWidgetPainter->drawLineSegments(pointArray, index, nlines); } } -void KisCanvasPainter::drawPolyline(const QPointArray& pointArray, int index, int npoints) +void KisCanvasPainter::drawPolyline(const Q3PointArray& pointArray, int index, int npoints) { if (m_canvasWidgetPainter != 0) { m_canvasWidgetPainter->drawPolyline(pointArray, index, npoints); } } -void KisCanvasPainter::drawPolygon(const QPointArray& pointArray, bool winding, int index, int npoints) +void KisCanvasPainter::drawPolygon(const Q3PointArray& pointArray, bool winding, int index, int npoints) { if (m_canvasWidgetPainter != 0) { m_canvasWidgetPainter->drawPolygon(pointArray, winding, index, npoints); } } -void KisCanvasPainter::drawConvexPolygon(const QPointArray& pointArray, int index, int npoints) +void KisCanvasPainter::drawConvexPolygon(const Q3PointArray& pointArray, int index, int npoints) { if (m_canvasWidgetPainter != 0) { m_canvasWidgetPainter->drawConvexPolygon(pointArray, index, npoints); } } -void KisCanvasPainter::drawCubicBezier(const QPointArray& pointArray, int index) +void KisCanvasPainter::drawCubicBezier(const Q3PointArray& pointArray, int index) { if (m_canvasWidgetPainter != 0) { m_canvasWidgetPainter->drawCubicBezier(pointArray, index); diff --git a/krita/ui/kis_clipboard.cc b/krita/ui/kis_clipboard.cc index e47ff2f2c1..1150486134 100644 --- a/krita/ui/kis_clipboard.cc +++ b/krita/ui/kis_clipboard.cc @@ -21,6 +21,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include "kdebug.h" @@ -80,7 +82,7 @@ void KisClipboard::setClip(KisPaintDeviceSP selection) // We'll create a store (ZIP format) in memory QBuffer buffer; - QCString mimeType("application/x-krita-selection"); + Q3CString mimeType("application/x-krita-selection"); KoStore* store = KoStore::createStore( &buffer, KoStore::Write, mimeType ); Q_ASSERT( store ); Q_ASSERT( !store->bad() ); @@ -122,7 +124,7 @@ void KisClipboard::setClip(KisPaintDeviceSP selection) KisProfile * monitorProfile = KisMetaRegistry::instance()->csRegistry()->getProfileByName(monitorProfileName); qimg = selection->convertToQImage(monitorProfile); - QImageDrag *qimgDrag = new QImageDrag(qimg); + Q3ImageDrag *qimgDrag = new Q3ImageDrag(qimg); KMultipleDrag *multiDrag = new KMultipleDrag(); if ( !qimg.isNull() ) multiDrag->addDragObject( qimgDrag ); @@ -139,7 +141,7 @@ void KisClipboard::setClip(KisPaintDeviceSP selection) KisPaintDeviceSP KisClipboard::clip() { QClipboard *cb = QApplication::clipboard(); - QCString mimeType("application/x-krita-selection"); + Q3CString mimeType("application/x-krita-selection"); QMimeSource *cbData = cb->data(); if(cbData && cbData->provides(mimeType)) @@ -213,7 +215,7 @@ void KisClipboard::clipboardDataChanged() QClipboard *cb = QApplication::clipboard(); QImage qimg = cb->image(); QMimeSource *cbData = cb->data(); - QCString mimeType("application/x-krita-selection"); + Q3CString mimeType("application/x-krita-selection"); if(cbData && cbData->provides(mimeType)) m_hasClip = true; @@ -235,7 +237,7 @@ QSize KisClipboard::clipSize() { QClipboard *cb = QApplication::clipboard(); - QCString mimeType("application/x-krita-selection"); + Q3CString mimeType("application/x-krita-selection"); QMimeSource *cbData = cb->data(); KisPaintDeviceSP clip; diff --git a/krita/ui/kis_color_cup.cc b/krita/ui/kis_color_cup.cc index 3342305f12..08d6f15a97 100644 --- a/krita/ui/kis_color_cup.cc +++ b/krita/ui/kis_color_cup.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -32,7 +32,9 @@ #include #include #include -#include +#include +//Added by qt3to4: +#include #include #include @@ -44,12 +46,12 @@ #include KisColorPopup::KisColorPopup(QColor c, QWidget * parent, const char * name) - : QFrame(parent, name, WType_Popup | WStyle_Customize | WStyle_NoBorder) + : Q3Frame(parent, name, Qt::WType_Popup | Qt::WStyle_Customize | Qt::WStyle_NoBorder) { m_color = c; setMargin(4); - setFocusPolicy(StrongFocus); - QHBoxLayout * l = new QHBoxLayout(this); + setFocusPolicy(Qt::StrongFocus); + Q3HBoxLayout * l = new Q3HBoxLayout(this); l->add(m_khsSelector = new KHSSelector(this)); m_khsSelector->setMinimumSize(140, 7); l->add(m_valueSelector = new KValueSelector(this)); diff --git a/krita/ui/kis_controlframe.cc b/krita/ui/kis_controlframe.cc index 1914cbdc52..9611c447ad 100644 --- a/krita/ui/kis_controlframe.cc +++ b/krita/ui/kis_controlframe.cc @@ -25,10 +25,14 @@ #include #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -62,7 +66,7 @@ #include "kis_text_brush.h" #endif KisPopupFrame::KisPopupFrame(QWidget * parent, const char* name) - : QPopupMenu(parent, name) + : Q3PopupMenu(parent, name) { setFocusPolicy(StrongFocus); } @@ -219,11 +223,11 @@ void KisControlFrame::createBrushesChooser(KisView * view) m_brushChooserPopup = new KisPopupFrame(m_brushWidget, "brush_chooser_popup"); - QHBoxLayout * l = new QHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuplayout"); + Q3HBoxLayout * l = new Q3HBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuplayout"); QTabWidget * m_brushesTab = new QTabWidget(m_brushChooserPopup, "brushestab"); m_brushesTab->setTabShape(QTabWidget::Triangular); - m_brushesTab->setFocusPolicy(QWidget::NoFocus); + m_brushesTab->setFocusPolicy(Qt::NoFocus); m_brushesTab->setFont(m_font); m_brushesTab->setMargin(1); @@ -271,11 +275,11 @@ void KisControlFrame::createPatternsChooser(KisView * view) { m_patternChooserPopup = new KisPopupFrame(m_patternWidget, "pattern_chooser_popup"); - QHBoxLayout * l2 = new QHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuplayout"); + Q3HBoxLayout * l2 = new Q3HBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuplayout"); QTabWidget * m_patternsTab = new QTabWidget(m_patternChooserPopup, "patternstab"); m_patternsTab->setTabShape(QTabWidget::Triangular); - m_patternsTab->setFocusPolicy(QWidget::NoFocus); + m_patternsTab->setFocusPolicy(Qt::NoFocus); m_patternsTab->setFont(m_font); m_patternsTab->setMargin(1); l2->add( m_patternsTab ); @@ -312,11 +316,11 @@ void KisControlFrame::createGradientsChooser(KisView * view) { m_gradientChooserPopup = new KisPopupFrame(m_gradientWidget, "gradient_chooser_popup"); - QHBoxLayout * l2 = new QHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuplayout"); + Q3HBoxLayout * l2 = new Q3HBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuplayout"); QTabWidget * m_gradientTab = new QTabWidget(m_gradientChooserPopup, "gradientstab"); m_gradientTab->setTabShape(QTabWidget::Triangular); - m_gradientTab->setFocusPolicy(QWidget::NoFocus); + m_gradientTab->setFocusPolicy(Qt::NoFocus); m_gradientTab->setFont(m_font); m_gradientTab->setMargin(1); diff --git a/krita/ui/kis_custom_brush.cc b/krita/ui/kis_custom_brush.cc index 3e6046e7e3..9c8d4dfc55 100644 --- a/krita/ui/kis_custom_brush.cc +++ b/krita/ui/kis_custom_brush.cc @@ -23,6 +23,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include #include @@ -124,8 +127,8 @@ void KisCustomBrush::createBrush() { } // For each layer in the current image, create a new image, and add it to the list - QValueVector< QValueVector > devices; - devices.push_back(QValueVector()); + Q3ValueVector< Q3ValueVector > devices; + devices.push_back(Q3ValueVector()); int w = img->width(); int h = img->height(); @@ -138,7 +141,7 @@ void KisCustomBrush::createBrush() { devices.at(0).push_back(paint->paintDevice()); layer = layer->nextSibling(); } - QValueVector modes; + Q3ValueVector modes; switch(comboBox2->currentItem()) { case 0: modes.push_back(KisPipeBrushParasite::Constant); break; diff --git a/krita/ui/kis_custom_image_widget.cc b/krita/ui/kis_custom_image_widget.cc index 16f8313996..1ceeea2084 100644 --- a/krita/ui/kis_custom_image_widget.cc +++ b/krita/ui/kis_custom_image_widget.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include KisCustomImageWidget::KisCustomImageWidget(QWidget *parent, KisDoc *doc, qint32 defWidth, qint32 defHeight, double resolution, QString defColorSpaceName, QString imageName) @@ -86,8 +86,8 @@ void KisCustomImageWidget::fillCmbProfiles(const KisID & s) KisColorSpaceFactory * csf = KisMetaRegistry::instance()->csRegistry()->get(s); if (csf == 0) return; - QValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( csf ); - QValueVector ::iterator it; + Q3ValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( csf ); + Q3ValueVector ::iterator it; for ( it = profileList.begin(); it != profileList.end(); ++it ) { cmbProfile->insertItem((*it)->productName()); } diff --git a/krita/ui/kis_custom_pattern.cc b/krita/ui/kis_custom_pattern.cc index 41ba73a735..ecfcc79eb3 100644 --- a/krita/ui/kis_custom_pattern.cc +++ b/krita/ui/kis_custom_pattern.cc @@ -22,6 +22,9 @@ #include #include #include +//Added by qt3to4: +#include +#include #include #include #include diff --git a/krita/ui/kis_dlg_adj_layer_props.cc b/krita/ui/kis_dlg_adj_layer_props.cc index 630ce5002f..811ac4e9c0 100644 --- a/krita/ui/kis_dlg_adj_layer_props.cc +++ b/krita/ui/kis_dlg_adj_layer_props.cc @@ -17,9 +17,12 @@ */ #include -#include +#include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -80,7 +83,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, setCaption(caption); QWidget * page = new QWidget(this, "page widget"); - QHBoxLayout * layout = new QHBoxLayout(page, 0, 6); + Q3HBoxLayout * layout = new Q3HBoxLayout(page, 0, 6); setMainWidget(page); m_preview = new KisPreviewWidget(page, "dlgadjustment.preview"); @@ -89,8 +92,8 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, connect( m_preview, SIGNAL(updated()), this, SLOT(refreshPreview())); layout->addWidget(m_preview, 1, 1); - QVBoxLayout *v1 = new QVBoxLayout( layout ); - QHBoxLayout *hl = new QHBoxLayout( v1 ); + Q3VBoxLayout *v1 = new Q3VBoxLayout( layout ); + Q3HBoxLayout *hl = new Q3HBoxLayout( v1 ); QLabel * lblName = new QLabel(i18n("Layer name:"), page, "lblName"); hl->addWidget(lblName, 0, 0); diff --git a/krita/ui/kis_dlg_adjustment_layer.cc b/krita/ui/kis_dlg_adjustment_layer.cc index df3f734259..de5530f691 100644 --- a/krita/ui/kis_dlg_adjustment_layer.cc +++ b/krita/ui/kis_dlg_adjustment_layer.cc @@ -17,9 +17,11 @@ */ #include -#include +#include #include #include +//Added by qt3to4: +#include #include #include @@ -75,7 +77,7 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img, setCaption(caption); QWidget * page = new QWidget(this, "page widget"); - QGridLayout * grid = new QGridLayout(page, 3, 2, 0, 6); + Q3GridLayout * grid = new Q3GridLayout(page, 3, 2, 0, 6); setMainWidget(page); QLabel * lblName = new QLabel(i18n("Layer name:"), page, "lblName"); @@ -86,7 +88,7 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img, connect( m_layerName, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotNameChanged( const QString & ) ) ); m_filtersList = new KisFiltersListView(m_dev, page, "dlgadjustment.filtersList"); - connect(m_filtersList , SIGNAL(selectionChanged(QIconViewItem*)), this, SLOT(selectionHasChanged(QIconViewItem* ))); + connect(m_filtersList , SIGNAL(selectionChanged(Q3IconViewItem*)), this, SLOT(selectionHasChanged(Q3IconViewItem* ))); grid->addMultiCellWidget(m_filtersList, 1, 2, 0, 0); m_preview = new KisPreviewWidget(page, "dlgadjustment.preview"); @@ -95,7 +97,7 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img, connect( m_preview, SIGNAL(updated()), this, SLOT(refreshPreview())); grid->addWidget(m_preview, 1, 1); - m_configWidgetHolder = new QGroupBox(i18n("Configuration"), page, "currentConfigWidget"); + m_configWidgetHolder = new Q3GroupBox(i18n("Configuration"), page, "currentConfigWidget"); m_configWidgetHolder->setColumnLayout(0, Qt::Horizontal); grid->addWidget(m_configWidgetHolder, 2, 1); @@ -153,7 +155,7 @@ void KisDlgAdjustmentLayer::refreshPreview() cmd.unexecute(); } -void KisDlgAdjustmentLayer::selectionHasChanged ( QIconViewItem * item ) +void KisDlgAdjustmentLayer::selectionHasChanged ( Q3IconViewItem * item ) { KisFiltersIconViewItem* kisitem = (KisFiltersIconViewItem*) item; diff --git a/krita/ui/kis_dlg_apply_profile.cc b/krita/ui/kis_dlg_apply_profile.cc index 5240a47d87..fa0ecafbce 100644 --- a/krita/ui/kis_dlg_apply_profile.cc +++ b/krita/ui/kis_dlg_apply_profile.cc @@ -18,7 +18,7 @@ #include #include -#include +#include #include "kis_factory.h" #include "kis_colorspace_factory_registry.h" @@ -84,8 +84,8 @@ void KisDlgApplyProfile::fillCmbProfiles(const KisID & s) KisColorSpaceFactory * csf = KisMetaRegistry::instance()->csRegistry()->get(s); if (csf == 0) return; - QValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( csf ); - QValueVector ::iterator it; + Q3ValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( csf ); + Q3ValueVector ::iterator it; for ( it = profileList.begin(); it != profileList.end(); ++it ) { m_page->cmbProfile->insertItem((*it)->productName()); } diff --git a/krita/ui/kis_dlg_image_properties.cc b/krita/ui/kis_dlg_image_properties.cc index df7d116dff..b2658599fa 100644 --- a/krita/ui/kis_dlg_image_properties.cc +++ b/krita/ui/kis_dlg_image_properties.cc @@ -15,15 +15,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include -#include +#include #include #include #include #include -#include +#include #include #include @@ -140,7 +140,7 @@ KisColorSpace * KisDlgImageProperties::colorSpace() KisProfile * KisDlgImageProperties::profile() { - QValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( m_image->colorSpace()->id() ); + Q3ValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( m_image->colorSpace()->id() ); quint32 index = m_page->cmbProfile->currentItem(); if (index < profileList.count()) { @@ -156,8 +156,8 @@ void KisDlgImageProperties::fillCmbProfiles(const KisID & s) KisColorSpaceFactory * csf = KisMetaRegistry::instance()->csRegistry()->get(s); m_page->cmbProfile->clear(); - QValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( csf ); - QValueVector ::iterator it; + Q3ValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( csf ); + Q3ValueVector ::iterator it; for ( it = profileList.begin(); it != profileList.end(); ++it ) { m_page->cmbProfile->insertItem((*it)->productName()); } diff --git a/krita/ui/kis_dlg_layer_properties.cc b/krita/ui/kis_dlg_layer_properties.cc index dcb4382099..0a9830a165 100644 --- a/krita/ui/kis_dlg_layer_properties.cc +++ b/krita/ui/kis_dlg_layer_properties.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include @@ -39,7 +39,7 @@ KisDlgLayerProperties::KisDlgLayerProperties(const QString& deviceName, qint32 opacity, const KisCompositeOp& compositeOp, const KisColorSpace * colorSpace, - QWidget *parent, const char *name, WFlags f) + QWidget *parent, const char *name, Qt::WFlags f) : super(parent, name, f, name, Ok | Cancel) { m_page = new WdgLayerProperties(this); diff --git a/krita/ui/kis_dlg_new_layer.cc b/krita/ui/kis_dlg_new_layer.cc index eb20782a07..906b5c0b7b 100644 --- a/krita/ui/kis_dlg_new_layer.cc +++ b/krita/ui/kis_dlg_new_layer.cc @@ -18,7 +18,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 +#include #include #include @@ -100,8 +100,8 @@ void NewLayerDialog::fillCmbProfiles(const KisID & s) KisColorSpaceFactory * csf = KisMetaRegistry::instance()->csRegistry()->get(s); if (csf == 0) return; - QValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( csf ); - QValueVector ::iterator it; + Q3ValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( csf ); + Q3ValueVector ::iterator it; for ( it = profileList.begin(); it != profileList.end(); ++it ) { m_page->cmbProfile->insertItem((*it)->productName()); } diff --git a/krita/ui/kis_dlg_preferences.cc b/krita/ui/kis_dlg_preferences.cc index 5829eb75ed..e6cb5ab7a2 100644 --- a/krita/ui/kis_dlg_preferences.cc +++ b/krita/ui/kis_dlg_preferences.cc @@ -23,7 +23,7 @@ #endif #include -#include +#include #include #include #include @@ -33,10 +33,12 @@ #include #include #include -#include +#include #ifdef HAVE_GL #include +//Added by qt3to4: +#include #endif #include @@ -114,7 +116,7 @@ ColorSettingsTab::ColorSettingsTab(QWidget *parent, const char *name ) // XXX: Make sure only profiles that fit the specified color model // are shown in the profile combos - QGridLayout * l = new QGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint()); + Q3GridLayout * l = new Q3GridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint()); l->setMargin(0); m_page = new WdgColorSettings(this); l->addWidget( m_page, 0, 0); @@ -164,8 +166,8 @@ void ColorSettingsTab::refillMonitorProfiles(const KisID & s) if ( !csf ) return; - QValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( csf ); - QValueVector ::iterator it; + Q3ValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( csf ); + Q3ValueVector ::iterator it; for ( it = profileList.begin(); it != profileList.end(); ++it ) { if ((*it)->deviceClass() == icSigDisplayClass) m_page->cmbMonitorProfile->insertItem((*it)->productName()); @@ -183,8 +185,8 @@ void ColorSettingsTab::refillPrintProfiles(const KisID & s) if ( !csf ) return; - QValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( csf ); - QValueVector ::iterator it; + Q3ValueVector profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor( csf ); + Q3ValueVector ::iterator it; for ( it = profileList.begin(); it != profileList.end(); ++it ) { if ((*it)->deviceClass() == icSigOutputClass) m_page->cmbPrintProfile->insertItem((*it)->productName()); @@ -733,7 +735,7 @@ void GridSettingsTab::linkSpacingToggled(bool b) PreferencesDialog::PreferencesDialog( QWidget* parent, const char* name ) : KDialogBase( IconList, i18n("Preferences"), Ok | Cancel | Help | Default /*| Apply*/, Ok, parent, name, true, true ) { - QVBox *vbox; + Q3VBox *vbox; vbox = addVBoxPage( i18n( "General"), i18n( "General"), BarIcon( "misc", K3Icon::SizeMedium )); m_general = new GeneralTab( vbox ); diff --git a/krita/ui/kis_doc.cc b/krita/ui/kis_doc.cc index 72fd5a95c1..299b4bccfe 100644 --- a/krita/ui/kis_doc.cc +++ b/krita/ui/kis_doc.cc @@ -24,10 +24,12 @@ #include #include #include -#include +#include #include #include -#include +#include +//Added by qt3to4: +#include // KDE #include @@ -168,7 +170,7 @@ KisDoc::~KisDoc() delete m_dcop; } -QCString KisDoc::mimeType() const +Q3CString KisDoc::mimeType() const { return APP_MIMETYPE; } @@ -347,7 +349,7 @@ bool KisDoc::loadXML(QIODevice *, const QDomDocument& doc) } bool KisDoc::loadChildren(KoStore* store) { - QPtrListIterator it(children()); + Q3PtrListIterator it(children()); for( ; it.current(); ++it ) { if (!it.current()->loadDocument(store)) { return false; @@ -902,7 +904,7 @@ bool KisDoc::newImage(const QString& name, qint32 width, qint32 height, KisColor painter.fillRect(0, 0, width, height, bgColor, opacity); painter.end(); - QValueVector actions = KisMetaRegistry::instance() -> + Q3ValueVector actions = KisMetaRegistry::instance() -> csRegistry()->paintDeviceActionsFor(cs); for (uint i = 0; i < actions.count(); i++) actions.at(i)->act(layer->paintDevice(), img->width(), img->height()); diff --git a/krita/ui/kis_double_widget.cc b/krita/ui/kis_double_widget.cc index 518707b7fb..ebe01b95f7 100644 --- a/krita/ui/kis_double_widget.cc +++ b/krita/ui/kis_double_widget.cc @@ -19,9 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include +//Added by qt3to4: +#include #include @@ -53,7 +55,7 @@ void KisDoubleWidget::init(double min, double max) connect(m_slider, SIGNAL(sliderPressed()), SIGNAL(sliderPressed())); connect(m_slider, SIGNAL(sliderReleased()), SIGNAL(sliderReleased())); - m_layout = new QHBoxLayout(this, 0, -1, "hbox layout"); + m_layout = new Q3HBoxLayout(this, 0, -1, "hbox layout"); m_layout->addWidget(m_slider); m_layout->addSpacing(5); diff --git a/krita/ui/kis_filter_manager.cc b/krita/ui/kis_filter_manager.cc index 8cb080b8fd..5f225559f3 100644 --- a/krita/ui/kis_filter_manager.cc +++ b/krita/ui/kis_filter_manager.cc @@ -18,9 +18,11 @@ #include "qsignalmapper.h" #include -#include +#include #include #include +//Added by qt3to4: +#include #include #include @@ -352,7 +354,7 @@ void KisFilterManager::slotApplyFilter(int i) connect(m_lastDialog->previewWidget(), SIGNAL(updated()), this, SLOT(refreshPreview())); - QGridLayout *widgetLayout = new QGridLayout((QWidget *)m_lastDialog->container(), 1, 1); + Q3GridLayout *widgetLayout = new Q3GridLayout((QWidget *)m_lastDialog->container(), 1, 1); widgetLayout->addWidget(m_lastWidget, 0 , 0); diff --git a/krita/ui/kis_filters_listview.cc b/krita/ui/kis_filters_listview.cc index 14b4625a80..67d8286dec 100644 --- a/krita/ui/kis_filters_listview.cc +++ b/krita/ui/kis_filters_listview.cc @@ -25,6 +25,8 @@ #include "qtimer.h" #include "qpainter.h" #include "qpixmap.h" +//Added by qt3to4: +#include #include @@ -40,7 +42,7 @@ // ------------------------------------------------ -KisFiltersThumbnailThread::KisFiltersThumbnailThread(QIconView * parent, KisFiltersIconViewItem * iconItem, KisFilterConfiguration * config, KisFilter * filter, KisPaintDeviceSP dev, const QRect & bounds, KisProfile * profile) +KisFiltersThumbnailThread::KisFiltersThumbnailThread(Q3IconView * parent, KisFiltersIconViewItem * iconItem, KisFilterConfiguration * config, KisFilter * filter, KisPaintDeviceSP dev, const QRect & bounds, KisProfile * profile) : m_parent(parent) , m_iconItem(iconItem) , m_config(config) @@ -87,10 +89,10 @@ void KisFiltersThumbnailThread::cancel() // ------------------------------------------------ -KisFiltersIconViewItem::KisFiltersIconViewItem(QIconView * parent, const QString & text, const QPixmap & icon, +KisFiltersIconViewItem::KisFiltersIconViewItem(Q3IconView * parent, const QString & text, const QPixmap & icon, KisID id, KisFilter* filter, KisFilterConfiguration* filterConfig, KisPaintDeviceSP thumb, const QRect & bounds, KisProfile * profile) - : QIconViewItem(parent, text, icon) + : Q3IconViewItem(parent, text, icon) , m_id(id) , m_filter(filter) , m_filterconfig(filterConfig) @@ -141,7 +143,7 @@ void KisFiltersListView::init() { setCaption(i18n("Filters List")); setItemsMovable(false); - setSelectionMode(QIconView::Single); + setSelectionMode(Q3IconView::Single); setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding )); setMinimumWidth(160); diff --git a/krita/ui/kis_gradient_chooser.cc b/krita/ui/kis_gradient_chooser.cc index ca0bfeb052..d17a5bb4a3 100644 --- a/krita/ui/kis_gradient_chooser.cc +++ b/krita/ui/kis_gradient_chooser.cc @@ -19,6 +19,8 @@ #include #include #include +//Added by qt3to4: +#include #include @@ -49,7 +51,7 @@ KisGradientChooser::KisGradientChooser(KisView * view, QWidget *parent, const ch KisCustomGradientDialog * autogradient = new KisCustomGradientDialog(view, this, "autogradient"); connect(m_customGradient, SIGNAL(clicked()), autogradient, SLOT(show())); - QVBoxLayout *mainLayout = new QVBoxLayout(this, 2, -1, "main layout"); + Q3VBoxLayout *mainLayout = new Q3VBoxLayout(this, 2, -1, "main layout"); mainLayout->addWidget(m_lbName); mainLayout->addWidget(chooserWidget(), 10); diff --git a/krita/ui/kis_gradient_slider_widget.cc b/krita/ui/kis_gradient_slider_widget.cc index 5058ad2c33..e1859e7697 100644 --- a/krita/ui/kis_gradient_slider_widget.cc +++ b/krita/ui/kis_gradient_slider_widget.cc @@ -20,6 +20,12 @@ #include "kis_gradient_slider_widget.h" #include +//Added by qt3to4: +#include +#include +#include +#include +#include #include #include @@ -30,7 +36,7 @@ #define MARGIN 5 #define HANDLE_SIZE 10 -KisGradientSliderWidget::KisGradientSliderWidget(QWidget *parent, const char* name, WFlags f ) +KisGradientSliderWidget::KisGradientSliderWidget(QWidget *parent, const char* name, Qt::WFlags f ) : QWidget( parent, name, f), m_currentSegment(0), m_selectedSegment(0), @@ -80,8 +86,8 @@ void KisGradientSliderWidget::paintEvent ( QPaintEvent* pe ) painter.fillRect( selection, QBrush( colorGroup().highlight() ) ); } - QPointArray triangle(3); - QValueVector handlePositions = m_autogradientResource->getHandlePositions(); + Q3PointArray triangle(3); + Q3ValueVector handlePositions = m_autogradientResource->getHandlePositions(); int position; painter.setBrush( QBrush( Qt::black) ); for (uint i = 0; i < handlePositions.count(); i++) @@ -93,7 +99,7 @@ void KisGradientSliderWidget::paintEvent ( QPaintEvent* pe ) painter.drawPolygon(triangle); } painter.setBrush( QBrush( Qt::white ) ); - QValueVector middleHandlePositions = m_autogradientResource->getMiddleHandlePositions(); + Q3ValueVector middleHandlePositions = m_autogradientResource->getMiddleHandlePositions(); for (uint i = 0; i < middleHandlePositions.count(); i++) { position = qRound( middleHandlePositions[i] * (double)(width()-12) ) + 6; @@ -109,7 +115,7 @@ void KisGradientSliderWidget::paintEvent ( QPaintEvent* pe ) void KisGradientSliderWidget::mousePressEvent( QMouseEvent * e ) { QWidget::mousePressEvent( e ); - if( ( e->y() < MARGIN || e->y() > height() - MARGIN ) || ( e->x() < MARGIN || e->x() > width() - MARGIN ) || e-> button() != LeftButton ) + if( ( e->y() < MARGIN || e->y() > height() - MARGIN ) || ( e->x() < MARGIN || e->x() > width() - MARGIN ) || e-> button() != Qt::LeftButton ) return; double t = (double)(e->x() - MARGIN) / (double)(width() - 2 * MARGIN); KisGradientSegment* segment = 0; diff --git a/krita/ui/kis_histogram_view.cc b/krita/ui/kis_histogram_view.cc index a6336573e1..c93751a613 100644 --- a/krita/ui/kis_histogram_view.cc +++ b/krita/ui/kis_histogram_view.cc @@ -22,9 +22,12 @@ #include #include #include -#include +#include #include #include +//Added by qt3to4: +#include +#include #include @@ -38,13 +41,13 @@ #include "kis_basic_histogram_producers.h" #include "kis_paint_device.h" -KisHistogramView::KisHistogramView(QWidget *parent, const char *name, WFlags f) +KisHistogramView::KisHistogramView(QWidget *parent, const char *name, Qt::WFlags f) : QLabel(parent, name, f) { // This is needed until we can computationally scale it well. Until then, this is needed // And when we have it, it won't hurt to have it around setScaledContents(true); - setFrameShape(QFrame::Box); // Draw a box around ourselves + setFrameShape(Q3Frame::Box); // Draw a box around ourselves } KisHistogramView::~KisHistogramView() @@ -120,14 +123,14 @@ KisIDList KisHistogramView::listProducers() return KisIDList(); } -void KisHistogramView::setCurrentChannels(const KisID& producerID, QValueVector channels) +void KisHistogramView::setCurrentChannels(const KisID& producerID, Q3ValueVector channels) { setCurrentChannels( KisHistogramProducerFactoryRegistry::instance()->get(producerID)->generate(), channels); } -void KisHistogramView::setCurrentChannels(KisHistogramProducerSP producer, QValueVector channels) +void KisHistogramView::setCurrentChannels(KisHistogramProducerSP producer, Q3ValueVector channels) { m_currentProducer = producer; m_currentProducer->setView(m_from, m_width); @@ -143,7 +146,7 @@ void KisHistogramView::setCurrentChannels(KisHistogramProducerSP producer, QValu return; } - QValueVector producerChannels = m_currentProducer->channels(); + Q3ValueVector producerChannels = m_currentProducer->channels(); for (uint i = 0; i < channels.count(); i++) { // Also makes sure the channel is actually in the producer's list @@ -197,7 +200,7 @@ void KisHistogramView::setActiveChannel(int channel) m_histogram->setChannel(0); // Set a default channel, just being nice } else { m_color = false; - QValueVector channels = m_currentProducer->channels(); + Q3ValueVector channels = m_currentProducer->channels(); for (uint i = 0; i < channels.count(); i++) { KisChannelInfo* channel = channels.at(i); if (channel->name() == info.channel->name()) { @@ -249,7 +252,7 @@ void KisHistogramView::addProducerChannels(KisHistogramProducerSP producer) { info.isProducer = true; info.producer = producer; // channel not used for a producer - QValueVector channels = info.producer->channels(); + Q3ValueVector channels = info.producer->channels(); int count = channels.count(); m_comboInfo.append(info); m_channelStrings.append(producer->id() . name()); diff --git a/krita/ui/kis_icon_item.cc b/krita/ui/kis_icon_item.cc index 44f6a02437..061cb37e0c 100644 --- a/krita/ui/kis_icon_item.cc +++ b/krita/ui/kis_icon_item.cc @@ -22,6 +22,8 @@ #include "kis_resource.h" #include "kis_global.h" #include "kis_icon_item.h" +//Added by qt3to4: +#include #define THUMB_SIZE 30 diff --git a/krita/ui/kis_iconwidget.cc b/krita/ui/kis_iconwidget.cc index f877748694..367fcd6bb1 100644 --- a/krita/ui/kis_iconwidget.cc +++ b/krita/ui/kis_iconwidget.cc @@ -18,6 +18,8 @@ */ #include +//Added by qt3to4: +#include #include #include "kis_iconwidget.h" @@ -71,7 +73,7 @@ void KisIconWidget::drawButtonLabel(QPainter *p) p->drawPixmap(x, y, thumbpix, 0, 0, itemWidth, itemHeight); } - p->setPen(gray); + p->setPen(Qt::gray); p->drawRect(0, 0, cw + 1, ch + 1); } } diff --git a/krita/ui/kis_input_device.cc b/krita/ui/kis_input_device.cc index a304d5c4b5..78d87bd97e 100644 --- a/krita/ui/kis_input_device.cc +++ b/krita/ui/kis_input_device.cc @@ -29,7 +29,7 @@ KisInputDevice KisInputDevice::Eraser; KisInputDevice KisInputDevice::Puck; KisInputDevice KisInputDevice::Unknown(UNKNOWN_INPUT_DEVICE_ID); -QValueVector KisInputDevice::InputDevices; +Q3ValueVector KisInputDevice::InputDevices; KisInputDevice::KisInputDevice() { @@ -62,7 +62,7 @@ void KisInputDevice::allocateDefaultDevicesIfNeeded() } } -QValueVector KisInputDevice::inputDevices() +Q3ValueVector KisInputDevice::inputDevices() { allocateDefaultDevicesIfNeeded(); diff --git a/krita/ui/kis_int_spinbox.cc b/krita/ui/kis_int_spinbox.cc index dcbe46a060..b02b91daab 100644 --- a/krita/ui/kis_int_spinbox.cc +++ b/krita/ui/kis_int_spinbox.cc @@ -34,10 +34,13 @@ #include #include #include -#include +#include #include #include #include +//Added by qt3to4: +#include +#include #include #include @@ -76,7 +79,7 @@ KisIntSpinbox::KisIntSpinbox(const QString & /*label*/, int val, QWidget *parent void KisIntSpinbox::init(int val) { d = new KisIntSpinboxPrivate( ); - QBoxLayout * l = new QHBoxLayout( this ); + Q3BoxLayout * l = new Q3HBoxLayout( this ); l->insertStretch(0, 1); d->m_numinput = new KIntSpinBox(0, 100, 1, val, 10, this, "KisIntSpinbox::KIntSpinBox"); @@ -86,7 +89,7 @@ void KisIntSpinbox::init(int val) l->addWidget( d->m_numinput ); d->m_slider = new KisPopupSlider(0, 100, 10, val, Qt::Horizontal, this); - d->m_slider->setFrameStyle(QFrame::Panel|QFrame::Raised); + d->m_slider->setFrameStyle(Q3Frame::Panel|Q3Frame::Raised); d->m_arrow = new KArrowButton(this, Qt::DownArrow); d->m_arrow->setPopup(d->m_slider); diff --git a/krita/ui/kis_itemchooser.cc b/krita/ui/kis_itemchooser.cc index b5dc03e041..9375182072 100644 --- a/krita/ui/kis_itemchooser.cc +++ b/krita/ui/kis_itemchooser.cc @@ -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 +#include #include #include #include @@ -66,7 +66,7 @@ void KisItemChooser::addItem(KoIconItem *item) void KisItemChooser::addItems(const vKoIconItem& items) { - QPtrListIterator itr(items); + Q3PtrListIterator itr(items); for (itr.toFirst(); itr.current(); ++itr) m_chooser->addItem(itr.current()); diff --git a/krita/ui/kis_label_cursor_pos.cc b/krita/ui/kis_label_cursor_pos.cc index 01bae559b5..7606248334 100644 --- a/krita/ui/kis_label_cursor_pos.cc +++ b/krita/ui/kis_label_cursor_pos.cc @@ -18,7 +18,7 @@ #include "kis_label_cursor_pos.h" #include "kis_label_cursor_pos.moc" -KisLabelCursorPos::KisLabelCursorPos(QWidget *parent, const char *name, WFlags f) : super(parent, name, f) +KisLabelCursorPos::KisLabelCursorPos(QWidget *parent, const char *name, Qt::WFlags f) : super(parent, name, f) { setText("0:0"); m_doUpdates = true; diff --git a/krita/ui/kis_label_progress.cc b/krita/ui/kis_label_progress.cc index f975272082..708008c2f7 100644 --- a/krita/ui/kis_label_progress.cc +++ b/krita/ui/kis_label_progress.cc @@ -21,6 +21,11 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include +#include #include #include @@ -45,12 +50,12 @@ public: } }; -KisLabelProgress::KisLabelProgress(QWidget *parent, const char *name, WFlags f) : super(parent, name, f) +KisLabelProgress::KisLabelProgress(QWidget *parent, const char *name, Qt::WFlags f) : super(parent, name, f) { m_subject = 0; m_modal = false; - QHBoxLayout *box = new QHBoxLayout(this); + Q3HBoxLayout *box = new Q3HBoxLayout(this); box->setAutoAdd(true); QIcon cancelIconSet = SmallIconSet("stop"); diff --git a/krita/ui/kis_layerbox.cc b/krita/ui/kis_layerbox.cc index 701bfe9f92..db0297daff 100644 --- a/krita/ui/kis_layerbox.cc +++ b/krita/ui/kis_layerbox.cc @@ -19,12 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include #include -#include +#include #include #include #include @@ -35,6 +35,10 @@ #include #include #include +//Added by qt3to4: +#include +#include +#include #include #include @@ -64,7 +68,7 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, QWidget *parent, const char *name) : super(parent, name), m_image(0) { - QVBoxLayout *vbox = new QVBoxLayout(this); + Q3VBoxLayout *vbox = new Q3VBoxLayout(this); vbox->setAutoAdd(true); m_lst = new WdgLayerBox(this); @@ -262,7 +266,7 @@ void KisLayerBox::slotLayersChanged(KisGroupLayerSP rootLayer) for (KisLayerSP layer = rootLayer->firstChild(); layer; layer = layer->nextSibling()) layer->accept(visitor); m_modified.clear(); - for (QListViewItemIterator it(list()->lastItem()); *it; --it) + for (Q3ListViewItemIterator it(list()->lastItem()); *it; --it) m_modified.append(static_cast(*it)->id()); updateUI(); } @@ -498,7 +502,7 @@ void KisLayerBox::slotAddMenuActivated(int type) void KisLayerBox::slotRmClicked() { - QValueList l = list()->selectedLayerIDs(); + Q3ValueList l = list()->selectedLayerIDs(); if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer()->id())) { l.clear(); @@ -514,7 +518,7 @@ void KisLayerBox::slotRmClicked() void KisLayerBox::slotRaiseClicked() { - QValueList l = list()->selectedLayerIDs(); + Q3ValueList l = list()->selectedLayerIDs(); if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer()->id())) { l.clear(); @@ -541,7 +545,7 @@ void KisLayerBox::slotRaiseClicked() void KisLayerBox::slotLowerClicked() { - QValueList l = list()->selectedLayers(); + Q3ValueList l = list()->selectedLayers(); if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer())) { l.clear(); @@ -605,7 +609,7 @@ void KisLayerBox::markModified(KisLayer* layer) if( !layer ) return; - QValueList v; + Q3ValueList v; while (layer && layer != m_image->rootLayer().data()) { v.append(layer->id()); diff --git a/krita/ui/kis_layerlist.cc b/krita/ui/kis_layerlist.cc index cd4ad20e2e..632e1fd26f 100644 --- a/krita/ui/kis_layerlist.cc +++ b/krita/ui/kis_layerlist.cc @@ -24,6 +24,8 @@ #include #include #include +//Added by qt3to4: +#include #include "kis_layer.h" #include "kis_paint_layer.h" @@ -75,7 +77,7 @@ void KisLayerList::constructMenu( LayerItem *layer ) void KisLayerList::menuActivated( int id, LayerItem *layer ) { - const QValueList selected = selectedLayers(); + const Q3ValueList selected = selectedLayers(); LayerItem *parent = ( layer && layer->isFolder() ) ? layer : 0; LayerItem *after = 0; if( layer && !parent ) @@ -99,7 +101,7 @@ void KisLayerList::menuActivated( int id, LayerItem *layer ) break; case MenuItems::RemoveLayer: { - QValueList ids; + Q3ValueList ids; for( int i = 0, n = selected.count(); i < n; ++i ) { ids.append( selected[i]->id() ); @@ -212,7 +214,7 @@ QImage KisLayerItem::tooltipPreview() const return img; //so Qt doesn't complain img.setAlphaBuffer( true ); const int size = qMin( 200, qMax( img.width(), img.height() ) ); - return img.smoothScale( size, size, QImage::ScaleMin ); + return img.smoothScale( size, size, Qt::KeepAspectRatio ); } //void KisLayerItem::paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int align ); diff --git a/krita/ui/kis_multi_bool_filter_widget.cc b/krita/ui/kis_multi_bool_filter_widget.cc index a10ddaf027..897dfdcdda 100644 --- a/krita/ui/kis_multi_bool_filter_widget.cc +++ b/krita/ui/kis_multi_bool_filter_widget.cc @@ -21,6 +21,8 @@ #include #include #include +//Added by qt3to4: +#include #include @@ -39,7 +41,7 @@ KisMultiBoolFilterWidget::KisMultiBoolFilterWidget(QWidget * parent, const char this->setCaption(caption); - QVBoxLayout *widgetLayout = new QVBoxLayout(this, m_nbboolWidgets + 1); + Q3VBoxLayout *widgetLayout = new Q3VBoxLayout(this, m_nbboolWidgets + 1); m_boolWidgets = new QCheckBox*[ m_nbboolWidgets ]; diff --git a/krita/ui/kis_multi_double_filter_widget.cc b/krita/ui/kis_multi_double_filter_widget.cc index 30595035b2..bf7b2d11a5 100644 --- a/krita/ui/kis_multi_double_filter_widget.cc +++ b/krita/ui/kis_multi_double_filter_widget.cc @@ -21,6 +21,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -66,7 +68,7 @@ KisMultiDoubleFilterWidget::KisMultiDoubleFilterWidget(QWidget * parent, const c this->setCaption(caption); - QGridLayout *widgetLayout = new QGridLayout(this, m_nbdoubleWidgets + 1, 3); + Q3GridLayout *widgetLayout = new Q3GridLayout(this, m_nbdoubleWidgets + 1, 3); widgetLayout->setColStretch ( 1, 1 ); m_doubleWidgets = new KisDelayedActionDoubleInput*[ m_nbdoubleWidgets ]; diff --git a/krita/ui/kis_multi_integer_filter_widget.cc b/krita/ui/kis_multi_integer_filter_widget.cc index b0bfa608e4..30d20eefc9 100644 --- a/krita/ui/kis_multi_integer_filter_widget.cc +++ b/krita/ui/kis_multi_integer_filter_widget.cc @@ -21,6 +21,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -66,7 +68,7 @@ KisMultiIntegerFilterWidget::KisMultiIntegerFilterWidget(QWidget * parent, m_nbintegerWidgets = iwparam.size(); this->setCaption(caption); - QGridLayout *widgetLayout = new QGridLayout(this, m_nbintegerWidgets + 1, 3); + Q3GridLayout *widgetLayout = new Q3GridLayout(this, m_nbintegerWidgets + 1, 3); widgetLayout->setColStretch ( 1, 1 ); m_integerWidgets = new KisDelayedActionIntegerInput*[ m_nbintegerWidgets ]; diff --git a/krita/ui/kis_opengl_canvas.cc b/krita/ui/kis_opengl_canvas.cc index 1b88e483fb..6d7c57ee4e 100644 --- a/krita/ui/kis_opengl_canvas.cc +++ b/krita/ui/kis_opengl_canvas.cc @@ -19,6 +19,15 @@ #include "kis_canvas.h" #include "kis_opengl_canvas.h" #include "kis_opengl_canvas_painter.h" +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_GL KisOpenGLCanvasWidget::KisOpenGLCanvasWidget(QWidget *parent, const char *name, QGLWidget *sharedContextWidget) diff --git a/krita/ui/kis_opengl_canvas_painter.cc b/krita/ui/kis_opengl_canvas_painter.cc index 2b9e341cbd..cbcbae5a62 100644 --- a/krita/ui/kis_opengl_canvas_painter.cc +++ b/krita/ui/kis_opengl_canvas_painter.cc @@ -27,6 +27,9 @@ #include "kis_canvas.h" #include "kis_canvas_painter.h" #include "kis_opengl_canvas_painter.h" +//Added by qt3to4: +#include +#include KisOpenGLCanvasPainter::KisOpenGLCanvasPainter() : m_active(false), m_widget(0) @@ -379,12 +382,12 @@ QRect KisOpenGLCanvasPainter::xForm(const QRect& r) const return r; } -QPointArray KisOpenGLCanvasPainter::xForm(const QPointArray& pointArray) const +Q3PointArray KisOpenGLCanvasPainter::xForm(const Q3PointArray& pointArray) const { return pointArray; } -QPointArray KisOpenGLCanvasPainter::xForm(const QPointArray& pointArray, int /*index*/, int /*npoints*/) const +Q3PointArray KisOpenGLCanvasPainter::xForm(const Q3PointArray& pointArray, int /*index*/, int /*npoints*/) const { return pointArray; } @@ -399,12 +402,12 @@ QRect KisOpenGLCanvasPainter::xFormDev(const QRect& r) const return r; } -QPointArray KisOpenGLCanvasPainter::xFormDev(const QPointArray& pointArray) const +Q3PointArray KisOpenGLCanvasPainter::xFormDev(const Q3PointArray& pointArray) const { return pointArray; } -QPointArray KisOpenGLCanvasPainter::xFormDev(const QPointArray& pointArray, int /*index*/, int /*npoints*/) const +Q3PointArray KisOpenGLCanvasPainter::xFormDev(const Q3PointArray& pointArray, int /*index*/, int /*npoints*/) const { return pointArray; } @@ -447,7 +450,7 @@ void KisOpenGLCanvasPainter::drawPoint(const QPoint& point) drawPoint(point.x(), point.y()); } -void KisOpenGLCanvasPainter::drawPoints(const QPointArray& pointArray, int index, int npoints) +void KisOpenGLCanvasPainter::drawPoints(const Q3PointArray& pointArray, int index, int npoints) { int firstPointIndex = index; @@ -561,7 +564,7 @@ void KisOpenGLCanvasPainter::drawEllipse(int x, int y, int w, int h) QRect r(x, y, w, h); r = r.normalize(); - QPointArray points; + Q3PointArray points; points.makeEllipse(r.x(), r.y(), r.width(), r.height()); drawPoints(points); @@ -596,11 +599,11 @@ void KisOpenGLCanvasPainter::drawChord(const QRect& /*r*/, int /*a*/, int /*alen { } -void KisOpenGLCanvasPainter::drawLineSegments(const QPointArray& /*pointArray*/, int /*index*/, int /*nlines*/) +void KisOpenGLCanvasPainter::drawLineSegments(const Q3PointArray& /*pointArray*/, int /*index*/, int /*nlines*/) { } -void KisOpenGLCanvasPainter::drawPolyline(const QPointArray& pointArray, int index, int npoints) +void KisOpenGLCanvasPainter::drawPolyline(const Q3PointArray& pointArray, int index, int npoints) { int firstPointIndex = index; @@ -636,15 +639,15 @@ void KisOpenGLCanvasPainter::drawPolyline(const QPointArray& pointArray, int ind glEnd(); } -void KisOpenGLCanvasPainter::drawPolygon(const QPointArray& /*pointArray*/, bool /*winding*/, int /*index*/, int /*npoints*/) +void KisOpenGLCanvasPainter::drawPolygon(const Q3PointArray& /*pointArray*/, bool /*winding*/, int /*index*/, int /*npoints*/) { } -void KisOpenGLCanvasPainter::drawConvexPolygon(const QPointArray& /*pointArray*/, int /*index*/, int /*npoints*/) +void KisOpenGLCanvasPainter::drawConvexPolygon(const Q3PointArray& /*pointArray*/, int /*index*/, int /*npoints*/) { } -void KisOpenGLCanvasPainter::drawCubicBezier(const QPointArray& /*pointArray*/, int /*index*/) +void KisOpenGLCanvasPainter::drawCubicBezier(const Q3PointArray& /*pointArray*/, int /*index*/) { } diff --git a/krita/ui/kis_paintop_box.cc b/krita/ui/kis_paintop_box.cc index 8c1840f5e3..764b0315c6 100644 --- a/krita/ui/kis_paintop_box.cc +++ b/krita/ui/kis_paintop_box.cc @@ -19,9 +19,11 @@ */ #include #include -#include +#include #include #include +//Added by qt3to4: +#include #include #include @@ -54,12 +56,12 @@ KisPaintopBox::KisPaintopBox (KisView * view, QWidget *parent, const char * name setCaption(i18n("Painter's Toolchest")); m_optionWidget = 0; - m_paintops = new QValueList(); - m_displayedOps = new QValueList(); + m_paintops = new Q3ValueList(); + m_displayedOps = new Q3ValueList(); m_cmbPaintops = new QComboBox(this, "KisPaintopBox::m_cmbPaintops"); m_cmbPaintops->setMinimumWidth(150); - m_layout = new QHBoxLayout(this, 1, 1); + m_layout = new Q3HBoxLayout(this, 1, 1); m_layout->addWidget(m_cmbPaintops); connect(this, SIGNAL(selected(const KisID &, const KisPaintOpSettings *)), view, SLOT(paintopActivated(const KisID &, const KisPaintOpSettings *))); @@ -104,8 +106,8 @@ void KisPaintopBox::slotItemSelected(int index) void KisPaintopBox::colorSpaceChanged(KisColorSpace *cs) { - QValueList::iterator it = m_paintops->begin(); - QValueList::iterator end = m_paintops->end(); + Q3ValueList::iterator it = m_paintops->begin(); + Q3ValueList::iterator end = m_paintops->end(); m_displayedOps->clear(); m_cmbPaintops->clear(); @@ -218,13 +220,13 @@ KisID KisPaintopBox::defaultPaintop(const KisInputDevice& inputDevice) const KisPaintOpSettings *KisPaintopBox::paintopSettings(const KisID & paintop, const KisInputDevice & inputDevice) { - QValueVector settingsArray; + Q3ValueVector settingsArray; InputDevicePaintopSettingsMap::iterator it = m_inputDevicePaintopSettings.find(inputDevice); if (it == m_inputDevicePaintopSettings.end()) { // Create settings for each paintop. - for (QValueList::const_iterator pit = m_paintops->begin(); pit != m_paintops->end(); ++pit) { + for (Q3ValueList::const_iterator pit = m_paintops->begin(); pit != m_paintops->end(); ++pit) { KisPaintOpSettings *settings = KisPaintOpRegistry::instance()->settings(*pit, this, inputDevice); settingsArray.append(settings); if (settings && settings->widget()) { diff --git a/krita/ui/kis_palette_view.cc b/krita/ui/kis_palette_view.cc index ff8aee82d8..ce7d879ef3 100644 --- a/krita/ui/kis_palette_view.cc +++ b/krita/ui/kis_palette_view.cc @@ -63,15 +63,15 @@ #include "kis_palette.h" KisPaletteView::KisPaletteView(QWidget *parent, const char* name, int minWidth, int cols) - : QScrollView( parent, name ), mMinWidth(minWidth), mCols(cols) + : Q3ScrollView( parent, name ), mMinWidth(minWidth), mCols(cols) { m_cells = 0; m_currentPalette = 0; QSize cellSize = QSize( mMinWidth, 50); - setHScrollBarMode(QScrollView::AlwaysOff); - setVScrollBarMode(QScrollView::AlwaysOn); + setHScrollBarMode(Q3ScrollView::AlwaysOff); + setVScrollBarMode(Q3ScrollView::AlwaysOn); QSize minSize = QSize(verticalScrollBar()->width(), 0); minSize += QSize(frameWidth(), 0); diff --git a/krita/ui/kis_palette_widget.cc b/krita/ui/kis_palette_widget.cc index e5edc72fb1..9ba4baaeea 100644 --- a/krita/ui/kis_palette_widget.cc +++ b/krita/ui/kis_palette_widget.cc @@ -33,6 +33,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -67,10 +69,10 @@ KisPaletteWidget::KisPaletteWidget( QWidget *parent, int minWidth, int cols) m_currentPalette = 0; - QVBoxLayout *layout = new QVBoxLayout( this ); + Q3VBoxLayout *layout = new Q3VBoxLayout( this ); combo = new QComboBox( false, this ); - combo->setFocusPolicy( QWidget::ClickFocus ); + combo->setFocusPolicy( Qt::ClickFocus ); layout->addWidget(combo); m_view = new KisPaletteView(this, 0, minWidth, cols); diff --git a/krita/ui/kis_part_layer.cc b/krita/ui/kis_part_layer.cc index 55efb8ef57..1c2c4ffd24 100644 --- a/krita/ui/kis_part_layer.cc +++ b/krita/ui/kis_part_layer.cc @@ -20,6 +20,8 @@ #include "qpixmap.h" #include "qimage.h" #include "qpainter.h" +//Added by qt3to4: +#include #include @@ -83,7 +85,7 @@ void KisPartLayerImpl::childActivated(KoDocumentChild* child) QRect rect = extent(); m_activated = true; setDirty(rect); - QPtrList views = child->parentDocument()->views(); + Q3PtrList views = child->parentDocument()->views(); Q_ASSERT(views.count()); // XXX iterate over views connect(views.at(0), SIGNAL(activated(bool)), @@ -97,7 +99,7 @@ void KisPartLayerImpl::childDeactivated(bool activated) // We probably changed, notify the image that it needs to repaint where we currently updated // We use the original geometry if (m_activated && !activated /* no clue, but debugging suggests it is false here */) { - QPtrList views = m_doc->parentDocument()->views(); + Q3PtrList views = m_doc->parentDocument()->views(); Q_ASSERT(views.count()); views.at(0)->disconnect(SIGNAL(activated(bool))); m_activated = false; diff --git a/krita/ui/kis_part_layer_handler.cc b/krita/ui/kis_part_layer_handler.cc index a6e927cfa6..1bf0195ac3 100644 --- a/krita/ui/kis_part_layer_handler.cc +++ b/krita/ui/kis_part_layer_handler.cc @@ -21,6 +21,8 @@ #include #include +//Added by qt3to4: +#include #include "kis_cursor.h" #include "kis_canvas_painter.h" diff --git a/krita/ui/kis_pattern_chooser.cc b/krita/ui/kis_pattern_chooser.cc index 8a9d08b03c..3fa270cc72 100644 --- a/krita/ui/kis_pattern_chooser.cc +++ b/krita/ui/kis_pattern_chooser.cc @@ -17,6 +17,8 @@ */ #include #include +//Added by qt3to4: +#include #include #include @@ -30,7 +32,7 @@ KisPatternChooser::KisPatternChooser(QWidget *parent, const char *name) : super( { m_lbName = new QLabel(this); - QVBoxLayout *mainLayout = new QVBoxLayout(this, 2, -1, "main layout"); + Q3VBoxLayout *mainLayout = new Q3VBoxLayout(this, 2, -1, "main layout"); mainLayout->addWidget(m_lbName); mainLayout->addWidget(chooserWidget(), 10); diff --git a/krita/ui/kis_previewdialog.cc b/krita/ui/kis_previewdialog.cc index 6b7467762f..86020cb8fe 100644 --- a/krita/ui/kis_previewdialog.cc +++ b/krita/ui/kis_previewdialog.cc @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include -#include +#include +#include +#include #include #include "kis_previewwidget.h" @@ -28,10 +28,10 @@ KisPreviewDialog::KisPreviewDialog( QWidget * parent, const char * name, bool modal, const QString &caption) : super (parent, name, modal, caption, Ok | Cancel, Ok) { - QHBox* layout = new QHBox(this); + Q3HBox* layout = new Q3HBox(this); layout->setSpacing( 6 ); - m_containerFrame = new QFrame( layout, "container" ); + m_containerFrame = new Q3Frame( layout, "container" ); m_preview = new KisPreviewWidget( layout, "previewWidget" ); diff --git a/krita/ui/kis_previewwidget.cc b/krita/ui/kis_previewwidget.cc index 02a09e73e4..bda70a0ed1 100644 --- a/krita/ui/kis_previewwidget.cc +++ b/krita/ui/kis_previewwidget.cc @@ -29,8 +29,10 @@ #include #include #include -#include +#include #include +//Added by qt3to4: +#include #include #include @@ -135,7 +137,7 @@ void KisPreviewWidget::slotUpdate() int w, h; w = (int) ceil(r.width() * m_zoom ); h = (int) ceil(r.height() * m_zoom ); - m_scaledPreview = m_scaledPreview.smoothScale (w,h, QImage::ScaleMax); + m_scaledPreview = m_scaledPreview.smoothScale (w,h, Qt::KeepAspectRatioByExpanding); } if(m_previewIsDisplayed) { diff --git a/krita/ui/kis_qpaintdevice_canvas.cc b/krita/ui/kis_qpaintdevice_canvas.cc index f2230b1d25..102b85617d 100644 --- a/krita/ui/kis_qpaintdevice_canvas.cc +++ b/krita/ui/kis_qpaintdevice_canvas.cc @@ -21,6 +21,15 @@ #include "kis_canvas_painter.h" #include "kis_qpaintdevice_canvas.h" #include "kis_qpaintdevice_canvas_painter.h" +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include +#include KisQPaintDeviceCanvasWidget::KisQPaintDeviceCanvasWidget(QWidget *parent, const char *name) : QWidget(parent, name) diff --git a/krita/ui/kis_qpaintdevice_canvas_painter.cc b/krita/ui/kis_qpaintdevice_canvas_painter.cc index 60c7ca6573..708227e15e 100644 --- a/krita/ui/kis_qpaintdevice_canvas_painter.cc +++ b/krita/ui/kis_qpaintdevice_canvas_painter.cc @@ -19,6 +19,9 @@ #include "kis_canvas.h" #include "kis_canvas_painter.h" #include "kis_qpaintdevice_canvas_painter.h" +//Added by qt3to4: +#include +#include KisQPaintDeviceCanvasPainter::KisQPaintDeviceCanvasPainter() { @@ -289,12 +292,12 @@ QRect KisQPaintDeviceCanvasPainter::xForm(const QRect& r) const return m_painter.transformed(r); } -QPointArray KisQPaintDeviceCanvasPainter::xForm(const QPointArray& pointArray) const +Q3PointArray KisQPaintDeviceCanvasPainter::xForm(const Q3PointArray& pointArray) const { return m_painter.transformed(pointArray); } -QPointArray KisQPaintDeviceCanvasPainter::xForm(const QPointArray& pointArray, int index, int npoints) const +Q3PointArray KisQPaintDeviceCanvasPainter::xForm(const Q3PointArray& pointArray, int index, int npoints) const { return m_painter.transformed(pointArray, index, npoints); } @@ -309,12 +312,12 @@ QRect KisQPaintDeviceCanvasPainter::xFormDev(const QRect& r) const return m_painter.xFormDev(r); } -QPointArray KisQPaintDeviceCanvasPainter::xFormDev(const QPointArray& pointArray) const +Q3PointArray KisQPaintDeviceCanvasPainter::xFormDev(const Q3PointArray& pointArray) const { return m_painter.xFormDev(pointArray); } -QPointArray KisQPaintDeviceCanvasPainter::xFormDev(const QPointArray& pointArray, int index, int npoints) const +Q3PointArray KisQPaintDeviceCanvasPainter::xFormDev(const Q3PointArray& pointArray, int index, int npoints) const { return m_painter.xFormDev(pointArray, index, npoints); } @@ -359,7 +362,7 @@ void KisQPaintDeviceCanvasPainter::drawPoint(const QPoint& point) m_painter.drawPoint(point); } -void KisQPaintDeviceCanvasPainter::drawPoints(const QPointArray& pointArray, int index, int npoints) +void KisQPaintDeviceCanvasPainter::drawPoints(const Q3PointArray& pointArray, int index, int npoints) { m_painter.drawPoints(pointArray, index, npoints); } @@ -474,27 +477,27 @@ void KisQPaintDeviceCanvasPainter::drawChord(const QRect& r, int a, int alen) m_painter.drawChord(r, a, alen); } -void KisQPaintDeviceCanvasPainter::drawLineSegments(const QPointArray& pointArray, int index, int nlines) +void KisQPaintDeviceCanvasPainter::drawLineSegments(const Q3PointArray& pointArray, int index, int nlines) { m_painter.drawLineSegments(pointArray, index, nlines); } -void KisQPaintDeviceCanvasPainter::drawPolyline(const QPointArray& pointArray, int index, int npoints) +void KisQPaintDeviceCanvasPainter::drawPolyline(const Q3PointArray& pointArray, int index, int npoints) { m_painter.drawPolyline(pointArray, index, npoints); } -void KisQPaintDeviceCanvasPainter::drawPolygon(const QPointArray& pointArray, bool winding, int index, int npoints) +void KisQPaintDeviceCanvasPainter::drawPolygon(const Q3PointArray& pointArray, bool winding, int index, int npoints) { m_painter.drawPolygon(pointArray, winding, index, npoints); } -void KisQPaintDeviceCanvasPainter::drawConvexPolygon(const QPointArray& pointArray, int index, int npoints) +void KisQPaintDeviceCanvasPainter::drawConvexPolygon(const Q3PointArray& pointArray, int index, int npoints) { m_painter.drawConvexPolygon(pointArray, index, npoints); } -void KisQPaintDeviceCanvasPainter::drawCubicBezier(const QPointArray& pointArray, int index) +void KisQPaintDeviceCanvasPainter::drawCubicBezier(const Q3PointArray& pointArray, int index) { m_painter.drawCubicBezier(pointArray, index); } diff --git a/krita/ui/kis_resource_mediator.cc b/krita/ui/kis_resource_mediator.cc index e4040cd2b5..3413b67159 100644 --- a/krita/ui/kis_resource_mediator.cc +++ b/krita/ui/kis_resource_mediator.cc @@ -24,6 +24,8 @@ #include "kis_itemchooser.h" #include "kis_resourceserver.h" #include "kis_resource_mediator.h" +//Added by qt3to4: +#include KisResourceMediator::KisResourceMediator(KisItemChooser *chooser, QObject *parent, @@ -42,8 +44,8 @@ KisResourceMediator::~KisResourceMediator() void KisResourceMediator::connectServer(KisResourceServerBase* rServer) { // Add the initially loaded items - QValueList resources = rServer->resources(); - QValueList::iterator it; + Q3ValueList resources = rServer->resources(); + Q3ValueList::iterator it; for ( it = resources.begin(); it != resources.end(); ++it ) rServerAddedResource( *it ); diff --git a/krita/ui/kis_resourceserver.cc b/krita/ui/kis_resourceserver.cc index bdb4eab1b2..e497ba0dff 100644 --- a/krita/ui/kis_resourceserver.cc +++ b/krita/ui/kis_resourceserver.cc @@ -23,6 +23,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -82,10 +84,10 @@ void KisResourceServerBase::loadResources(QStringList filenames) m_loaded = true; } -QValueList KisResourceServerBase::resources() +Q3ValueList KisResourceServerBase::resources() { if(!m_loaded) { - return QValueList(); + return Q3ValueList(); } return m_resources; diff --git a/krita/ui/kis_ruler.cc b/krita/ui/kis_ruler.cc index 6b81f4d892..82f0b18158 100644 --- a/krita/ui/kis_ruler.cc +++ b/krita/ui/kis_ruler.cc @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include +//Added by qt3to4: +#include +#include +#include #include "kdebug.h" @@ -39,7 +43,7 @@ const char *KisRuler::m_nums[] = { "XX XXXXXX XXX XXX XXXXXX XXX XXXX XXXXX XXXXX XXXX XXX" }; -KisRuler::KisRuler(Qt::Orientation o, QWidget *parent, const char *name) : super(parent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums) +KisRuler::KisRuler(Qt::Orientation o, QWidget *parent, const char *name) : super(parent, name, Qt::WNoAutoErase | Qt::WResizeNoErase), m_pixmapNums(m_nums) { setBackgroundMode(NoBackground); setFrameStyle(Box | Sunken); diff --git a/krita/ui/kis_selection_manager.cc b/krita/ui/kis_selection_manager.cc index 157f3ec663..31942ef2db 100644 --- a/krita/ui/kis_selection_manager.cc +++ b/krita/ui/kis_selection_manager.cc @@ -20,6 +20,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -461,7 +463,7 @@ void KisSelectionManager::pasteNew() return; } - const QCString mimetype = KoDocument::readNativeFormatMimeType(); + const Q3CString mimetype = KoDocument::readNativeFormatMimeType(); KoDocumentEntry entry = KoDocumentEntry::queryByMimeType( mimetype ); KisDoc * doc = (KisDoc*) entry.createDoc(); diff --git a/krita/ui/kis_selection_options.cc b/krita/ui/kis_selection_options.cc index f14cdf308c..37f189e397 100644 --- a/krita/ui/kis_selection_options.cc +++ b/krita/ui/kis_selection_options.cc @@ -19,6 +19,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -39,7 +41,7 @@ KisSelectionOptions::KisSelectionOptions(QWidget *parent, KisCanvasSubject * sub m_page = new WdgSelectionOptions(this); Q_CHECK_PTR(m_page); - QVBoxLayout * l = new QVBoxLayout(this); + Q3VBoxLayout * l = new Q3VBoxLayout(this); l->addWidget(m_page); connect(m_page->cmbAction, SIGNAL(activated(int)), this, SIGNAL(actionChanged(int))); diff --git a/krita/ui/kis_text_brush.cc b/krita/ui/kis_text_brush.cc index 6285e503b5..017e4b61b9 100644 --- a/krita/ui/kis_text_brush.cc +++ b/krita/ui/kis_text_brush.cc @@ -21,6 +21,8 @@ #include #include #include +//Added by qt3to4: +#include #include diff --git a/krita/ui/kis_tool_dummy.cc b/krita/ui/kis_tool_dummy.cc index 8cb126957a..f32d539a9e 100644 --- a/krita/ui/kis_tool_dummy.cc +++ b/krita/ui/kis_tool_dummy.cc @@ -39,7 +39,7 @@ KisToolDummy::KisToolDummy() m_subject = 0; m_dragging = false; m_optionWidget = 0; - setCursor(QCursor::forbiddenCursor); + setCursor(Qt::forbiddenCursor); } KisToolDummy::~KisToolDummy() diff --git a/krita/ui/kis_tool_freehand.cc b/krita/ui/kis_tool_freehand.cc index caacd77573..78ae812486 100644 --- a/krita/ui/kis_tool_freehand.cc +++ b/krita/ui/kis_tool_freehand.cc @@ -79,7 +79,7 @@ void KisToolFreehand::buttonPress(KisButtonPressEvent *e) if (!m_currentImage || !m_currentImage->activeDevice()) return; - if (e->button() == QMouseEvent::LeftButton) { + if (e->button() == Qt::LeftButton) { if (!m_currentImage->bounds().contains(e->pos().floorQPoint())) return; @@ -115,7 +115,7 @@ void KisToolFreehand::buttonPress(KisButtonPressEvent *e) void KisToolFreehand::buttonRelease(KisButtonReleaseEvent* e) { - if (e->button() == QMouseEvent::LeftButton && m_mode == PAINT) { + if (e->button() == Qt::LeftButton && m_mode == PAINT) { endPaint(); } } diff --git a/krita/ui/kis_tool_manager.cc b/krita/ui/kis_tool_manager.cc index d8167936d0..bc75a4fe9b 100644 --- a/krita/ui/kis_tool_manager.cc +++ b/krita/ui/kis_tool_manager.cc @@ -65,7 +65,7 @@ void KisToolManager::setUp(KoToolBox * toolbox, KoPaletteManager * paletteManage if (!m_dummyTool) m_dummyTool = KisToolDummyFactory().createTool(actionCollection); - QValueVector inputDevices = KisInputDevice::inputDevices(); + Q3ValueVector inputDevices = KisInputDevice::inputDevices(); for (quint32 inputDevice = 0; inputDevice < inputDevices.count(); inputDevice++) { m_inputDeviceToolSetMap[inputDevices[inputDevice]] = KisToolRegistry::instance()->createTools(actionCollection, m_subject); diff --git a/krita/ui/kis_tool_non_paint.cc b/krita/ui/kis_tool_non_paint.cc index ee578fadee..a7133b8d0d 100644 --- a/krita/ui/kis_tool_non_paint.cc +++ b/krita/ui/kis_tool_non_paint.cc @@ -24,6 +24,9 @@ #include "kis_canvas_controller.h" #include "kis_tool_controller.h" #include "kis_tool_non_paint.h" +//Added by qt3to4: +#include +#include KisToolNonPaint::KisToolNonPaint(const QString & UIName) : super(UIName) diff --git a/krita/ui/kis_tool_paint.cc b/krita/ui/kis_tool_paint.cc index a84cc261d0..58970ec79f 100644 --- a/krita/ui/kis_tool_paint.cc +++ b/krita/ui/kis_tool_paint.cc @@ -21,8 +21,14 @@ #include #include #include -#include +#include #include +//Added by qt3to4: +#include +#include +#include +#include +#include #include #include @@ -129,11 +135,11 @@ QWidget* KisToolPaint::createOptionWidget(QWidget* parent) m_cmbComposite = new KisCmbComposite(m_optionWidget); connect(m_cmbComposite, SIGNAL(activated(const KisCompositeOp&)), this, SLOT(slotSetCompositeMode(const KisCompositeOp&))); - QVBoxLayout* verticalLayout = new QVBoxLayout(m_optionWidget); + Q3VBoxLayout* verticalLayout = new Q3VBoxLayout(m_optionWidget); verticalLayout->setMargin(0); verticalLayout->setSpacing(3); - m_optionWidgetLayout = new QGridLayout(verticalLayout, 2, 3, 6); + m_optionWidgetLayout = new Q3GridLayout(verticalLayout, 2, 3, 6); m_optionWidgetLayout->addWidget(m_lbOpacity, 0, 0); m_optionWidgetLayout->addWidget(m_slOpacity, 0, 1); @@ -147,7 +153,7 @@ QWidget* KisToolPaint::createOptionWidget(QWidget* parent) QPushButton* push = new QPushButton(SmallIconSet( "help" ), "", m_optionWidget); connect(push, SIGNAL(clicked()), this, SLOT(slotPopupQuickHelp())); - QHBoxLayout* hLayout = new QHBoxLayout(m_optionWidget); + Q3HBoxLayout* hLayout = new Q3HBoxLayout(m_optionWidget); hLayout->addWidget(push); hLayout->addItem(new QSpacerItem(0,0,QSizePolicy::Expanding,QSizePolicy::Fixed)); verticalLayout->addLayout(hLayout); @@ -253,7 +259,7 @@ void KisToolPaint::updateCompositeOpComboBox() } void KisToolPaint::slotPopupQuickHelp() { - QWhatsThis::display(quickHelp()); + Q3WhatsThis::display(quickHelp()); } #include "kis_tool_paint.moc" diff --git a/krita/ui/kis_tool_shape.cc b/krita/ui/kis_tool_shape.cc index 06c854a7ca..44a214b29c 100644 --- a/krita/ui/kis_tool_shape.cc +++ b/krita/ui/kis_tool_shape.cc @@ -20,6 +20,8 @@ #include #include #include +//Added by qt3to4: +#include #include #include @@ -44,7 +46,7 @@ QWidget* KisToolShape::createOptionWidget(QWidget* parent) m_shapeOptionsWidget = new WdgGeometryOptions(0); Q_CHECK_PTR(m_shapeOptionsWidget); - m_optionLayout = new QGridLayout(widget, 2, 1); + m_optionLayout = new Q3GridLayout(widget, 2, 1); // super::addOptionWidgetLayout(m_optionLayout); m_shapeOptionsWidget->cmbFill->reparent(widget, QPoint(0,0), true); diff --git a/krita/ui/kis_view.cc b/krita/ui/kis_view.cc index 03968683af..08b360ed4f 100644 --- a/krita/ui/kis_view.cc +++ b/krita/ui/kis_view.cc @@ -27,19 +27,32 @@ // Qt #include -#include +#include #include #include #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include -#include +#include +//Added by qt3to4: +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // KDE #include @@ -358,7 +371,7 @@ KisView::~KisView() } -static Qt::Dock stringToDock( const QString& attrPosition ) +static Qt::ToolBarDock stringToDock( const QString& attrPosition ) { KToolBar::Dock dock = KToolBar::DockTop; if ( !attrPosition.isEmpty() ) { @@ -386,7 +399,7 @@ QWidget * KisView::createContainer( QWidget *parent, int index, const QDomElemen m_toolBox->setLabel(i18n("Krita")); m_toolManager->setUp(m_toolBox, m_paletteManager, actionCollection()); - Dock dock = stringToDock( element.attribute( "position" ).lower() ); + Qt::ToolBarDock dock = stringToDock( element.attribute( "position" ).lower() ); mainWindow()->addDockWindow( m_toolBox, dock, false); mainWindow()->moveDockWindow( m_toolBox, dock, false, 0, 0 ); @@ -456,10 +469,10 @@ void KisView::setupScrollBars() { m_scrollX = 0; m_scrollY = 0; - m_vScroll = new QScrollBar(QScrollBar::Vertical, this); + m_vScroll = new QScrollBar(Qt::Vertical, this); Q_CHECK_PTR(m_vScroll); - m_hScroll = new QScrollBar(QScrollBar::Horizontal, this); + m_hScroll = new QScrollBar(Qt::Horizontal, this); Q_CHECK_PTR(m_hScroll); m_vScroll->setGeometry(width() - 16, 20, 16, height() - 36); @@ -835,7 +848,7 @@ void KisView::resizeEvent(QResizeEvent *) if (!m_canvasPixmap.isNull() && !exposedRegion.isEmpty()) { - QMemArray rects = exposedRegion.rects(); + Q3MemArray rects = exposedRegion.rects(); for (unsigned int i = 0; i < rects.count(); i++) { QRect r = rects[i]; @@ -935,7 +948,7 @@ void KisView::updateQPaintDeviceCanvas(const QRect& imageRect) QRegion rg(vr); rg -= QRegion(windowToView(QRect(0, 0, img->width(), img->height()))); - QMemArray rects = rg.rects(); + Q3MemArray rects = rg.rects(); for (unsigned int i = 0; i < rects.count(); i++) { QRect er = rects[i]; @@ -1001,7 +1014,7 @@ void KisView::paintQPaintDeviceView(const QRegion& canvasRegion) Q_ASSERT(m_canvas->QPaintDeviceWidget() != 0); if (m_canvas->QPaintDeviceWidget() != 0 && !m_canvasPixmap.isNull()) { - QMemArray rects = canvasRegion.rects(); + Q3MemArray rects = canvasRegion.rects(); for (unsigned int i = 0; i < rects.count(); i++) { QRect r = rects[i]; @@ -1044,7 +1057,7 @@ void KisView::paintOpenGLView(const QRect& canvasRect) QColor widgetBackgroundColor = colorGroup().mid(); - glClearColor(widgetBackgroundColor.red() / 255.0, widgetBackgroundColor.green() / 255.0, widgetBackgroundColor.blue() / 255.0, 1.0); + glClearColor(widgetBackgroundColor.Qt::red() / 255.0, widgetBackgroundColor.Qt::green() / 255.0, widgetBackgroundColor.Qt::blue() / 255.0, 1.0); glClear(GL_COLOR_BUFFER_BIT); KisImageSP img = currentImg(); @@ -1643,8 +1656,8 @@ void KisView::slotEditPalette() if (!srv) { return; } - QValueList resources = srv->resources(); - QValueList palettes; + Q3ValueList resources = srv->resources(); + Q3ValueList palettes; for(uint i = 0; i < resources.count(); i++) { KisPalette* palette = dynamic_cast(*resources.at(i)); @@ -2314,7 +2327,7 @@ void KisView::canvasGotButtonPressEvent(KisButtonPressEvent *e) if (m_popup == 0 && factory()) { Q_ASSERT(factory()); - m_popup = (QPopupMenu *)factory()->container("image_popup", this); + m_popup = (Q3PopupMenu *)factory()->container("image_popup", this); } if (m_popup) m_popup->popup(e->globalPos().roundQPoint()); } @@ -3449,7 +3462,7 @@ bool KisView::eventFilter(QObject *o, QEvent *e) break; } #ifdef EXTENDED_X11_TABLET_SUPPORT - case QEvent::ChildInserted: + case QEvent::ChildAdded: { QChildEvent *childEvent = static_cast(e); QObject *child = childEvent->child(); @@ -3787,8 +3800,8 @@ void KisView::createDockers() KisResourceServerBase* rServer; rServer = KisResourceServerRegistry::instance()->get("PaletteServer"); - QValueList resources = rServer->resources(); - QValueList::iterator it; + Q3ValueList resources = rServer->resources(); + Q3ValueList::iterator it; for ( it = resources.begin(); it != resources.end(); ++it ) { m_palettewidget->slotAddPalette( *it ); } -- GitLab