diff options
Diffstat (limited to 'chalk/ui')
137 files changed, 488 insertions, 488 deletions
diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cc index 84613974..c7f9e0ad 100644 --- a/chalk/ui/kcurve.cc +++ b/chalk/ui/kcurve.cc @@ -42,8 +42,8 @@ #include "kcurve.h" -KCurve::KCurve(TQWidget *tqparent, const char *name, WFlags f) - : TQWidget(tqparent, name, f) +KCurve::KCurve(TQWidget *parent, const char *name, WFlags f) + : TQWidget(parent, name, f) { m_grab_point = NULL; m_readOnlyMode = false; diff --git a/chalk/ui/kcurve.h b/chalk/ui/kcurve.h index 820b5f5a..20aa20c3 100644 --- a/chalk/ui/kcurve.h +++ b/chalk/ui/kcurve.h @@ -32,7 +32,7 @@ Q_OBJECT TQ_OBJECT public: - KCurve(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); + KCurve(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); virtual ~KCurve(); diff --git a/chalk/ui/kis_autobrush.cc b/chalk/ui/kis_autobrush.cc index 3d081188..b2e848a8 100644 --- a/chalk/ui/kis_autobrush.cc +++ b/chalk/ui/kis_autobrush.cc @@ -26,7 +26,7 @@ #include <tqlabel.h> -KisAutobrush::KisAutobrush(TQWidget *tqparent, const char* name, const TQString& caption) : KisWdgAutobrush(tqparent, name) +KisAutobrush::KisAutobrush(TQWidget *parent, const char* name, const TQString& caption) : KisWdgAutobrush(parent, name) { setCaption(caption); diff --git a/chalk/ui/kis_autobrush.h b/chalk/ui/kis_autobrush.h index 92b8509d..fb06393e 100644 --- a/chalk/ui/kis_autobrush.h +++ b/chalk/ui/kis_autobrush.h @@ -28,7 +28,7 @@ class KisAutobrush : public KisWdgAutobrush Q_OBJECT TQ_OBJECT public: - KisAutobrush(TQWidget *tqparent, const char* name, const TQString& caption); + KisAutobrush(TQWidget *parent, const char* name, const TQString& caption); void activate(); signals: diff --git a/chalk/ui/kis_autogradient.cc b/chalk/ui/kis_autogradient.cc index 86b755f9..318bf305 100644 --- a/chalk/ui/kis_autogradient.cc +++ b/chalk/ui/kis_autogradient.cc @@ -32,7 +32,7 @@ /****************************** KisAutogradient ******************************/ -KisAutogradient::KisAutogradient(TQWidget *tqparent, const char* name, const TQString& caption) : KisWdgAutogradient(tqparent, name) +KisAutogradient::KisAutogradient(TQWidget *parent, const char* name, const TQString& caption) : KisWdgAutogradient(parent, name) { setCaption(caption); m_autogradientResource = new KisAutogradientResource(); diff --git a/chalk/ui/kis_autogradient.h b/chalk/ui/kis_autogradient.h index 7399aa67..19c832a9 100644 --- a/chalk/ui/kis_autogradient.h +++ b/chalk/ui/kis_autogradient.h @@ -32,7 +32,7 @@ class KisAutogradient : public KisWdgAutogradient TQ_OBJECT public: - KisAutogradient(TQWidget *tqparent, const char* name, const TQString& caption); + KisAutogradient(TQWidget *parent, const char* name, const TQString& caption); void activate(); signals: void activatedResource(KisResource *r); diff --git a/chalk/ui/kis_birdeye_box.cc b/chalk/ui/kis_birdeye_box.cc index 1484563f..0bc9ae08 100644 --- a/chalk/ui/kis_birdeye_box.cc +++ b/chalk/ui/kis_birdeye_box.cc @@ -177,8 +177,8 @@ namespace { } -KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name) +KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name) + : TQWidget(parent, name) , m_view(view) , m_subject(view->canvasSubject()) { diff --git a/chalk/ui/kis_birdeye_box.h b/chalk/ui/kis_birdeye_box.h index b9550474..e8fb88f7 100644 --- a/chalk/ui/kis_birdeye_box.h +++ b/chalk/ui/kis_birdeye_box.h @@ -38,7 +38,7 @@ class KisBirdEyeBox : public TQWidget public: - KisBirdEyeBox(KisView * view, TQWidget * tqparent = 0, const char* name=0); + KisBirdEyeBox(KisView * view, TQWidget * parent = 0, const char* name=0); ~KisBirdEyeBox(); void setImage(KisImageSP image); diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc index 69aeafdf..20de3c5b 100644 --- a/chalk/ui/kis_brush_chooser.cc +++ b/chalk/ui/kis_brush_chooser.cc @@ -27,8 +27,8 @@ #include "kis_icon_item.h" #include "kis_brush.h" -KisBrushChooser::KisBrushChooser(TQWidget *tqparent, const char *name) - : super(tqparent, name) +KisBrushChooser::KisBrushChooser(TQWidget *parent, const char *name) + : super(parent, name) { m_lbSpacing = new TQLabel(i18n("Spacing:"), this); m_slSpacing = new KisDoubleWidget(0.0, 10, this, "double_widget"); @@ -36,7 +36,7 @@ KisBrushChooser::KisBrushChooser(TQWidget *tqparent, const char *name) m_slSpacing->setTickInterval(1); TQObject::connect(m_slSpacing, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotSetItemSpacing(double))); - m_chkColorMask = new TQCheckBox(i18n("Use color as tqmask"), this); + m_chkColorMask = new TQCheckBox(i18n("Use color as mask"), this); TQObject::connect(m_chkColorMask, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetItemUseColorAsMask(bool))); m_lbName = new TQLabel(this); diff --git a/chalk/ui/kis_brush_chooser.h b/chalk/ui/kis_brush_chooser.h index 99438e70..cd5509ad 100644 --- a/chalk/ui/kis_brush_chooser.h +++ b/chalk/ui/kis_brush_chooser.h @@ -31,7 +31,7 @@ class KisBrushChooser : public KisItemChooser { TQ_OBJECT public: - KisBrushChooser(TQWidget *tqparent = 0, const char *name = 0); + KisBrushChooser(TQWidget *parent = 0, const char *name = 0); virtual ~KisBrushChooser(); protected: diff --git a/chalk/ui/kis_canvas.cc b/chalk/ui/kis_canvas.cc index 8ad09df3..16872418 100644 --- a/chalk/ui/kis_canvas.cc +++ b/chalk/ui/kis_canvas.cc @@ -1064,9 +1064,9 @@ KisInputDevice KisCanvasWidget::findActiveInputDevice() #define TQPAINTDEVICE_CANVAS_WIDGET false #define OPENGL_CANVAS_WIDGET true -KisCanvas::KisCanvas(TQWidget *tqparent, const char *name) +KisCanvas::KisCanvas(TQWidget *parent, const char *name) { - m_parent = tqparent; + m_parent = parent; m_name = name; m_enableMoveEventCompressionHint = false; m_canvasWidget = 0; diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h index be698ae2..4d92a4ce 100644 --- a/chalk/ui/kis_canvas.h +++ b/chalk/ui/kis_canvas.h @@ -286,7 +286,7 @@ class KisCanvas : public TQObject { TQ_OBJECT public: - KisCanvas(TQWidget *tqparent, const char *name); + KisCanvas(TQWidget *parent, const char *name); virtual ~KisCanvas(); // When enabled, the canvas may throw away move events if the application diff --git a/chalk/ui/kis_cmb_composite.cc b/chalk/ui/kis_cmb_composite.cc index 754e69da..51681351 100644 --- a/chalk/ui/kis_cmb_composite.cc +++ b/chalk/ui/kis_cmb_composite.cc @@ -25,8 +25,8 @@ #include "kis_cmb_composite.h" -KisCmbComposite::KisCmbComposite(TQWidget * tqparent, const char * name) - : super( false, tqparent, name ) +KisCmbComposite::KisCmbComposite(TQWidget * parent, const char * name) + : super( false, parent, name ) { connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpActivated(int))); connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotOpHighlighted(int))); diff --git a/chalk/ui/kis_cmb_composite.h b/chalk/ui/kis_cmb_composite.h index ef5df0e6..25ccf367 100644 --- a/chalk/ui/kis_cmb_composite.h +++ b/chalk/ui/kis_cmb_composite.h @@ -45,7 +45,7 @@ class KRITAUI_EXPORT KisCmbComposite : public TQComboBox public: - KisCmbComposite(TQWidget * tqparent = 0, const char * name = 0 ); + KisCmbComposite(TQWidget * parent = 0, const char * name = 0 ); virtual ~KisCmbComposite(); KisCompositeOp currentItem() const; diff --git a/chalk/ui/kis_cmb_idlist.cc b/chalk/ui/kis_cmb_idlist.cc index 0936350e..2d7e80d9 100644 --- a/chalk/ui/kis_cmb_idlist.cc +++ b/chalk/ui/kis_cmb_idlist.cc @@ -26,8 +26,8 @@ #include "kis_id.h" #include "kis_cmb_idlist.h" -KisCmbIDList::KisCmbIDList(TQWidget * tqparent, const char * name) - : super( false, tqparent, name ) +KisCmbIDList::KisCmbIDList(TQWidget * parent, const char * name) + : super( false, parent, name ) { connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotIDActivated(int))); connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotIDHighlighted(int))); diff --git a/chalk/ui/kis_cmb_idlist.h b/chalk/ui/kis_cmb_idlist.h index 2665c8f8..06894309 100644 --- a/chalk/ui/kis_cmb_idlist.h +++ b/chalk/ui/kis_cmb_idlist.h @@ -39,7 +39,7 @@ class KisCmbIDList : public TQComboBox public: - KisCmbIDList(TQWidget * tqparent = 0, const char * name = 0 ); + KisCmbIDList(TQWidget * parent = 0, const char * name = 0 ); virtual ~KisCmbIDList(); diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc index 44a9699b..4d2103d8 100644 --- a/chalk/ui/kis_color_cup.cc +++ b/chalk/ui/kis_color_cup.cc @@ -43,8 +43,8 @@ #include <kis_color.h> #include <kis_color_cup.h> -KisColorPopup::KisColorPopup(TQColor c, TQWidget * tqparent, const char * name) - : TQFrame(tqparent, name, WType_Popup | WStyle_Customize | WStyle_NoBorder) +KisColorPopup::KisColorPopup(TQColor c, TQWidget * parent, const char * name) + : TQFrame(parent, name, WType_Popup | WStyle_Customize | WStyle_NoBorder) { m_color = c; setMargin(4); @@ -59,8 +59,8 @@ KisColorPopup::KisColorPopup(TQColor c, TQWidget * tqparent, const char * name) } -KisColorCup::KisColorCup(TQWidget * tqparent, const char * name) - : TQPushButton(tqparent, name) +KisColorCup::KisColorCup(TQWidget * parent, const char * name) + : TQPushButton(parent, name) { m_color = TQt::black; m_popup = new KisColorPopup(m_color, this, "colorpopup"); diff --git a/chalk/ui/kis_color_cup.h b/chalk/ui/kis_color_cup.h index 7a59837a..2cf9ddef 100644 --- a/chalk/ui/kis_color_cup.h +++ b/chalk/ui/kis_color_cup.h @@ -60,7 +60,7 @@ class KRITAUI_EXPORT KisColorCup : public TQPushButton { public: - KisColorCup(TQWidget * tqparent, const char * name = 0); + KisColorCup(TQWidget * parent, const char * name = 0); virtual ~KisColorCup() {}; diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc index 29b9aa8b..fab8c4bb 100644 --- a/chalk/ui/kis_controlframe.cc +++ b/chalk/ui/kis_controlframe.cc @@ -60,8 +60,8 @@ #ifdef HAVE_TEXT_BRUSH #include "kis_text_brush.h" #endif -KisPopupFrame::KisPopupFrame(TQWidget * tqparent, const char* name) - : TQPopupMenu(tqparent, name) +KisPopupFrame::KisPopupFrame(TQWidget * parent, const char* name) + : TQPopupMenu(parent, name) { setFocusPolicy(TQ_StrongFocus); } diff --git a/chalk/ui/kis_controlframe.h b/chalk/ui/kis_controlframe.h index 0c16c77f..ac20191d 100644 --- a/chalk/ui/kis_controlframe.h +++ b/chalk/ui/kis_controlframe.h @@ -56,7 +56,7 @@ class KisPopupFrame : public TQPopupMenu { public: - KisPopupFrame(TQWidget * tqparent, const char * name = 0); + KisPopupFrame(TQWidget * parent, const char * name = 0); virtual void keyPressEvent(TQKeyEvent *); public: diff --git a/chalk/ui/kis_cursor.cc b/chalk/ui/kis_cursor.cc index ca899da8..c4281eac 100644 --- a/chalk/ui/kis_cursor.cc +++ b/chalk/ui/kis_cursor.cc @@ -122,9 +122,9 @@ TQCursor KisCursor::pickerCursor() 0x74, 0x00, 0x00, 0x32, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00}; TQBitmap picker_bitmap(24, 24, picker_bits, true); - TQBitmap picker_tqmask = picker_bitmap.createHeuristicMask( false ); + TQBitmap picker_mask = picker_bitmap.createHeuristicMask( false ); - return TQCursor( picker_bitmap, picker_tqmask, 1, 22 ); + return TQCursor( picker_bitmap, picker_mask, 1, 22 ); } @@ -139,9 +139,9 @@ TQCursor KisCursor::pickerPlusCursor() 0x74, 0x00, 0x0c, 0x32, 0x00, 0x0c, 0x0a, 0x00, 0x0c, 0x00, 0x00, 0x00}; TQBitmap picker_bitmap(24, 24, pickerplus_bits, true); - TQBitmap picker_tqmask = picker_bitmap.createHeuristicMask( false ); + TQBitmap picker_mask = picker_bitmap.createHeuristicMask( false ); - return TQCursor( picker_bitmap, picker_tqmask, 1, 22 ); + return TQCursor( picker_bitmap, picker_mask, 1, 22 ); } @@ -156,9 +156,9 @@ TQCursor KisCursor::pickerMinusCursor() 0x74, 0x00, 0x00, 0x32, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00}; TQBitmap picker_bitmap(24, 24, pickerminus_bits, true); - TQBitmap picker_tqmask = picker_bitmap.createHeuristicMask( false ); + TQBitmap picker_mask = picker_bitmap.createHeuristicMask( false ); - return TQCursor( picker_bitmap, picker_tqmask, 1, 22 ); + return TQCursor( picker_bitmap, picker_mask, 1, 22 ); } @@ -174,9 +174,9 @@ TQCursor KisCursor::penCursor() 0x7c, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00}; TQBitmap pen_bitmap( 24, 24, pen_bits, true ); - TQBitmap pen_tqmask = pen_bitmap.createHeuristicMask( false ); + TQBitmap pen_mask = pen_bitmap.createHeuristicMask( false ); - return TQCursor( pen_bitmap, pen_tqmask, 1, 22 ); + return TQCursor( pen_bitmap, pen_mask, 1, 22 ); } TQCursor KisCursor::brushCursor() @@ -192,9 +192,9 @@ TQCursor KisCursor::brushCursor() 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; TQBitmap brush_bitmap( 25, 23, brush_bits, true ); - TQBitmap brush_tqmask = brush_bitmap.createHeuristicMask( false ); + TQBitmap brush_mask = brush_bitmap.createHeuristicMask( false ); - return TQCursor( brush_bitmap, brush_tqmask, 1, 21 ); + return TQCursor( brush_bitmap, brush_mask, 1, 21 ); } TQCursor KisCursor::airbrushCursor() @@ -208,9 +208,9 @@ TQCursor KisCursor::airbrushCursor() 0xf8, 0x00, 0x06, 0x76, 0x00, 0x03, 0x36, 0x00, 0x03, 0x00, 0x00, 0x00}; TQBitmap airbrush_bitmap( 24, 24, airbrush_bits, true ); - TQBitmap airbrush_tqmask = airbrush_bitmap.createHeuristicMask( false ); + TQBitmap airbrush_mask = airbrush_bitmap.createHeuristicMask( false ); - return TQCursor( airbrush_bitmap, airbrush_tqmask, 1, 22 ); + return TQCursor( airbrush_bitmap, airbrush_mask, 1, 22 ); } TQCursor KisCursor::eraserCursor() @@ -226,9 +226,9 @@ TQCursor KisCursor::eraserCursor() 0x10, 0x01, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; TQBitmap eraser_bitmap( 25, 24, eraser_bits, true ); - TQBitmap eraser_tqmask = eraser_bitmap.createHeuristicMask( false ); + TQBitmap eraser_mask = eraser_bitmap.createHeuristicMask( false ); - return TQCursor( eraser_bitmap, eraser_tqmask, 7, 22 ); + return TQCursor( eraser_bitmap, eraser_mask, 7, 22 ); } TQCursor KisCursor::fillerCursor() @@ -242,9 +242,9 @@ TQCursor KisCursor::fillerCursor() 0x08, 0x60, 0x00, 0x00, 0x00, 0x00}; TQBitmap filler_bitmap( 22, 22, filler_bits, true ); - TQBitmap filler_tqmask = filler_bitmap.createHeuristicMask( false ); + TQBitmap filler_mask = filler_bitmap.createHeuristicMask( false ); - return TQCursor( filler_bitmap, filler_tqmask, 3, 20 ); + return TQCursor( filler_bitmap, filler_mask, 3, 20 ); } TQCursor KisCursor::colorChangerCursor() @@ -258,9 +258,9 @@ TQCursor KisCursor::colorChangerCursor() 0x80, 0x81, 0x01, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00}; TQBitmap colorChanger_bitmap( 24, 23, colorChanger_bits, true ); - TQBitmap colorChanger_tqmask = colorChanger_bitmap.createHeuristicMask( false ); + TQBitmap colorChanger_mask = colorChanger_bitmap.createHeuristicMask( false ); - return TQCursor( colorChanger_bitmap, colorChanger_tqmask, 12, 10 ); + return TQCursor( colorChanger_bitmap, colorChanger_mask, 12, 10 ); } TQCursor KisCursor::zoomCursor() @@ -274,9 +274,9 @@ TQCursor KisCursor::zoomCursor() 0x00, 0x00, 0x7c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00}; TQBitmap zoom_bitmap( 24, 23, zoom_bits, true ); - TQBitmap zoom_tqmask = zoom_bitmap.createHeuristicMask( false ); + TQBitmap zoom_mask = zoom_bitmap.createHeuristicMask( false ); - return TQCursor( zoom_bitmap, zoom_tqmask, 9, 8 ); + return TQCursor( zoom_bitmap, zoom_mask, 9, 8 ); } TQCursor KisCursor::moveCursor() @@ -290,9 +290,9 @@ TQCursor KisCursor::moveCursor() 0x00, 0x7e, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00}; TQBitmap move_bitmap( 24, 24, move_bits, true ); - TQBitmap move_tqmask = move_bitmap.createHeuristicMask( false ); + TQBitmap move_mask = move_bitmap.createHeuristicMask( false ); - return TQCursor( move_bitmap, move_tqmask, 12, 11 ); + return TQCursor( move_bitmap, move_mask, 12, 11 ); } TQCursor KisCursor::handCursor() @@ -311,9 +311,9 @@ TQCursor KisCursor::selectCursor() 0x00, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x08, 0x00}; TQBitmap select_bitmap(23, 23, select_bits, true); - TQBitmap select_tqmask = select_bitmap.createHeuristicMask( false ); + TQBitmap select_mask = select_bitmap.createHeuristicMask( false ); - return TQCursor( select_bitmap, select_tqmask, 11, 11 ); + return TQCursor( select_bitmap, select_mask, 11, 11 ); } TQCursor KisCursor::openHandCursor() @@ -341,10 +341,10 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY) Q_ASSERT(cursorImage.hasAlphaBuffer()); TQBitmap bitmap(cursorImage.width(), cursorImage.height()); - TQBitmap tqmask(cursorImage.width(), cursorImage.height()); + TQBitmap mask(cursorImage.width(), cursorImage.height()); TQPainter bitmapPainter(&bitmap); - TQPainter maskPainter(&tqmask); + TQPainter maskPainter(&mask); for (TQ_INT32 x = 0; x < cursorImage.width(); ++x) { for (TQ_INT32 y = 0; y < cursorImage.height(); ++y) { @@ -369,6 +369,6 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY) } } - return TQCursor(bitmap, tqmask, hotspotX, hotspotY); + return TQCursor(bitmap, mask, hotspotX, hotspotY); } diff --git a/chalk/ui/kis_custom_brush.cc b/chalk/ui/kis_custom_brush.cc index 49a44cc8..8091d0fb 100644 --- a/chalk/ui/kis_custom_brush.cc +++ b/chalk/ui/kis_custom_brush.cc @@ -39,8 +39,8 @@ #include "kis_paint_layer.h" #include "kis_group_layer.h" -KisCustomBrush::KisCustomBrush(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view) - : KisWdgCustomBrush(tqparent, name), m_view(view) +KisCustomBrush::KisCustomBrush(TQWidget *parent, const char* name, const TQString& caption, KisView* view) + : KisWdgCustomBrush(parent, name), m_view(view) { Q_ASSERT(m_view); m_mediator = 0; diff --git a/chalk/ui/kis_custom_brush.h b/chalk/ui/kis_custom_brush.h index 56e90553..a92ba65c 100644 --- a/chalk/ui/kis_custom_brush.h +++ b/chalk/ui/kis_custom_brush.h @@ -33,7 +33,7 @@ class KisCustomBrush : public KisWdgCustomBrush Q_OBJECT TQ_OBJECT public: - KisCustomBrush(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view); + KisCustomBrush(TQWidget *parent, const char* name, const TQString& caption, KisView* view); virtual ~KisCustomBrush(); void setResourceServer(KisResourceServerBase* server) { m_server = server; } diff --git a/chalk/ui/kis_custom_image_widget.cc b/chalk/ui/kis_custom_image_widget.cc index 0b77da9f..93c82977 100644 --- a/chalk/ui/kis_custom_image_widget.cc +++ b/chalk/ui/kis_custom_image_widget.cc @@ -39,8 +39,8 @@ #include <KoUnitWidgets.h> #include <tqlabel.h> -KisCustomImageWidget::KisCustomImageWidget(TQWidget *tqparent, KisDoc *doc, TQ_INT32 defWidth, TQ_INT32 defHeight, double resolution, TQString defColorSpaceName, TQString imageName) - : WdgNewImage(tqparent) { +KisCustomImageWidget::KisCustomImageWidget(TQWidget *parent, KisDoc *doc, TQ_INT32 defWidth, TQ_INT32 defHeight, double resolution, TQString defColorSpaceName, TQString imageName) + : WdgNewImage(parent) { m_doc = doc; txtName->setText(imageName); diff --git a/chalk/ui/kis_custom_image_widget.h b/chalk/ui/kis_custom_image_widget.h index eef443dc..a36d44bc 100644 --- a/chalk/ui/kis_custom_image_widget.h +++ b/chalk/ui/kis_custom_image_widget.h @@ -36,10 +36,10 @@ class KisCustomImageWidget : public WdgNewImage { public: /** * Constructor. Please note that this class is being used/created by KisDoc. - * @param tqparent the tqparent widget + * @param parent the parent widget * @param doc the document that wants to be altered */ - KisCustomImageWidget(TQWidget *tqparent, KisDoc *doc, TQ_INT32 defWidth, TQ_INT32 defHeight, double resolution, TQString defColorSpaceName, TQString imageName); + KisCustomImageWidget(TQWidget *parent, KisDoc *doc, TQ_INT32 defWidth, TQ_INT32 defHeight, double resolution, TQString defColorSpaceName, TQString imageName); private slots: void buttonClicked(); diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc index 47bd63b4..f84bf24d 100644 --- a/chalk/ui/kis_custom_palette.cc +++ b/chalk/ui/kis_custom_palette.cc @@ -39,8 +39,8 @@ #include "kis_resource_mediator.h" #include "kis_resourceserver.h" -KisCustomPalette::KisCustomPalette(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view) - : KisWdgCustomPalette(tqparent, name), m_view(view) +KisCustomPalette::KisCustomPalette(TQWidget *parent, const char* name, const TQString& caption, KisView* view) + : KisWdgCustomPalette(parent, name), m_view(view) { Q_ASSERT(m_view); m_mediator = 0; diff --git a/chalk/ui/kis_custom_palette.h b/chalk/ui/kis_custom_palette.h index 7ff9c9d8..e8994c1e 100644 --- a/chalk/ui/kis_custom_palette.h +++ b/chalk/ui/kis_custom_palette.h @@ -34,7 +34,7 @@ class KisCustomPalette : public KisWdgCustomPalette Q_OBJECT TQ_OBJECT public: - KisCustomPalette(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view); + KisCustomPalette(TQWidget *parent, const char* name, const TQString& caption, KisView* view); virtual ~KisCustomPalette(); void setResourceServer(KisResourceServerBase* server) { m_server = server; } void setEditMode(bool b); diff --git a/chalk/ui/kis_custom_pattern.cc b/chalk/ui/kis_custom_pattern.cc index 64430f1c..c5c04f23 100644 --- a/chalk/ui/kis_custom_pattern.cc +++ b/chalk/ui/kis_custom_pattern.cc @@ -36,8 +36,8 @@ #include "kis_resourceserver.h" #include "kis_paint_layer.h" -KisCustomPattern::KisCustomPattern(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view) - : KisWdgCustomPattern(tqparent, name), m_view(view) +KisCustomPattern::KisCustomPattern(TQWidget *parent, const char* name, const TQString& caption, KisView* view) + : KisWdgCustomPattern(parent, name), m_view(view) { Q_ASSERT(m_view); m_mediator = 0; diff --git a/chalk/ui/kis_custom_pattern.h b/chalk/ui/kis_custom_pattern.h index 993c9d10..7850b370 100644 --- a/chalk/ui/kis_custom_pattern.h +++ b/chalk/ui/kis_custom_pattern.h @@ -33,7 +33,7 @@ class KisCustomPattern : public KisWdgCustomPattern Q_OBJECT TQ_OBJECT public: - KisCustomPattern(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view); + KisCustomPattern(TQWidget *parent, const char* name, const TQString& caption, KisView* view); virtual ~KisCustomPattern(); void setResourceServer(KisResourceServerBase* server) { m_server = server; } diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc index c955eba3..1cdd309c 100644 --- a/chalk/ui/kis_dlg_adj_layer_props.cc +++ b/chalk/ui/kis_dlg_adj_layer_props.cc @@ -44,9 +44,9 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, const TQString & layerName, const TQString & caption, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : KDialogBase(tqparent, name, true, "", Ok | Cancel) + : KDialogBase(parent, name, true, "", Ok | Cancel) { Q_ASSERT( layer ); m_layer = layer; diff --git a/chalk/ui/kis_dlg_adj_layer_props.h b/chalk/ui/kis_dlg_adj_layer_props.h index de848002..e40635ee 100644 --- a/chalk/ui/kis_dlg_adj_layer_props.h +++ b/chalk/ui/kis_dlg_adj_layer_props.h @@ -50,13 +50,13 @@ public: * @param caption the caption for the dialog -- create or properties * @param create if true, set the dialog up for creating a new adj. layer, if false, edit the * propeties of the current adj. layer - * @param tqparent the widget tqparent of this dialog + * @param parent the widget parent of this dialog * @param name the TQObject name, if any */ KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, const TQString & layerName, const TQString & caption, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0); KisFilterConfiguration * filterConfiguration() const; diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc index 22cb9c0d..13caff98 100644 --- a/chalk/ui/kis_dlg_adjustment_layer.cc +++ b/chalk/ui/kis_dlg_adjustment_layer.cc @@ -44,9 +44,9 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img, const TQString & /*layerName*/, const TQString & caption, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : KDialogBase(tqparent, name, true, "", Ok | Cancel) + : KDialogBase(parent, name, true, "", Ok | Cancel) , m_image(img) , m_currentFilter(0) , m_customName(false) diff --git a/chalk/ui/kis_dlg_adjustment_layer.h b/chalk/ui/kis_dlg_adjustment_layer.h index 4e20b8fd..dd799260 100644 --- a/chalk/ui/kis_dlg_adjustment_layer.h +++ b/chalk/ui/kis_dlg_adjustment_layer.h @@ -50,13 +50,13 @@ public: * @param caption the caption for the dialog -- create or properties * @param create if true, set the dialog up for creating a new adj. layer, if false, edit the * propeties of the current adj. layer - * @param tqparent the widget tqparent of this dialog + * @param parent the widget parent of this dialog * @param name the TQObject name, if any */ KisDlgAdjustmentLayer(KisImage * img, const TQString & layerName, const TQString & caption, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0); KisFilterConfiguration * filterConfiguration() const; diff --git a/chalk/ui/kis_dlg_apply_profile.cc b/chalk/ui/kis_dlg_apply_profile.cc index 12134aa0..5c136738 100644 --- a/chalk/ui/kis_dlg_apply_profile.cc +++ b/chalk/ui/kis_dlg_apply_profile.cc @@ -34,8 +34,8 @@ #include "wdgapplyprofile.h" // XXX: Hardcode RGBA name. This should be a constant, somewhere. -KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *tqparent, const char *name) - : super(tqparent, name, true, "", Ok | Cancel) +KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *parent, const char *name) + : super(parent, name, true, "", Ok | Cancel) { setCaption(i18n("Apply Image Profile to Clipboard Data")); diff --git a/chalk/ui/kis_dlg_apply_profile.h b/chalk/ui/kis_dlg_apply_profile.h index 18f56d0a..017c54ec 100644 --- a/chalk/ui/kis_dlg_apply_profile.h +++ b/chalk/ui/kis_dlg_apply_profile.h @@ -30,7 +30,7 @@ class KisDlgApplyProfile : public KDialogBase { TQ_OBJECT public: - KisDlgApplyProfile(TQWidget *tqparent = 0, + KisDlgApplyProfile(TQWidget *parent = 0, const char *name = 0); virtual ~KisDlgApplyProfile(); diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc index 29d221a0..ca6a1b72 100644 --- a/chalk/ui/kis_dlg_image_properties.cc +++ b/chalk/ui/kis_dlg_image_properties.cc @@ -44,8 +44,8 @@ #include "squeezedcombobox.h" #include "wdgnewimage.h" -KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *tqparent, const char *name) - : super(tqparent, name, true, "", Ok | Cancel) +KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *parent, const char *name) + : super(parent, name, true, "", Ok | Cancel) { setCaption(i18n("Image Properties")); diff --git a/chalk/ui/kis_dlg_image_properties.h b/chalk/ui/kis_dlg_image_properties.h index 934adc05..b5d0a3ae 100644 --- a/chalk/ui/kis_dlg_image_properties.h +++ b/chalk/ui/kis_dlg_image_properties.h @@ -33,7 +33,7 @@ class KisDlgImageProperties : public KDialogBase { public: KisDlgImageProperties(KisImageSP image, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0); virtual ~KisDlgImageProperties(); diff --git a/chalk/ui/kis_dlg_layer_properties.cc b/chalk/ui/kis_dlg_layer_properties.cc index 68df970b..7742969b 100644 --- a/chalk/ui/kis_dlg_layer_properties.cc +++ b/chalk/ui/kis_dlg_layer_properties.cc @@ -39,8 +39,8 @@ KisDlgLayerProperties::KisDlgLayerProperties(const TQString& deviceName, TQ_INT32 opacity, const KisCompositeOp& compositeOp, const KisColorSpace * colorSpace, - TQWidget *tqparent, const char *name, WFlags f) - : super(tqparent, name, f, name, Ok | Cancel) + TQWidget *parent, const char *name, WFlags f) + : super(parent, name, f, name, Ok | Cancel) { m_page = new WdgLayerProperties(this); m_page->tqlayout()->setMargin(0); diff --git a/chalk/ui/kis_dlg_layer_properties.h b/chalk/ui/kis_dlg_layer_properties.h index c2b2a5e0..d60a6b8f 100644 --- a/chalk/ui/kis_dlg_layer_properties.h +++ b/chalk/ui/kis_dlg_layer_properties.h @@ -35,7 +35,7 @@ public: TQ_INT32 opacity, const KisCompositeOp& compositeOp, const KisColorSpace * colorSpace, - TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); + TQWidget *parent = 0, const char *name = 0, WFlags f = 0); virtual ~KisDlgLayerProperties(); diff --git a/chalk/ui/kis_dlg_new_layer.cc b/chalk/ui/kis_dlg_new_layer.cc index a0a97a7e..154dbf2c 100644 --- a/chalk/ui/kis_dlg_new_layer.cc +++ b/chalk/ui/kis_dlg_new_layer.cc @@ -43,9 +43,9 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID, const TQString & profilename, const TQString & deviceName, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : super(tqparent, name, true, "", Ok | Cancel) + : super(parent, name, true, "", Ok | Cancel) { m_page = new WdgLayerProperties(this); m_page->tqlayout()->setMargin(0); diff --git a/chalk/ui/kis_dlg_new_layer.h b/chalk/ui/kis_dlg_new_layer.h index b484e1dc..761b2495 100644 --- a/chalk/ui/kis_dlg_new_layer.h +++ b/chalk/ui/kis_dlg_new_layer.h @@ -38,7 +38,7 @@ public: NewLayerDialog(const KisID colorSpace, const TQString & profilename, const TQString & deviceName, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0); TQString layerName() const; diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index 941e033e..a19edebe 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -108,8 +108,8 @@ float GeneralTab::dockerFontSize() //--------------------------------------------------------------------------------------------------- -ColorSettingsTab::ColorSettingsTab(TQWidget *tqparent, const char *name ) - : TQWidget(tqparent, name) +ColorSettingsTab::ColorSettingsTab(TQWidget *parent, const char *name ) + : TQWidget(parent, name) { // XXX: Make sure only profiles that fit the specified color model // are shown in the profile combos @@ -195,8 +195,8 @@ void ColorSettingsTab::refillPrintProfiles(const KisID & s) //--------------------------------------------------------------------------------------------------- -PerformanceTab::PerformanceTab(TQWidget *tqparent, const char *name ) - : WdgPerformanceSettings(tqparent, name) +PerformanceTab::PerformanceTab(TQWidget *parent, const char *name ) + : WdgPerformanceSettings(parent, name) { // XXX: Make sure only profiles that fit the specified color model // are shown in the profile combos @@ -216,8 +216,8 @@ void PerformanceTab::setDefault() //--------------------------------------------------------------------------------------------------- -TabletSettingsTab::TabletSettingsTab( TQWidget *tqparent, const char *name) - : WdgTabletSettings( tqparent, name ) +TabletSettingsTab::TabletSettingsTab( TQWidget *parent, const char *name) + : WdgTabletSettings( parent, name ) { #ifdef EXTENDED_X11_TABLET_SUPPORT initTabletDevices(); @@ -380,8 +380,8 @@ TQ_INT32 TabletSettingsTab::DeviceSettings::serialNumberAxis() const } TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const TQString& deviceName, DeviceSettings settings, - TQWidget *tqparent, const char *name) - : super(tqparent, name, true, "", Ok | Cancel) + TQWidget *parent, const char *name) + : super(parent, name, true, "", Ok | Cancel) { setCaption(i18n("Configure %1").tqarg(deviceName)); @@ -611,8 +611,8 @@ void TabletSettingsTab::applyTabletDeviceSettings() //--------------------------------------------------------------------------------------------------- -DisplaySettingsTab::DisplaySettingsTab( TQWidget *tqparent, const char *name) - : WdgDisplaySettings( tqparent, name ) +DisplaySettingsTab::DisplaySettingsTab( TQWidget *parent, const char *name) + : WdgDisplaySettings( parent, name ) { #ifdef HAVE_GL KisConfig cfg; @@ -646,7 +646,7 @@ void DisplaySettingsTab::slotUseOpenGLToggled(bool /*isChecked*/) } //--------------------------------------------------------------------------------------------------- -GridSettingsTab::GridSettingsTab(TQWidget* tqparent) : WdgGridSettingsBase(tqparent) +GridSettingsTab::GridSettingsTab(TQWidget* parent) : WdgGridSettingsBase(parent) { KisConfig cfg; selectMainStyle->setCurrentItem(cfg.getGridMainStyle()); @@ -723,8 +723,8 @@ void GridSettingsTab::linkSpacingToggled(bool b) //--------------------------------------------------------------------------------------------------- -PreferencesDialog::PreferencesDialog( TQWidget* tqparent, const char* name ) - : KDialogBase( IconList, i18n("Preferences"), Ok | Cancel | Help | Default /*| Apply*/, Ok, tqparent, name, true, true ) +PreferencesDialog::PreferencesDialog( TQWidget* parent, const char* name ) + : KDialogBase( IconList, i18n("Preferences"), Ok | Cancel | Help | Default /*| Apply*/, Ok, parent, name, true, true ) { TQVBox *vbox; diff --git a/chalk/ui/kis_dlg_preferences.h b/chalk/ui/kis_dlg_preferences.h index 61f4a586..908caf8e 100644 --- a/chalk/ui/kis_dlg_preferences.h +++ b/chalk/ui/kis_dlg_preferences.h @@ -53,7 +53,7 @@ class GeneralTab : public WdgGeneralSettings public: - GeneralTab( TQWidget *tqparent = 0, const char *name = 0 ); + GeneralTab( TQWidget *parent = 0, const char *name = 0 ); enumCursorStyle cursorStyle(); enumKoDockability dockability(); @@ -72,7 +72,7 @@ class ColorSettingsTab : public TQWidget public: - ColorSettingsTab( TQWidget *tqparent = 0, const char * name = 0 ); + ColorSettingsTab( TQWidget *parent = 0, const char * name = 0 ); private slots: @@ -94,7 +94,7 @@ Q_OBJECT TQ_OBJECT public: - PerformanceTab( TQWidget *tqparent = 0, const char *name = 0 ); + PerformanceTab( TQWidget *parent = 0, const char *name = 0 ); public: void setDefault(); @@ -112,7 +112,7 @@ Q_OBJECT TQ_OBJECT public: - TabletSettingsTab( TQWidget *tqparent = 0, const char *name = 0 ); + TabletSettingsTab( TQWidget *parent = 0, const char *name = 0 ); public: void setDefault(); @@ -180,7 +180,7 @@ private: public: TabletDeviceSettingsDialog(const TQString& deviceName, DeviceSettings settings, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0); virtual ~TabletDeviceSettingsDialog(); @@ -209,7 +209,7 @@ Q_OBJECT TQ_OBJECT public: - DisplaySettingsTab( TQWidget *tqparent = 0, const char *name = 0 ); + DisplaySettingsTab( TQWidget *parent = 0, const char *name = 0 ); public: void setDefault(); @@ -227,7 +227,7 @@ class GridSettingsTab : public WdgGridSettingsBase { Q_OBJECT TQ_OBJECT public: - GridSettingsTab(TQWidget* tqparent); + GridSettingsTab(TQWidget* parent); public: void setDefault(); private slots: @@ -256,7 +256,7 @@ public: protected: - PreferencesDialog( TQWidget *tqparent = 0, const char *name = 0 ); + PreferencesDialog( TQWidget *parent = 0, const char *name = 0 ); ~PreferencesDialog(); protected: diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc index 1fc1c9c9..6bae7e78 100644 --- a/chalk/ui/kis_doc.cc +++ b/chalk/ui/kis_doc.cc @@ -137,8 +137,8 @@ namespace { } -KisDoc::KisDoc(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, bool singleViewMode) : - super(parentWidget, widgetName, tqparent, name, singleViewMode) +KisDoc::KisDoc(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, bool singleViewMode) : + super(parentWidget, widgetName, parent, name, singleViewMode) { m_undo = false; @@ -460,7 +460,7 @@ KisImageSP KisDoc::loadImage(const TQDomElement& element) return img; } -void KisDoc::loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP tqparent) +void KisDoc::loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP parent) { TQDomNode node = element.firstChild(); TQDomNode child; @@ -477,7 +477,7 @@ void KisDoc::loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLay } else { img->nextLayerName(); // Make sure the nameserver is current with the number of layers. - img->addLayer(layer, tqparent, 0); + img->addLayer(layer, parent, 0); } } } @@ -593,11 +593,11 @@ KisLayerSP KisDoc::loadPaintLayer(const TQDomElement& element, KisImageSP img, else m_layerFilenames[layer.data()] = TQString(element.attribute("filename")); - if ((attr = element.attribute("hastqmask")).isNull()) + if ((attr = element.attribute("hasmask")).isNull()) attr = "0"; if (attr == "1") { - // We add a tqmask, but we'll fill in the actual tqmask later in completeLoading with the visitor + // We add a mask, but we'll fill in the actual mask later in completeLoading with the visitor layer->createMask(); } @@ -805,7 +805,7 @@ bool KisDoc::completeLoading(KoStore *store) return true; } -TQWidget* KisDoc::createCustomDocumentWidget(TQWidget *tqparent) +TQWidget* KisDoc::createCustomDocumentWidget(TQWidget *parent) { KisConfig cfg; @@ -818,7 +818,7 @@ TQWidget* KisDoc::createCustomDocumentWidget(TQWidget *tqparent) w = sz.width(); h = sz.height(); } - return new KisCustomImageWidget(tqparent, this, w, h, cfg.defImgResolution(), cfg.workingColorSpace(),"unnamed"); + return new KisCustomImageWidget(parent, this, w, h, cfg.defImgResolution(), cfg.workingColorSpace(),"unnamed"); } @@ -931,9 +931,9 @@ bool KisDoc::newImage(const TQString& name, TQ_INT32 width, TQ_INT32 height, Kis return true; } -KoView* KisDoc::createViewInstance(TQWidget* tqparent, const char *name) +KoView* KisDoc::createViewInstance(TQWidget* parent, const char *name) { - KisView * v = new KisView(this, this, tqparent, name); + KisView * v = new KisView(this, this, parent, name); Q_CHECK_PTR(v); return v; diff --git a/chalk/ui/kis_doc.h b/chalk/ui/kis_doc.h index 222e9da6..f09cf39d 100644 --- a/chalk/ui/kis_doc.h +++ b/chalk/ui/kis_doc.h @@ -53,7 +53,7 @@ class KRITACORE_EXPORT KisDoc : public KoDocument, private KisUndoAdapter { TQ_OBJECT public: - KisDoc(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false); + KisDoc(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false); virtual ~KisDoc(); public: @@ -68,7 +68,7 @@ public: virtual bool loadChildren( KoStore* store); virtual bool loadXML(TQIODevice *, const TQDomDocument& doc); virtual TQCString mimeType() const; - virtual TQWidget* createCustomDocumentWidget(TQWidget *tqparent); + virtual TQWidget* createCustomDocumentWidget(TQWidget *parent); virtual KoDocument* hitTest(const TQPoint &pos, const TQWMatrix& matrix = TQWMatrix()); /** @@ -114,13 +114,13 @@ public: void setRedoLimit(TQ_INT32 limit); /** - * Create a new image that has this document as a tqparent and + * Create a new image that has this document as a parent and * replace the current image with this image. */ bool newImage(const TQString& name, TQ_INT32 width, TQ_INT32 height, KisColorSpace * cs, const KisColor &bgColor, const TQString &imgDescription, const double imgResolution); /** - * Create a new image that has this document as a tqparent and + * Create a new image that has this document as a parent and * replace the current image with this image. */ KisImageSP newImage(const TQString& name, TQ_INT32 width, TQ_INT32 height, KisColorSpace * colorstrategy); @@ -168,7 +168,7 @@ signals: protected: // Overide KoDocument - virtual KoView* createViewInstance(TQWidget *tqparent, const char *name); + virtual KoView* createViewInstance(TQWidget *parent, const char *name); protected slots: // Overide KoDocument @@ -183,7 +183,7 @@ private: TQDomElement saveImage(TQDomDocument& doc, KisImageSP img); KisImageSP loadImage(const TQDomElement& elem); - void loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP tqparent); + void loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP parent); KisLayerSP loadLayer(const TQDomElement& elem, KisImageSP img); KisLayerSP loadPaintLayer(const TQDomElement& elem, KisImageSP img, TQString name, TQ_INT32 x, TQ_INT32 y, TQ_INT32 opacity, bool visible, bool locked, diff --git a/chalk/ui/kis_double_widget.cc b/chalk/ui/kis_double_widget.cc index 3c13a47e..6c03b3e9 100644 --- a/chalk/ui/kis_double_widget.cc +++ b/chalk/ui/kis_double_widget.cc @@ -27,14 +27,14 @@ #include "kis_double_widget.h" -KisDoubleWidget::KisDoubleWidget(TQWidget* tqparent, const char* name) - : super(tqparent, name) +KisDoubleWidget::KisDoubleWidget(TQWidget* parent, const char* name) + : super(parent, name) { init(0, 1); } -KisDoubleWidget::KisDoubleWidget(double min, double max, TQWidget* tqparent, const char* name) - : super(tqparent, name) +KisDoubleWidget::KisDoubleWidget(double min, double max, TQWidget* parent, const char* name) + : super(parent, name) { init(min, max); } diff --git a/chalk/ui/kis_double_widget.h b/chalk/ui/kis_double_widget.h index 89a425b7..beb1cdd0 100644 --- a/chalk/ui/kis_double_widget.h +++ b/chalk/ui/kis_double_widget.h @@ -35,8 +35,8 @@ class KisDoubleWidget : public TQWidget typedef TQWidget super; public: - KisDoubleWidget(TQWidget* tqparent = 0, const char* name = 0); - KisDoubleWidget(double min, double max, TQWidget* tqparent = 0, const char* name = 0); + KisDoubleWidget(TQWidget* parent = 0, const char* name = 0); + KisDoubleWidget(double min, double max, TQWidget* parent = 0, const char* name = 0); ~KisDoubleWidget(); double value() const; diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cc index aa84aa61..519ca878 100644 --- a/chalk/ui/kis_factory.cc +++ b/chalk/ui/kis_factory.cc @@ -50,8 +50,8 @@ KInstance* KisFactory::s_instance = 0; -KisFactory::KisFactory( TQObject* tqparent, const char* name ) - : KoFactory( tqparent, name ) +KisFactory::KisFactory( TQObject* parent, const char* name ) + : KoFactory( parent, name ) { s_aboutData = newChalkAboutData(); @@ -79,13 +79,13 @@ KisFactory::~KisFactory() * Create the document */ KParts::Part* KisFactory::createPartObject( TQWidget *parentWidget, - const char *widgetName, TQObject* tqparent, + const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & ) { bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); KisDoc *doc = new KisDoc( parentWidget, - widgetName, tqparent, name, !bWantKoDocument ); + widgetName, parent, name, !bWantKoDocument ); Q_CHECK_PTR(doc); if ( !bWantKoDocument ) diff --git a/chalk/ui/kis_factory.h b/chalk/ui/kis_factory.h index da9d3e40..660e77dd 100644 --- a/chalk/ui/kis_factory.h +++ b/chalk/ui/kis_factory.h @@ -38,12 +38,12 @@ class KRITACORE_EXPORT KisFactory : public KoFactory TQ_OBJECT public: - KisFactory( TQObject* tqparent = 0, const char* name = 0 ); + KisFactory( TQObject* parent = 0, const char* name = 0 ); ~KisFactory(); virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, - TQObject *tqparent = 0, + TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); diff --git a/chalk/ui/kis_filter_manager.h b/chalk/ui/kis_filter_manager.h index beaf66a2..a155e74a 100644 --- a/chalk/ui/kis_filter_manager.h +++ b/chalk/ui/kis_filter_manager.h @@ -48,7 +48,7 @@ class KRITACORE_EXPORT KisFilterManager : public TQObject { public: - KisFilterManager(KisView * tqparent, KisDoc * doc); + KisFilterManager(KisView * parent, KisDoc * doc); ~KisFilterManager(); void setup(KActionCollection * ac); diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc index 163c88a4..f2d63cc3 100644 --- a/chalk/ui/kis_filters_listview.cc +++ b/chalk/ui/kis_filters_listview.cc @@ -40,8 +40,8 @@ // ------------------------------------------------ -KisFiltersThumbnailThread::KisFiltersThumbnailThread(TQIconView * tqparent, KisFiltersIconViewItem * iconItem, KisFilterConfiguration * config, KisFilter * filter, KisPaintDeviceSP dev, const TQRect & bounds, KisProfile * profile) - : m_parent(tqparent) +KisFiltersThumbnailThread::KisFiltersThumbnailThread(TQIconView * parent, KisFiltersIconViewItem * iconItem, KisFilterConfiguration * config, KisFilter * filter, KisPaintDeviceSP dev, const TQRect & bounds, KisProfile * profile) + : m_parent(parent) , m_iconItem(iconItem) , m_config(config) , m_filter(filter) @@ -87,15 +87,15 @@ void KisFiltersThumbnailThread::cancel() // ------------------------------------------------ -KisFiltersIconViewItem::KisFiltersIconViewItem(TQIconView * tqparent, const TQString & text, const TQPixmap & icon, +KisFiltersIconViewItem::KisFiltersIconViewItem(TQIconView * parent, const TQString & text, const TQPixmap & icon, KisID id, KisFilter* filter, KisFilterConfiguration* filterConfig, KisPaintDeviceSP thumb, const TQRect & bounds, KisProfile * profile) - : TQIconViewItem(tqparent, text, icon) + : TQIconViewItem(parent, text, icon) , m_id(id) , m_filter(filter) , m_filterconfig(filterConfig) { - m_thread = new KisFiltersThumbnailThread(tqparent, this, filterConfig, filter, thumb, bounds, profile); + m_thread = new KisFiltersThumbnailThread(parent, this, filterConfig, filter, thumb, bounds, profile); } KisFiltersIconViewItem::~KisFiltersIconViewItem() @@ -106,8 +106,8 @@ KisFiltersIconViewItem::~KisFiltersIconViewItem() // ------------------------------------------------ -KisFiltersListView::KisFiltersListView(TQWidget* tqparent, bool filterForAdjustmentLayers, const char* name) - : KIconView(tqparent, name) +KisFiltersListView::KisFiltersListView(TQWidget* parent, bool filterForAdjustmentLayers, const char* name) + : KIconView(parent, name) , m_original(0) , m_profile(0) , m_filterForAdjustmentLayers(filterForAdjustmentLayers) @@ -115,8 +115,8 @@ KisFiltersListView::KisFiltersListView(TQWidget* tqparent, bool filterForAdjustm init(); } -KisFiltersListView::KisFiltersListView(TQWidget * tqparent, const char * name, WFlags f, bool filterForAdjustmentLayers) - : KIconView(tqparent, name, f) +KisFiltersListView::KisFiltersListView(TQWidget * parent, const char * name, WFlags f, bool filterForAdjustmentLayers) + : KIconView(parent, name, f) , m_original(0) , m_profile(0) , m_filterForAdjustmentLayers(filterForAdjustmentLayers) @@ -124,8 +124,8 @@ KisFiltersListView::KisFiltersListView(TQWidget * tqparent, const char * name, W init(); } -KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* tqparent, bool filterForAdjustmentLayers, const char * name) - : KIconView(tqparent, name) +KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* parent, bool filterForAdjustmentLayers, const char * name) + : KIconView(parent, name) , m_original(0) , m_profile(0) , m_filterForAdjustmentLayers(filterForAdjustmentLayers) @@ -139,8 +139,8 @@ KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* tqparent, boo init(); } -KisFiltersListView::KisFiltersListView(KisPaintDeviceSP device, TQWidget* tqparent, bool filterForAdjustmentLayers, const char * name) - : KIconView(tqparent, name) +KisFiltersListView::KisFiltersListView(KisPaintDeviceSP device, TQWidget* parent, bool filterForAdjustmentLayers, const char * name) + : KIconView(parent, name) , m_original(device) , m_profile(0) , m_filterForAdjustmentLayers(filterForAdjustmentLayers) diff --git a/chalk/ui/kis_filters_listview.h b/chalk/ui/kis_filters_listview.h index c4979e25..3b7fa77b 100644 --- a/chalk/ui/kis_filters_listview.h +++ b/chalk/ui/kis_filters_listview.h @@ -58,7 +58,7 @@ class KisFiltersThumbnailThread : public KisThread { public: - KisFiltersThumbnailThread(TQIconView * tqparent, + KisFiltersThumbnailThread(TQIconView * parent, KisFiltersIconViewItem * iconItem, KisFilterConfiguration * config, KisFilter * filter, KisPaintDeviceSP dev, const TQRect & bounds, @@ -83,7 +83,7 @@ private: class KisFiltersIconViewItem : public TQIconViewItem { public: - KisFiltersIconViewItem( TQIconView * tqparent, const TQString & text, const TQPixmap & icon, + KisFiltersIconViewItem( TQIconView * parent, const TQString & text, const TQPixmap & icon, KisID id, KisFilter* filter, KisFilterConfiguration* filterConfig, KisPaintDeviceSP thumb, const TQRect & bounds, KisProfile * profile); @@ -105,10 +105,10 @@ private: class KisFiltersListView : public KIconView { public: - explicit KisFiltersListView(TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0, bool filterForAdjustmentLayers = false); - KisFiltersListView(TQWidget* tqparent, bool filterForAdjustmentLayers = false, const char* name = 0); - KisFiltersListView(KisLayerSP layer, TQWidget* tqparent, bool filterForAdjustmentLayers = false, const char * name = 0) KDE_DEPRECATED; - KisFiltersListView(KisPaintDeviceSP layer, TQWidget* tqparent, bool filterForAdjustmentLayers = false, const char * name = 0); + explicit KisFiltersListView(TQWidget * parent = 0, const char * name = 0, WFlags f = 0, bool filterForAdjustmentLayers = false); + KisFiltersListView(TQWidget* parent, bool filterForAdjustmentLayers = false, const char* name = 0); + KisFiltersListView(KisLayerSP layer, TQWidget* parent, bool filterForAdjustmentLayers = false, const char * name = 0) KDE_DEPRECATED; + KisFiltersListView(KisPaintDeviceSP layer, TQWidget* parent, bool filterForAdjustmentLayers = false, const char * name = 0); virtual void customEvent(TQCustomEvent *); diff --git a/chalk/ui/kis_gradient_chooser.cc b/chalk/ui/kis_gradient_chooser.cc index 7e416ea1..203f0718 100644 --- a/chalk/ui/kis_gradient_chooser.cc +++ b/chalk/ui/kis_gradient_chooser.cc @@ -32,15 +32,15 @@ #include "kis_gradient_chooser.h" -KisCustomGradientDialog::KisCustomGradientDialog(KisView * view, TQWidget * tqparent, const char *name) - : KDialogBase(tqparent, name, false, i18n("Custom Gradient"), Close) +KisCustomGradientDialog::KisCustomGradientDialog(KisView * view, TQWidget * parent, const char *name) + : KDialogBase(parent, name, false, i18n("Custom Gradient"), Close) { m_page = new KisAutogradient(this, "autogradient", i18n("Custom Gradient")); setMainWidget(m_page); connect(m_page, TQT_SIGNAL(activatedResource(KisResource *)), view, TQT_SLOT(gradientActivated(KisResource*))); } -KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *tqparent, const char *name) : super(tqparent, name) +KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const char *name) : super(parent, name) { m_lbName = new TQLabel(this); diff --git a/chalk/ui/kis_gradient_chooser.h b/chalk/ui/kis_gradient_chooser.h index fc154f3c..3553213f 100644 --- a/chalk/ui/kis_gradient_chooser.h +++ b/chalk/ui/kis_gradient_chooser.h @@ -33,7 +33,7 @@ class KisCustomGradientDialog : public KDialogBase { public: - KisCustomGradientDialog(KisView * view, TQWidget * tqparent, const char *name); + KisCustomGradientDialog(KisView * view, TQWidget * parent, const char *name); private: @@ -48,7 +48,7 @@ class KisGradientChooser : public KisItemChooser { public: // XXX: On library redesign, remove m_view parameter here, it's just a temporary hack for the autogradient dialog! - KisGradientChooser(KisView * view, TQWidget *tqparent = 0, const char *name = 0); + KisGradientChooser(KisView * view, TQWidget *parent = 0, const char *name = 0); virtual ~KisGradientChooser(); protected: diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc index 0547bdb5..cda77d68 100644 --- a/chalk/ui/kis_gradient_slider_widget.cc +++ b/chalk/ui/kis_gradient_slider_widget.cc @@ -30,8 +30,8 @@ #define MARGIN 5 #define HANDLE_SIZE 10 -KisGradientSliderWidget::KisGradientSliderWidget(TQWidget *tqparent, const char* name, WFlags f ) - : TQWidget( tqparent, name, f), +KisGradientSliderWidget::KisGradientSliderWidget(TQWidget *parent, const char* name, WFlags f ) + : TQWidget( parent, name, f), m_currentSegment(0), m_selectedSegment(0), m_drag(0) diff --git a/chalk/ui/kis_gradient_slider_widget.h b/chalk/ui/kis_gradient_slider_widget.h index d15ac1c4..995b3a59 100644 --- a/chalk/ui/kis_gradient_slider_widget.h +++ b/chalk/ui/kis_gradient_slider_widget.h @@ -33,7 +33,7 @@ class KisGradientSliderWidget : public TQWidget TQ_OBJECT public: - KisGradientSliderWidget(TQWidget *tqparent = 0, const char* name = 0, WFlags f = 0); + KisGradientSliderWidget(TQWidget *parent = 0, const char* name = 0, WFlags f = 0); public: virtual void paintEvent ( TQPaintEvent * ); diff --git a/chalk/ui/kis_grid_manager.cpp b/chalk/ui/kis_grid_manager.cpp index 53ee931c..5eda1cf9 100644 --- a/chalk/ui/kis_grid_manager.cpp +++ b/chalk/ui/kis_grid_manager.cpp @@ -40,8 +40,8 @@ #include "kis_image.h" #include "kis_view.h" -KisGridManager::KisGridManager(KisView * tqparent) - : TQObject(tqparent), m_view(tqparent) +KisGridManager::KisGridManager(KisView * parent) + : TQObject(parent), m_view(parent) { } diff --git a/chalk/ui/kis_grid_manager.h b/chalk/ui/kis_grid_manager.h index f4708ef0..16ae03f5 100644 --- a/chalk/ui/kis_grid_manager.h +++ b/chalk/ui/kis_grid_manager.h @@ -35,7 +35,7 @@ class KisGridManager : public TQObject Q_OBJECT TQ_OBJECT public: - KisGridManager(KisView * tqparent); + KisGridManager(KisView * parent); ~KisGridManager(); public: void setup(KActionCollection * collection); diff --git a/chalk/ui/kis_histogram_view.cc b/chalk/ui/kis_histogram_view.cc index cc4fe59c..3b94db61 100644 --- a/chalk/ui/kis_histogram_view.cc +++ b/chalk/ui/kis_histogram_view.cc @@ -38,8 +38,8 @@ #include "kis_basic_histogram_producers.h" #include "kis_paint_device.h" -KisHistogramView::KisHistogramView(TQWidget *tqparent, const char *name, WFlags f) - : TQLabel(tqparent, name, f) +KisHistogramView::KisHistogramView(TQWidget *parent, const char *name, WFlags f) + : TQLabel(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 diff --git a/chalk/ui/kis_histogram_view.h b/chalk/ui/kis_histogram_view.h index 6b4524a8..92ab8f20 100644 --- a/chalk/ui/kis_histogram_view.h +++ b/chalk/ui/kis_histogram_view.h @@ -49,7 +49,7 @@ class KisHistogramView : public TQLabel { Q_OBJECT TQ_OBJECT public: - KisHistogramView(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); + KisHistogramView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); virtual ~KisHistogramView(); void setPaintDevice(KisPaintDeviceSP dev); diff --git a/chalk/ui/kis_iconwidget.cc b/chalk/ui/kis_iconwidget.cc index 3e9ce4f1..0109f7eb 100644 --- a/chalk/ui/kis_iconwidget.cc +++ b/chalk/ui/kis_iconwidget.cc @@ -21,7 +21,7 @@ #include <koIconChooser.h> #include "kis_iconwidget.h" -KisIconWidget::KisIconWidget(TQWidget *tqparent, const char *name) : super(tqparent, name) +KisIconWidget::KisIconWidget(TQWidget *parent, const char *name) : super(parent, name) { m_item = 0; } diff --git a/chalk/ui/kis_iconwidget.h b/chalk/ui/kis_iconwidget.h index d65cbcbd..45733d13 100644 --- a/chalk/ui/kis_iconwidget.h +++ b/chalk/ui/kis_iconwidget.h @@ -34,7 +34,7 @@ class KisIconWidget : public TQToolButton { * are shown. */ public: - KisIconWidget(TQWidget *tqparent = 0, const char *name = 0); + KisIconWidget(TQWidget *parent = 0, const char *name = 0); public slots: void slotSetItem(KoIconItem& item); diff --git a/chalk/ui/kis_import_catcher.cc b/chalk/ui/kis_import_catcher.cc index b2d04cab..26040309 100644 --- a/chalk/ui/kis_import_catcher.cc +++ b/chalk/ui/kis_import_catcher.cc @@ -54,23 +54,23 @@ void KisImportCatcher::slotLoadingFinished() // Don't import the root if this is not a layered image (1 group layer // plus 1 other). importedImageLayer = importedImageLayer->firstChild(); - importedImageLayer->tqparent()->removeLayer(importedImageLayer); + importedImageLayer->parent()->removeLayer(importedImageLayer); } importedImageLayer->setName(m_url.prettyURL()); - KisGroupLayerSP tqparent = 0; + KisGroupLayerSP parent = 0; KisLayerSP currentActiveLayer = m_image->activeLayer(); if (currentActiveLayer) { - tqparent = currentActiveLayer->tqparent(); + parent = currentActiveLayer->parent(); } - if (tqparent == 0) { - tqparent = m_image->rootLayer(); + if (parent == 0) { + parent = m_image->rootLayer(); } - m_image->addLayer(importedImageLayer.data(), tqparent, currentActiveLayer); + m_image->addLayer(importedImageLayer.data(), parent, currentActiveLayer); } } m_doc->deleteLater(); diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc index 8dc0e68d..1375cacc 100644 --- a/chalk/ui/kis_int_spinbox.cc +++ b/chalk/ui/kis_int_spinbox.cc @@ -61,14 +61,14 @@ public: }; -KisIntSpinbox::KisIntSpinbox(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KisIntSpinbox::KisIntSpinbox(TQWidget *parent, const char *name) + : TQWidget(parent, name) { init(0); } -KisIntSpinbox::KisIntSpinbox(const TQString & /*label*/, int val, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KisIntSpinbox::KisIntSpinbox(const TQString & /*label*/, int val, TQWidget *parent, const char *name) + : TQWidget(parent, name) { init(val); } diff --git a/chalk/ui/kis_int_spinbox.h b/chalk/ui/kis_int_spinbox.h index a5c4602e..469de099 100644 --- a/chalk/ui/kis_int_spinbox.h +++ b/chalk/ui/kis_int_spinbox.h @@ -38,8 +38,8 @@ class KisPopupSlider : public TQPopupMenu { public: - KisPopupSlider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, TQWidget * tqparent, const char * name = 0) - : TQPopupMenu(tqparent, name) + KisPopupSlider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, TQWidget * parent, const char * name = 0) + : TQPopupMenu(parent, name) { m_slider = new TQSlider(minValue, maxValue, pageStep, value, orientation, this, name); //m_slider->setTracking(false); @@ -86,10 +86,10 @@ public: * Constructs an input control for integer values * with base 10 and initial value 0. * - * @param tqparent tqparent TQWidget + * @param parent parent TQWidget * @param name internal name for this widget */ - KisIntSpinbox(TQWidget *tqparent=0, const char *name=0); + KisIntSpinbox(TQWidget *parent=0, const char *name=0); /** * Constructor * It constructs a TQSpinBox that allows the input of integer numbers @@ -98,10 +98,10 @@ public: * * @param label the tabel (may contain &, and my be empty) * @param value initial value for the control - * @param tqparent tqparent TQWidget + * @param parent parent TQWidget * @param name internal name for this widget */ - KisIntSpinbox(const TQString & label, int value, TQWidget* tqparent=0, const char *name=0); + KisIntSpinbox(const TQString & label, int value, TQWidget* parent=0, const char *name=0); /** * Destructor diff --git a/chalk/ui/kis_itemchooser.cc b/chalk/ui/kis_itemchooser.cc index d418bd2f..36513c32 100644 --- a/chalk/ui/kis_itemchooser.cc +++ b/chalk/ui/kis_itemchooser.cc @@ -25,7 +25,7 @@ #include "kis_global.h" #include "kis_icon_item.h" -KisItemChooser::KisItemChooser(TQWidget *tqparent, const char *name) : super(tqparent, name) +KisItemChooser::KisItemChooser(TQWidget *parent, const char *name) : super(parent, name) { /* m_frame = new TQVBox(this); m_frame->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);*/ diff --git a/chalk/ui/kis_itemchooser.h b/chalk/ui/kis_itemchooser.h index d29aa28d..bb84ddcc 100644 --- a/chalk/ui/kis_itemchooser.h +++ b/chalk/ui/kis_itemchooser.h @@ -34,7 +34,7 @@ class KisItemChooser : public TQWidget { TQ_OBJECT public: - KisItemChooser(TQWidget *tqparent = 0, + KisItemChooser(TQWidget *parent = 0, const char *name = 0); virtual ~KisItemChooser(); diff --git a/chalk/ui/kis_label_cursor_pos.cc b/chalk/ui/kis_label_cursor_pos.cc index 984df6dd..d28f1a83 100644 --- a/chalk/ui/kis_label_cursor_pos.cc +++ b/chalk/ui/kis_label_cursor_pos.cc @@ -18,12 +18,12 @@ #include "kis_label_cursor_pos.h" #include "kis_label_cursor_pos.moc" -KisLabelCursorPos::KisLabelCursorPos(TQWidget *tqparent, const char *name, WFlags f) : super(tqparent, name, f) +KisLabelCursorPos::KisLabelCursorPos(TQWidget *parent, const char *name, WFlags f) : super(parent, name, f) { setText("0:0"); m_doUpdates = true; - //setMinimumSize( 200, tqparent->height() - 4); + //setMinimumSize( 200, parent->height() - 4); } KisLabelCursorPos::~KisLabelCursorPos() diff --git a/chalk/ui/kis_label_cursor_pos.h b/chalk/ui/kis_label_cursor_pos.h index 392a0b68..ff7301f1 100644 --- a/chalk/ui/kis_label_cursor_pos.h +++ b/chalk/ui/kis_label_cursor_pos.h @@ -26,7 +26,7 @@ class KisLabelCursorPos : public TQLabel { typedef TQLabel super; public: - KisLabelCursorPos(TQWidget *tqparent, const char *name = 0, WFlags f = 0); + KisLabelCursorPos(TQWidget *parent, const char *name = 0, WFlags f = 0); virtual ~KisLabelCursorPos(); public slots: diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc index c04452f4..c081111f 100644 --- a/chalk/ui/kis_label_progress.cc +++ b/chalk/ui/kis_label_progress.cc @@ -36,7 +36,7 @@ class EscapeButton : public TQToolButton { public: - EscapeButton(TQWidget * tqparent, const char * name) : TQToolButton(tqparent, name) {}; + EscapeButton(TQWidget * parent, const char * name) : TQToolButton(parent, name) {}; void keyReleaseEvent(TQKeyEvent *e) { @@ -45,7 +45,7 @@ public: } }; -KisLabelProgress::KisLabelProgress(TQWidget *tqparent, const char *name, WFlags f) : super(tqparent, name, f) +KisLabelProgress::KisLabelProgress(TQWidget *parent, const char *name, WFlags f) : super(parent, name, f) { m_subject = 0; m_modal = false; diff --git a/chalk/ui/kis_label_progress.h b/chalk/ui/kis_label_progress.h index a2c42fd9..0539a143 100644 --- a/chalk/ui/kis_label_progress.h +++ b/chalk/ui/kis_label_progress.h @@ -33,7 +33,7 @@ class KisLabelProgress : public TQLabel, public KisProgressDisplayInterface { typedef TQLabel super; public: - KisLabelProgress(TQWidget *tqparent, const char *name = 0, WFlags f = 0); + KisLabelProgress(TQWidget *parent, const char *name = 0, WFlags f = 0); virtual ~KisLabelProgress(); public: diff --git a/chalk/ui/kis_label_zoom.h b/chalk/ui/kis_label_zoom.h index e7fad08a..a2cff7ea 100644 --- a/chalk/ui/kis_label_zoom.h +++ b/chalk/ui/kis_label_zoom.h @@ -24,8 +24,8 @@ class KisLabelZoom : public TQLabel { Q_OBJECT TQ_OBJECT - KisLabelZoom( TQWidget *tqparent, const char *name = 0, WFlags f = 0 ) : - TQLabel( tqparent, name, f ) {} + KisLabelZoom( TQWidget *parent, const char *name = 0, WFlags f = 0 ) : + TQLabel( parent, name, f ) {} virtual ~KisLabelZoom() {} }; diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index cfdc6acd..424c405d 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -61,8 +61,8 @@ #include "kis_layerbox.h" -KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *tqparent, const char *name) - : super(tqparent, name), m_image(0) +KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char *name) + : super(parent, name), m_image(0) { TQVBoxLayout *vbox = new TQVBoxLayout(this); vbox->setAutoAdd(true); @@ -200,7 +200,7 @@ void KisLayerBox::slotLayerAdded(KisLayerSP layer) vKisLayerSP layersAdded; - if (layer->tqparent() == m_image->rootLayer()) + if (layer->parent() == m_image->rootLayer()) { KisPopulateVisitor visitor(list()); layer->accept(visitor); @@ -208,7 +208,7 @@ void KisLayerBox::slotLayerAdded(KisLayerSP layer) } else { - KisPopulateVisitor visitor(static_cast<KisLayerItem*>(list()->layer(layer->tqparent()->id()))); + KisPopulateVisitor visitor(static_cast<KisLayerItem*>(list()->layer(layer->parent()->id()))); layer->accept(visitor); layersAdded = visitor.layersAdded(); } @@ -229,8 +229,8 @@ void KisLayerBox::slotLayerRemoved(KisLayerSP layer, KisGroupLayerSP wasParent, void KisLayerBox::slotLayerMoved(KisLayerSP layer, KisGroupLayerSP wasParent, KisLayerSP) { - int parentID = layer->tqparent()->id(); - if (layer->tqparent() == m_image->rootLayer()) + int parentID = layer->parent()->id(); + if (layer->parent() == m_image->rootLayer()) parentID = -1; int siblingID = -1; @@ -239,7 +239,7 @@ void KisLayerBox::slotLayerMoved(KisLayerSP layer, KisGroupLayerSP wasParent, Ki list()->moveLayer(layer->id(), parentID, siblingID); - markModified(layer->tqparent()); + markModified(layer->parent()); markModified(wasParent); updateUI(); } @@ -302,16 +302,16 @@ void KisLayerBox::slotLayerPropertyChanged(LayerItem* item, const TQString& name void KisLayerBox::slotLayerMoved(LayerItem* item, LayerItem*, LayerItem*) { KisLayerSP layer = m_image->findLayer(item->id()); - KisGroupLayerSP tqparent; - if( item->tqparent() ) - tqparent = dynamic_cast<KisGroupLayer*>(m_image->findLayer(item->tqparent()->id()).data()); - if( !tqparent ) - tqparent = m_image->rootLayer(); + KisGroupLayerSP parent; + if( item->parent() ) + parent = dynamic_cast<KisGroupLayer*>(m_image->findLayer(item->parent()->id()).data()); + if( !parent ) + parent = m_image->rootLayer(); KisLayerSP above = 0; if (item->nextSibling()) above = m_image->findLayer(item->nextSibling()->id()); if (layer) - m_image->moveLayer(layer, tqparent.data(), above); + m_image->moveLayer(layer, parent.data(), above); updateUI(); } @@ -320,7 +320,7 @@ void KisLayerBox::slotRequestNewLayer(LayerItem* p, LayerItem* after) KisLayer* l = m_image->rootLayer().data(); if (p) l = m_image->findLayer(p->id()).data(); - KisGroupLayerSP tqparent = dynamic_cast<KisGroupLayer*>(l); + KisGroupLayerSP parent = dynamic_cast<KisGroupLayer*>(l); KisLayerSP above = 0; if (after && after->nextSibling()) @@ -328,10 +328,10 @@ void KisLayerBox::slotRequestNewLayer(LayerItem* p, LayerItem* after) else if (after) above = 0; else if (p && p->firstChild()) - above = tqparent->firstChild(); + above = parent->firstChild(); else if (!p && m_image->rootLayer()->childCount()) above = m_image->rootLayer()->firstChild(); - emit sigRequestLayer(tqparent, above); + emit sigRequestLayer(parent, above); } void KisLayerBox::slotRequestNewFolder(LayerItem* p, LayerItem* after) @@ -339,7 +339,7 @@ void KisLayerBox::slotRequestNewFolder(LayerItem* p, LayerItem* after) KisLayer* l = m_image->rootLayer().data(); //FIXME I hate copy-pasting like this. if (p) l = m_image->findLayer(p->id()).data(); - KisGroupLayerSP tqparent = dynamic_cast<KisGroupLayer*>(l); + KisGroupLayerSP parent = dynamic_cast<KisGroupLayer*>(l); KisLayerSP above = 0; if (after && after->nextSibling()) @@ -347,10 +347,10 @@ void KisLayerBox::slotRequestNewFolder(LayerItem* p, LayerItem* after) else if (after) above = 0; else if (p && p->firstChild()) - above = tqparent->firstChild(); + above = parent->firstChild(); else if (!p && m_image->rootLayer()->childCount()) above = m_image->rootLayer()->firstChild(); - emit sigRequestGroupLayer(tqparent, above); + emit sigRequestGroupLayer(parent, above); } void KisLayerBox::slotRequestNewAdjustmentLayer(LayerItem* p, LayerItem* after) @@ -358,7 +358,7 @@ void KisLayerBox::slotRequestNewAdjustmentLayer(LayerItem* p, LayerItem* after) KisLayer* l = m_image->rootLayer().data(); //FIXME here too. if (p) l = m_image->findLayer(p->id()).data(); - KisGroupLayerSP tqparent = dynamic_cast<KisGroupLayer*>(l); + KisGroupLayerSP parent = dynamic_cast<KisGroupLayer*>(l); KisLayerSP above = 0; if (after && after->nextSibling()) @@ -366,10 +366,10 @@ void KisLayerBox::slotRequestNewAdjustmentLayer(LayerItem* p, LayerItem* after) else if (after) above = 0; else if (p && p->firstChild()) - above = tqparent->firstChild(); + above = parent->firstChild(); else if (!p && m_image->rootLayer()->childCount()) above = m_image->rootLayer()->firstChild(); - emit sigRequestAdjustmentLayer(tqparent, above); + emit sigRequestAdjustmentLayer(parent, above); } void KisLayerBox::slotRequestNewObjectLayer(LayerItem* p, LayerItem* after, const KoDocumentEntry& entry) @@ -377,7 +377,7 @@ void KisLayerBox::slotRequestNewObjectLayer(LayerItem* p, LayerItem* after, cons KisLayer* l = m_image->rootLayer().data(); //FIXME and here. if (p) l = m_image->findLayer(p->id()).data(); - KisGroupLayerSP tqparent = dynamic_cast<KisGroupLayer*>(l); + KisGroupLayerSP parent = dynamic_cast<KisGroupLayer*>(l); KisLayerSP above = 0; if (after && after->nextSibling()) @@ -385,10 +385,10 @@ void KisLayerBox::slotRequestNewObjectLayer(LayerItem* p, LayerItem* after, cons else if (after) above = 0; else if (p && p->firstChild()) - above = tqparent->firstChild(); + above = parent->firstChild(); else if (!p && m_image->rootLayer()->childCount()) above = m_image->rootLayer()->firstChild(); - emit sigRequestPartLayer(tqparent, above, entry); + emit sigRequestPartLayer(parent, above, entry); } void KisLayerBox::slotRequestRemoveLayer(LayerItem* item) @@ -410,7 +410,7 @@ void KisLayerBox::slotRequestLayerProperties(LayerItem* item) void KisLayerBox::updateUI() { m_lst->bnDelete->setEnabled(list()->activeLayer()); - m_lst->bnRaise->setEnabled(list()->activeLayer() && (list()->activeLayer()->prevSibling() || list()->activeLayer()->tqparent())); + m_lst->bnRaise->setEnabled(list()->activeLayer() && (list()->activeLayer()->prevSibling() || list()->activeLayer()->parent())); m_lst->bnLower->setEnabled(list()->activeLayer() && list()->activeLayer()->nextSibling()); m_lst->intOpacity->setEnabled(list()->activeLayer()); m_lst->cmbComposite->setEnabled(list()->activeLayer()); @@ -464,35 +464,35 @@ void KisLayerBox::slotAddMenuActivated(int type) return; KisGroupLayerSP root = m_image->rootLayer(); - KisGroupLayerSP tqparent; + KisGroupLayerSP parent; KisLayerSP above; if (KisLayerSP active = m_image->activeLayer()) { - tqparent = root; + parent = root; above = active; - if (active->tqparent()) - tqparent = active->tqparent(); + if (active->parent()) + parent = active->parent(); } else { - tqparent = root; + parent = root; above = m_image->rootLayer()->firstChild(); } switch (type) { case PAINT_LAYER: - emit sigRequestLayer(tqparent, above); + emit sigRequestLayer(parent, above); break; case GROUP_LAYER: - emit sigRequestGroupLayer(tqparent, above); + emit sigRequestGroupLayer(parent, above); break; case ADJUSTMENT_LAYER: - emit sigRequestAdjustmentLayer(tqparent, above); + emit sigRequestAdjustmentLayer(parent, above); break; case OBJECT_LAYER: default: //goddamned TQt doesn't emit activated for default-assigned IDs, so this does nothing - emit sigRequestPartLayer(tqparent, above, m_partLayerAction->documentEntry()); + emit sigRequestPartLayer(parent, above, m_partLayerAction->documentEntry()); } } @@ -522,17 +522,17 @@ void KisLayerBox::slotRaiseClicked() } KisLayerSP layer = m_image->findLayer(l.first()); - if( l.count() == 1 && layer == layer->tqparent()->firstChild() && layer->tqparent() != m_image->rootLayer()) + if( l.count() == 1 && layer == layer->parent()->firstChild() && layer->parent() != m_image->rootLayer()) { - if (KisGroupLayerSP grandtqparent = layer->tqparent()->tqparent()) - m_image->moveLayer(layer, grandtqparent, layer->tqparent().data()); + if (KisGroupLayerSP grandparent = layer->parent()->parent()) + m_image->moveLayer(layer, grandparent, layer->parent().data()); } else { for (int i = 0, n = l.count(); i < n; ++i) if (KisLayerSP li = m_image->findLayer(l[i])) if (li->prevSibling()) - m_image->moveLayer(li, li->tqparent(), li->prevSibling()); + m_image->moveLayer(li, li->parent(), li->prevSibling()); } if( !l.isEmpty() ) @@ -551,7 +551,7 @@ void KisLayerBox::slotLowerClicked() for (int i = l.count() - 1; i >= 0; --i) if (LayerItem *layer = l[i]) if (layer->nextSibling()) - list()->moveLayer(layer, layer->tqparent(), layer->nextSibling()); + list()->moveLayer(layer, layer->parent(), layer->nextSibling()); if( !l.isEmpty() ) list()->ensureItemVisible( l.last() ); @@ -609,7 +609,7 @@ void KisLayerBox::markModified(KisLayer* layer) while (layer && layer != m_image->rootLayer().data()) { v.append(layer->id()); - layer = layer->tqparent(); + layer = layer->parent(); } for (int i = v.count() - 1; i >= 0; --i) if (!m_modified.contains(v[i])) @@ -636,7 +636,7 @@ void KisLayerBox::printChalkLayers() const root = layer; printChalkLayers(); indent -= 2; - root = layer->tqparent(); + root = layer->parent(); } } @@ -652,7 +652,7 @@ void KisLayerBox::printLayerboxLayers() const root = layer; printLayerboxLayers(); indent -= 2; - root = layer->tqparent(); + root = layer->parent(); } return; } @@ -668,7 +668,7 @@ void KisLayerBox::printLayerboxLayers() const root = layer; printLayerboxLayers(); indent -= 2; - root = layer->tqparent(); + root = layer->parent(); } } diff --git a/chalk/ui/kis_layerbox.h b/chalk/ui/kis_layerbox.h index c9d14a88..776f7fe2 100644 --- a/chalk/ui/kis_layerbox.h +++ b/chalk/ui/kis_layerbox.h @@ -47,7 +47,7 @@ class KisLayerBox : public TQFrame { TQ_OBJECT public: - KisLayerBox(KisCanvasSubject *subject, TQWidget *tqparent = 0, const char *name = 0); + KisLayerBox(KisCanvasSubject *subject, TQWidget *parent = 0, const char *name = 0); virtual ~KisLayerBox(); void clear(); @@ -69,10 +69,10 @@ public slots: void slotSetColorSpace(const KisColorSpace * colorSpace); signals: - void sigRequestLayer(KisGroupLayerSP tqparent, KisLayerSP above); - void sigRequestGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above); - void sigRequestAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above); - void sigRequestPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoDocumentEntry& entry); + void sigRequestLayer(KisGroupLayerSP parent, KisLayerSP above); + void sigRequestGroupLayer(KisGroupLayerSP parent, KisLayerSP above); + void sigRequestAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above); + void sigRequestPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDocumentEntry& entry); void sigRequestLayerProperties(KisLayerSP layer); void sigOpacityChanged(int opacity, bool withSlider); @@ -87,11 +87,11 @@ private slots: void slotLayerActivated(LayerItem* layer); void slotLayerDisplayNameChanged(LayerItem* layer, const TQString& displayName); void slotLayerPropertyChanged(LayerItem* layer, const TQString& name, bool on); - void slotLayerMoved(LayerItem* layer, LayerItem* tqparent, LayerItem* after); - void slotRequestNewLayer(LayerItem* tqparent, LayerItem* after); - void slotRequestNewFolder(LayerItem* tqparent, LayerItem* after); - void slotRequestNewAdjustmentLayer(LayerItem* tqparent, LayerItem* after); - void slotRequestNewObjectLayer(LayerItem* tqparent, LayerItem* item, const KoDocumentEntry& entry); + void slotLayerMoved(LayerItem* layer, LayerItem* parent, LayerItem* after); + void slotRequestNewLayer(LayerItem* parent, LayerItem* after); + void slotRequestNewFolder(LayerItem* parent, LayerItem* after); + void slotRequestNewAdjustmentLayer(LayerItem* parent, LayerItem* after); + void slotRequestNewObjectLayer(LayerItem* parent, LayerItem* item, const KoDocumentEntry& entry); void slotRequestRemoveLayer(LayerItem* layer); void slotRequestLayerProperties(LayerItem* layer); diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc index 64127d20..985bd0c6 100644 --- a/chalk/ui/kis_layerlist.cc +++ b/chalk/ui/kis_layerlist.cc @@ -35,8 +35,8 @@ #include "kis_layerlist.h" -KisLayerList::KisLayerList( TQWidget *tqparent, const char *name ) - : super( tqparent, name ) +KisLayerList::KisLayerList( TQWidget *parent, const char *name ) + : super( parent, name ) { m_partLayerAction = new KoPartSelectAction( i18n( "New &Object Layer" ), "gear", TQT_TQOBJECT(this) ); } @@ -76,26 +76,26 @@ void KisLayerList::constructMenu( LayerItem *layer ) void KisLayerList::menuActivated( int id, LayerItem *layer ) { const TQValueList<LayerItem*> selected = selectedLayers(); - LayerItem *tqparent = ( layer && layer->isFolder() ) ? layer : 0; + LayerItem *parent = ( layer && layer->isFolder() ) ? layer : 0; LayerItem *after = 0; - if( layer && !tqparent ) + if( layer && !parent ) { - tqparent = layer->tqparent(); + parent = layer->parent(); after = layer->prevSibling(); } switch( id ) { case MenuItems::NewLayer: - emit requestNewLayer( tqparent, after ); - emit requestNewLayer( tqparent ? tqparent->id() : -1, after ? after->id() : -1 ); + emit requestNewLayer( parent, after ); + emit requestNewLayer( parent ? parent->id() : -1, after ? after->id() : -1 ); break; case MenuItems::NewFolder: - emit requestNewFolder( tqparent, after ); - emit requestNewFolder( tqparent ? tqparent->id() : -1, after ? after->id() : -1 ); + emit requestNewFolder( parent, after ); + emit requestNewFolder( parent ? parent->id() : -1, after ? after->id() : -1 ); break; case ADJUSTMENT_LAYER: - emit requestNewAdjustmentLayer( tqparent, after ); - emit requestNewAdjustmentLayer( tqparent ? tqparent->id() : -1, after ? after->id() : -1 ); + emit requestNewAdjustmentLayer( parent, after ); + emit requestNewAdjustmentLayer( parent ? parent->id() : -1, after ? after->id() : -1 ); break; case MenuItems::RemoveLayer: { @@ -123,26 +123,26 @@ void KisLayerList::menuActivated( int id, LayerItem *layer ) super::menuActivated( id, layer ); else if( id != -1 ) //object layer was selected { - emit requestNewObjectLayer( tqparent, after, m_partLayerAction->documentEntry() ); - emit requestNewObjectLayer( tqparent ? tqparent->id() : -1, after ? after->id() : -1, m_partLayerAction->documentEntry() ); + emit requestNewObjectLayer( parent, after, m_partLayerAction->documentEntry() ); + emit requestNewObjectLayer( parent ? parent->id() : -1, after ? after->id() : -1, m_partLayerAction->documentEntry() ); } } } -KisLayerItem::KisLayerItem( LayerList* tqparent, KisLayer* layer ) +KisLayerItem::KisLayerItem( LayerList* parent, KisLayer* layer ) : super( layer->name(), - tqparent, - layer->prevSibling() ? tqparent->layer( layer->prevSibling()->id() ) : 0, + parent, + layer->prevSibling() ? parent->layer( layer->prevSibling()->id() ) : 0, layer->id() ) , m_layer( layer ) { init(); } -KisLayerItem::KisLayerItem( LayerItem* tqparent, KisLayer* layer ) +KisLayerItem::KisLayerItem( LayerItem* parent, KisLayer* layer ) : super( layer->name(), - tqparent, - layer->prevSibling() ? tqparent->listView()->layer( layer->prevSibling()->id() ) : 0, + parent, + layer->prevSibling() ? parent->listView()->layer( layer->prevSibling()->id() ) : 0, layer->id() ) , m_layer( layer ) { diff --git a/chalk/ui/kis_layerlist.h b/chalk/ui/kis_layerlist.h index 5b74acea..c8a2c18c 100644 --- a/chalk/ui/kis_layerlist.h +++ b/chalk/ui/kis_layerlist.h @@ -34,13 +34,13 @@ class KisLayerList: public LayerList typedef LayerList super; signals: - void requestNewObjectLayer( LayerItem *tqparent, LayerItem *after, const KoDocumentEntry &entry ); + void requestNewObjectLayer( LayerItem *parent, LayerItem *after, const KoDocumentEntry &entry ); void requestNewObjectLayer( int parentID, int afterID, const KoDocumentEntry &entry ); - void requestNewAdjustmentLayer( LayerItem *tqparent, LayerItem *after ); + void requestNewAdjustmentLayer( LayerItem *parent, LayerItem *after ); void requestNewAdjustmentLayer( int parentID, int afterID ); public: - KisLayerList( TQWidget *tqparent = 0, const char *name = 0 ); + KisLayerList( TQWidget *parent = 0, const char *name = 0 ); virtual void constructMenu( LayerItem *layer ); virtual void menuActivated( int id, LayerItem *layer ); @@ -56,8 +56,8 @@ class KisLayerItem: public LayerItem typedef LayerItem super; public: - KisLayerItem( LayerList* tqparent, KisLayer* layer ); - KisLayerItem( LayerItem* tqparent, KisLayer* layer ); + KisLayerItem( LayerList* parent, KisLayer* layer ); + KisLayerItem( LayerItem* parent, KisLayer* layer ); KisLayer* layer() const; diff --git a/chalk/ui/kis_load_visitor.h b/chalk/ui/kis_load_visitor.h index 1997d3bc..bdac5e82 100644 --- a/chalk/ui/kis_load_visitor.h +++ b/chalk/ui/kis_load_visitor.h @@ -88,16 +88,16 @@ public: kdDebug(DBG_AREA_FILE) << "Opened icc information, size is " << data.size() << endl; } - // tqmask + // mask if (layer->hasMask()) { // We set this in KisDoc::loadPaintLayer - KisPaintDeviceSP tqmask = layer->getMask(); + KisPaintDeviceSP mask = layer->getMask(); location = m_external ? TQString() : m_uri; - location += m_img->name() + "/layers/" + m_layerFilenames[layer] + ".tqmask"; + location += m_img->name() + "/layers/" + m_layerFilenames[layer] + ".mask"; // Layer data if (m_store->open(location)) { - if (!tqmask->read(m_store)) { - tqmask->disconnect(); + if (!mask->read(m_store)) { + mask->disconnect(); m_store->close(); //IODone(); return false; diff --git a/chalk/ui/kis_multi_bool_filter_widget.cc b/chalk/ui/kis_multi_bool_filter_widget.cc index 2507f1fb..806998bf 100644 --- a/chalk/ui/kis_multi_bool_filter_widget.cc +++ b/chalk/ui/kis_multi_bool_filter_widget.cc @@ -32,8 +32,8 @@ KisBoolWidgetParam::KisBoolWidgetParam( bool ninitvalue, TQString nlabel, TQStr } -KisMultiBoolFilterWidget::KisMultiBoolFilterWidget(TQWidget * tqparent, const char * name, const char * caption, vKisBoolWidgetParam iwparam) : - KisFilterConfigWidget( tqparent, name ) +KisMultiBoolFilterWidget::KisMultiBoolFilterWidget(TQWidget * parent, const char * name, const char * caption, vKisBoolWidgetParam iwparam) : + KisFilterConfigWidget( parent, name ) { TQ_INT32 m_nbboolWidgets = iwparam.size(); diff --git a/chalk/ui/kis_multi_bool_filter_widget.h b/chalk/ui/kis_multi_bool_filter_widget.h index 0e719bee..81d626fa 100644 --- a/chalk/ui/kis_multi_bool_filter_widget.h +++ b/chalk/ui/kis_multi_bool_filter_widget.h @@ -43,7 +43,7 @@ class KRITA_EXPORT KisMultiBoolFilterWidget : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisMultiBoolFilterWidget(TQWidget * tqparent, const char * name, const char *caption, vKisBoolWidgetParam iwparam); + KisMultiBoolFilterWidget(TQWidget * parent, const char * name, const char *caption, vKisBoolWidgetParam iwparam); virtual void setConfiguration(KisFilterConfiguration * cfg); public: inline TQ_INT32 nbValues() { return m_nbboolWidgets; }; diff --git a/chalk/ui/kis_multi_double_filter_widget.cc b/chalk/ui/kis_multi_double_filter_widget.cc index 9b5d453b..486bc770 100644 --- a/chalk/ui/kis_multi_double_filter_widget.cc +++ b/chalk/ui/kis_multi_double_filter_widget.cc @@ -26,8 +26,8 @@ #include <kis_filter_config_widget.h> #include <klocale.h> -KisDelayedActionDoubleInput::KisDelayedActionDoubleInput(TQWidget * tqparent, const char * name) - : KDoubleNumInput(tqparent, name) +KisDelayedActionDoubleInput::KisDelayedActionDoubleInput(TQWidget * parent, const char * name) + : KDoubleNumInput(parent, name) { m_timer = new TQTimer(this, name); connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotValueChanged())); @@ -59,8 +59,8 @@ KisDoubleWidgetParam::KisDoubleWidgetParam(double nmin, double nmax, double nini } -KisMultiDoubleFilterWidget::KisMultiDoubleFilterWidget(TQWidget * tqparent, const char * name, const char * caption, vKisDoubleWidgetParam dwparam) - : KisFilterConfigWidget( tqparent, name ) +KisMultiDoubleFilterWidget::KisMultiDoubleFilterWidget(TQWidget * parent, const char * name, const char * caption, vKisDoubleWidgetParam dwparam) + : KisFilterConfigWidget( parent, name ) { TQ_INT32 m_nbdoubleWidgets = dwparam.size(); diff --git a/chalk/ui/kis_multi_double_filter_widget.h b/chalk/ui/kis_multi_double_filter_widget.h index 5351745e..ee3a3dcf 100644 --- a/chalk/ui/kis_multi_double_filter_widget.h +++ b/chalk/ui/kis_multi_double_filter_widget.h @@ -32,7 +32,7 @@ class KisDelayedActionDoubleInput : public KDoubleNumInput public: - KisDelayedActionDoubleInput(TQWidget * tqparent, const char * name); + KisDelayedActionDoubleInput(TQWidget * parent, const char * name); void cancelDelayedSignal(); @@ -66,7 +66,7 @@ class KRITA_EXPORT KisMultiDoubleFilterWidget : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisMultiDoubleFilterWidget(TQWidget * tqparent, const char * name, const char * caption, vKisDoubleWidgetParam dwparam); + KisMultiDoubleFilterWidget(TQWidget * parent, const char * name, const char * caption, vKisDoubleWidgetParam dwparam); virtual void setConfiguration(KisFilterConfiguration * cfg); public: inline TQ_INT32 nbValues() { return m_nbdoubleWidgets; }; diff --git a/chalk/ui/kis_multi_integer_filter_widget.cc b/chalk/ui/kis_multi_integer_filter_widget.cc index 07bfbe2a..130a03d1 100644 --- a/chalk/ui/kis_multi_integer_filter_widget.cc +++ b/chalk/ui/kis_multi_integer_filter_widget.cc @@ -25,8 +25,8 @@ #include <knuminput.h> #include <klocale.h> -KisDelayedActionIntegerInput::KisDelayedActionIntegerInput(TQWidget * tqparent, const char * name) - : KIntNumInput(tqparent, name) +KisDelayedActionIntegerInput::KisDelayedActionIntegerInput(TQWidget * parent, const char * name) + : KIntNumInput(parent, name) { m_timer = new TQTimer(this, name); connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotValueChanged())); @@ -57,11 +57,11 @@ KisIntegerWidgetParam::KisIntegerWidgetParam( TQ_INT32 nmin, TQ_INT32 nmax, TQ_ { } -KisMultiIntegerFilterWidget::KisMultiIntegerFilterWidget(TQWidget * tqparent, +KisMultiIntegerFilterWidget::KisMultiIntegerFilterWidget(TQWidget * parent, const char * name, const char * caption, vKisIntegerWidgetParam iwparam) - : KisFilterConfigWidget( tqparent, name ) + : KisFilterConfigWidget( parent, name ) { m_nbintegerWidgets = iwparam.size(); this->setCaption(caption); diff --git a/chalk/ui/kis_multi_integer_filter_widget.h b/chalk/ui/kis_multi_integer_filter_widget.h index a08f4cad..c40b74a1 100644 --- a/chalk/ui/kis_multi_integer_filter_widget.h +++ b/chalk/ui/kis_multi_integer_filter_widget.h @@ -33,7 +33,7 @@ class KisDelayedActionIntegerInput : public KIntNumInput public: - KisDelayedActionIntegerInput(TQWidget * tqparent, const char * name); + KisDelayedActionIntegerInput(TQWidget * parent, const char * name); void cancelDelayedSignal(); @@ -67,7 +67,7 @@ class KRITA_EXPORT KisMultiIntegerFilterWidget : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisMultiIntegerFilterWidget(TQWidget * tqparent, const char * name, const char *caption, vKisIntegerWidgetParam iwparam); + KisMultiIntegerFilterWidget(TQWidget * parent, const char * name, const char *caption, vKisIntegerWidgetParam iwparam); virtual void setConfiguration(KisFilterConfiguration * config); diff --git a/chalk/ui/kis_opengl_canvas.cc b/chalk/ui/kis_opengl_canvas.cc index ef8f743e..82363a0b 100644 --- a/chalk/ui/kis_opengl_canvas.cc +++ b/chalk/ui/kis_opengl_canvas.cc @@ -21,8 +21,8 @@ #include "kis_opengl_canvas_painter.h" #ifdef HAVE_GL -KisOpenGLCanvasWidget::KisOpenGLCanvasWidget(TQWidget *tqparent, const char *name, TQGLWidget *sharedContextWidget) - : TQGLWidget(KisOpenGLCanvasFormat, tqparent, name, sharedContextWidget) +KisOpenGLCanvasWidget::KisOpenGLCanvasWidget(TQWidget *parent, const char *name, TQGLWidget *sharedContextWidget) + : TQGLWidget(KisOpenGLCanvasFormat, parent, name, sharedContextWidget) { if (isSharing()) { kdDebug(41001) << "Created TQGLWidget with sharing\n"; diff --git a/chalk/ui/kis_opengl_canvas.h b/chalk/ui/kis_opengl_canvas.h index 8ca2b1e3..99a67b09 100644 --- a/chalk/ui/kis_opengl_canvas.h +++ b/chalk/ui/kis_opengl_canvas.h @@ -43,7 +43,7 @@ class KisOpenGLCanvasWidget : public virtual TQGLWidget, public virtual KisCanvasWidget { public: - KisOpenGLCanvasWidget(TQWidget *tqparent, const char *name, TQGLWidget *sharedContextWidget); + KisOpenGLCanvasWidget(TQWidget *parent, const char *name, TQGLWidget *sharedContextWidget); ~KisOpenGLCanvasWidget(); virtual KisCanvasWidgetPainter *createPainter(); diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc index ad4dbabb..e0fc1dc8 100644 --- a/chalk/ui/kis_paintop_box.cc +++ b/chalk/ui/kis_paintop_box.cc @@ -43,8 +43,8 @@ #include "kis_paintop_box.h" -KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *tqparent, const char * name) - : super (tqparent, name), +KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *parent, const char * name) + : super (parent, name), m_canvasController(view->getCanvasController()) { #if KDE_VERSION >= KDE_MAKE_VERSION(3,3,90) diff --git a/chalk/ui/kis_paintop_box.h b/chalk/ui/kis_paintop_box.h index 90238c78..400c087c 100644 --- a/chalk/ui/kis_paintop_box.h +++ b/chalk/ui/kis_paintop_box.h @@ -55,7 +55,7 @@ class KisPaintopBox : public TQWidget { typedef TQWidget super; public: - KisPaintopBox (KisView * view, TQWidget * tqparent, const char * name = 0); + KisPaintopBox (KisView * view, TQWidget * parent, const char * name = 0); ~KisPaintopBox(); diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc index dfc75eb4..a424d9ac 100644 --- a/chalk/ui/kis_palette_view.cc +++ b/chalk/ui/kis_palette_view.cc @@ -62,8 +62,8 @@ #include "kis_resource.h" #include "kis_palette.h" -KisPaletteView::KisPaletteView(TQWidget *tqparent, const char* name, int minWidth, int cols) - : TQScrollView( tqparent, name ), mMinWidth(minWidth), mCols(cols) +KisPaletteView::KisPaletteView(TQWidget *parent, const char* name, int minWidth, int cols) + : TQScrollView( parent, name ), mMinWidth(minWidth), mCols(cols) { m_cells = 0; m_currentPalette = 0; diff --git a/chalk/ui/kis_palette_view.h b/chalk/ui/kis_palette_view.h index 79b3e0b0..e82b66c0 100644 --- a/chalk/ui/kis_palette_view.h +++ b/chalk/ui/kis_palette_view.h @@ -37,7 +37,7 @@ class KisPaletteView : public TQScrollView Q_OBJECT TQ_OBJECT public: - KisPaletteView(TQWidget *tqparent, const char* name = 0, int minWidth=210, int cols = 16); + KisPaletteView(TQWidget *parent, const char* name = 0, int minWidth=210, int cols = 16); virtual ~KisPaletteView(); KisPalette* palette() const; diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc index a8305337..2feb74c8 100644 --- a/chalk/ui/kis_palette_widget.cc +++ b/chalk/ui/kis_palette_widget.cc @@ -60,8 +60,8 @@ #include "kis_palette.h" #include "kis_palette_view.h" -KisPaletteWidget::KisPaletteWidget( TQWidget *tqparent, int minWidth, int cols) - : TQWidget( tqparent ), mMinWidth(minWidth), mCols(cols) +KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols) + : TQWidget( parent ), mMinWidth(minWidth), mCols(cols) { init = false; diff --git a/chalk/ui/kis_palette_widget.h b/chalk/ui/kis_palette_widget.h index 6323b0a7..6ea62019 100644 --- a/chalk/ui/kis_palette_widget.h +++ b/chalk/ui/kis_palette_widget.h @@ -41,7 +41,7 @@ class KisPaletteWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KisPaletteWidget( TQWidget *tqparent, int minWidth=210, int cols = 16); + KisPaletteWidget( TQWidget *parent, int minWidth=210, int cols = 16); virtual ~KisPaletteWidget(); TQString palette() const; diff --git a/chalk/ui/kis_part_layer.h b/chalk/ui/kis_part_layer.h index 65026139..d2ff10eb 100644 --- a/chalk/ui/kis_part_layer.h +++ b/chalk/ui/kis_part_layer.h @@ -46,7 +46,7 @@ public: virtual ~KisChildDoc(); - KisDoc * tqparent() const { return m_doc; } + KisDoc * parent() const { return m_doc; } void setPartLayer (KisPartLayerSP layer) { m_partLayer = layer; } diff --git a/chalk/ui/kis_part_layer_handler.cc b/chalk/ui/kis_part_layer_handler.cc index f062e4a1..d44f928a 100644 --- a/chalk/ui/kis_part_layer_handler.cc +++ b/chalk/ui/kis_part_layer_handler.cc @@ -31,8 +31,8 @@ #include "kis_part_layer_handler.h" KisPartLayerHandler::KisPartLayerHandler(KisView* view, const KoDocumentEntry& entry, - KisGroupLayerSP tqparent, KisLayerSP above) - : m_parent(tqparent), m_above(above), m_view(view), m_entry(entry) { + KisGroupLayerSP parent, KisLayerSP above) + : m_parent(parent), m_above(above), m_view(view), m_entry(entry) { m_started = false; view->getCanvasController()->setCanvasCursor( KisCursor::selectCursor() ); } diff --git a/chalk/ui/kis_part_layer_handler.h b/chalk/ui/kis_part_layer_handler.h index 746b23d9..ad21f868 100644 --- a/chalk/ui/kis_part_layer_handler.h +++ b/chalk/ui/kis_part_layer_handler.h @@ -32,7 +32,7 @@ Q_OBJECT TQ_OBJECT public: KisPartLayerHandler(KisView* view, const KoDocumentEntry& entry, - KisGroupLayerSP tqparent, KisLayerSP above); + KisGroupLayerSP parent, KisLayerSP above); signals: void sigGotMoveEvent(KisMoveEvent* event); void sigGotKeyPressEvent(TQKeyEvent* event); diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cc index f19200bf..70484b0a 100644 --- a/chalk/ui/kis_pattern_chooser.cc +++ b/chalk/ui/kis_pattern_chooser.cc @@ -26,7 +26,7 @@ #include "kis_icon_item.h" #include "kis_pattern.h" -KisPatternChooser::KisPatternChooser(TQWidget *tqparent, const char *name) : super(tqparent, name) +KisPatternChooser::KisPatternChooser(TQWidget *parent, const char *name) : super(parent, name) { m_lbName = new TQLabel(this); diff --git a/chalk/ui/kis_pattern_chooser.h b/chalk/ui/kis_pattern_chooser.h index b7a61080..284bd8e1 100644 --- a/chalk/ui/kis_pattern_chooser.h +++ b/chalk/ui/kis_pattern_chooser.h @@ -28,7 +28,7 @@ class KisPatternChooser : public KisItemChooser { TQ_OBJECT public: - KisPatternChooser(TQWidget *tqparent = 0, const char *name = 0); + KisPatternChooser(TQWidget *parent = 0, const char *name = 0); virtual ~KisPatternChooser(); protected: diff --git a/chalk/ui/kis_perspective_grid_manager.cpp b/chalk/ui/kis_perspective_grid_manager.cpp index c454af80..6c326a3c 100644 --- a/chalk/ui/kis_perspective_grid_manager.cpp +++ b/chalk/ui/kis_perspective_grid_manager.cpp @@ -29,10 +29,10 @@ #include "kis_perspective_grid.h" #include "kis_view.h" -KisPerspectiveGridManager::KisPerspectiveGridManager(KisView * tqparent) +KisPerspectiveGridManager::KisPerspectiveGridManager(KisView * parent) : TQObject() , m_toggleEdition(false) - , m_view(tqparent) + , m_view(parent) { } diff --git a/chalk/ui/kis_perspective_grid_manager.h b/chalk/ui/kis_perspective_grid_manager.h index 85954ba4..11875587 100644 --- a/chalk/ui/kis_perspective_grid_manager.h +++ b/chalk/ui/kis_perspective_grid_manager.h @@ -33,7 +33,7 @@ class KisPerspectiveGridManager : public TQObject Q_OBJECT TQ_OBJECT public: - KisPerspectiveGridManager(KisView * tqparent); + KisPerspectiveGridManager(KisView * parent); ~KisPerspectiveGridManager(); void setup(KActionCollection * collection); void drawGrid(TQRect wr, TQPainter *p, bool openGL = false); diff --git a/chalk/ui/kis_populate_visitor.h b/chalk/ui/kis_populate_visitor.h index d228137a..ee43e825 100644 --- a/chalk/ui/kis_populate_visitor.h +++ b/chalk/ui/kis_populate_visitor.h @@ -41,9 +41,9 @@ class KisPopulateVisitor: public KisLayerVisitor , m_parent(0) { } - KisPopulateVisitor(KisLayerItem* tqparent) - : m_widget(tqparent->listView()) - , m_parent(tqparent) + KisPopulateVisitor(KisLayerItem* parent) + : m_widget(parent->listView()) + , m_parent(parent) { } virtual bool visit(KisPaintLayer* layer) diff --git a/chalk/ui/kis_previewdialog.cc b/chalk/ui/kis_previewdialog.cc index fdeb872a..e2857c19 100644 --- a/chalk/ui/kis_previewdialog.cc +++ b/chalk/ui/kis_previewdialog.cc @@ -25,8 +25,8 @@ #include "kis_previewwidget.h" #include "kis_previewdialog.h" -KisPreviewDialog::KisPreviewDialog( TQWidget * tqparent, const char * name, bool modal, const TQString &caption) - : super (tqparent, name, modal, caption, Ok | Cancel, Ok) +KisPreviewDialog::KisPreviewDialog( TQWidget * parent, const char * name, bool modal, const TQString &caption) + : super (parent, name, modal, caption, Ok | Cancel, Ok) { TQHBox* tqlayout = new TQHBox(this); tqlayout->setSpacing( 6 ); diff --git a/chalk/ui/kis_previewdialog.h b/chalk/ui/kis_previewdialog.h index 9f268d44..68f8153d 100644 --- a/chalk/ui/kis_previewdialog.h +++ b/chalk/ui/kis_previewdialog.h @@ -32,7 +32,7 @@ class KisPreviewDialog: public KDialogBase { TQ_OBJECT public: - KisPreviewDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = false, const TQString &caption=TQString()); + KisPreviewDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, const TQString &caption=TQString()); ~KisPreviewDialog(); KisPreviewWidget* previewWidget() { return m_preview; } diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc index c534384a..2598e79d 100644 --- a/chalk/ui/kis_previewwidget.cc +++ b/chalk/ui/kis_previewwidget.cc @@ -65,8 +65,8 @@ static const int ZOOM_PAUSE = 100; static const int FILTER_PAUSE = 500; static const double ZOOM_FACTOR = 1.1; -KisPreviewWidget::KisPreviewWidget( TQWidget* tqparent, const char* name ) - : PreviewWidgetBase( tqparent, name ) +KisPreviewWidget::KisPreviewWidget( TQWidget* parent, const char* name ) + : PreviewWidgetBase( parent, name ) , m_autoupdate(true) , m_previewIsDisplayed(true) , m_scaledOriginal() diff --git a/chalk/ui/kis_previewwidget.h b/chalk/ui/kis_previewwidget.h index bcdf437e..51592624 100644 --- a/chalk/ui/kis_previewwidget.h +++ b/chalk/ui/kis_previewwidget.h @@ -52,7 +52,7 @@ class KisPreviewWidget : public PreviewWidgetBase public: /** Constructs the widget */ - KisPreviewWidget( TQWidget* tqparent = 0, const char* name = 0 ); + KisPreviewWidget( TQWidget* parent = 0, const char* name = 0 ); virtual ~KisPreviewWidget(); /** returns if the preview is automatically updated */ diff --git a/chalk/ui/kis_qpaintdevice_canvas.cc b/chalk/ui/kis_qpaintdevice_canvas.cc index 1f7def2d..e3824f55 100644 --- a/chalk/ui/kis_qpaintdevice_canvas.cc +++ b/chalk/ui/kis_qpaintdevice_canvas.cc @@ -23,8 +23,8 @@ #include "kis_qpaintdevice_canvas_painter.h" #include <kdebug.h> -KisTQPaintDeviceCanvasWidget::KisTQPaintDeviceCanvasWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KisTQPaintDeviceCanvasWidget::KisTQPaintDeviceCanvasWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { } diff --git a/chalk/ui/kis_qpaintdevice_canvas.h b/chalk/ui/kis_qpaintdevice_canvas.h index ae688248..706cb195 100644 --- a/chalk/ui/kis_qpaintdevice_canvas.h +++ b/chalk/ui/kis_qpaintdevice_canvas.h @@ -39,7 +39,7 @@ class KisTQPaintDeviceCanvasWidget : public virtual TQWidget, public virtual KisCanvasWidget { public: - KisTQPaintDeviceCanvasWidget(TQWidget *tqparent = 0, const char *name = 0); + KisTQPaintDeviceCanvasWidget(TQWidget *parent = 0, const char *name = 0); ~KisTQPaintDeviceCanvasWidget(); virtual KisCanvasWidgetPainter *createPainter(); diff --git a/chalk/ui/kis_resource_mediator.cc b/chalk/ui/kis_resource_mediator.cc index d4993807..c06584c3 100644 --- a/chalk/ui/kis_resource_mediator.cc +++ b/chalk/ui/kis_resource_mediator.cc @@ -26,8 +26,8 @@ #include "kis_resource_mediator.h" KisResourceMediator::KisResourceMediator(KisItemChooser *chooser, - TQObject *tqparent, - const char *name) : super(tqparent, name), m_chooser(chooser) + TQObject *parent, + const char *name) : super(parent, name), m_chooser(chooser) { Q_ASSERT(chooser); m_activeItem = 0; diff --git a/chalk/ui/kis_resource_mediator.h b/chalk/ui/kis_resource_mediator.h index b224d25c..8c67151d 100644 --- a/chalk/ui/kis_resource_mediator.h +++ b/chalk/ui/kis_resource_mediator.h @@ -41,7 +41,7 @@ class KisResourceMediator : public TQObject { public: KisResourceMediator(KisItemChooser *chooser, - TQObject *tqparent = 0, + TQObject *parent = 0, const char *name = 0); virtual ~KisResourceMediator(); diff --git a/chalk/ui/kis_ruler.cc b/chalk/ui/kis_ruler.cc index 6b0eea80..44e86cae 100644 --- a/chalk/ui/kis_ruler.cc +++ b/chalk/ui/kis_ruler.cc @@ -40,7 +40,7 @@ const char *KisRuler::m_nums[] = { "XX XXXXXX XXX XXX XXXXXX XXX XXXX XXXXX XXXXX XXXX XXX" }; -KisRuler::KisRuler(Qt::Orientation o, TQWidget *tqparent, const char *name) : super(tqparent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums) +KisRuler::KisRuler(Qt::Orientation o, TQWidget *parent, const char *name) : super(parent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums) { setBackgroundMode(NoBackground); setFrameStyle(Box | Sunken); diff --git a/chalk/ui/kis_ruler.h b/chalk/ui/kis_ruler.h index 6c8dd46d..28ab4d82 100644 --- a/chalk/ui/kis_ruler.h +++ b/chalk/ui/kis_ruler.h @@ -38,7 +38,7 @@ class KisRuler : public TQFrame { typedef TQFrame super; public: - KisRuler(Qt::Orientation, TQWidget *tqparent = 0, const char *name = 0); + KisRuler(Qt::Orientation, TQWidget *parent = 0, const char *name = 0); virtual ~KisRuler(); public: diff --git a/chalk/ui/kis_save_visitor.h b/chalk/ui/kis_save_visitor.h index ce668a53..1205632b 100644 --- a/chalk/ui/kis_save_visitor.h +++ b/chalk/ui/kis_save_visitor.h @@ -80,16 +80,16 @@ public: } if (layer->hasMask()) { - KisPaintDeviceSP tqmask = layer->getMask(); + KisPaintDeviceSP mask = layer->getMask(); - if (tqmask) { + if (mask) { // save layer profile location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".tqmask"; + location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".mask"; if (m_store->open(location)) { - if (!tqmask->write(m_store)) { - tqmask->disconnect(); + if (!mask->write(m_store)) { + mask->disconnect(); m_store->close(); return false; } diff --git a/chalk/ui/kis_savexml_visitor.h b/chalk/ui/kis_savexml_visitor.h index 52c0dc80..15580752 100644 --- a/chalk/ui/kis_savexml_visitor.h +++ b/chalk/ui/kis_savexml_visitor.h @@ -56,7 +56,7 @@ public: layerElement.setAttribute("layertype", "paintlayer"); layerElement.setAttribute("filename", TQString("layer%1").tqarg(m_count)); layerElement.setAttribute("colorspacename", layer->paintDevice()->colorSpace()->id().id()); - layerElement.setAttribute("hastqmask", layer->hasMask()); + layerElement.setAttribute("hasmask", layer->hasMask()); m_elem.appendChild(layerElement); if(layer->paintDevice()->hasExifInfo()) diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc index 3caba5e7..0655b834 100644 --- a/chalk/ui/kis_selection_manager.cc +++ b/chalk/ui/kis_selection_manager.cc @@ -60,8 +60,8 @@ #include "kis_fill_painter.h" #include "kis_canvas.h" -KisSelectionManager::KisSelectionManager(KisView * tqparent, KisDoc * doc) - : m_parent(tqparent), +KisSelectionManager::KisSelectionManager(KisView * parent, KisDoc * doc) + : m_parent(parent), m_doc(doc), m_copy(0), m_cut(0), @@ -258,7 +258,7 @@ void KisSelectionManager::updateGUI() Q_ASSERT(m_clipboard); if (m_parent == 0) { - // "Eek, no tqparent! + // "Eek, no parent! return; } @@ -393,7 +393,7 @@ void KisSelectionManager::copy() gc.bitBlt(0, 0, COMPOSITE_COPY, dev, r.x(), r.y(), r.width(), r.height()); gc.end(); - // Apply selection tqmask. + // Apply selection mask. for (TQ_INT32 y = 0; y < r.height(); y++) { KisHLineIteratorPixel layerIt = clip->createHLineIterator(0, y, r.width(), true); @@ -451,7 +451,7 @@ KisLayerSP KisSelectionManager::paste() layer->convertTo(img->colorSpace()); */ TQApplication::restoreOverrideCursor(); - if(img->addLayer(layer, img->activeLayer()->tqparent(), img->activeLayer())) + if(img->addLayer(layer, img->activeLayer()->parent(), img->activeLayer())) { return layer; } else { @@ -833,7 +833,7 @@ void KisSelectionManager::grow (TQ_INT32 xradius, TQ_INT32 yradius) TQ_UINT8* out = new TQ_UINT8[ layerSize.width() ]; // holds the new scan line we are computing - TQ_INT32* circ = new TQ_INT32[ 2 * xradius + 1 ]; // holds the y coords of the filter's tqmask + TQ_INT32* circ = new TQ_INT32[ 2 * xradius + 1 ]; // holds the y coords of the filter's mask computeBorder (circ, xradius, yradius); /* offset the circ pointer by xradius so the range of the array @@ -994,7 +994,7 @@ void KisSelectionManager::shrink (TQ_INT32 xradius, TQ_INT32 yradius, bool edge_ TQ_UINT8* out = new TQ_UINT8[layerSize.width()]; // holds the new scan line we are computing - TQ_INT32* circ = new TQ_INT32[2 * xradius + 1]; // holds the y coords of the filter's tqmask + TQ_INT32* circ = new TQ_INT32[2 * xradius + 1]; // holds the y coords of the filter's mask computeBorder (circ, xradius, yradius); @@ -1090,7 +1090,7 @@ void KisSelectionManager::shrink (TQ_INT32 xradius, TQ_INT32 yradius, bool edge_ dev->emitSelectionChanged(); } -//Simple convolution filter to smooth a tqmask (1bpp) +//Simple convolution filter to smooth a mask (1bpp) void KisSelectionManager::smooth() { @@ -1159,7 +1159,7 @@ void KisSelectionManager::smooth() dev->emitSelectionChanged(); } -// Erode (radius 1 pixel) a tqmask (1bpp) +// Erode (radius 1 pixel) a mask (1bpp) void KisSelectionManager::erode() { @@ -1234,7 +1234,7 @@ void KisSelectionManager::erode() dev->emitSelectionChanged(); } -// dilate (radius 1 pixel) a tqmask (1bpp) +// dilate (radius 1 pixel) a mask (1bpp) void KisSelectionManager::dilate() { diff --git a/chalk/ui/kis_selection_manager.h b/chalk/ui/kis_selection_manager.h index fb33218e..d71353b2 100644 --- a/chalk/ui/kis_selection_manager.h +++ b/chalk/ui/kis_selection_manager.h @@ -40,7 +40,7 @@ class KRITACORE_EXPORT KisSelectionManager : public TQObject { public: - KisSelectionManager(KisView * tqparent, KisDoc * doc); + KisSelectionManager(KisView * parent, KisDoc * doc); virtual ~KisSelectionManager(); void setup(KActionCollection * collection); diff --git a/chalk/ui/kis_selection_options.cc b/chalk/ui/kis_selection_options.cc index f94ff17f..32933b5a 100644 --- a/chalk/ui/kis_selection_options.cc +++ b/chalk/ui/kis_selection_options.cc @@ -32,8 +32,8 @@ #include "kis_selection.h" #include "kis_paint_device.h" -KisSelectionOptions::KisSelectionOptions(TQWidget *tqparent, KisCanvasSubject * subject) - : super(tqparent), +KisSelectionOptions::KisSelectionOptions(TQWidget *parent, KisCanvasSubject * subject) + : super(parent), m_subject(subject) { m_page = new WdgSelectionOptions(this); diff --git a/chalk/ui/kis_selection_options.h b/chalk/ui/kis_selection_options.h index e8168d04..115678cd 100644 --- a/chalk/ui/kis_selection_options.h +++ b/chalk/ui/kis_selection_options.h @@ -37,7 +37,7 @@ class KRITAUI_EXPORT KisSelectionOptions : public TQWidget typedef TQWidget super; public: - KisSelectionOptions( TQWidget *tqparent, KisCanvasSubject * subject); + KisSelectionOptions( TQWidget *parent, KisCanvasSubject * subject); virtual ~KisSelectionOptions(); int action(); diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cc index ef376373..ad681c75 100644 --- a/chalk/ui/kis_text_brush.cc +++ b/chalk/ui/kis_text_brush.cc @@ -43,8 +43,8 @@ void KisTextBrushResource::updateBrush() setImage(px.convertToImage ()); } -KisTextBrush::KisTextBrush(TQWidget *tqparent, const char* name, const TQString& caption) - : KisWdgTextBrush(tqparent, name), +KisTextBrush::KisTextBrush(TQWidget *parent, const char* name, const TQString& caption) + : KisWdgTextBrush(parent, name), m_textBrushResource(new KisTextBrushResource()) { setCaption(caption); @@ -57,7 +57,7 @@ KisTextBrush::KisTextBrush(TQWidget *tqparent, const char* name, const TQString& void KisTextBrush::getFont() { - KFontDialog::getFont( m_font, false/*, TQWidget* tqparent! */ ); + KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ ); rebuildTextBrush(); } diff --git a/chalk/ui/kis_text_brush.h b/chalk/ui/kis_text_brush.h index 3c8835de..623ff432 100644 --- a/chalk/ui/kis_text_brush.h +++ b/chalk/ui/kis_text_brush.h @@ -51,7 +51,7 @@ class KisTextBrush : public KisWdgTextBrush Q_OBJECT TQ_OBJECT public: - KisTextBrush(TQWidget *tqparent, const char* name, const TQString& caption); + KisTextBrush(TQWidget *parent, const char* name, const TQString& caption); signals: void activatedResource(KisResource *r); diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc index 5aee554b..d6e600af 100644 --- a/chalk/ui/kis_tool.cc +++ b/chalk/ui/kis_tool.cc @@ -53,10 +53,10 @@ KisTool::~KisTool() delete d; } -TQWidget* KisTool::createOptionWidget(TQWidget* tqparent) +TQWidget* KisTool::createOptionWidget(TQWidget* parent) { - d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), tqparent); + d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), parent); d->optionWidget->setCaption(d->uiname); d->optionWidget->tqsetAlignment(TQt::AlignCenter); return d->optionWidget; diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h index c8f2d349..b9abdc75 100644 --- a/chalk/ui/kis_tool.h +++ b/chalk/ui/kis_tool.h @@ -93,9 +93,9 @@ public: virtual void setCursor(const TQCursor& cursor) = 0; /** * This function is called to create the configuration widget of the tool. - * @param tqparent the tqparent of the widget + * @param parent the parent of the widget */ - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); /** * @return the current configuration widget. */ diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc index d8ac04e5..51eb1407 100644 --- a/chalk/ui/kis_tool_dummy.cc +++ b/chalk/ui/kis_tool_dummy.cc @@ -94,9 +94,9 @@ void KisToolDummy::setup(KActionCollection *collection) } -TQWidget* KisToolDummy::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolDummy::createOptionWidget(TQWidget* parent) { - m_optionWidget = new TQLabel(i18n("Layer is locked or invisible."), tqparent); + m_optionWidget = new TQLabel(i18n("Layer is locked or invisible."), parent); m_optionWidget->setCaption(i18n("No Active Tool")); m_optionWidget->tqsetAlignment(TQt::AlignCenter); return m_optionWidget; diff --git a/chalk/ui/kis_tool_dummy.h b/chalk/ui/kis_tool_dummy.h index d10850e8..de74ce84 100644 --- a/chalk/ui/kis_tool_dummy.h +++ b/chalk/ui/kis_tool_dummy.h @@ -53,7 +53,7 @@ public: virtual void move(KisMoveEvent *e); virtual void buttonRelease(KisButtonReleaseEvent *e); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); private: diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc index bbe575d1..adbf9b8a 100644 --- a/chalk/ui/kis_tool_freehand.cc +++ b/chalk/ui/kis_tool_freehand.cc @@ -182,12 +182,12 @@ void KisToolFreehand::initPaint(KisEvent *) // projection). KisLayer* l = layer->layer(); KisPaintLayer* pl = dynamic_cast<KisPaintLayer*>(l); - if (l->tqparent() && (l->tqparent()->tqparent() == 0) - && (l->tqparent()->childCount() == 1) - && l->tqparent()->paintLayerInducesProjectionOptimization(pl)) { - // If there's a tqmask, device could've been the tqmask. The induce function + if (l->parent() && (l->parent()->parent() == 0) + && (l->parent()->childCount() == 1) + && l->parent()->paintLayerInducesProjectionOptimization(pl)) { + // If there's a mask, device could've been the mask. The induce function // should catch this, but better safe than sorry - l->tqparent()->resetProjection(pl->paintDevice()); + l->parent()->resetProjection(pl->paintDevice()); } m_target = new KisPaintDevice(m_currentImage->activeLayer(), diff --git a/chalk/ui/kis_tool_manager.cc b/chalk/ui/kis_tool_manager.cc index 456c60a7..458b54e2 100644 --- a/chalk/ui/kis_tool_manager.cc +++ b/chalk/ui/kis_tool_manager.cc @@ -32,8 +32,8 @@ #include "kis_input_device.h" -KisToolManager::KisToolManager(KisCanvasSubject * tqparent, KisCanvasController * controller) - : m_subject(tqparent), +KisToolManager::KisToolManager(KisCanvasSubject * parent, KisCanvasController * controller) + : m_subject(parent), m_controller(controller) { m_toolBox = 0; @@ -126,7 +126,7 @@ void KisToolManager::updateGUI() { Q_ASSERT(m_subject); if (m_subject == 0) { - // "Eek, no tqparent! + // "Eek, no parent! return; } diff --git a/chalk/ui/kis_tool_manager.h b/chalk/ui/kis_tool_manager.h index 8f04f680..f3368383 100644 --- a/chalk/ui/kis_tool_manager.h +++ b/chalk/ui/kis_tool_manager.h @@ -47,7 +47,7 @@ class KisToolManager : public TQObject, public KisToolControllerInterface { public: - KisToolManager(KisCanvasSubject * tqparent, KisCanvasController * controller); + KisToolManager(KisCanvasSubject * parent, KisCanvasController * controller); ~KisToolManager(); public: diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc index aa1bf7a7..9d37dae6 100644 --- a/chalk/ui/kis_tool_paint.cc +++ b/chalk/ui/kis_tool_paint.cc @@ -115,9 +115,9 @@ void KisToolPaint::keyRelease(TQKeyEvent *) { } -TQWidget* KisToolPaint::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolPaint::createOptionWidget(TQWidget* parent) { - m_optionWidget = new TQWidget(tqparent); + m_optionWidget = new TQWidget(parent); m_optionWidget->setCaption(m_UIName); m_lbOpacity = new TQLabel(i18n("Opacity:"), m_optionWidget); diff --git a/chalk/ui/kis_tool_paint.h b/chalk/ui/kis_tool_paint.h index 6e1406b5..7fb4b819 100644 --- a/chalk/ui/kis_tool_paint.h +++ b/chalk/ui/kis_tool_paint.h @@ -73,7 +73,7 @@ public: virtual TQCursor cursor(); virtual void setCursor(const TQCursor& cursor); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void addOptionWidgetOption(TQWidget *control, TQWidget *label = 0); diff --git a/chalk/ui/kis_tool_shape.cc b/chalk/ui/kis_tool_shape.cc index b919a578..9e76f159 100644 --- a/chalk/ui/kis_tool_shape.cc +++ b/chalk/ui/kis_tool_shape.cc @@ -37,9 +37,9 @@ KisToolShape::~KisToolShape() { } -TQWidget* KisToolShape::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolShape::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); m_tqshapeOptionsWidget = new WdgGeometryOptions(0); Q_CHECK_PTR(m_tqshapeOptionsWidget); diff --git a/chalk/ui/kis_tool_shape.h b/chalk/ui/kis_tool_shape.h index 2c0a9500..e8974c79 100644 --- a/chalk/ui/kis_tool_shape.h +++ b/chalk/ui/kis_tool_shape.h @@ -40,7 +40,7 @@ public: virtual enumToolType toolType() { return TOOL_SHAPE; } protected: - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); KisPainter::FillStyle fillStyle(); diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index 0b288da5..4455f17d 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -168,8 +168,8 @@ // sent to a receiver if it does not accept the tablet event. #define MOUSE_CHANGE_EVENT_DELAY 100 -KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *tqparent, const char *name) - : super(doc, tqparent, name) +KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const char *name) + : super(doc, parent, name) , KXMLGUIBuilder( shell() ) , m_panning( false ) , m_oldTool( 0 ) @@ -239,7 +239,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *tqparent, const Q_ASSERT(doc); Q_ASSERT(adapter); - Q_ASSERT(tqparent); + Q_ASSERT(parent); KisConfig cfg; @@ -380,7 +380,7 @@ static TQt::Dock stringToDock( const TQString& attrPosition ) return dock; } -TQWidget * KisView::createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id ) +TQWidget * KisView::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ) { if( element.attribute( "name" ) == "ToolBox" ) { @@ -394,11 +394,11 @@ TQWidget * KisView::createContainer( TQWidget *tqparent, int index, const TQDomE mainWindow()->moveDockWindow( m_toolBox, dock, false, 0, 0 ); } - return KXMLGUIBuilder::createContainer( tqparent, index, element, id ); + return KXMLGUIBuilder::createContainer( parent, index, element, id ); } -void KisView::removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id ) +void KisView::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ) { Q_ASSERT(container); @@ -408,7 +408,7 @@ void KisView::removeContainer( TQWidget *container, TQWidget *tqparent, TQDomEle m_toolManager->youAintGotNoToolBox(); } else { - KXMLGUIBuilder::removeContainer( container, tqparent, element, id ); + KXMLGUIBuilder::removeContainer( container, parent, element, id ); } } @@ -645,20 +645,20 @@ void KisView::setupActions() (void)new KAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY"); m_createMask = new KAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCreateMask()), actionCollection(), "create_tqmask"); + TQT_SLOT(slotCreateMask()), actionCollection(), "create_mask"); m_maskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMaskFromSelection()), actionCollection(), "mask_fromsel"); m_maskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel"); m_applyMask = new KAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()), - actionCollection(), "apply_tqmask"); + actionCollection(), "apply_mask"); m_removeMask = new KAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_tqmask"); + TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_mask"); m_showMask = new KToggleAction(i18n( "Show Mask" ), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotShowMask()), actionCollection(), "show_tqmask"); + TQT_SLOT(slotShowMask()), actionCollection(), "show_mask"); m_editMask = new KToggleAction(i18n( "Edit Mask" ), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotEditMask()), actionCollection(), "edit_tqmask"); + TQT_SLOT(slotEditMask()), actionCollection(), "edit_mask"); // image actions m_imgFlatten = new KAction(i18n("&Flatten Image"), "Ctrl+Shift+E", TQT_TQOBJECT(this), TQT_SLOT(flattenImage()), actionCollection(), "flatten_image"); @@ -2717,13 +2717,13 @@ void KisView::layerAdd() { KisImageSP img = currentImg(); if (img && img->activeLayer()) { - addLayer(img->activeLayer()->tqparent(), img->activeLayer()); + addLayer(img->activeLayer()->parent(), img->activeLayer()); } else if (img) addLayer(static_cast<KisGroupLayer*>(img->rootLayer().data()), 0); } -void KisView::addLayer(KisGroupLayerSP tqparent, KisLayerSP above) +void KisView::addLayer(KisGroupLayerSP parent, KisLayerSP above) { KisImageSP img = currentImg(); if (img) { @@ -2739,7 +2739,7 @@ void KisView::addLayer(KisGroupLayerSP tqparent, KisLayerSP above) KisLayerSP layer = new KisPaintLayer(img, dlg.layerName(), dlg.opacity(), cs); if (layer) { layer->setCompositeOp(dlg.compositeOp()); - img->addLayer(layer, tqparent.data(), above); + img->addLayer(layer, parent.data(), above); updateCanvas(); } else { KMessageBox::error(this, i18n("Could not add layer to image."), i18n("Layer Error")); @@ -2751,7 +2751,7 @@ void KisView::addLayer(KisGroupLayerSP tqparent, KisLayerSP above) } } -void KisView::addGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above) +void KisView::addGroupLayer(KisGroupLayerSP parent, KisLayerSP above) { KisImageSP img = currentImg(); if (img) { @@ -2766,7 +2766,7 @@ void KisView::addGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above) KisLayerSP layer = new KisGroupLayer(img, dlg.layerName(), dlg.opacity()); if (layer) { layer->setCompositeOp(dlg.compositeOp()); - img->addLayer(layer, tqparent.data(), above); + img->addLayer(layer, parent.data(), above); updateCanvas(); } else { KMessageBox::error(this, i18n("Could not add layer to image."), i18n("Layer Error")); @@ -2783,10 +2783,10 @@ void KisView::addPartLayer() addPartLayer(img->rootLayer(), img->rootLayer()->firstChild(), m_actionPartLayer->documentEntry()); } -void KisView::addPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoDocumentEntry& entry) +void KisView::addPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDocumentEntry& entry) { delete m_partHandler; // Only one at a time - m_partHandler = new KisPartLayerHandler(this, entry, tqparent, above); + m_partHandler = new KisPartLayerHandler(this, entry, parent, above); disconnect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), this, 0); disconnect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), this, 0); @@ -2811,7 +2811,7 @@ void KisView::addPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoD } void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry, - KisGroupLayerSP tqparent, KisLayerSP above) { + KisGroupLayerSP parent, KisLayerSP above) { KisImageSP img = currentImg(); if (!img) return; @@ -2828,7 +2828,7 @@ void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry, KisPartLayerImpl* partLayer = new KisPartLayerImpl(img, childDoc); partLayer->setDocType(entry.service()->genericName()); - img->addLayer(partLayer, tqparent, above); + img->addLayer(partLayer, parent, above); m_doc->setModified(true); reconnectAfterPartInsert(); @@ -2853,12 +2853,12 @@ void KisView::addAdjustmentLayer() KisImageSP img = currentImg(); if (!img) return; - addAdjustmentLayer( img->activeLayer()->tqparent(), img->activeLayer() ); + addAdjustmentLayer( img->activeLayer()->parent(), img->activeLayer() ); } -void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above) +void KisView::addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above) { - Q_ASSERT(tqparent); + Q_ASSERT(parent); Q_ASSERT(above); KisImageSP img = currentImg(); @@ -2898,15 +2898,15 @@ void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above) KisFilterConfiguration * filter = dlg.filterConfiguration(); TQString name = dlg.layerName(); - addAdjustmentLayer( tqparent, above, name, filter, selection); + addAdjustmentLayer( parent, above, name, filter, selection); } } -void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above, const TQString & name, +void KisView::addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above, const TQString & name, KisFilterConfiguration * filter, KisSelectionSP selection) { - Q_ASSERT(tqparent); + Q_ASSERT(parent); Q_ASSERT(above); Q_ASSERT(filter); @@ -2914,7 +2914,7 @@ void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above, con if (!img) return; KisAdjustmentLayer * l = new KisAdjustmentLayer(img, name, filter, selection); - img->addLayer(l, tqparent, above); + img->addLayer(l, parent, above); } void KisView::slotChildActivated(bool a) { @@ -2943,8 +2943,8 @@ void KisView::layerRemove() img->removeLayer(layer); - if (layer->tqparent()) - layer->tqparent()->setDirty(layer->extent()); + if (layer->parent()) + layer->parent()->setDirty(layer->extent()); updateCanvas(); layerUpdateGUI(img->activeLayer() != 0); @@ -2966,7 +2966,7 @@ void KisView::layerDuplicate() KisLayerSP dup = active->clone(); dup->setName(i18n("Duplicate of '%1'").tqarg(active->name())); - img->addLayer(dup, active->tqparent().data(), active); + img->addLayer(dup, active->parent().data(), active); if (dup) { img->activate( dup ); updateCanvas(); diff --git a/chalk/ui/kis_view.h b/chalk/ui/kis_view.h index 71bb9065..3e4b6987 100644 --- a/chalk/ui/kis_view.h +++ b/chalk/ui/kis_view.h @@ -127,13 +127,13 @@ class KRITA_EXPORT KisView typedef vKisCanvasObserver::const_iterator vKisCanvasObserver_cit; public: - KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *tqparent = 0, const char *name = 0); + KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent = 0, const char *name = 0); virtual ~KisView(); public: // KXMLGUIBuilder implementation - virtual TQWidget *createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id ); - virtual void removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id ); + virtual TQWidget *createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ); + virtual void removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ); public: // KoView implementation virtual bool eventFilter(TQObject *o, TQEvent *e); @@ -220,7 +220,7 @@ public: void shearCurrentImage(double angleX, double angleY); void insertPart(const TQRect& viewRect, const KoDocumentEntry& entry, - KisGroupLayerSP tqparent, KisLayerSP above); + KisGroupLayerSP parent, KisLayerSP above); /** * Import an image as a layer. If there is more than @@ -428,7 +428,7 @@ private: private slots: void layersUpdated(); // Used in the channel separation to notify the view that we have added a few layers. - void maskUpdated(); // To update the enabled or disabled status of the tqmask entries + void maskUpdated(); // To update the enabled or disabled status of the mask entries void slotSetFGQColor(const TQColor & c); void slotSetBGQColor(const TQColor & c); @@ -466,13 +466,13 @@ private slots: void layerProperties(); void showLayerProperties(KisLayerSP layer); void layerAdd(); - void addLayer(KisGroupLayerSP tqparent, KisLayerSP above); - void addGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above); + void addLayer(KisGroupLayerSP parent, KisLayerSP above); + void addGroupLayer(KisGroupLayerSP parent, KisLayerSP above); void addPartLayer(); - void addPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoDocumentEntry& entry); + void addPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDocumentEntry& entry); void addAdjustmentLayer(); - void addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above); - void addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above, const TQString & name, KisFilterConfiguration * filter, KisSelectionSP selection = 0); + void addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above); + void addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above, const TQString & name, KisFilterConfiguration * filter, KisSelectionSP selection = 0); void layerRemove(); void layerDuplicate(); void layerRaise(); diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index 34dd043f..542e257d 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -52,10 +52,10 @@ KoThumbnailAdapter::~KoThumbnailAdapter() {} KoBirdEyePanel::KoBirdEyePanel( KoZoomAdapter * zoomListener, KoThumbnailAdapter * thumbnailProvider, KoCanvasAdapter * canvas, - TQWidget * tqparent, + TQWidget * parent, const char * name, WFlags f) - : TQWidget(tqparent, name, f) + : TQWidget(parent, name, f) , m_zoomListener(zoomListener) , m_thumbnailProvider(thumbnailProvider) , m_canvas(canvas) diff --git a/chalk/ui/kobirdeyepanel.h b/chalk/ui/kobirdeyepanel.h index 24770b18..de280d9a 100644 --- a/chalk/ui/kobirdeyepanel.h +++ b/chalk/ui/kobirdeyepanel.h @@ -149,14 +149,14 @@ public: * @param thumbnailProvider the class that creates the small image at the right * zoomlevel * @param canvas the place the document is painted. - * @param tqparent the tqparent widget + * @param parent the parent widget * @param name the TQObject name of this bird eye widget * @param f the widget flags (@see TQWidget) */ KoBirdEyePanel( KoZoomAdapter * zoomListener, KoThumbnailAdapter * thumbnailProvider, KoCanvasAdapter * canvas, - TQWidget * tqparent, + TQWidget * parent, const char * name = 0, WFlags f = 0 ); diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 6f7cb4e2..96e1e032 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -83,7 +83,7 @@ public: KPopupMenu contextMenu; LayerToolTip *tooltip; - Private( TQWidget *tqparent, LayerList *list ); + Private( TQWidget *parent, LayerList *list ); ~Private(); }; @@ -113,8 +113,8 @@ class LayerToolTip: public TQToolTip, public TQFrame TQImage m_img; public: - LayerToolTip( TQWidget *tqparent, LayerList *list ) - : TQToolTip( tqparent ), + LayerToolTip( TQWidget *parent, LayerList *list ) + : TQToolTip( parent ), TQFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM | WNoAutoErase ), m_list( list ) { @@ -257,9 +257,9 @@ public: } }; -LayerList::Private::Private( TQWidget *tqparent, LayerList *list ) +LayerList::Private::Private( TQWidget *parent, LayerList *list ) : activeLayer( 0 ), foldersCanBeActive( false ), previewsShown( false ), itemHeight( 32 ), - tooltip( new LayerToolTip( tqparent, list ) ) { } + tooltip( new LayerToolTip( parent, list ) ) { } LayerList::Private::~Private() { @@ -280,8 +280,8 @@ static TQSize iconSize() { return TQIconSet::iconSize( TQIconSet::Small ); } // LayerList // /////////////// -LayerList::LayerList( TQWidget *tqparent, const char *name ) - : super( tqparent, name ), d( new Private( viewport(), this ) ) +LayerList::LayerList( TQWidget *parent, const char *name ) + : super( parent, name ), d( new Private( viewport(), this ) ) { setSelectionMode( TQListView::Extended ); setRootIsDecorated( true ); @@ -609,10 +609,10 @@ LayerItem *LayerList::addLayer( const TQString &displayName, int afterID, int id } //SLOT -LayerItem *LayerList::addLayerToParent( const TQString &displayName, LayerItem *tqparent, LayerItem *after, int id ) +LayerItem *LayerList::addLayerToParent( const TQString &displayName, LayerItem *parent, LayerItem *after, int id ) { - if( tqparent && tqparent->isFolder() ) - return tqparent->addLayer( displayName, after, id ); + if( parent && parent->isFolder() ) + return parent->addLayer( displayName, after, id ); else return 0; } @@ -622,23 +622,23 @@ LayerItem *LayerList::addLayerToParent( const TQString &displayName, int parentI return addLayerToParent( displayName, folder( parentID ), layer( afterID ), id ); } -void LayerList::moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after ) //SLOT +void LayerList::moveLayer( LayerItem *layer, LayerItem *parent, LayerItem *after ) //SLOT { if( !layer ) return; - if( tqparent && !tqparent->isFolder() ) - tqparent = 0; + if( parent && !parent->isFolder() ) + parent = 0; - if( layer->tqparent() == tqparent && layer->prevSibling() == after ) + if( layer->parent() == parent && layer->prevSibling() == after ) return; TQListViewItem *current = currentItem(); - moveItem( layer, tqparent, after ); + moveItem( layer, parent, after ); - emit layerMoved( layer, tqparent, after ); - emit layerMoved( layer->id(), tqparent ? tqparent->id() : -1, after ? after->id() : -1 ); + emit layerMoved( layer, parent, after ); + emit layerMoved( layer->id(), parent ? parent->id() : -1, after ? after->id() : -1 ); setCurrentItem( current ); //HACK, sometimes TQt changes this under us } @@ -694,16 +694,16 @@ void LayerList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) } } -void LayerList::findDrop( const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after ) +void LayerList::findDrop( const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after ) { LayerItem *item = static_cast<LayerItem*>( itemAt( contentsToViewport( pos ) ) ); if( item && item->isFolder() ) { - tqparent = item; + parent = item; after = 0; } else - super::findDrop( pos, tqparent, after ); + super::findDrop( pos, parent, after ); } void LayerList::showContextMenu() @@ -748,22 +748,22 @@ void LayerList::menuActivated( int id, LayerItem *layer ) { const TQValueList<LayerItem*> selected = selectedLayers(); - LayerItem *tqparent = ( layer && layer->isFolder() ) ? layer : 0; + LayerItem *parent = ( layer && layer->isFolder() ) ? layer : 0; LayerItem *after = 0; - if( layer && !tqparent ) + if( layer && !parent ) { - tqparent = layer->tqparent(); + parent = layer->parent(); after = layer->prevSibling(); } switch( id ) { case MenuItems::NewLayer: - emit requestNewLayer( tqparent, after ); - emit requestNewLayer( tqparent ? tqparent->id() : -1, after ? after->id() : -1 ); + emit requestNewLayer( parent, after ); + emit requestNewLayer( parent ? parent->id() : -1, after ? after->id() : -1 ); break; case MenuItems::NewFolder: - emit requestNewFolder( tqparent, after ); - emit requestNewFolder( tqparent ? tqparent->id() : -1, after ? after->id() : -1 ); + emit requestNewFolder( parent, after ); + emit requestNewFolder( parent ? parent->id() : -1, after ? after->id() : -1 ); break; case MenuItems::RemoveLayer: { @@ -810,11 +810,11 @@ void LayerList::slotItemMoved( TQPtrList<TQListViewItem> &items, TQPtrList<TQLis if( !l ) continue; - if( l->tqparent() ) - l->tqparent()->setOpen( true ); + if( l->parent() ) + l->parent()->setOpen( true ); - emit layerMoved( l, l->tqparent(), a ); - emit layerMoved( l->id(), l->tqparent() ? l->tqparent()->id() : -1, a ? a->id() : -1 ); + emit layerMoved( l, l->parent(), a ); + emit layerMoved( l->id(), l->parent() ? l->parent()->id() : -1, a ? a->id() : -1 ); } } @@ -861,8 +861,8 @@ void LayerItem::init() for( int i = 0, n = listView()->d->properties.count(); i < n; ++i ) d->properties.append( listView()->d->properties[i].defaultValue ); - if( tqparent()) - tqparent()->setOpen( true ); + if( parent()) + parent()->setOpen( true ); } LayerItem::~LayerItem() @@ -996,7 +996,7 @@ LayerItem *LayerItem::addLayer( const TQString &displayName, LayerItem *after, i LayerItem *LayerItem::prevSibling() const { - LayerItem *item = tqparent() ? tqparent()->firstChild() : listView()->firstChild(); + LayerItem *item = parent() ? parent()->firstChild() : listView()->firstChild(); if( !item || this == item ) return 0; for(; item && this != item->nextSibling(); item = item->nextSibling() ); @@ -1319,7 +1319,7 @@ LayerList *LayerItem::listView() const { return static_cast<LayerList*>( super:: void LayerItem::update() const { listView()->repaintItem( this ); } LayerItem *LayerItem::firstChild() const { return static_cast<LayerItem*>( super::firstChild() ); } LayerItem *LayerItem::nextSibling() const { return static_cast<LayerItem*>( super::nextSibling() ); } -LayerItem *LayerItem::tqparent() const { return static_cast<LayerItem*>( super::tqparent() ); } +LayerItem *LayerItem::parent() const { return static_cast<LayerItem*>( super::parent() ); } #include "layerlist.moc" diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h index 5c75b6b7..ea6926b7 100644 --- a/chalk/ui/layerlist.h +++ b/chalk/ui/layerlist.h @@ -37,7 +37,7 @@ class LayerList: public KListView TQ_OBJECT public: - LayerList( TQWidget *tqparent = 0, const char *name = 0 ); + LayerList( TQWidget *parent = 0, const char *name = 0 ); virtual ~LayerList(); void addProperty( const TQString &name, const TQString &displayName, const TQIconSet &icon = TQIconSet(), @@ -97,10 +97,10 @@ public slots: LayerItem *addLayer( const TQString &displayName, LayerItem *after = 0, int id = -1 ); LayerItem *addLayer( const TQString &displayName, int afterID, int id = -1 ); - LayerItem *addLayerToParent( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 ); + LayerItem *addLayerToParent( const TQString &displayName, LayerItem *parent, LayerItem *after = 0, int id = -1 ); LayerItem *addLayerToParent( const TQString &displayName, int parentID, int afterID = -1, int id = -1 ); - void moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after ); + void moveLayer( LayerItem *layer, LayerItem *parent, LayerItem *after ); void moveLayer( int id, int parentID, int afterID ); void removeLayer( LayerItem *layer ); @@ -116,13 +116,13 @@ signals: void propertyChanged( LayerItem *layer, const TQString &name, bool on ); void propertyChanged( int id, const TQString &name, bool on ); - void layerMoved( LayerItem *layer, LayerItem *tqparent, LayerItem *after ); + void layerMoved( LayerItem *layer, LayerItem *parent, LayerItem *after ); void layerMoved( int id, int parentID, int afterID ); - void requestNewLayer( LayerItem *tqparent, LayerItem *after ); + void requestNewLayer( LayerItem *parent, LayerItem *after ); void requestNewLayer( int parentID, int afterID ); - void requestNewFolder( LayerItem *tqparent, LayerItem *after ); + void requestNewFolder( LayerItem *parent, LayerItem *after ); void requestNewFolder( int parentID, int afterID ); void requestRemoveLayer( LayerItem *layer ); @@ -163,14 +163,14 @@ public: //reimplemented for internal reasons protected: virtual void contentsMousePressEvent( TQMouseEvent *e ); virtual void contentsMouseDoubleClickEvent ( TQMouseEvent *e ); - virtual void findDrop( const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after ); + virtual void findDrop( const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after ); }; class LayerItem: public KListViewItem { public: - LayerItem( const TQString &displayName, LayerList *tqparent, LayerItem *after = 0, int id = -1 ); - LayerItem( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 ); + LayerItem( const TQString &displayName, LayerList *parent, LayerItem *after = 0, int id = -1 ); + LayerItem( const TQString &displayName, LayerItem *parent, LayerItem *after = 0, int id = -1 ); virtual ~LayerItem(); void makeFolder(); @@ -203,7 +203,7 @@ public: //convenience LayerItem *nextSibling() const; LayerList *listView() const; LayerItem *firstChild() const; - LayerItem *tqparent() const; + LayerItem *parent() const; void update() const; //like TQWidget::update() protected: @@ -259,10 +259,10 @@ public: //reimplemented for internal reasons class LayerFolder: public LayerItem { public: - LayerFolder( const TQString &displayName, LayerList *tqparent, LayerItem *after = 0, int id = -1 ) - : LayerItem( displayName, tqparent, after, id ) { makeFolder(); } - LayerFolder( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 ) - : LayerItem( displayName, tqparent, after, id ) { makeFolder(); } + LayerFolder( const TQString &displayName, LayerList *parent, LayerItem *after = 0, int id = -1 ) + : LayerItem( displayName, parent, after, id ) { makeFolder(); } + LayerFolder( const TQString &displayName, LayerItem *parent, LayerItem *after = 0, int id = -1 ) + : LayerItem( displayName, parent, after, id ) { makeFolder(); } }; diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp index 1c58f1dd..6b957a26 100644 --- a/chalk/ui/squeezedcombobox.cpp +++ b/chalk/ui/squeezedcombobox.cpp @@ -35,8 +35,8 @@ #include "squeezedcombobox.h" -SqueezedComboBoxTip::SqueezedComboBoxTip( TQWidget * tqparent, SqueezedComboBox* name ) - : TQToolTip( tqparent ) +SqueezedComboBoxTip::SqueezedComboBoxTip( TQWidget * parent, SqueezedComboBox* name ) + : TQToolTip( parent ) { m_originalWidget = name; } @@ -57,8 +57,8 @@ void SqueezedComboBoxTip::maybeTip( const TQPoint &pos ) } } -SqueezedComboBox::SqueezedComboBox( TQWidget *tqparent, const char *name ) - : TQComboBox( tqparent, name ) +SqueezedComboBox::SqueezedComboBox( TQWidget *parent, const char *name ) + : TQComboBox( parent, name ) { setMinimumWidth(100); m_timer = new TQTimer(this); diff --git a/chalk/ui/squeezedcombobox.h b/chalk/ui/squeezedcombobox.h index 0ca7bb41..03a1cdb9 100644 --- a/chalk/ui/squeezedcombobox.h +++ b/chalk/ui/squeezedcombobox.h @@ -51,10 +51,10 @@ public: * t = new SqueezedComboBoxTip( this->listBox()->viewport(), this ); * @endcode * - * @param tqparent tqparent widget (viewport) - * @param name tqparent widget + * @param parent parent widget (viewport) + * @param name parent widget */ - SqueezedComboBoxTip( TQWidget *tqparent, SqueezedComboBox *name ); + SqueezedComboBoxTip( TQWidget *parent, SqueezedComboBox *name ); protected: /** @@ -87,10 +87,10 @@ class SqueezedComboBox : public TQComboBox public: /** * Constructor - * @param tqparent tqparent widget + * @param parent parent widget * @param name name to give to the widget */ - SqueezedComboBox(TQWidget *tqparent = 0, const char *name = 0 ); + SqueezedComboBox(TQWidget *parent = 0, const char *name = 0 ); /** * destructor diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui index 6dca8768..dba17dac 100644 --- a/chalk/ui/wdgcustombrush.ui +++ b/chalk/ui/wdgcustombrush.ui @@ -98,7 +98,7 @@ <cstring>colorAsMask</cstring> </property> <property name="text"> - <string>Use color as tqmask</string> + <string>Use color as mask</string> </property> </widget> <widget class="TQLayoutWidget"> |