diff options
Diffstat (limited to 'chalk/plugins/tools')
69 files changed, 152 insertions, 152 deletions
diff --git a/chalk/plugins/tools/defaulttools/default_tools.cc b/chalk/plugins/tools/defaulttools/default_tools.cc index 61d06e982..0a9298dad 100644 --- a/chalk/plugins/tools/defaulttools/default_tools.cc +++ b/chalk/plugins/tools/defaulttools/default_tools.cc @@ -56,14 +56,14 @@ typedef KGenericFactory<DefaultTools> DefaultToolsFactory; K_EXPORT_COMPONENT_FACTORY( chalkdefaulttools, DefaultToolsFactory( "chalk" ) ) -DefaultTools::DefaultTools(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +DefaultTools::DefaultTools(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(DefaultToolsFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolFillFactory()); r->add(new KisToolGradientFactory()); diff --git a/chalk/plugins/tools/defaulttools/default_tools.h b/chalk/plugins/tools/defaulttools/default_tools.h index c50a9147b..891f2b9aa 100644 --- a/chalk/plugins/tools/defaulttools/default_tools.h +++ b/chalk/plugins/tools/defaulttools/default_tools.h @@ -36,7 +36,7 @@ class DefaultTools : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - DefaultTools(TQObject *tqparent, const char *name, const TQStringList &); + DefaultTools(TQObject *parent, const char *name, const TQStringList &); virtual ~DefaultTools(); }; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc index 373e0a075..384e4e263 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc @@ -147,9 +147,9 @@ void KisToolBrush::slotSetPaintingMode( int mode ) } -TQWidget* KisToolBrush::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolBrush::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); m_chkDirect = new TQCheckBox(i18n("Paint direct"), widget, "chkDirect"); m_chkDirect->setChecked(true); connect(m_chkDirect, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotSetPaintingMode(int))); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.h b/chalk/plugins/tools/defaulttools/kis_tool_brush.h index a23e8d12a..cc40a8c0f 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_brush.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.h @@ -45,7 +45,7 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } virtual TQ_UINT32 priority() { return 0; } - TQWidget* createOptionWidget(TQWidget* tqparent); + TQWidget* createOptionWidget(TQWidget* parent); protected: diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc index b238e746d..6aff68c8d 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc @@ -221,9 +221,9 @@ void KisToolColorPicker::setup(KActionCollection *collection) } } -TQWidget* KisToolColorPicker::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolColorPicker::createOptionWidget(TQWidget* parent) { - m_optionsWidget = new ColorPickerOptionsWidget(tqparent); + m_optionsWidget = new ColorPickerOptionsWidget(parent); m_optionsWidget->cbUpdateCurrentColour->setChecked(m_updateColor); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h index ab59ef172..b6ee36d32 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h @@ -42,7 +42,7 @@ public: virtual void update(KisCanvasSubject *subject); virtual void setup(KActionCollection *collection); virtual void buttonPress(KisButtonPressEvent *e); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual enumToolType toolType() { return TOOL_FILL; } virtual TQ_UINT32 priority() { return 3; } diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc index 9619c6aea..341bbe9af 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc @@ -230,9 +230,9 @@ TQString KisToolDuplicate::quickHelp() const { return i18n("To start, shift-click on the place you want to duplicate from. Then you can start painting. An indication of where you are copying from will be displayed while drawing and moving the mouse."); } -TQWidget* KisToolDuplicate::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolDuplicate::createOptionWidget(TQWidget* parent) { - TQWidget* widget = KisToolPaint::createOptionWidget(tqparent); + TQWidget* widget = KisToolPaint::createOptionWidget(parent); m_healing = new TQCheckBox(widget); m_healing->setChecked( false); addOptionWidgetOption(m_healing, new TQLabel(i18n("Healing"), widget )); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h index 8a2983180..ec04a592b 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h @@ -52,7 +52,7 @@ public: const double yTilt); virtual TQString quickHelp() const; - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); protected slots: virtual void activate(); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc index 5a919771d..f15bf7781 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc @@ -158,9 +158,9 @@ void KisToolFill::buttonRelease(KisButtonReleaseEvent *e) notifyModified(); } -TQWidget* KisToolFill::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolFill::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); m_lbThreshold = new TQLabel(i18n("Threshold: "), widget); m_slThreshold = new KIntNumInput( widget, "int_widget"); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.h b/chalk/plugins/tools/defaulttools/kis_tool_fill.h index 61087243c..01b1f139f 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.h @@ -55,7 +55,7 @@ public: bool flood(int startX, int startY); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); public slots: virtual void slotSetThreshold(int); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc index 4eb685a58..6df9f8da4 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc @@ -226,9 +226,9 @@ void KisToolGradient::paintLine(KisCanvasPainter& gc) } } -TQWidget* KisToolGradient::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); Q_CHECK_PTR(widget); m_lbShape = new TQLabel(i18n("Shape:"), widget); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h index 59d78ad30..29df8bf7b 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h @@ -67,7 +67,7 @@ public: virtual void paint(KisCanvasPainter& gc); virtual void paint(KisCanvasPainter& gc, const TQRect& rc); - TQWidget* createOptionWidget(TQWidget* tqparent); + TQWidget* createOptionWidget(TQWidget* parent); public slots: void slotSetShape(int); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc index df2479172..bf23b4412 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc @@ -121,10 +121,10 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) TQ_INT32 height = boundingRect.height(); TQ_INT32 width = boundingRect.width(); KisPaintLayer *layer = new KisPaintLayer(img, '"' + text + '"', OPACITY_OPAQUE); - KisGroupLayerSP tqparent = img->rootLayer(); + KisGroupLayerSP parent = img->rootLayer(); if (img->activeLayer()) - tqparent = img->activeLayer()->tqparent(); - img->addLayer(layer, tqparent, img->activeLayer()); + parent = img->activeLayer()->parent(); + img->addLayer(layer, parent, img->activeLayer()); for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { TQRgb pixel = image.pixel(x, y); @@ -155,13 +155,13 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) } void KisToolText::setFont() { - KFontDialog::getFont( m_font, false/*, TQWidget* tqparent! */ ); + KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ ); m_lbFontName->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize())); } -TQWidget* KisToolText::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolText::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); m_lbFont = new TQLabel(i18n("Font: "), widget); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.h b/chalk/plugins/tools/defaulttools/kis_tool_text.h index b2aa7e186..2625fb58d 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.h @@ -47,7 +47,7 @@ public: virtual void buttonPress(KisButtonPressEvent*); virtual void buttonRelease(KisButtonReleaseEvent *e); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); public slots: virtual void setFont(); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc index ff5242d65..4a59c3845 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc @@ -100,7 +100,7 @@ void KisToolSelectBrush::initPaint(KisEvent* /*e*/) KisPaintOp * op = KisPaintOpRegistry::instance()->paintOp("paintbrush", 0, painter()); painter()->setPaintOp(op); // And now the painter owns the op and will destroy it. - // Set the cursor -- ideally. this should be a tqmask created from the brush, + // Set the cursor -- ideally. this should be a mask created from the brush, // now that X11 can handle colored cursors. #if 0 // Setting cursors has no effect until the tool is selected again; this @@ -143,12 +143,12 @@ void KisToolSelectBrush::setup(KActionCollection *collection) } } -TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* parent) { - Q_UNUSED(tqparent); + Q_UNUSED(parent); // Commented out due to the fact that this doesn't actually work if you change the action #if 0 - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Brush")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h index 374050f67..faeb32d8b 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h @@ -47,7 +47,7 @@ public: virtual void setup(KActionCollection *collection); virtual TQ_UINT32 priority() { return 1; } virtual enumToolType toolType() { return TOOL_SELECT; } - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); public slots: diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc index c4c908fc6..cc1646808 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc @@ -183,9 +183,9 @@ void KisToolSelectContiguous::slotSetAction(int action) } -TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent) { - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Contiguous Area Selection")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h index e4beb6b7e..688276e0d 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h @@ -54,7 +54,7 @@ public: virtual TQ_UINT32 priority() { return 7; } virtual enumToolType toolType() { return TOOL_SELECT; }; - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void buttonPress(KisButtonPressEvent *event); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc index efdae2f32..d16ab740e 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc @@ -297,9 +297,9 @@ void KisToolSelectElliptical::setup(KActionCollection *collection) } } -TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent) { - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Elliptical Selection")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h index f0d1a039c..4c21cfcdc 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h @@ -46,7 +46,7 @@ public: virtual void setup(KActionCollection *collection); virtual TQ_UINT32 priority() { return 4; } - virtual TQWidget * createOptionWidget(TQWidget* tqparent); + virtual TQWidget * createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual enumToolType toolType() { return TOOL_SELECT; } diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc index 58a7778c0..118281e17 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc @@ -100,7 +100,7 @@ void KisToolSelectEraser::initPaint(KisEvent */*e*/) KisPaintOp * op = KisPaintOpRegistry::instance()->paintOp("eraser", 0, painter()); painter()->setPaintOp(op); // And now the painter owns the op and will destroy it. - // Set the cursor -- ideally. this should be a tqmask created from the brush, + // Set the cursor -- ideally. this should be a mask created from the brush, // now that X11 can handle colored cursors. #if 0 // Setting cursors has no effect until the tool is selected again; this @@ -130,12 +130,12 @@ void KisToolSelectEraser::setup(KActionCollection *collection) } } -TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* parent) { - Q_UNUSED(tqparent); + Q_UNUSED(parent); // Commented out due to the fact that this doesn't actually work if you change the action #if 0 - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Eraser")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h index 85bd55097..c796ec3c7 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h @@ -45,7 +45,7 @@ public: virtual void setup(KActionCollection *collection); virtual TQ_UINT32 priority() { return 2; } virtual enumToolType toolType() { return TOOL_SELECT; } - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); public slots: diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc index b81762fb4..8bac379ce 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc @@ -267,9 +267,9 @@ void KisToolSelectOutline::setup(KActionCollection *collection) } -TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent) { - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Outline Selection")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h index 74ecab780..08119c96a 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h @@ -52,7 +52,7 @@ public: virtual void move(KisMoveEvent *event); virtual void buttonRelease(KisButtonReleaseEvent *event); - TQWidget* createOptionWidget(TQWidget* tqparent); + TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); public slots: diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc index 7bac7cc32..85a53c94c 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc @@ -286,9 +286,9 @@ void KisToolSelectPolygonal::setup(KActionCollection *collection) } -TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent) { - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Polygonal Selection")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h index 65a32ee6b..6e2d62fa8 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h @@ -58,7 +58,7 @@ public: virtual void doubleClick(KisDoubleClickEvent * event); void finish(); - TQWidget* createOptionWidget(TQWidget* tqparent); + TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); public slots: diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc index aa7052af3..54bfbdd6d 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc @@ -298,9 +298,9 @@ void KisToolSelectRectangular::setup(KActionCollection *collection) } } -TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent) { - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Rectangular Selection")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h index eb286ccad..b2f8ecad4 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h @@ -44,7 +44,7 @@ public: virtual void setup(KActionCollection *collection); virtual TQ_UINT32 priority() { return 3; } virtual enumToolType toolType() { return TOOL_SELECT; } - virtual TQWidget * createOptionWidget(TQWidget* tqparent); + virtual TQWidget * createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void paint(KisCanvasPainter& gc); diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cc b/chalk/plugins/tools/selectiontools/selection_tools.cc index db4df1ab0..fb0e61912 100644 --- a/chalk/plugins/tools/selectiontools/selection_tools.cc +++ b/chalk/plugins/tools/selectiontools/selection_tools.cc @@ -51,14 +51,14 @@ typedef KGenericFactory<SelectionTools> SelectionToolsFactory; K_EXPORT_COMPONENT_FACTORY( chalkselectiontools, SelectionToolsFactory( "chalk" ) ) -SelectionTools::SelectionTools(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +SelectionTools::SelectionTools(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(SelectionToolsFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolSelectOutlineFactory()); r->add(new KisToolSelectPolygonalFactory()); r->add(new KisToolSelectRectangularFactory()); diff --git a/chalk/plugins/tools/selectiontools/selection_tools.h b/chalk/plugins/tools/selectiontools/selection_tools.h index 2e448e3ed..b3650ff2e 100644 --- a/chalk/plugins/tools/selectiontools/selection_tools.h +++ b/chalk/plugins/tools/selectiontools/selection_tools.h @@ -36,7 +36,7 @@ class SelectionTools : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - SelectionTools(TQObject *tqparent, const char *name, const TQStringList &); + SelectionTools(TQObject *parent, const char *name, const TQStringList &); virtual ~SelectionTools(); }; diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc index 0d7d9728e..8f5c9e5f8 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc @@ -698,9 +698,9 @@ void KisToolCrop::setOptionWidgetRatio(double ratio) } -TQWidget* KisToolCrop::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolCrop::createOptionWidget(TQWidget* parent) { - m_optWidget = new WdgToolCrop(tqparent); + m_optWidget = new WdgToolCrop(parent); Q_CHECK_PTR(m_optWidget); connect(m_optWidget->bnCrop, TQT_SIGNAL(clicked()), this, TQT_SLOT(crop())); diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.h b/chalk/plugins/tools/tool_crop/kis_tool_crop.h index 7ad7c9fdb..0f4f677ad 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.h +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.h @@ -50,7 +50,7 @@ public: virtual void update(KisCanvasSubject *subject); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void setup(KActionCollection *collection); diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cc b/chalk/plugins/tools/tool_crop/tool_crop.cc index 599c7562c..c624d62f8 100644 --- a/chalk/plugins/tools/tool_crop/tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/tool_crop.cc @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolCrop> ToolCropFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolcrop, ToolCropFactory( "chalk" ) ) -ToolCrop::ToolCrop(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolCrop::ToolCrop(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolCropFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolCropFactory()); } diff --git a/chalk/plugins/tools/tool_crop/tool_crop.h b/chalk/plugins/tools/tool_crop/tool_crop.h index df5d7c28a..263fb1c29 100644 --- a/chalk/plugins/tools/tool_crop/tool_crop.h +++ b/chalk/plugins/tools/tool_crop/tool_crop.h @@ -31,7 +31,7 @@ class ToolCrop : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolCrop(TQObject *tqparent, const char *name, const TQStringList &); + ToolCrop(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolCrop(); private: diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc index 08becf67c..d4a8605d8 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc @@ -552,12 +552,12 @@ void KisToolCurve::selectCurve() draw(false); } -TQWidget* KisToolCurve::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolCurve::createOptionWidget(TQWidget* parent) { if (toolType() == TOOL_SHAPE || toolType() == TOOL_FREEHAND) - return super::createOptionWidget(tqparent); + return super::createOptionWidget(parent); else if (toolType() == TOOL_SELECT) - return createSelectionOptionWidget(tqparent); + return createSelectionOptionWidget(parent); else kdDebug(0) << "NO SUPPORT FOR THIS TOOL TYPE" << endl; return 0; @@ -568,9 +568,9 @@ void KisToolCurve::slotSetAction(int action) { m_selectAction =(enumSelectionMode)action; } -TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* tqparent) +TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent) { - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(m_UIName); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.h b/chalk/plugins/tools/tool_curves/kis_tool_curve.h index 74d1ccda5..d1c0886c4 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.h @@ -51,7 +51,7 @@ public: virtual ~KisToolCurve(); virtual void update (KisCanvasSubject *subject); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual void buttonPress(KisButtonPressEvent *event); virtual void move(KisMoveEvent *event); @@ -179,7 +179,7 @@ public: /* * This initializes our Option Widget (called by createOptionWidget()) */ - virtual TQWidget* createSelectionOptionWidget(TQWidget* tqparent); + virtual TQWidget* createSelectionOptionWidget(TQWidget* parent); /* * This return our internal KisSelectionOptions if toolType() returns TOOL_SELECT diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc index 4b7e51d4b..42806771f 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc @@ -100,14 +100,14 @@ public: m_hCost = node.hCost(); m_tCost = node.tCost(); m_malus = node.malus(); - m_parent = node.tqparent(); + m_parent = node.parent(); } - Node(const TQPoint& tqparent, const TQPoint& pos, int g, int h, bool malus) + Node(const TQPoint& parent, const TQPoint& pos, int g, int h, bool malus) : m_pos(pos), m_hCost(h), m_malus(malus) { setGCost(g); - m_parent = tqparent; + m_parent = parent; } ~Node () { @@ -120,7 +120,7 @@ public: TQPoint pos () const {return m_pos;} int col () const {return m_pos.x();} int row () const {return m_pos.y();} - TQPoint tqparent () const {return m_parent;} + TQPoint parent () const {return m_parent;} void setGCost (int g) { @@ -230,8 +230,8 @@ KisKernelSP createKernel( TQ_INT32 i0, TQ_INT32 i1, TQ_INT32 i2, return kernel; } -KisCurveMagnetic::KisCurveMagnetic (KisToolMagnetic *tqparent) - : m_parent(tqparent) +KisCurveMagnetic::KisCurveMagnetic (KisToolMagnetic *parent) + : m_parent(parent) { m_standardkeepselected = false; } @@ -299,9 +299,9 @@ void KisCurveMagnetic::calculateCurve (KisCurve::iterator p1, KisCurve::iterator int col = (*i).col(); int row = (*i).row(); if ((*i) == endNode) { - while (current.tqparent() != TQPoint(-1,-1)) { + while (current.parent() != TQPoint(-1,-1)) { it = addPoint(it,KisPoint(tl+current.pos()),false,false,LINEHINT); - current = closedMatrix[current.tqparent().x()][current.tqparent().y()]; + current = closedMatrix[current.parent().x()][current.parent().y()]; } return; } @@ -759,9 +759,9 @@ void KisToolMagnetic::slotSetDistance (int dist) m_distance = dist; } -TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent) { - m_optWidget = super::createOptionWidget(tqparent); + m_optWidget = super::createOptionWidget(parent); TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); TQGridLayout *box = new TQGridLayout(l, 2, 2, 3); box->setColStretch(0, 1); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.h b/chalk/plugins/tools/tool_curves/kis_tool_moutline.h index ac7327fe8..ca15aaef0 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.h @@ -53,7 +53,7 @@ class KisCurveMagnetic : public KisCurve { public: - KisCurveMagnetic (KisToolMagnetic *tqparent); + KisCurveMagnetic (KisToolMagnetic *parent); ~KisCurveMagnetic (); virtual KisCurve::iterator addPivot (iterator, const KisPoint&); @@ -88,7 +88,7 @@ public: virtual KisCurve::iterator selectByMouse(KisCurve::iterator it); bool editingMode() {return m_editingMode;} - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); public slots: diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cc index f9f5be337..d941c2dc0 100644 --- a/chalk/plugins/tools/tool_curves/tool_curves.cc +++ b/chalk/plugins/tools/tool_curves/tool_curves.cc @@ -45,14 +45,14 @@ typedef KGenericFactory<ToolCurves> ToolCurvesFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolcurves, ToolCurvesFactory( "chalk" ) ) -ToolCurves::ToolCurves(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolCurves::ToolCurves(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolCurvesFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( tqparent ); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( parent ); r->add(new KisToolBezierPaintFactory()); r->add(new KisToolBezierSelectFactory()); r->add(new KisToolMagneticFactory()); diff --git a/chalk/plugins/tools/tool_curves/tool_curves.h b/chalk/plugins/tools/tool_curves/tool_curves.h index 82199e48b..64bd1507f 100644 --- a/chalk/plugins/tools/tool_curves/tool_curves.h +++ b/chalk/plugins/tools/tool_curves/tool_curves.h @@ -28,7 +28,7 @@ class ToolCurves : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolCurves(TQObject *tqparent, const char *name, const TQStringList &); + ToolCurves(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolCurves(); }; diff --git a/chalk/plugins/tools/tool_filter/kis_filterop.cc b/chalk/plugins/tools/tool_filter/kis_filterop.cc index 2296965c2..3c34abcec 100644 --- a/chalk/plugins/tools/tool_filter/kis_filterop.cc +++ b/chalk/plugins/tools/tool_filter/kis_filterop.cc @@ -82,14 +82,14 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) splitCoordinate(pt.x(), &x, &xFraction); splitCoordinate(pt.y(), &y, &yFraction); - // Filters always work with a tqmask, never with an image; that + // Filters always work with a mask, never with an image; that // wouldn't be useful at all. - KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction); + KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction); m_painter->setPressure(info.pressure); - TQ_INT32 maskWidth = tqmask->width(); - TQ_INT32 maskHeight = tqmask->height(); + TQ_INT32 maskWidth = mask->width(); + TQ_INT32 maskHeight = mask->height(); // Create a temporary paint device KisPaintDeviceSP tmpDev = new KisPaintDevice(colorSpace, "filterop tmpdev"); @@ -105,14 +105,14 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) filter->process( tmpDev, tmpDev, m_filterConfiguration, TQRect( 0, 0, maskWidth, maskHeight )); filter->enableProgress(); - // Apply the tqmask on the paint device (filter before tqmask because edge pixels may be important) + // Apply the mask on the paint device (filter before mask because edge pixels may be important) for (int y = 0; y < maskHeight; y++) { KisHLineIterator hiter = tmpDev->createHLineIterator(0, y, maskWidth, false); int x=0; while(! hiter.isDone()) { - TQ_UINT8 alpha = tqmask->alphaAt( x++, y ); + TQ_UINT8 alpha = mask->alphaAt( x++, y ); colorSpace->setAlpha(hiter.rawData(), alpha, 1); ++hiter; diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc index e9fdad9ec..e53c96da8 100644 --- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc +++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc @@ -96,9 +96,9 @@ void KisToolFilter::initPaint(KisEvent *e) dynamic_cast<KisFilterOp *>(op)->setFilterConfiguration( m_filter->configuration( m_filterConfigurationWidget) ); } -TQWidget* KisToolFilter::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolFilter::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); m_cbFilter = new KisCmbIDList(widget); Q_CHECK_PTR(m_cbFilter); diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.h b/chalk/plugins/tools/tool_filter/kis_tool_filter.h index e8b5e86b7..651fbfb89 100644 --- a/chalk/plugins/tools/tool_filter/kis_tool_filter.h +++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.h @@ -46,7 +46,7 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_FREEHAND; } virtual TQ_UINT32 priority() { return 1; } - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); public slots: void changeFilter( const KisID & filter); diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cc b/chalk/plugins/tools/tool_filter/tool_filter.cc index 484ed39ac..b5d7c4b56 100644 --- a/chalk/plugins/tools/tool_filter/tool_filter.cc +++ b/chalk/plugins/tools/tool_filter/tool_filter.cc @@ -44,14 +44,14 @@ typedef KGenericFactory<ToolFilter> ToolFilterFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolfilter, ToolFilterFactory( "chalk" ) ) -ToolFilter::ToolFilter(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolFilter::ToolFilter(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolFilterFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add( new KisToolFilterFactory()); // XXX: Put this in a separate plugin? diff --git a/chalk/plugins/tools/tool_filter/tool_filter.h b/chalk/plugins/tools/tool_filter/tool_filter.h index 7bf33dca5..fba259c73 100644 --- a/chalk/plugins/tools/tool_filter/tool_filter.h +++ b/chalk/plugins/tools/tool_filter/tool_filter.h @@ -31,7 +31,7 @@ class ToolFilter : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolFilter(TQObject *tqparent, const char *name, const TQStringList &); + ToolFilter(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolFilter(); private: diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc index 061db8815..ae07e5895 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc @@ -485,7 +485,7 @@ void KisToolPerspectiveGrid::setup(KActionCollection *collection) } -// TQWidget* KisToolPerspectiveGrid::createOptionWidget(TQWidget* tqparent) +// TQWidget* KisToolPerspectiveGrid::createOptionWidget(TQWidget* parent) // { // return 0; // } diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h index 69f6407ab..f7415f630 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h @@ -56,7 +56,7 @@ public: virtual void move(KisMoveEvent *event); virtual void buttonRelease(KisButtonReleaseEvent *event); -// TQWidget* createOptionWidget(TQWidget* tqparent); +// TQWidget* createOptionWidget(TQWidget* parent); // virtual TQWidget* optionWidget(); public slots: diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc index 69158e21f..12615387f 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolPerspectiveGrid> ToolPerspectiveGridFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivegrid, ToolPerspectiveGridFactory( "chalk" ) ) -ToolPerspectiveGrid::ToolPerspectiveGrid(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolPerspectiveGrid::ToolPerspectiveGrid(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolPerspectiveGridFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolPerspectiveGridFactory()); } diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h index aed4a60cd..aeb99c746 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h +++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h @@ -31,7 +31,7 @@ class ToolPerspectiveGrid : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolPerspectiveGrid(TQObject *tqparent, const char *name, const TQStringList &); + ToolPerspectiveGrid(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolPerspectiveGrid(); private: diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc index dbcfd74c0..07598b7de 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc +++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc @@ -681,10 +681,10 @@ void KisToolPerspectiveTransform::slotLayerActivated(KisLayerSP) } -TQWidget* KisToolPerspectiveTransform::createOptionWidget(TQWidget* /*tqparent*/) +TQWidget* KisToolPerspectiveTransform::createOptionWidget(TQWidget* /*parent*/) { #if 0 - m_optWidget = new WdgToolPerspectiveTransform(tqparent); + m_optWidget = new WdgToolPerspectiveTransform(parent); Q_CHECK_PTR(m_optWidget); m_optWidget->cmbFilter->clear(); diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h index 5d637ae54..690e356ca 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h +++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h @@ -53,7 +53,7 @@ public: KisToolPerspectiveTransform(); virtual ~KisToolPerspectiveTransform(); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void setup(KActionCollection *collection); diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc index 2c3c85d48..24d716201 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc +++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc @@ -42,15 +42,15 @@ typedef KGenericFactory<ToolPerspectiveTransform> ToolPerspectiveTransformFactor K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivetransform, ToolPerspectiveTransformFactory( "chalk" ) ) -ToolPerspectiveTransform::ToolPerspectiveTransform(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolPerspectiveTransform::ToolPerspectiveTransform(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolPerspectiveTransformFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { kdDebug() << " add perspective transform tool to the registry" << endl; - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolPerspectiveTransformFactory()); } diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h index 1cbeadee3..af412a587 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h +++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h @@ -31,7 +31,7 @@ class ToolPerspectiveTransform : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolPerspectiveTransform(TQObject *tqparent, const char *name, const TQStringList &); + ToolPerspectiveTransform(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolPerspectiveTransform(); private: diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cc b/chalk/plugins/tools/tool_polygon/tool_polygon.cc index 3dbd15d62..5ace60794 100644 --- a/chalk/plugins/tools/tool_polygon/tool_polygon.cc +++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cc @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolPolygon> ToolPolygonFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolpolygon, ToolPolygonFactory( "chalk" ) ) -ToolPolygon::ToolPolygon(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolPolygon::ToolPolygon(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolPolygonFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( tqparent ); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( parent ); r->add(new KisToolPolygonFactory()); } diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.h b/chalk/plugins/tools/tool_polygon/tool_polygon.h index ec816736c..b6f35bc66 100644 --- a/chalk/plugins/tools/tool_polygon/tool_polygon.h +++ b/chalk/plugins/tools/tool_polygon/tool_polygon.h @@ -31,7 +31,7 @@ class ToolPolygon : public KParts::Plugin public: - ToolPolygon(TQObject *tqparent, const char *name, const TQStringList &); + ToolPolygon(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolPolygon(); }; diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cc b/chalk/plugins/tools/tool_polyline/tool_polyline.cc index 369169c9f..fe9eb0024 100644 --- a/chalk/plugins/tools/tool_polyline/tool_polyline.cc +++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cc @@ -43,14 +43,14 @@ typedef KGenericFactory<ToolPolyline> ToolPolylineFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolpolyline, ToolPolylineFactory( "chalk" ) ) -ToolPolyline::ToolPolyline(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolPolyline::ToolPolyline(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolPolylineFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolPolylineFactory()); } diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.h b/chalk/plugins/tools/tool_polyline/tool_polyline.h index 9f483363f..fdfa5427b 100644 --- a/chalk/plugins/tools/tool_polyline/tool_polyline.h +++ b/chalk/plugins/tools/tool_polyline/tool_polyline.h @@ -31,7 +31,7 @@ class ToolPolyline : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolPolyline(TQObject *tqparent, const char *name, const TQStringList &); + ToolPolyline(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolPolyline(); private: diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc index 2dfe40f14..700efa4b6 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc @@ -226,9 +226,9 @@ void KisToolSelectSimilar::slotSetAction(int action) m_defaultSelectAction = (enumSelectionMode)action; } -TQWidget* KisToolSelectSimilar::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectSimilar::createOptionWidget(TQWidget* parent) { - m_optWidget = new TQWidget(tqparent); + m_optWidget = new TQWidget(parent); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Similar Selection")); diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h index d98659d05..d29750408 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h @@ -61,7 +61,7 @@ public slots: virtual void slotSetAction(int); private: - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void buttonPress(KisButtonPressEvent *e); diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc index 539f534a0..95c315d80 100644 --- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc @@ -41,14 +41,14 @@ typedef KGenericFactory<SelectSimilar> SelectSimilarFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolselectsimilar, SelectSimilarFactory( "chalk" ) ) -SelectSimilar::SelectSimilar(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +SelectSimilar::SelectSimilar(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(SelectSimilarFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolSelectSimilarFactory()); } } diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h index a0588bfb9..a858b3365 100644 --- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h +++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h @@ -26,7 +26,7 @@ class SelectSimilar : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - SelectSimilar(TQObject *tqparent, const char *name, const TQStringList &); + SelectSimilar(TQObject *parent, const char *name, const TQStringList &); virtual ~SelectSimilar(); diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cc index 3a804f890..037f6bb52 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.cc +++ b/chalk/plugins/tools/tool_star/kis_tool_star.cc @@ -225,9 +225,9 @@ vKisPoint KisToolStar::starCoordinates(int N, double mx, double my, double x, do return starCoordinatesArray; } -TQWidget* KisToolStar::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolStar::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); m_optWidget = new WdgToolStar(widget); Q_CHECK_PTR(m_optWidget); diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.h b/chalk/plugins/tools/tool_star/kis_tool_star.h index 3bd8df2ba..947dae25c 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.h +++ b/chalk/plugins/tools/tool_star/kis_tool_star.h @@ -46,7 +46,7 @@ public: virtual void update (KisCanvasSubject *subject); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); // // KisToolPaint interface diff --git a/chalk/plugins/tools/tool_star/tool_star.cc b/chalk/plugins/tools/tool_star/tool_star.cc index e399fafa6..dc40edf9f 100644 --- a/chalk/plugins/tools/tool_star/tool_star.cc +++ b/chalk/plugins/tools/tool_star/tool_star.cc @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolStar> ToolStarFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolstar, ToolStarFactory( "chalk" ) ) -ToolStar::ToolStar(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolStar::ToolStar(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolStarFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( tqparent ); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( parent ); r->add(new KisToolStarFactory()); } diff --git a/chalk/plugins/tools/tool_star/tool_star.h b/chalk/plugins/tools/tool_star/tool_star.h index 36172dd6c..7ac973a2f 100644 --- a/chalk/plugins/tools/tool_star/tool_star.h +++ b/chalk/plugins/tools/tool_star/tool_star.h @@ -31,7 +31,7 @@ class ToolStar : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolStar(TQObject *tqparent, const char *name, const TQStringList &); + ToolStar(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolStar(); private: diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc index 5b828122c..d6759dca2 100644 --- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc +++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc @@ -856,10 +856,10 @@ void KisToolTransform::slotLayerActivated(KisLayerSP) } -TQWidget* KisToolTransform::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolTransform::createOptionWidget(TQWidget* parent) { - m_optWidget = new WdgToolTransform(tqparent); + m_optWidget = new WdgToolTransform(parent); Q_CHECK_PTR(m_optWidget); m_optWidget->cmbFilter->clear(); diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.h b/chalk/plugins/tools/tool_transform/kis_tool_transform.h index a98cd4f72..70502d605 100644 --- a/chalk/plugins/tools/tool_transform/kis_tool_transform.h +++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.h @@ -48,7 +48,7 @@ public: KisToolTransform(); virtual ~KisToolTransform(); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void setup(KActionCollection *collection); diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cc b/chalk/plugins/tools/tool_transform/tool_transform.cc index 2ee002ded..b50499f06 100644 --- a/chalk/plugins/tools/tool_transform/tool_transform.cc +++ b/chalk/plugins/tools/tool_transform/tool_transform.cc @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolTransform> ToolTransformFactory; K_EXPORT_COMPONENT_FACTORY( chalktooltransform, ToolTransformFactory( "chalk" ) ) -ToolTransform::ToolTransform(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolTransform::ToolTransform(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolTransformFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); KisToolTransformFactory * f = new KisToolTransformFactory(); Q_CHECK_PTR(f); r->add(f); diff --git a/chalk/plugins/tools/tool_transform/tool_transform.h b/chalk/plugins/tools/tool_transform/tool_transform.h index 04bfbaa90..9c4025630 100644 --- a/chalk/plugins/tools/tool_transform/tool_transform.h +++ b/chalk/plugins/tools/tool_transform/tool_transform.h @@ -31,7 +31,7 @@ class ToolTransform : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolTransform(TQObject *tqparent, const char *name, const TQStringList &); + ToolTransform(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolTransform(); private: |