diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 04766b207afba7961d4d802313e426f5a2fbef63 (patch) | |
| tree | c888ea1027c793e2d0386a7e5a1a0cd077b03cb3 /chalk/plugins | |
| parent | b6edfe41c9395f2e20784cbf0e630af6426950a3 (diff) | |
| download | koffice-04766b207afba7961d4d802313e426f5a2fbef63.tar.gz koffice-04766b207afba7961d4d802313e426f5a2fbef63.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'chalk/plugins')
267 files changed, 797 insertions, 797 deletions
diff --git a/chalk/plugins/filters/blur/blur.cc b/chalk/plugins/filters/blur/blur.cc index bcf798b9e..69bac7b1d 100644 --- a/chalk/plugins/filters/blur/blur.cc +++ b/chalk/plugins/filters/blur/blur.cc @@ -27,8 +27,8 @@ typedef KGenericFactory<BlurFilterPlugin> BlurFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkblurfilter, BlurFilterPluginFactory( "chalk" ) ) -BlurFilterPlugin::BlurFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +BlurFilterPlugin::BlurFilterPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(BlurFilterPluginFactory::instance()); @@ -36,11 +36,11 @@ BlurFilterPlugin::BlurFilterPlugin(TQObject *tqparent, const char *name, const T kdDebug(41006) << "Extensions Convolution Filters plugin. Class: " << className() << ", Parent: " - << tqparent -> className() + << parent -> className() << "\n"; - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisBlurFilter()); } } diff --git a/chalk/plugins/filters/blur/blur.h b/chalk/plugins/filters/blur/blur.h index 8ce31706e..239d05d0b 100644 --- a/chalk/plugins/filters/blur/blur.h +++ b/chalk/plugins/filters/blur/blur.h @@ -30,7 +30,7 @@ class BlurFilterPlugin : public KParts::Plugin { public: - BlurFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + BlurFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~BlurFilterPlugin(); }; diff --git a/chalk/plugins/filters/blur/kis_blur_filter.cc b/chalk/plugins/filters/blur/kis_blur_filter.cc index 8709c073b..0217b7e17 100644 --- a/chalk/plugins/filters/blur/kis_blur_filter.cc +++ b/chalk/plugins/filters/blur/kis_blur_filter.cc @@ -56,9 +56,9 @@ KisBlurFilter::KisBlurFilter() : KisFilter(id(), "blur", i18n("&Blur...")) { } -KisFilterConfigWidget * KisBlurFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisBlurFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { - return new KisWdgBlur(this, tqparent, "configuration of color to alpha"); + return new KisWdgBlur(this, parent, "configuration of color to alpha"); } KisFilterConfiguration* KisBlurFilter::configuration(TQWidget* w) @@ -110,19 +110,19 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte kas = new KisAutobrushCircleShape(width, height, hFade, vFade); break; } - TQImage tqmask; - kas->createBrush(&tqmask); + TQImage mask; + kas->createBrush(&mask); - tqmask.convertDepth(1); + mask.convertDepth(1); if( rotate != 0) { TQWMatrix m; m.rotate( rotate ); - tqmask = tqmask.xForm( m ); - if( (tqmask.height() & 1) || tqmask.width() & 1) + mask = mask.xForm( m ); + if( (mask.height() & 1) || mask.width() & 1) { - tqmask.smoothScale( tqmask.width() + !(tqmask.width() & 1), tqmask.height() + !(tqmask.height() & 1) ); + mask.smoothScale( mask.width() + !(mask.width() & 1), mask.height() + !(mask.height() & 1) ); } } @@ -130,7 +130,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte if (m_progressDisplay) m_progressDisplay->setSubject( &painter, true, true ); - KisKernelSP kernel = kernelFromTQImage(tqmask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage + KisKernelSP kernel = kernelFromTQImage(mask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage painter.applyMatrix(kernel, rect.x(), rect.y(), rect.width(), rect.height(), BORDER_REPEAT, KisChannelInfo::FLAG_COLOR_AND_ALPHA); diff --git a/chalk/plugins/filters/blur/kis_blur_filter.h b/chalk/plugins/filters/blur/kis_blur_filter.h index 886551864..b1d2a65a1 100644 --- a/chalk/plugins/filters/blur/kis_blur_filter.h +++ b/chalk/plugins/filters/blur/kis_blur_filter.h @@ -42,7 +42,7 @@ class KisBlurFilter : public KisFilter virtual bool supportsThreading() { return false; } virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.cc b/chalk/plugins/filters/blur/kis_wdg_blur.cc index bfed7474c..dc836971f 100644 --- a/chalk/plugins/filters/blur/kis_wdg_blur.cc +++ b/chalk/plugins/filters/blur/kis_wdg_blur.cc @@ -32,7 +32,7 @@ #include "wdgblur.h" -KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) +KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) { Q_UNUSED( nfilter ); diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.h b/chalk/plugins/filters/blur/kis_wdg_blur.h index c0cc4834f..f305df252 100644 --- a/chalk/plugins/filters/blur/kis_wdg_blur.h +++ b/chalk/plugins/filters/blur/kis_wdg_blur.h @@ -35,7 +35,7 @@ class KisWdgBlur : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgBlur( KisFilter* nfilter, TQWidget * tqparent, const char * name); + KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name); inline WdgBlur* widget() { return m_widget; }; virtual void setConfiguration(KisFilterConfiguration*); private slots: diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cc b/chalk/plugins/filters/bumpmap/bumpmap.cc index 455889d5a..4ae92469c 100644 --- a/chalk/plugins/filters/bumpmap/bumpmap.cc +++ b/chalk/plugins/filters/bumpmap/bumpmap.cc @@ -72,14 +72,14 @@ typedef KGenericFactory<ChalkBumpmap> ChalkBumpmapFactory; K_EXPORT_COMPONENT_FACTORY( chalkbumpmap, ChalkBumpmapFactory( "chalk" ) ) -ChalkBumpmap::ChalkBumpmap(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkBumpmap::ChalkBumpmap(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkBumpmapFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterBumpmap()); } } @@ -347,9 +347,9 @@ void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi } -KisFilterConfigWidget * KisFilterBumpmap::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisFilterBumpmap::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev) { - KisBumpmapConfigWidget * w = new KisBumpmapConfigWidget(this, dev, tqparent); + KisBumpmapConfigWidget * w = new KisBumpmapConfigWidget(this, dev, parent); return w; @@ -456,8 +456,8 @@ TQString KisBumpmapConfiguration::toString() return KisFilterConfiguration::toString(); } -KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter *, KisPaintDeviceSP dev, TQWidget * tqparent, const char * name, WFlags f) - : KisFilterConfigWidget(tqparent, name, f) +KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter *, KisPaintDeviceSP dev, TQWidget * parent, const char * name, WFlags f) + : KisFilterConfigWidget(parent, name, f) { m_page = new WdgBumpmap(this); TQHBoxLayout * l = new TQHBoxLayout(this); diff --git a/chalk/plugins/filters/bumpmap/bumpmap.h b/chalk/plugins/filters/bumpmap/bumpmap.h index b1c16b1aa..efaf4058f 100644 --- a/chalk/plugins/filters/bumpmap/bumpmap.h +++ b/chalk/plugins/filters/bumpmap/bumpmap.h @@ -49,7 +49,7 @@ using namespace chalk; class ChalkBumpmap : public KParts::Plugin { public: - ChalkBumpmap(TQObject *tqparent, const char *name, const TQStringList &); + ChalkBumpmap(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkBumpmap(); }; @@ -76,7 +76,7 @@ public: virtual bool supportsAdjustmentLayers() { return false; } virtual bool supportsThreading() { return false; } - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration(); @@ -116,7 +116,7 @@ class KisBumpmapConfigWidget : public KisFilterConfigWidget { TQ_OBJECT public: - KisBumpmapConfigWidget(KisFilter * filter, KisPaintDeviceSP dev, TQWidget * tqparent, const char * name = 0, WFlags f = 0 ); + KisBumpmapConfigWidget(KisFilter * filter, KisPaintDeviceSP dev, TQWidget * parent, const char * name = 0, WFlags f = 0 ); virtual ~KisBumpmapConfigWidget() {}; KisBumpmapConfiguration * config(); diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h index 8d6a24f65..abd1bb66c 100644 --- a/chalk/plugins/filters/cimg/CImg.h +++ b/chalk/plugins/filters/cimg/CImg.h @@ -659,7 +659,7 @@ namespace cimg_library { - \b CImgDisplayException : Thrown when an error occured when trying to display an image in a window. This exception is thrown when image display request cannot be satisfied. - The tqparent class CImgException may be thrown itself when errors that cannot be classified in one of + The parent class CImgException may be thrown itself when errors that cannot be classified in one of the above type occur. It is recommended not to throw CImgExceptions yourself, since there are normally reserved to %CImg Library functions. \b CImgInstanceException, \b CImgArgumentException, \b CImgIOException and \b CImgDisplayException are simple @@ -4425,11 +4425,11 @@ namespace cimg_library { pthread_mutex_lock(cimg::X11attr().mutex); for (unsigned int i=0; i<cimg::X11attr().nb_wins; i++) { const unsigned int xevent_type = (cimg::X11attr().wins[i]->events)&3; - const unsigned int etqmask = + const unsigned int emask = ((xevent_type>=1)?ExposureMask|StructureNotifyMask:0)| ((xevent_type>=2)?ButtonPressMask|KeyPressMask|PointerMotionMask|LeaveWindowMask:0)| ((xevent_type>=3)?ButtonReleaseMask|KeyReleaseMask:0); - XSelectInput(cimg::X11attr().display,cimg::X11attr().wins[i]->window,etqmask); + XSelectInput(cimg::X11attr().display,cimg::X11attr().wins[i]->window,emask); } bool event_flag = XCheckTypedEvent(cimg::X11attr().display, ClientMessage, &event); if (!event_flag) event_flag = XCheckMaskEvent(cimg::X11attr().display, @@ -4599,10 +4599,10 @@ namespace cimg_library { do { pthread_mutex_lock(cimg::X11attr().mutex); const unsigned int - etqmask = ExposureMask|StructureNotifyMask| + emask = ExposureMask|StructureNotifyMask| ((events>=2)?ButtonPressMask|KeyPressMask|PointerMotionMask|LeaveWindowMask:0)| ((events>=3)?ButtonReleaseMask|KeyReleaseMask:0); - XSelectInput(cimg::X11attr().display,window,etqmask); + XSelectInput(cimg::X11attr().display,window,emask); XPeekEvent(cimg::X11attr().display,&event); cimg::X11attr().thread_finished = false; pthread_mutex_unlock(cimg::X11attr().mutex); @@ -7867,13 +7867,13 @@ namespace cimg_library { CImg get_resize_halfXY() const { typedef typename cimg::largest<T,float>::type ftype; if (is_empty()) return CImg<T>(); - CImg<ftype> tqmask = CImg<ftype>::matrix(0.07842776544f, 0.1231940459f, 0.07842776544f, + CImg<ftype> mask = CImg<ftype>::matrix(0.07842776544f, 0.1231940459f, 0.07842776544f, 0.1231940459f, 0.1935127547f, 0.1231940459f, 0.07842776544f, 0.1231940459f, 0.07842776544f); CImg_3x3x1(I,ftype); CImg dest(width/2,height/2,depth,dim); cimg_mapZV(*this,z,k) cimg_map3x3x1(*this,x,y,z,k,I) - if (x%2 && y%2) dest(x/2,y/2,z,k) = (T)cimg_conv3x3x1(I,tqmask); + if (x%2 && y%2) dest(x/2,y/2,z,k) = (T)cimg_conv3x3x1(I,mask); return dest; } @@ -8816,7 +8816,7 @@ namespace cimg_library { CImg_2x2x1(I,restype); cimg_mapZV(*this,z,k) cimg_map2x2x1(*this,x,y,z,k,I) { res[0](x,y,0,k) = Inc-Icc; res[1](x,y,z,k) = Icn-Icc; } } break; - case 2: { // using Sobel tqmask + case 2: { // using Sobel mask CImg_3x3x1(I,restype); const float a = 1, b = 2; cimg_mapZV(*this,z,k) cimg_map3x3x1(*this,x,y,z,k,I) { @@ -8824,7 +8824,7 @@ namespace cimg_library { res[1](x,y,z,k) = -a*Ipp-b*Icp-a*Inp+a*Ipn+b*Icn+a*Inn; } } break; - case 3: { // using rotation invariant tqmask + case 3: { // using rotation invariant mask CImg_3x3x1(I,restype); const float a = (float)(0.25*(2-std::sqrt(2.0))), b = (float)(0.5f*(std::sqrt(2.0)-1)); cimg_mapZV(*this,z,k) cimg_map3x3x1(*this,x,y,z,k,I) { @@ -9825,42 +9825,42 @@ namespace cimg_library { //! Draw a masked sprite image in the instance image, at coordinates (\c x0,\c y0,\c z0,\c v0). /** \param sprite = sprite image. - \param tqmask = tqmask image. + \param mask = mask image. \param x0 = X-coordinate of the sprite position in the instance image. \param y0 = Y-coordinate of the sprite position in the instance image. \param z0 = Z-coordinate of the sprite position in the instance image. \param v0 = V-coordinate of the sprite position in the instance image. - \param mask_valmax = Maximum pixel value of the tqmask image \c tqmask. + \param mask_valmax = Maximum pixel value of the mask image \c mask. \param opacity = opacity of the drawing. - \note Pixel values of \c tqmask set the opacity of the corresponding pixels in \c sprite. + \note Pixel values of \c mask set the opacity of the corresponding pixels in \c sprite. \note Clipping is supported. - \note Dimensions along x,y and z of \c sprite and \c tqmask must be the same. + \note Dimensions along x,y and z of \c sprite and \c mask must be the same. **/ - template<typename ti,typename tm> CImg& draw_image(const CImg<ti>& sprite,const CImg<tm>& tqmask, + template<typename ti,typename tm> CImg& draw_image(const CImg<ti>& sprite,const CImg<tm>& mask, const int x0=0,const int y0=0,const int z0=0,const int v0=0, const tm mask_valmax=1,const float opacity=1) { if (!is_empty()) { if (sprite.is_empty()) throw CImgArgumentException("CImg<%s>::draw_image() : Specified sprite image (%u,%u,%u,%u,%p) is empty.", pixel_type(),sprite.width,sprite.height,sprite.depth,sprite.dim,sprite.data); - if (tqmask.is_empty()) - throw CImgArgumentException("CImg<%s>::draw_image() : Specified tqmask image (%u,%u,%u,%u,%p) is empty.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); - if ((void*)this==(void*)&sprite) return draw_image(CImg<T>(sprite),tqmask,x0,y0,z0,v0); - if(tqmask.width!=sprite.width || tqmask.height!=sprite.height || tqmask.depth!=sprite.depth) + if (mask.is_empty()) + throw CImgArgumentException("CImg<%s>::draw_image() : Specified mask image (%u,%u,%u,%u,%p) is empty.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); + if ((void*)this==(void*)&sprite) return draw_image(CImg<T>(sprite),mask,x0,y0,z0,v0); + if(mask.width!=sprite.width || mask.height!=sprite.height || mask.depth!=sprite.depth) throw CImgArgumentException("CImg<%s>::draw_image() : Mask dimension is (%u,%u,%u,%u), while sprite is (%u,%u,%u,%u)", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,sprite.width,sprite.height,sprite.depth,sprite.dim); + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,sprite.width,sprite.height,sprite.depth,sprite.dim); const bool bx=(x0<0), by=(y0<0), bz=(z0<0), bv=(v0<0); const int lX = sprite.dimx() - (x0+sprite.dimx()>dimx()?x0+sprite.dimx()-dimx():0) + (bx?x0:0), lY = sprite.dimy() - (y0+sprite.dimy()>dimy()?y0+sprite.dimy()-dimy():0) + (by?y0:0), lZ = sprite.dimz() - (z0+sprite.dimz()>dimz()?z0+sprite.dimz()-dimz():0) + (bz?z0:0), lV = sprite.dimv() - (v0+sprite.dimv()>dimv()?v0+sprite.dimv()-dimv():0) + (bv?v0:0); - const int coff = -(bx?x0:0)-(by?y0*tqmask.dimx():0)-(bz?z0*tqmask.dimx()*tqmask.dimy():0)- - (bv?v0*tqmask.dimx()*tqmask.dimy()*tqmask.dimz():0), - ssize = tqmask.dimx()*tqmask.dimy()*tqmask.dimz(); + const int coff = -(bx?x0:0)-(by?y0*mask.dimx():0)-(bz?z0*mask.dimx()*mask.dimy():0)- + (bv?v0*mask.dimx()*mask.dimy()*mask.dimz():0), + ssize = mask.dimx()*mask.dimy()*mask.dimz(); const ti *ptrs = sprite.ptr() + coff; - const tm *ptrm = tqmask.ptr() + coff; + const tm *ptrm = mask.ptr() + coff; const unsigned int offX = width-lX, soffX = sprite.width-lX, offY = width*(height-lY), soffY = sprite.width*(sprite.height-lY), @@ -9868,7 +9868,7 @@ namespace cimg_library { T *ptrd = ptr(x0<0?0:x0,y0<0?0:y0,z0<0?0:z0,v0<0?0:v0); if (lX>0 && lY>0 && lZ>0 && lV>0) for (int v=0; v<lV; v++) { - ptrm = tqmask.data + (ptrm - tqmask.data)%ssize; + ptrm = mask.data + (ptrm - mask.data)%ssize; for (int z=0; z<lZ; z++) { for (int y=0; y<lY; y++) { for (int x=0; x<lX; x++) { @@ -10785,12 +10785,12 @@ namespace cimg_library { case '\t': x+=4*font[' '].width; break; default: if (c<font.size) { letter = font[c]; - const CImg& tqmask = (c+256)<(int)font.size?font[c+256]:font[c]; + const CImg& mask = (c+256)<(int)font.size?font[c+256]:font[c]; if (fgcolor) for (unsigned int p=0; p<letter.width*letter.height; p++) - if (tqmask(p)) cimg_mapV(*this,k) letter(p,0,0,k)=(T)(letter(p,0,0,k)*fgcolor[k]); + if (mask(p)) cimg_mapV(*this,k) letter(p,0,0,k)=(T)(letter(p,0,0,k)*fgcolor[k]); if (bgcolor) for (unsigned int p=0; p<letter.width*letter.height; p++) - if (!tqmask(p)) cimg_mapV(*this,k) letter(p,0,0,k)=bgcolor[k]; - if (!bgcolor && font.size>=512) draw_image(letter,tqmask,x,y,0,0,(T)1,opacity); else draw_image(letter,x,y,0,0,opacity); + if (!mask(p)) cimg_mapV(*this,k) letter(p,0,0,k)=bgcolor[k]; + if (!bgcolor && font.size>=512) draw_image(letter,mask,x,y,0,0,(T)1,opacity); else draw_image(letter,x,y,0,0,opacity); x+=letter.width; } break; @@ -11163,11 +11163,11 @@ namespace cimg_library { \param y = Y-coordinate of the starting point of the region to fill. \param z = Z-coordinate of the starting point of the region to fill. \param color = an array of dimv() values of type \c T, defining the drawing color. - \param region = image that will contain the tqmask of the filled region tqmask, as an output. + \param region = image that will contain the mask of the filled region mask, as an output. \param sigma = tolerance concerning neighborhood values. \param opacity = opacity of the drawing. - \return \p region is initialized with the binary tqmask of the filled region. + \return \p region is initialized with the binary mask of the filled region. **/ template<typename t> CImg& draw_fill(const int x,const int y,const int z, const T *const color, CImg<t>& region,const float sigma=0, @@ -11963,107 +11963,107 @@ namespace cimg_library { //@{ //---------------------------- - //! Return the correlation of the image by a tqmask. + //! Return the correlation of the image by a mask. /** - The result \p res of the correlation of an image \p img by a tqmask \p tqmask is defined to be : + The result \p res of the correlation of an image \p img by a mask \p mask is defined to be : - res(x,y,z) = sum_{i,j,k} img(x+i,y+j,z+k)*tqmask(i,j,k) + res(x,y,z) = sum_{i,j,k} img(x+i,y+j,z+k)*mask(i,j,k) - \param tqmask = the correlation kernel. + \param mask = the correlation kernel. \param cond = the border condition type (0=zero, 1=dirichlet) \param weighted_correl = enable local normalization. **/ template<typename t> CImg<typename cimg::largest<T,t>::type> - get_correlate(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_correl=false) const { + get_correlate(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_correl=false) const { typedef typename cimg::largest<T,t>::type restype; typedef typename cimg::largest<t,float>::type fftype; typedef typename cimg::largest<T,fftype>::type ftype; if (is_empty()) return CImg<restype>(); - if (tqmask.is_empty() || tqmask.dim!=1) - throw CImgArgumentException("CImg<%s>::get_correlate() : Specified tqmask (%u,%u,%u,%u,%p) is not scalar.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); + if (mask.is_empty() || mask.dim!=1) + throw CImgArgumentException("CImg<%s>::get_correlate() : Specified mask (%u,%u,%u,%u,%p) is not scalar.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); CImg<restype> dest(*this,false); - if (cond && tqmask.width==tqmask.height && ((tqmask.depth==1 && tqmask.width<=5) || (tqmask.depth==tqmask.width && tqmask.width<=3))) { - // A special optimization is done for 2x2,3x3,4x4,5x5,2x2x2 and 3x3x3 tqmask (with cond=1) - switch (tqmask.depth) { + if (cond && mask.width==mask.height && ((mask.depth==1 && mask.width<=5) || (mask.depth==mask.width && mask.width<=3))) { + // A special optimization is done for 2x2,3x3,4x4,5x5,2x2x2 and 3x3x3 mask (with cond=1) + switch (mask.depth) { case 3: { CImg_3x3x3(I,T); - if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr3x3x3(I,tqmask); + if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr3x3x3(I,mask); else cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum3x3x3(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x3(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x3(I,mask)/std::sqrt(norm)):0; } } break; case 2: { CImg_2x2x2(I,T); - if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr2x2x2(I,tqmask); + if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr2x2x2(I,mask); else cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum2x2x2(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x2(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x2(I,mask)/std::sqrt(norm)):0; } } break; default: case 1: - switch (tqmask.width) { + switch (mask.width) { case 5: { CImg_5x5x1(I,T); - if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr5x5x1(I,tqmask); + if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr5x5x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum5x5x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr5x5x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr5x5x1(I,mask)/std::sqrt(norm)):0; } } break; case 4: { CImg_4x4x1(I,T); - if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr4x4x1(I,tqmask); + if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr4x4x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum4x4x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr4x4x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr4x4x1(I,mask)/std::sqrt(norm)):0; } } break; case 3: { CImg_3x3x1(I,T); - if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr3x3x1(I,tqmask); + if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr3x3x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum3x3x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x1(I,mask)/std::sqrt(norm)):0; } } break; case 2: { CImg_2x2x1(I,T); - if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr2x2x1(I,tqmask); + if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr2x2x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum2x2x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x1(I,mask)/std::sqrt(norm)):0; } } break; - case 1: dest = tqmask(0)*(*this); break; + case 1: dest = mask(0)*(*this); break; } } } else { // Generic version for other masks - const int cxm=tqmask.width/2, cym=tqmask.height/2, czm=tqmask.depth/2, fxm=cxm-1+(tqmask.width%2), fym=cym-1+(tqmask.height%2), fzm=czm-1+(tqmask.depth%2); + const int cxm=mask.width/2, cym=mask.height/2, czm=mask.depth/2, fxm=cxm-1+(mask.width%2), fym=cym-1+(mask.height%2), fzm=czm-1+(mask.depth%2); cimg_mapV(*this,v) if (!weighted_correl) { // Classical correlation for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) { ftype val = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - val+= (*this)(x+xm,y+ym,z+zm,v)*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= (*this)(x+xm,y+ym,z+zm,v)*mask(cxm+xm,cym+ym,czm+zm,0); dest(x,y,z,v)=(restype)val; } if (cond) cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { ftype val = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - val+= pix3d(x+xm,y+ym,z+zm,v)*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= pix3d(x+xm,y+ym,z+zm,v)*mask(cxm+xm,cym+ym,czm+zm,0); dest(x,y,z,v)=(restype)val; } else cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { ftype val = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - val+= pix3d(x+xm,y+ym,z+zm,v,0)*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= pix3d(x+xm,y+ym,z+zm,v,0)*mask(cxm+xm,cym+ym,czm+zm,0); dest(x,y,z,v)=(restype)val; } } else { // Weighted correlation @@ -12071,7 +12071,7 @@ namespace cimg_library { ftype val = 0, norm = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) { const T cval = (*this)(x+xm,y+ym,z+zm,v); - val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*mask(cxm+xm,cym+ym,czm+zm,0); norm+= cval*cval; } dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt((double)norm)):0; @@ -12081,7 +12081,7 @@ namespace cimg_library { ftype val = 0, norm = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) { const T cval = pix3d(x+xm,y+ym,z+zm,v); - val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*mask(cxm+xm,cym+ym,czm+zm,0); norm+=cval*cval; } dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt((double)norm)):0; @@ -12091,7 +12091,7 @@ namespace cimg_library { ftype val = 0, norm = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) { const T cval = pix3d(x+xm,y+ym,z+zm,v,0); - val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*mask(cxm+xm,cym+ym,czm+zm,0); norm+= cval*cval; } dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt((double)norm)):0; @@ -12102,115 +12102,115 @@ namespace cimg_library { } - //! Correlate the image by a tqmask + //! Correlate the image by a mask /** This is the in-place version of get_correlate. \see get_correlate **/ - template<typename t> CImg& correlate(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_correl=false) { - return get_correlate(tqmask,cond,weighted_correl).swap(*this); + template<typename t> CImg& correlate(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_correl=false) { + return get_correlate(mask,cond,weighted_correl).swap(*this); } - //! Return the convolution of the image by a tqmask + //! Return the convolution of the image by a mask /** - The result \p res of the convolution of an image \p img by a tqmask \p tqmask is defined to be : + The result \p res of the convolution of an image \p img by a mask \p mask is defined to be : - res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*tqmask(i,j,k) + res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*mask(i,j,k) - \param tqmask = the correlation kernel. + \param mask = the correlation kernel. \param cond = the border condition type (0=zero, 1=dirichlet) \param weighted_convol = enable local normalization. **/ template<typename t> CImg<typename cimg::largest<T,t>::type> - get_convolve(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_convol=false) const { + get_convolve(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_convol=false) const { typedef typename cimg::largest<T,t>::type restype; typedef typename cimg::largest<t,float>::type fftype; typedef typename cimg::largest<T,fftype>::type ftype; if (is_empty()) return CImg<restype>(); - if (tqmask.is_empty() || tqmask.dim!=1) - throw CImgArgumentException("CImg<%s>::get_convolve() : Specified tqmask (%u,%u,%u,%u,%p) is not scalar.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); + if (mask.is_empty() || mask.dim!=1) + throw CImgArgumentException("CImg<%s>::get_convolve() : Specified mask (%u,%u,%u,%u,%p) is not scalar.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); CImg<restype> dest(*this,false); - if (cond && tqmask.width==tqmask.height && ((tqmask.depth==1 && tqmask.width<=5) || (tqmask.depth==tqmask.width && tqmask.width<=3))) { // optimized version - switch (tqmask.depth) { + if (cond && mask.width==mask.height && ((mask.depth==1 && mask.width<=5) || (mask.depth==mask.width && mask.width<=3))) { // optimized version + switch (mask.depth) { case 3: { CImg_3x3x3(I,T); - if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv3x3x3(I,tqmask); + if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv3x3x3(I,mask); else cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum3x3x3(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x3(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x3(I,mask)/std::sqrt(norm)):0; } } break; case 2: { CImg_2x2x2(I,T); - if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv2x2x2(I,tqmask); + if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv2x2x2(I,mask); else cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum2x2x2(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x2(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x2(I,mask)/std::sqrt(norm)):0; } } break; default: case 1: - switch (tqmask.width) { + switch (mask.width) { case 5: { CImg_5x5x1(I,T); - if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv5x5x1(I,tqmask); + if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv5x5x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum5x5x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv5x5x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv5x5x1(I,mask)/std::sqrt(norm)):0; } } break; case 4: { CImg_4x4x1(I,T); - if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv4x4x1(I,tqmask); + if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv4x4x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum4x4x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv4x4x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv4x4x1(I,mask)/std::sqrt(norm)):0; } } break; case 3: { CImg_3x3x1(I,T); - if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv3x3x1(I,tqmask); + if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv3x3x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum3x3x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x1(I,mask)/std::sqrt(norm)):0; } } break; case 2: { CImg_2x2x1(I,T); - if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv2x2x1(I,tqmask); + if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv2x2x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum2x2x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x1(I,mask)/std::sqrt(norm)):0; } } break; - case 1: dest = tqmask(0)*(*this); break; + case 1: dest = mask(0)*(*this); break; } } } else { // generic version - const int cxm=tqmask.width/2, cym=tqmask.height/2, czm=tqmask.depth/2, fxm=cxm-1+(tqmask.width%2), fym=cym-1+(tqmask.height%2), fzm=czm-1+(tqmask.depth%2); + const int cxm=mask.width/2, cym=mask.height/2, czm=mask.depth/2, fxm=cxm-1+(mask.width%2), fym=cym-1+(mask.height%2), fzm=czm-1+(mask.depth%2); cimg_mapV(*this,v) if (!weighted_convol) { // Classical convolution for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) { ftype val = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - val+= (*this)(x-xm,y-ym,z-zm,v)*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= (*this)(x-xm,y-ym,z-zm,v)*mask(cxm+xm,cym+ym,czm+zm,0); dest(x,y,z,v)=(restype)val; } if (cond) cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { ftype val = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - val+= pix3d(x-xm,y-ym,z-zm,v)*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= pix3d(x-xm,y-ym,z-zm,v)*mask(cxm+xm,cym+ym,czm+zm,0); dest(x,y,z,v)=(restype)val; } else cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { ftype val = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - val+= pix3d(x-xm,y-ym,z-zm,v,0)*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= pix3d(x-xm,y-ym,z-zm,v,0)*mask(cxm+xm,cym+ym,czm+zm,0); dest(x,y,z,v)=(restype)val; } } else { // Weighted convolution @@ -12218,7 +12218,7 @@ namespace cimg_library { ftype val = 0, norm = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) { const T cval = (*this)(x-xm,y-ym,z-zm,v); - val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*mask(cxm+xm,cym+ym,czm+zm,0); norm+= cval*cval; } dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt(norm)):0; @@ -12228,7 +12228,7 @@ namespace cimg_library { ftype val = 0, norm = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) { const T cval = pix3d(x-xm,y-ym,z-zm,v); - val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*mask(cxm+xm,cym+ym,czm+zm,0); norm+=cval*cval; } dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt(norm)):0; @@ -12238,7 +12238,7 @@ namespace cimg_library { double val = 0, norm = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) { const T cval = pix3d(x-xm,y-ym,z-zm,v,0); - val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*mask(cxm+xm,cym+ym,czm+zm,0); norm+= cval*cval; } dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt(norm)):0; @@ -12248,46 +12248,46 @@ namespace cimg_library { return dest; } - //! Convolve the image by a tqmask + //! Convolve the image by a mask /** This is the in-place version of get_convolve(). \see get_convolve() **/ - template<typename t> CImg& convolve(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_convol=false) { - return get_convolve(tqmask,cond,weighted_convol).swap(*this); + template<typename t> CImg& convolve(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_convol=false) { + return get_convolve(mask,cond,weighted_convol).swap(*this); } //! Return the erosion of the image by a structuring element. template<typename t> CImg<typename cimg::largest<T,t>::type> - get_erode(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_erosion=false) const { + get_erode(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_erosion=false) const { typedef typename cimg::largest<T,t>::type restype; if (is_empty()) return CImg<restype>(); - if (tqmask.is_empty() || tqmask.dim!=1) - throw CImgArgumentException("CImg<%s>::get_erosion() : Specified tqmask (%u,%u,%u,%u,%p) is not a scalar image.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); + if (mask.is_empty() || mask.dim!=1) + throw CImgArgumentException("CImg<%s>::get_erosion() : Specified mask (%u,%u,%u,%u,%p) is not a scalar image.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); CImg<restype> dest(*this,false); - const int cxm=tqmask.width/2, cym=tqmask.height/2, czm=tqmask.depth/2, - fxm=cxm-1+(tqmask.width%2), fym=cym-1+(tqmask.height%2), fzm=czm-1+(tqmask.depth%2); + const int cxm=mask.width/2, cym=mask.height/2, czm=mask.depth/2, + fxm=cxm-1+(mask.width%2), fym=cym-1+(mask.height%2), fzm=czm-1+(mask.depth%2); cimg_mapV(*this,v) if (!weighted_erosion) { // Classical erosion for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) { restype foo, min_val = cimg::get_type_max(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if (tqmask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)(*this)(x+xm,y+ym,z+zm,v),min_val); + if (mask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)(*this)(x+xm,y+ym,z+zm,v),min_val); dest(x,y,z,v)=min_val; } if (cond) cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, min_val = cimg::get_type_max(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if (tqmask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v),min_val); + if (mask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v),min_val); dest(x,y,z,v)=min_val; } else cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, min_val = cimg::get_type_max(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if (tqmask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v,0),min_val); + if (mask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v,0),min_val); dest(x,y,z,v)=min_val; } } else { // Weighted erosion @@ -12295,21 +12295,21 @@ namespace cimg_library { for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) { restype foo, min_val = cimg::get_type_max(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)((*this)(x+xm,y+ym,z+zm,v)+mval),min_val); + if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)((*this)(x+xm,y+ym,z+zm,v)+mval),min_val); dest(x,y,z,v)=min_val; } if (cond) cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, min_val = cimg::get_type_max(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)(pix3d(x+xm,y+ym,z+zm,v)+mval),min_val); + if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)(pix3d(x+xm,y+ym,z+zm,v)+mval),min_val); dest(x,y,z,v)=min_val; } else cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, min_val = cimg::get_type_max(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)(pix3d(x+xm,y+ym,z+zm,v,0)+mval),min_val); + if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)(pix3d(x+xm,y+ym,z+zm,v,0)+mval),min_val); dest(x,y,z,v)=min_val; } } @@ -12321,14 +12321,14 @@ namespace cimg_library { This is the in-place version of get_erode(). \see get_erode() **/ - template<typename t> CImg& erode(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_erosion=false) { - return get_erode(tqmask,cond,weighted_erosion).swap(*this); + template<typename t> CImg& erode(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_erosion=false) { + return get_erode(mask,cond,weighted_erosion).swap(*this); } //! Erode the image by a square structuring element of size n CImg get_erode(const unsigned int n=1, const unsigned int cond=1) const { - static const CImg<T> tqmask(3,3,1,1,1); - return get_erode(tqmask,cond,false); + static const CImg<T> mask(3,3,1,1,1); + return get_erode(mask,cond,false); } //! Erode the image by a square structuring element of size n @@ -12338,35 +12338,35 @@ namespace cimg_library { //! Return the dilatation of the image by a structuring element. template<typename t> CImg<typename cimg::largest<T,t>::type> - get_dilate(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_dilatation=false) const { + get_dilate(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_dilatation=false) const { typedef typename cimg::largest<T,t>::type restype; if (is_empty()) return CImg<restype>(); - if (tqmask.is_empty() || tqmask.dim!=1) - throw CImgArgumentException("CImg<%s>::get_dilate() : Specified tqmask (%u,%u,%u,%u,%p) is not a scalar image.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); + if (mask.is_empty() || mask.dim!=1) + throw CImgArgumentException("CImg<%s>::get_dilate() : Specified mask (%u,%u,%u,%u,%p) is not a scalar image.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); CImg<restype> dest(*this,false); - const int cxm=tqmask.width/2, cym=tqmask.height/2, czm=tqmask.depth/2, - fxm=cxm-1+(tqmask.width%2), fym=cym-1+(tqmask.height%2), fzm=czm-1+(tqmask.depth%2); + const int cxm=mask.width/2, cym=mask.height/2, czm=mask.depth/2, + fxm=cxm-1+(mask.width%2), fym=cym-1+(mask.height%2), fzm=czm-1+(mask.depth%2); cimg_mapV(*this,v) if (!weighted_dilatation) { // Classical dilatation for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) { restype foo, max_val = cimg::get_type_min(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if (tqmask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)(*this)(x+xm,y+ym,z+zm,v),max_val); + if (mask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)(*this)(x+xm,y+ym,z+zm,v),max_val); dest(x,y,z,v)=max_val; } if (cond) cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, max_val = cimg::get_type_min(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if (tqmask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v),max_val); + if (mask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v),max_val); dest(x,y,z,v)=max_val; } else cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, max_val = cimg::get_type_min(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if (tqmask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v,0),max_val); + if (mask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v,0),max_val); dest(x,y,z,v)=max_val; } } else { // Weighted dilatation @@ -12374,21 +12374,21 @@ namespace cimg_library { for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) { restype foo, max_val = cimg::get_type_min(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)((*this)(x+xm,y+ym,z+zm,v)-mval),max_val); + if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)((*this)(x+xm,y+ym,z+zm,v)-mval),max_val); dest(x,y,z,v)=max_val; } if (cond) cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, max_val = cimg::get_type_min(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)(pix3d(x+xm,y+ym,z+zm,v)-mval),max_val); + if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)(pix3d(x+xm,y+ym,z+zm,v)-mval),max_val); dest(x,y,z,v)=max_val; } else cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, max_val = cimg::get_type_min(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)(pix3d(x+xm,y+ym,z+zm,v,0)-mval),max_val); + if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)(pix3d(x+xm,y+ym,z+zm,v,0)-mval),max_val); dest(x,y,z,v)=max_val; } } @@ -12400,14 +12400,14 @@ namespace cimg_library { This is the in-place version of get_dilate(). \see get_dilate() **/ - template<typename t> CImg& dilate(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_dilatation=false) { - return get_dilate(tqmask,cond,weighted_dilatation).swap(*this); + template<typename t> CImg& dilate(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_dilatation=false) { + return get_dilate(mask,cond,weighted_dilatation).swap(*this); } //! Dilate the image by a square structuring element of size n CImg get_dilate(const unsigned int n=1, const unsigned int cond=1) const { - static const CImg<T> tqmask(3,3,1,1,1); - return get_dilate(tqmask,cond,false); + static const CImg<T> mask(3,3,1,1,1); + return get_dilate(mask,cond,false); } //! Dilate the image by a square structuring element of size n @@ -14723,27 +14723,27 @@ namespace cimg_library { switch (bpp) { case 1: { // Monochrome for (int y=res.height-1; y>=0; y--) { - unsigned char tqmask = 0x80, val = 0; + unsigned char mask = 0x80, val = 0; cimg_mapX(res,x) { - if (tqmask==0x80) val = *(ptrs++); - const unsigned char *col = (unsigned char*)(palette+(val&tqmask?1:0)); + if (mask==0x80) val = *(ptrs++); + const unsigned char *col = (unsigned char*)(palette+(val&mask?1:0)); res(x,y,2) = (T)*(col++); res(x,y,1) = (T)*(col++); res(x,y,0) = (T)*(col++); - tqmask = cimg::ror(tqmask); + mask = cimg::ror(mask); } ptrs+=align; } } break; case 4: { // 16 colors for (int y=res.height-1; y>=0; y--) { - unsigned char tqmask = 0xF0, val = 0; + unsigned char mask = 0xF0, val = 0; cimg_mapX(res,x) { - if (tqmask==0xF0) val = *(ptrs++); - const unsigned char color = (tqmask<16)?(val&tqmask):((val&tqmask)>>4); + if (mask==0xF0) val = *(ptrs++); + const unsigned char color = (mask<16)?(val&mask):((val&mask)>>4); unsigned char *col = (unsigned char*)(palette+color); res(x,y,2) = (T)*(col++); res(x,y,1) = (T)*(col++); res(x,y,0) = (T)*(col++); - tqmask = cimg::ror(tqmask,4); + mask = cimg::ror(mask,4); } ptrs+=align; } } break; case 8: { // 256 colors @@ -17670,9 +17670,9 @@ namespace cimg_library { for (unsigned int y=0; y<h; y++) for (unsigned int x=0; x<256*w; x++) { m>>=1; if (!m) { m=0x80000000; val = *(ptr++); } - CImg<T>& img = res[x/w], &tqmask = res[x/w+256]; + CImg<T>& img = res[x/w], &mask = res[x/w+256]; unsigned int xm = x%w; - img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = tqmask(xm,y,0) = (T)((val&m)?1:0); + img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = mask(xm,y,0) = (T)((val&m)?1:0); } if (variable_size) res.crop_font(); if (paddingx || paddingy) cimgl_map(res,l) res[l].resize(res[l].dimx()+paddingx, res[l].dimy()+paddingy,1,-100,0); diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cc b/chalk/plugins/filters/cimg/kis_cimg_filter.cc index dc074e7b5..665dfc098 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_filter.cc +++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cc @@ -291,7 +291,7 @@ void get_geom(const char *geom, int &geom_w, int &geom_h) void KisCImgFilter::cleanup() { img0 = flow = G = dest = sum= W = CImg<>(); - tqmask = CImg<uchar> (); + mask = CImg<uchar> (); } //---------------------------------------------------------------------------- @@ -351,45 +351,45 @@ bool KisCImgFilter::prepare_restore() bool KisCImgFilter::prepare_inpaint() { - const char *file_m = NULL; //cimg_option("-m",(const char*)NULL,"Input inpainting tqmask"); + const char *file_m = NULL; //cimg_option("-m",(const char*)NULL,"Input inpainting mask"); if (!file_m) { // XXX: Do KDE messagebox - // g_message ("You need to specify an inpainting tqmask (option '-m') !"); + // g_message ("You need to specify an inpainting mask (option '-m') !"); return false; } - const unsigned int dilate = 0; //cimg_option("-dilate",0,"Inpainting tqmask dilatation"); + const unsigned int dilate = 0; //cimg_option("-dilate",0,"Inpainting mask dilatation"); const unsigned int ip_init = 3; //cimg_option("-init",3,"Inpainting init (0=black, 1=white, 2=noise, 3=unchanged, 4=interpol)"); if (cimg::strncasecmp("block",file_m,5)) - tqmask = CImg<uchar>(file_m); + mask = CImg<uchar>(file_m); else { int l=16; std::sscanf(file_m,"block%d",&l); - tqmask = CImg<uchar>(img.width/l,img.height/l); - cimg_mapXY(tqmask,x,y) tqmask(x,y)=(x+y)%2; + mask = CImg<uchar>(img.width/l,img.height/l); + cimg_mapXY(mask,x,y) mask(x,y)=(x+y)%2; } - tqmask.resize(img.width,img.height,1,1); - if (dilate) tqmask.dilate(dilate); + mask.resize(img.width,img.height,1,1); + if (dilate) mask.dilate(dilate); switch (ip_init) { - case 0 : { cimg_mapXYV(img,x,y,k) if (tqmask(x,y)) img(x,y,k) = 0; } break; - case 1 : { cimg_mapXYV(img,x,y,k) if (tqmask(x,y)) img(x,y,k) = 255; } break; - case 2 : { cimg_mapXYV(img,x,y,k) if (tqmask(x,y)) img(x,y,k) = (float)(255*cimg::rand()); } break; + case 0 : { cimg_mapXYV(img,x,y,k) if (mask(x,y)) img(x,y,k) = 0; } break; + case 1 : { cimg_mapXYV(img,x,y,k) if (mask(x,y)) img(x,y,k) = 255; } break; + case 2 : { cimg_mapXYV(img,x,y,k) if (mask(x,y)) img(x,y,k) = (float)(255*cimg::rand()); } break; case 3 : break; case 4 : { - CImg<uchar> ttqmask(tqmask),nttqmask(ttqmask); + CImg<uchar> tmask(mask),ntmask(tmask); CImg_3x3(M,uchar); CImg_3x3(I,float); - while (CImgStats(nttqmask,false).max>0) { - cimg_map3x3(ttqmask,x,y,0,0,M) if (Mcc && (!Mpc || !Mnc || !Mcp || !Mcn)) { + while (CImgStats(ntmask,false).max>0) { + cimg_map3x3(tmask,x,y,0,0,M) if (Mcc && (!Mpc || !Mnc || !Mcp || !Mcn)) { const float ccp = Mcp?0.0f:1.0f, cpc = Mpc?0.0f:1.0f, cnc = Mnc?0.0f:1.0f, ccn = Mcn?0.0f:1.0f, csum = ccp + cpc + cnc + ccn; cimg_mapV(img,k) { cimg_get3x3(img,x,y,0,k,I); img(x,y,k) = (ccp*Icp + cpc*Ipc + cnc*Inc + ccn*Icn)/csum; } - nttqmask(x,y) = 0; + ntmask(x,y) = 0; } - ttqmask = nttqmask; + tmask = ntmask; } } break; default: break; @@ -398,7 +398,7 @@ bool KisCImgFilter::prepare_inpaint() G = CImg<>(img.width,img.height,1,3,0); CImg_3x3(g,uchar); CImg_3x3(I,float); - cimg_map3x3(tqmask,x,y,0,0,g) if (!gcc && !(gnc-gcc) && !(gcc-gpc) && !(gcn-gcc) && !(gcc-gcp)) cimg_mapV(img,k) { + cimg_map3x3(mask,x,y,0,0,g) if (!gcc && !(gnc-gcc) && !(gcc-gpc) && !(gcn-gcc) && !(gcc-gcp)) cimg_mapV(img,k) { cimg_get3x3(img,x,y,0,k,I); const float ix = 0.5f*(Inc-Ipc), iy = 0.5f*(Icn-Icp); G(x,y,0)+= ix*ix; G(x,y,1)+= ix*iy; G(x,y,2)+= iy*iy; @@ -433,8 +433,8 @@ bool KisCImgFilter::prepare_resize() const bool anchor = true; //cimg_option("-anchor",true,"Anchor original pixels"); if (!geom) throw CImgArgumentException("You need to specify an output geomety (option -g)"); int w,h; get_geom(geom,w,h); - tqmask = CImg<uchar>(img.width,img.height,1,1,255); - if (!anchor) tqmask.resize(w,h,1,1,1); else tqmask = ~tqmask.resize(w,h,1,1,4); + mask = CImg<uchar>(img.width,img.height,1,1,255); + if (!anchor) mask.resize(w,h,1,1,1); else mask = ~mask.resize(w,h,1,1,4); img0 = img.get_resize(w,h,1,-100,1); img.resize(w,h,1,-100,3); G = CImg<>(img.width,img.height,1,3); @@ -618,7 +618,7 @@ void KisCImgFilter::compute_LIC(int &progressSteps) return; } - if (!tqmask.data || tqmask(x,y)) compute_LIC_back_forward(x,y); + if (!mask.data || mask(x,y)) compute_LIC_back_forward(x,y); } } @@ -680,9 +680,9 @@ bool KisCImgFilter::process() return true; } -KisFilterConfigWidget * KisCImgFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisCImgFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { - return new KisCImgconfigWidget(this, tqparent); + return new KisCImgconfigWidget(this, parent); } KisFilterConfiguration* KisCImgFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.h b/chalk/plugins/filters/cimg/kis_cimg_filter.h index 3b7454761..965ecbd8b 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_filter.h +++ b/chalk/plugins/filters/cimg/kis_cimg_filter.h @@ -60,7 +60,7 @@ public: virtual bool supportsPreview() { return false; } virtual ColorSpaceIndependence colorSpaceIndependence(); public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisCImgFilterConfiguration();}; private: @@ -115,7 +115,7 @@ private: cimg_library::CImg<> dest, sum, W; cimg_library::CImg<> img, img0, flow,G; cimg_library::CImgl<> eigen; - cimg_library::CImg<unsigned char> tqmask; + cimg_library::CImg<unsigned char> mask; diff --git a/chalk/plugins/filters/cimg/kis_cimg_plugin.cc b/chalk/plugins/filters/cimg/kis_cimg_plugin.cc index 6c3e9522f..9ed82fe26 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_plugin.cc +++ b/chalk/plugins/filters/cimg/kis_cimg_plugin.cc @@ -28,12 +28,12 @@ typedef KGenericFactory<KisCImgPlugin> KisCImgPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkcimg, KisCImgPluginFactory( "chalk" ) ) -KisCImgPlugin::KisCImgPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) +KisCImgPlugin::KisCImgPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) { setInstance(KisCImgPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisCImgFilter()); } } diff --git a/chalk/plugins/filters/cimg/kis_cimg_plugin.h b/chalk/plugins/filters/cimg/kis_cimg_plugin.h index 2d35bff43..d016abf15 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_plugin.h +++ b/chalk/plugins/filters/cimg/kis_cimg_plugin.h @@ -25,7 +25,7 @@ class KisCImgPlugin : public KParts::Plugin { public: - KisCImgPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisCImgPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisCImgPlugin(); }; diff --git a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc index c12ebf5f1..b65a435f9 100644 --- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc +++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc @@ -29,8 +29,8 @@ #include "kis_cimgconfig_widget.h" #include "kis_cimg_filter.h" -KisCImgconfigWidget::KisCImgconfigWidget(KisFilter* nfilter, TQWidget * tqparent, const char * name, WFlags f) - : KisFilterConfigWidget(tqparent, name, f) +KisCImgconfigWidget::KisCImgconfigWidget(KisFilter* nfilter, TQWidget * parent, const char * name, WFlags f) + : KisFilterConfigWidget(parent, name, f) { m_page = new WdgCImg(this); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h index aba373ca8..e95b34f0d 100644 --- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h +++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h @@ -34,7 +34,7 @@ class KisCImgconfigWidget : public KisFilterConfigWidget { public: - KisCImgconfigWidget(KisFilter* nfilter, TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + KisCImgconfigWidget(KisFilter* nfilter, TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); virtual ~KisCImgconfigWidget() {}; public: diff --git a/chalk/plugins/filters/colorify/Colorify.cpp b/chalk/plugins/filters/colorify/Colorify.cpp index 0b5010cfc..11f28d9a5 100644 --- a/chalk/plugins/filters/colorify/Colorify.cpp +++ b/chalk/plugins/filters/colorify/Colorify.cpp @@ -31,8 +31,8 @@ typedef KGenericFactory<ChalkColorify> ChalkColorifyFactory; K_EXPORT_COMPONENT_FACTORY( chalkcolorify, ChalkColorifyFactory( "chalk" ) ) -ChalkColorify::ChalkColorify(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkColorify::ChalkColorify(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkColorifyFactory::instance()); @@ -40,11 +40,11 @@ ChalkColorify::ChalkColorify(TQObject *tqparent, const char *name, const TQStrin kdDebug(41006) << "Colorify Filter plugin. Class: " << className() << ", Parent: " - << tqparent -> className() + << parent -> className() << "\n"; - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisColorify()); } } @@ -59,9 +59,9 @@ KisColorify::KisColorify() : KisFilter(id(), "colors", i18n("&Colorify...")) { } -KisFilterConfigWidget * KisColorify::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisColorify::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { - return new KisWdgColorify(this, tqparent, "configuration of colorify"); + return new KisWdgColorify(this, parent, "configuration of colorify"); } KisFilterConfiguration* KisColorify::configuration(TQWidget* w) diff --git a/chalk/plugins/filters/colorify/Colorify.h b/chalk/plugins/filters/colorify/Colorify.h index 363785052..6a984134b 100644 --- a/chalk/plugins/filters/colorify/Colorify.h +++ b/chalk/plugins/filters/colorify/Colorify.h @@ -32,7 +32,7 @@ class ChalkColorify : public KParts::Plugin { public: - ChalkColorify(TQObject *tqparent, const char *name, const TQStringList &); + ChalkColorify(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkColorify(); }; @@ -49,7 +49,7 @@ class KisColorify : public KisFilter { virtual bool supportsAdjustmentLayers() { return false; } virtual ColorSpaceIndependence colorSpaceIndendendence() { return TO_LAB16; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/colorify/KisWdgColorify.cpp b/chalk/plugins/filters/colorify/KisWdgColorify.cpp index 3d1e2413c..5b03ad70d 100644 --- a/chalk/plugins/filters/colorify/KisWdgColorify.cpp +++ b/chalk/plugins/filters/colorify/KisWdgColorify.cpp @@ -30,7 +30,7 @@ #include "WdgColorifyBase.h" -KisWdgColorify::KisWdgColorify( KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) +KisWdgColorify::KisWdgColorify( KisFilter* nfilter, TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgColorifyBase(this); diff --git a/chalk/plugins/filters/colorify/KisWdgColorify.h b/chalk/plugins/filters/colorify/KisWdgColorify.h index 662a24cd6..9e160fb78 100644 --- a/chalk/plugins/filters/colorify/KisWdgColorify.h +++ b/chalk/plugins/filters/colorify/KisWdgColorify.h @@ -35,7 +35,7 @@ class KisWdgColorify : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgColorify( KisFilter* nfilter, TQWidget * tqparent, const char * name); + KisWdgColorify( KisFilter* nfilter, TQWidget * parent, const char * name); inline WdgColorifyBase* widget() { return m_widget; }; virtual void setConfiguration(KisFilterConfiguration*); private: diff --git a/chalk/plugins/filters/colors/colors.cc b/chalk/plugins/filters/colors/colors.cc index d9a421348..d3cadc68a 100644 --- a/chalk/plugins/filters/colors/colors.cc +++ b/chalk/plugins/filters/colors/colors.cc @@ -28,8 +28,8 @@ typedef KGenericFactory<ChalkExtensionsColors> ChalkExtensionsColorsFactory; K_EXPORT_COMPONENT_FACTORY( chalkextensioncolorsfilters, ChalkExtensionsColorsFactory( "chalk" ) ) -ChalkExtensionsColors::ChalkExtensionsColors(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkExtensionsColors::ChalkExtensionsColors(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkExtensionsColorsFactory::instance()); @@ -37,11 +37,11 @@ ChalkExtensionsColors::ChalkExtensionsColors(TQObject *tqparent, const char *nam kdDebug(41006) << "Extensions Colors Filter plugin. Class: " << className() << ", Parent: " - << tqparent -> className() + << parent -> className() << "\n"; - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterMax()); manager->add(new KisFilterMin()); manager->add(new KisFilterColorToAlpha()); diff --git a/chalk/plugins/filters/colors/colors.h b/chalk/plugins/filters/colors/colors.h index d93ae1cc6..dd27cc91b 100644 --- a/chalk/plugins/filters/colors/colors.h +++ b/chalk/plugins/filters/colors/colors.h @@ -30,7 +30,7 @@ class ChalkExtensionsColors : public KParts::Plugin { public: - ChalkExtensionsColors(TQObject *tqparent, const char *name, const TQStringList &); + ChalkExtensionsColors(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkExtensionsColors(); }; diff --git a/chalk/plugins/filters/colors/kis_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_color_to_alpha.cc index 288149104..26f428448 100644 --- a/chalk/plugins/filters/colors/kis_color_to_alpha.cc +++ b/chalk/plugins/filters/colors/kis_color_to_alpha.cc @@ -34,9 +34,9 @@ KisFilterColorToAlpha::KisFilterColorToAlpha() : KisFilter(id(), "colors", i18n( { } -KisFilterConfigWidget * KisFilterColorToAlpha::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisFilterColorToAlpha::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { - return new KisWdgColorToAlpha(this, tqparent, "configuration of color to alpha"); + return new KisWdgColorToAlpha(this, parent, "configuration of color to alpha"); } KisFilterConfiguration* KisFilterColorToAlpha::configuration(TQWidget* w) diff --git a/chalk/plugins/filters/colors/kis_color_to_alpha.h b/chalk/plugins/filters/colors/kis_color_to_alpha.h index 9161b38e9..57f6ca7e1 100644 --- a/chalk/plugins/filters/colors/kis_color_to_alpha.h +++ b/chalk/plugins/filters/colors/kis_color_to_alpha.h @@ -39,7 +39,7 @@ class KisFilterColorToAlpha : public KisFilter { virtual bool supportsAdjustmentLayers() { return false; } virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc index e70fbc856..31b726bf0 100644 --- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc +++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc @@ -30,7 +30,7 @@ #include "wdgcolortoalphabase.h" -KisWdgColorToAlpha::KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) +KisWdgColorToAlpha::KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgColorToAlphaBase(this); diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h index d2b5c9b97..90d16ef2f 100644 --- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h +++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h @@ -35,7 +35,7 @@ class KisWdgColorToAlpha : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * tqparent, const char * name); + KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * parent, const char * name); inline WdgColorToAlphaBase* widget() { return m_widget; }; virtual void setConfiguration(KisFilterConfiguration*); private: diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.cc b/chalk/plugins/filters/colorsfilters/colorsfilters.cc index cdc7dedec..ae84bcaaa 100644 --- a/chalk/plugins/filters/colorsfilters/colorsfilters.cc +++ b/chalk/plugins/filters/colorsfilters/colorsfilters.cc @@ -54,13 +54,13 @@ typedef KGenericFactory<ColorsFilters> ColorsFiltersFactory; K_EXPORT_COMPONENT_FACTORY( chalkcolorsfilters, ColorsFiltersFactory( "chalk" ) ) -ColorsFilters::ColorsFilters(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ColorsFilters::ColorsFilters(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ColorsFiltersFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisBrightnessContrastFilter()); manager->add(new KisAutoContrast()); manager->add(new KisPerChannelFilter()); diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.h b/chalk/plugins/filters/colorsfilters/colorsfilters.h index ebf2dfebf..40dc8d747 100644 --- a/chalk/plugins/filters/colorsfilters/colorsfilters.h +++ b/chalk/plugins/filters/colorsfilters/colorsfilters.h @@ -29,7 +29,7 @@ class KisColorAdjustment; class ColorsFilters : public KParts::Plugin { public: - ColorsFilters(TQObject *tqparent, const char *name, const TQStringList &); + ColorsFilters(TQObject *parent, const char *name, const TQStringList &); virtual ~ColorsFilters(); }; diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc index e9280425c..a97f809bd 100644 --- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc +++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc @@ -144,9 +144,9 @@ KisBrightnessContrastFilter::KisBrightnessContrastFilter() } -KisFilterConfigWidget * KisBrightnessContrastFilter::createConfigurationWidget(TQWidget *tqparent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisBrightnessContrastFilter::createConfigurationWidget(TQWidget *parent, KisPaintDeviceSP dev) { - return new KisBrightnessContrastConfigWidget(tqparent, dev); + return new KisBrightnessContrastConfigWidget(parent, dev); } KisFilterConfiguration* KisBrightnessContrastFilter::configuration(TQWidget *nwidget) @@ -252,8 +252,8 @@ void KisBrightnessContrastFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP setProgressDone(); } -KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name, WFlags f) - : KisFilterConfigWidget(tqparent, name, f) +KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f) + : KisFilterConfigWidget(parent, name, f) { int i; int height; diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h index 598e4bcc1..fb80a302a 100644 --- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h +++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h @@ -55,7 +55,7 @@ public: public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget *); virtual KisFilterConfiguration * configuration() { return new KisBrightnessContrastFilterConfiguration(); }; virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); @@ -73,7 +73,7 @@ public: class KisBrightnessContrastConfigWidget : public KisFilterConfigWidget { public: - KisBrightnessContrastConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); + KisBrightnessContrastConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); virtual ~KisBrightnessContrastConfigWidget() {}; KisBrightnessContrastFilterConfiguration * config(); diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc index 1eaa14170..928badedc 100644 --- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc +++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc @@ -154,9 +154,9 @@ TQString KisPerChannelFilterConfiguration::toString() } -KisFilterConfigWidget * KisPerChannelFilter::createConfigurationWidget(TQWidget *tqparent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisPerChannelFilter::createConfigurationWidget(TQWidget *parent, KisPaintDeviceSP dev) { - return new KisPerChannelConfigWidget(tqparent, dev); + return new KisPerChannelConfigWidget(parent, dev); } KisFilterConfiguration* KisPerChannelFilter::configuration(TQWidget *nwidget) @@ -300,8 +300,8 @@ void KisPerChannelConfigWidget::setActiveChannel(int ch) m_page->kCurve->setPixmap(pix); } -KisPerChannelConfigWidget::KisPerChannelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name, WFlags f) - : KisFilterConfigWidget(tqparent, name, f) +KisPerChannelConfigWidget::KisPerChannelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f) + : KisFilterConfigWidget(parent, name, f) { int i; int height; diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h index 6d11ab433..9497075af 100644 --- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h +++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h @@ -59,7 +59,7 @@ class KisPerChannelFilter public: KisPerChannelFilter() : KisFilter( id(), "adjust", i18n("&Color Adjustment...")) {}; public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration* configuration() { return new KisPerChannelFilterConfiguration(0); }; virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); @@ -80,7 +80,7 @@ class KisPerChannelConfigWidget : public KisFilterConfigWidget { TQ_OBJECT public: - KisPerChannelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); + KisPerChannelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); virtual ~KisPerChannelConfigWidget() {}; KisPerChannelFilterConfiguration * config(); diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc index ddf2332f6..b3c73a924 100644 --- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc +++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc @@ -60,13 +60,13 @@ KisKernelSP createKernel( TQ_INT32 i0, TQ_INT32 i1, TQ_INT32 i2, typedef KGenericFactory<ChalkConvolutionFilters> ChalkConvolutionFiltersFactory; K_EXPORT_COMPONENT_FACTORY( chalkconvolutionfilters, ChalkConvolutionFiltersFactory( "chalk" ) ) -ChalkConvolutionFilters::ChalkConvolutionFilters(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkConvolutionFilters::ChalkConvolutionFilters(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkConvolutionFiltersFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisGaussianBlurFilter()); manager->add(new KisSharpenFilter()); manager->add(new KisMeanRemovalFilter()); diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.h b/chalk/plugins/filters/convolutionfilters/convolutionfilters.h index 94e4654c3..aa8dc7491 100644 --- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.h +++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.h @@ -145,7 +145,7 @@ public: class ChalkConvolutionFilters : public KParts::Plugin { public: - ChalkConvolutionFilters(TQObject *tqparent, const char *name, const TQStringList &); + ChalkConvolutionFilters(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkConvolutionFilters(); }; diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc index 8d48d25d2..39da5b188 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc @@ -30,9 +30,9 @@ #include "kis_matrix_widget.h" -KisFilterConfigWidget * KisCustomConvolutionFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP) +KisFilterConfigWidget * KisCustomConvolutionFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP) { - KisCustomConvolutionFilterConfigurationWidget* ccfcw = new KisCustomConvolutionFilterConfigurationWidget(this,tqparent, "custom convolution config widget"); + KisCustomConvolutionFilterConfigurationWidget* ccfcw = new KisCustomConvolutionFilterConfigurationWidget(this,parent, "custom convolution config widget"); Q_CHECK_PTR(ccfcw); return ccfcw; } diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h index cbfd375e3..60c009ce3 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h @@ -39,7 +39,7 @@ public: virtual bool supportsIncrementalPainting() { return true; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return configuration(0); }; protected: diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc index b1905d300..2c1c87d9c 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc @@ -34,8 +34,8 @@ #include "kis_custom_convolution_filter_configuration_base_widget.h" #include "kis_matrix_widget.h" -KisCustomConvolutionFilterConfigurationWidget::KisCustomConvolutionFilterConfigurationWidget( KisFilter* /*nfilter*/, TQWidget * tqparent, const char * name) - : KisFilterConfigWidget ( tqparent, name ) +KisCustomConvolutionFilterConfigurationWidget::KisCustomConvolutionFilterConfigurationWidget( KisFilter* /*nfilter*/, TQWidget * parent, const char * name) + : KisFilterConfigWidget ( parent, name ) { TQGridLayout *widgetLayout = new TQGridLayout(this, 2, 1); Q_CHECK_PTR(widgetLayout); diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h index b5819e394..eb16e587a 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h @@ -34,7 +34,7 @@ class KisCustomConvolutionFilterConfigurationWidget : public KisFilterConfigWidg public: - KisCustomConvolutionFilterConfigurationWidget( KisFilter* nfilter, TQWidget * tqparent, const char * name); + KisCustomConvolutionFilterConfigurationWidget( KisFilter* nfilter, TQWidget * parent, const char * name); inline KisCustomConvolutionFilterConfigurationBaseWidget* matrixWidget() { return m_ccfcws; }; void setConfiguration(KisFilterConfiguration * config); diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc index 1cd1aa8df..68f560c41 100644 --- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc +++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc @@ -433,12 +433,12 @@ void KisCubismFilter::cubism(KisPaintDeviceSP src, KisPaintDeviceSP dst, const T setProgressDone(); } -KisFilterConfigWidget * KisCubismFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisCubismFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 2, 40, 10, i18n("Tile size"), "tileSize" ) ); param.push_back( KisIntegerWidgetParam( 2, 40, 10, i18n("Tile saturation"), "tileSaturation" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisCubismFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.h b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.h index f2624030c..332e5fd12 100644 --- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.h +++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.h @@ -60,7 +60,7 @@ public: virtual bool workWith(KisColorSpace* cs); virtual ColorSpaceIndependence colorSpaceIndependence() { return TO_RGBA8; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration* configuration() { return new KisCubismFilterConfiguration( 10, 10); }; private: diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc index 4e7dfa7d8..7215a2e3b 100644 --- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc +++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc @@ -25,13 +25,13 @@ typedef KGenericFactory<KisCubismFilterPlugin> KisCubismFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkcubismfilter, KisCubismFilterPluginFactory( "chalk" ) ) -KisCubismFilterPlugin::KisCubismFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) +KisCubismFilterPlugin::KisCubismFilterPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) { setInstance(KisCubismFilterPluginFactory::instance()); - if ( tqparent->inherits("KisFilterRegistry") ) + if ( parent->inherits("KisFilterRegistry") ) { - KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(tqparent); + KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(parent); r->add(new KisCubismFilter()); } } diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h index b37e40c1f..064c55e3c 100644 --- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h +++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h @@ -25,7 +25,7 @@ class KisCubismFilterPlugin : public KParts::Plugin { public: - KisCubismFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisCubismFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisCubismFilterPlugin(); }; diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc index f15b5952f..6e69761b6 100644 --- a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc +++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc @@ -158,11 +158,11 @@ int KisEmbossFilter::Lim_Max (int Now, int Up, int Max) return (Up); } -KisFilterConfigWidget * KisEmbossFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP) +KisFilterConfigWidget * KisEmbossFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 10, 300, 30, i18n("Depth"), "depth" ) ); - KisFilterConfigWidget * w = new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + KisFilterConfigWidget * w = new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); Q_CHECK_PTR(w); return w; } diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter.h b/chalk/plugins/filters/embossfilter/kis_emboss_filter.h index fe4410ed5..1e46d21f1 100644 --- a/chalk/plugins/filters/embossfilter/kis_emboss_filter.h +++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter.h @@ -50,7 +50,7 @@ public: virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP ) { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisEmbossFilterConfiguration(100)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration* configuration() {return new KisEmbossFilterConfiguration( 30 );}; diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc index 4aec1db6a..bd11b115b 100644 --- a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc +++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc @@ -25,12 +25,12 @@ typedef KGenericFactory<KisEmbossFilterPlugin> KisEmbossFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkembossfilter, KisEmbossFilterPluginFactory( "chalk" ) ) -KisEmbossFilterPlugin::KisEmbossFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) +KisEmbossFilterPlugin::KisEmbossFilterPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) { setInstance(KisEmbossFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisEmbossFilter()); } } diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h index 39803418f..81312b014 100644 --- a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h +++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h @@ -24,7 +24,7 @@ class KisEmbossFilterPlugin : public KParts::Plugin { public: - KisEmbossFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisEmbossFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisEmbossFilterPlugin(); }; diff --git a/chalk/plugins/filters/example/example.cc b/chalk/plugins/filters/example/example.cc index 2e2fbc7c7..e1e33ade7 100644 --- a/chalk/plugins/filters/example/example.cc +++ b/chalk/plugins/filters/example/example.cc @@ -44,14 +44,14 @@ typedef KGenericFactory<ChalkExample> ChalkExampleFactory; K_EXPORT_COMPONENT_FACTORY( chalkexample, ChalkExampleFactory( "chalk" ) ) -ChalkExample::ChalkExample(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkExample::ChalkExample(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkExampleFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterInvert()); } } diff --git a/chalk/plugins/filters/example/example.h b/chalk/plugins/filters/example/example.h index df49d0366..4df6705c7 100644 --- a/chalk/plugins/filters/example/example.h +++ b/chalk/plugins/filters/example/example.h @@ -27,7 +27,7 @@ class ChalkExample : public KParts::Plugin { public: - ChalkExample(TQObject *tqparent, const char *name, const TQStringList &); + ChalkExample(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkExample(); }; diff --git a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc index 10ef044d9..c43e56900 100644 --- a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc +++ b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc @@ -37,19 +37,19 @@ typedef KGenericFactory<FastColorTransferPlugin> ChalkFastColorTransferFactory; K_EXPORT_COMPONENT_FACTORY( chalkfastcolortransfer, ChalkFastColorTransferFactory( "chalk" ) ) -FastColorTransferPlugin::FastColorTransferPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +FastColorTransferPlugin::FastColorTransferPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkFastColorTransferFactory::instance()); kdDebug(41006) << "Color Transfer Filter plugin. Class: " << className() << ", Parent: " - << tqparent -> className() + << parent -> className() << "\n"; - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterFastColorTransfer()); } } @@ -63,9 +63,9 @@ KisFilterFastColorTransfer::KisFilterFastColorTransfer() : KisFilter(id(), "colo } -KisFilterConfigWidget * KisFilterFastColorTransfer::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisFilterFastColorTransfer::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { - return new KisWdgFastColorTransfer(this, tqparent, "configuration of color to alpha"); + return new KisWdgFastColorTransfer(this, parent, "configuration of color to alpha"); } KisFilterConfiguration* KisFilterFastColorTransfer::configuration(TQWidget* w) diff --git a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h index d8a3c8983..dbaee9f8d 100644 --- a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h +++ b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h @@ -31,7 +31,7 @@ class FastColorTransferPlugin : public KParts::Plugin { public: - FastColorTransferPlugin(TQObject *tqparent, const char *name, const TQStringList &); + FastColorTransferPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~FastColorTransferPlugin(); }; @@ -48,7 +48,7 @@ class KisFilterFastColorTransfer : public KisFilter virtual bool supportsIncrementalPainting() { return false; } virtual bool supportsAdjustmentLayers() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp index 3c08cac31..49826ccb9 100644 --- a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp +++ b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp @@ -26,7 +26,7 @@ #include "wdgfastcolortransfer.h" -KisWdgFastColorTransfer::KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) +KisWdgFastColorTransfer::KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgFastColorTransfer(this); diff --git a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h index 0a29aef51..0e95e3194 100644 --- a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h +++ b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h @@ -36,7 +36,7 @@ class WdgFastColorTransfer; class KisWdgFastColorTransfer : public KisFilterConfigWidget { public: - KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * tqparent, const char * name); + KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * parent, const char * name); ~KisWdgFastColorTransfer(); virtual void setConfiguration(KisFilterConfiguration*); inline WdgFastColorTransfer* widget() { return m_widget; } diff --git a/chalk/plugins/filters/halftone/kis_halftone.cpp b/chalk/plugins/filters/halftone/kis_halftone.cpp index 35e838ed2..c2c2f4631 100644 --- a/chalk/plugins/filters/halftone/kis_halftone.cpp +++ b/chalk/plugins/filters/halftone/kis_halftone.cpp @@ -36,21 +36,21 @@ typedef KGenericFactory<ChalkHalftone> ChalkHalftoneFactory; K_EXPORT_COMPONENT_FACTORY( chalkhalftone, ChalkHalftoneFactory( "chalk" ) ) - ChalkHalftone::ChalkHalftone(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) + ChalkHalftone::ChalkHalftone(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkHalftoneFactory::instance()); kdDebug(41006) << "Halftone filter plugin. Class: " << className() << ", Parent: " - << tqparent->className() + << parent->className() << "\n"; - if ( tqparent->inherits("KisFilterRegistry") ) + if ( parent->inherits("KisFilterRegistry") ) { - KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(tqparent); + KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(parent); r->add(new KisHalftoneReduction()); } } @@ -71,12 +71,12 @@ KisHalftoneReduction::~KisHalftoneReduction() { } -KisFilterConfigWidget * KisHalftoneReduction::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisHalftoneReduction::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 0, 100, BEST_WAVELET_FREQUENCY_VALUE, i18n("Frequency"), "frequency" ) ); param.push_back( KisIntegerWidgetParam( 0, 100, 2, i18n("Half-size"), "halfsize" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisHalftoneReduction::configuration(TQWidget* nwidget ) @@ -121,11 +121,11 @@ void KisHalftoneReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, K kdDebug(41005) << halfSize << endl; KisAutobrushShape* kas = new KisAutobrushCircleShape(2*halfSize+1, 2*halfSize+1 , halfSize, halfSize); - TQImage tqmask; - kas->createBrush(&tqmask); + TQImage mask; + kas->createBrush(&mask); - KisKernelSP kernel = KisKernel::fromTQImage(tqmask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage - tqmask.save("testtqmask.png", "PNG"); + KisKernelSP kernel = KisKernel::fromTQImage(mask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage + mask.save("testmask.png", "PNG"); KisPaintDeviceSP interm = new KisPaintDevice(*src); KisColorSpace * cs = src->colorSpace(); diff --git a/chalk/plugins/filters/halftone/kis_halftone.h b/chalk/plugins/filters/halftone/kis_halftone.h index 38842d311..96f22e8f0 100644 --- a/chalk/plugins/filters/halftone/kis_halftone.h +++ b/chalk/plugins/filters/halftone/kis_halftone.h @@ -32,7 +32,7 @@ class ChalkHalftone : public KParts::Plugin { public: - ChalkHalftone(TQObject *tqparent, const char *name, const TQStringList &); + ChalkHalftone(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkHalftone(); }; @@ -65,7 +65,7 @@ public: virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); virtual KisFilterConfiguration * configuration(TQWidget* nwidget); virtual KisFilterConfiguration * configuration() {return new KisHalftoneReductionConfiguration( BEST_WAVELET_FREQUENCY_VALUE, 2 );}; - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); static inline KisID id() { return KisID("halftone", i18n("Halftone Reducer")); }; virtual bool supportsPainting() { return false; } diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp index 8108a3d6b..78398157f 100644 --- a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp +++ b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp @@ -47,21 +47,21 @@ typedef KGenericFactory<ChalkImageEnhancement> ChalkImageEnhancementFactory; K_EXPORT_COMPONENT_FACTORY( chalkimageenhancement, ChalkImageEnhancementFactory( "chalk" ) ) - ChalkImageEnhancement::ChalkImageEnhancement(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) + ChalkImageEnhancement::ChalkImageEnhancement(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkImageEnhancementFactory::instance()); kdDebug(41006) << "Image enhancement filter plugin. Class: " << className() << ", Parent: " - << tqparent->className() + << parent->className() << "\n"; - if ( tqparent->inherits("KisFilterRegistry") ) + if ( parent->inherits("KisFilterRegistry") ) { - KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(tqparent); + KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(parent); r->add(new KisSimpleNoiseReducer()); r->add(new KisWaveletNoiseReduction()); } diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.h b/chalk/plugins/filters/imageenhancement/imageenhancement.h index b333e25ff..7a00f3526 100644 --- a/chalk/plugins/filters/imageenhancement/imageenhancement.h +++ b/chalk/plugins/filters/imageenhancement/imageenhancement.h @@ -27,7 +27,7 @@ class ChalkImageEnhancement : public KParts::Plugin { public: - ChalkImageEnhancement(TQObject *tqparent, const char *name, const TQStringList &); + ChalkImageEnhancement(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkImageEnhancement(); }; diff --git a/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp b/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp index 0ff7a9586..f38f364ce 100644 --- a/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp +++ b/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp @@ -37,12 +37,12 @@ KisSimpleNoiseReducer::~KisSimpleNoiseReducer() { } -KisFilterConfigWidget * KisSimpleNoiseReducer::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP) +KisFilterConfigWidget * KisSimpleNoiseReducer::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 0, 255, 50, i18n("Threshold"), "threshold" ) ); param.push_back( KisIntegerWidgetParam( 0, 10, 1, i18n("Window size"), "windowsize") ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisSimpleNoiseReducer::configuration(TQWidget* nwidget) @@ -77,13 +77,13 @@ void KisSimpleNoiseReducer::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisColorSpace* cs = src->colorSpace(); - // Compute the blur tqmask + // Compute the blur mask KisAutobrushShape* kas = new KisAutobrushCircleShape(2*windowsize+1, 2*windowsize+1, windowsize, windowsize); - TQImage tqmask; - kas->createBrush(&tqmask); + TQImage mask; + kas->createBrush(&mask); - KisKernelSP kernel = KisKernel::fromTQImage(tqmask); + KisKernelSP kernel = KisKernel::fromTQImage(mask); KisPaintDeviceSP interm = new KisPaintDevice(*src); KisConvolutionPainter painter( interm ); diff --git a/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.h b/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.h index a233bb854..620981c73 100644 --- a/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.h +++ b/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.h @@ -47,7 +47,7 @@ class KisSimpleNoiseReducer : public KisFilter virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); virtual KisFilterConfiguration * configuration(TQWidget* nwidget); virtual KisFilterConfiguration * configuration() { return new KisSimpleNoiseReducerConfiguration( 50, 1); }; - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); static inline KisID id() { return KisID("gaussiannoisereducer", i18n("Gaussian Noise Reducer")); }; virtual bool supportsPainting() { return false; } diff --git a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp index 021bf5c69..e5cca62ed 100644 --- a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp +++ b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp @@ -38,11 +38,11 @@ KisWaveletNoiseReduction::~KisWaveletNoiseReduction() { } -KisFilterConfigWidget * KisWaveletNoiseReduction::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisWaveletNoiseReduction::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { vKisDoubleWidgetParam param; param.push_back( KisDoubleWidgetParam( 0.0, 256.0, BEST_WAVELET_THRESHOLD_VALUE, i18n("Threshold"), "threshold" ) ); - return new KisMultiDoubleFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiDoubleFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisWaveletNoiseReduction::configuration(TQWidget* nwidget ) diff --git a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h index 85a96ec81..b6da5773f 100644 --- a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h +++ b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h @@ -54,7 +54,7 @@ public: virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); virtual KisFilterConfiguration * configuration(TQWidget* nwidget); virtual KisFilterConfiguration * configuration() {return new KisWaveletNoiseReductionConfiguration( BEST_WAVELET_THRESHOLD_VALUE );}; - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); static inline KisID id() { return KisID("waveletnoisereducer", i18n("Wavelet Noise Reducer")); }; virtual bool supportsPainting() { return false; } diff --git a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp index f33681a57..b83baa116 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp +++ b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp @@ -26,8 +26,8 @@ #include "wdglenscorrectionoptions.h" -KisWdgLensCorrection::KisWdgLensCorrection(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name) - : KisFilterConfigWidget(tqparent,name) +KisWdgLensCorrection::KisWdgLensCorrection(KisFilter* /*nfilter*/, TQWidget* parent, const char* name) + : KisFilterConfigWidget(parent,name) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgLensCorrectionOptions(this); diff --git a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h index 193aa5aac..d5d3ce96a 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h +++ b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h @@ -31,7 +31,7 @@ class KisWdgLensCorrection : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgLensCorrection(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0); + KisWdgLensCorrection(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0); ~KisWdgLensCorrection(); public: inline WdgLensCorrectionOptions* widget() { return m_widget; }; diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc index cd3627c5a..4fefb5970 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc +++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc @@ -52,14 +52,14 @@ typedef KGenericFactory<ChalkLensCorrectionFilter> ChalkLensCorrectionFilterFactory; K_EXPORT_COMPONENT_FACTORY( chalklenscorrectionfilter, ChalkLensCorrectionFilterFactory( "chalk" ) ) -ChalkLensCorrectionFilter::ChalkLensCorrectionFilter(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkLensCorrectionFilter::ChalkLensCorrectionFilter(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkLensCorrectionFilterFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterLensCorrection()); } } @@ -88,9 +88,9 @@ KisFilterConfiguration* KisFilterLensCorrection::configuration(TQWidget* w) return config; } -KisFilterConfigWidget * KisFilterLensCorrection::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisFilterLensCorrection::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { - return new KisWdgLensCorrection((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of lens correction filter").ascii()); + return new KisWdgLensCorrection((KisFilter*)this, (TQWidget*)parent, i18n("Configuration of lens correction filter").ascii()); } void KisFilterLensCorrection::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rawrect) diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h index f04012b6a..a54f11a99 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h +++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h @@ -29,7 +29,7 @@ class KisFilterConfigWidget; class ChalkLensCorrectionFilter : public KParts::Plugin { public: - ChalkLensCorrectionFilter(TQObject *tqparent, const char *name, const TQStringList &); + ChalkLensCorrectionFilter(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkLensCorrectionFilter(); }; @@ -46,7 +46,7 @@ class KisFilterLensCorrection : public KisFilter virtual bool supportsIncrementalPainting() { return false; } virtual bool supportsAdjustmentLayers() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cc b/chalk/plugins/filters/levelfilter/kgradientslider.cc index 948fd277c..7b836436e 100644 --- a/chalk/plugins/filters/levelfilter/kgradientslider.cc +++ b/chalk/plugins/filters/levelfilter/kgradientslider.cc @@ -34,8 +34,8 @@ #include "kgradientslider.h" -KGradientSlider::KGradientSlider(TQWidget *tqparent, const char *name, WFlags f) - : TQWidget(tqparent, name, f) +KGradientSlider::KGradientSlider(TQWidget *parent, const char *name, WFlags f) + : TQWidget(parent, name, f) { m_dragging = false; diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.h b/chalk/plugins/filters/levelfilter/kgradientslider.h index c8990c805..ad667ca27 100644 --- a/chalk/plugins/filters/levelfilter/kgradientslider.h +++ b/chalk/plugins/filters/levelfilter/kgradientslider.h @@ -40,7 +40,7 @@ Q_OBJECT } eCursor; public: - KGradientSlider(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); + KGradientSlider(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); virtual ~KGradientSlider(); diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cc b/chalk/plugins/filters/levelfilter/kis_level_filter.cc index fb437f269..b7c1cb00d 100644 --- a/chalk/plugins/filters/levelfilter/kis_level_filter.cc +++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cc @@ -86,9 +86,9 @@ KisLevelFilter::KisLevelFilter() } -KisFilterConfigWidget * KisLevelFilter::createConfigurationWidget(TQWidget *tqparent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisLevelFilter::createConfigurationWidget(TQWidget *parent, KisPaintDeviceSP dev) { - return new KisLevelConfigWidget(tqparent, dev); + return new KisLevelConfigWidget(parent, dev); } KisFilterConfiguration* KisLevelFilter::configuration(TQWidget *nwidget) @@ -207,8 +207,8 @@ void KisLevelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilt setProgressDone(); } -KisLevelConfigWidget::KisLevelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name, WFlags f) - : KisFilterConfigWidget(tqparent, name, f) +KisLevelConfigWidget::KisLevelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f) + : KisFilterConfigWidget(parent, name, f) { m_page = new WdgLevel(this); histogram = NULL; diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.h b/chalk/plugins/filters/levelfilter/kis_level_filter.h index 8f3d3591b..b2a385215 100644 --- a/chalk/plugins/filters/levelfilter/kis_level_filter.h +++ b/chalk/plugins/filters/levelfilter/kis_level_filter.h @@ -57,7 +57,7 @@ public: public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget *); virtual KisFilterConfiguration * configuration() { return new KisLevelFilterConfiguration(); }; virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); @@ -76,7 +76,7 @@ class KisLevelConfigWidget : public KisFilterConfigWidget { Q_OBJECT TQ_OBJECT public: - KisLevelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); + KisLevelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); virtual ~KisLevelConfigWidget(); KisLevelFilterConfiguration * config(); diff --git a/chalk/plugins/filters/levelfilter/levelfilter.cc b/chalk/plugins/filters/levelfilter/levelfilter.cc index 669775fbc..cabda0b5b 100644 --- a/chalk/plugins/filters/levelfilter/levelfilter.cc +++ b/chalk/plugins/filters/levelfilter/levelfilter.cc @@ -51,13 +51,13 @@ typedef KGenericFactory<LevelFilter> LevelFilterFactory; K_EXPORT_COMPONENT_FACTORY( chalklevelfilter, LevelFilterFactory( "chalk" ) ) -LevelFilter::LevelFilter(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +LevelFilter::LevelFilter(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(LevelFilterFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisLevelFilter()); } } diff --git a/chalk/plugins/filters/levelfilter/levelfilter.h b/chalk/plugins/filters/levelfilter/levelfilter.h index 69627ff7f..433a8d8ac 100644 --- a/chalk/plugins/filters/levelfilter/levelfilter.h +++ b/chalk/plugins/filters/levelfilter/levelfilter.h @@ -28,7 +28,7 @@ class KisColorAdjustment; class LevelFilter : public KParts::Plugin { public: - LevelFilter(TQObject *tqparent, const char *name, const TQStringList &); + LevelFilter(TQObject *parent, const char *name, const TQStringList &); virtual ~LevelFilter(); }; diff --git a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp index 060418f3a..c13db9527 100644 --- a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp +++ b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp @@ -26,8 +26,8 @@ #include "wdgnoiseoptions.h" -KisWdgNoise::KisWdgNoise(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name) - : KisFilterConfigWidget(tqparent,name) +KisWdgNoise::KisWdgNoise(KisFilter* /*nfilter*/, TQWidget* parent, const char* name) + : KisFilterConfigWidget(parent,name) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgNoiseOptions(this); diff --git a/chalk/plugins/filters/noisefilter/kis_wdg_noise.h b/chalk/plugins/filters/noisefilter/kis_wdg_noise.h index ca42ebd23..a9b347459 100644 --- a/chalk/plugins/filters/noisefilter/kis_wdg_noise.h +++ b/chalk/plugins/filters/noisefilter/kis_wdg_noise.h @@ -31,7 +31,7 @@ class KisWdgNoise : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgNoise(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0); + KisWdgNoise(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0); ~KisWdgNoise(); public: inline WdgNoiseOptions* widget() { return m_widget; }; diff --git a/chalk/plugins/filters/noisefilter/noisefilter.cc b/chalk/plugins/filters/noisefilter/noisefilter.cc index af593703b..0f634eb89 100644 --- a/chalk/plugins/filters/noisefilter/noisefilter.cc +++ b/chalk/plugins/filters/noisefilter/noisefilter.cc @@ -48,14 +48,14 @@ typedef KGenericFactory<ChalkNoiseFilter> ChalkNoiseFilterFactory; K_EXPORT_COMPONENT_FACTORY( chalknoisefilter, ChalkNoiseFilterFactory( "chalk" ) ) -ChalkNoiseFilter::ChalkNoiseFilter(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkNoiseFilter::ChalkNoiseFilter(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkNoiseFilterFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterNoise()); } } @@ -80,9 +80,9 @@ KisFilterConfiguration* KisFilterNoise::configuration(TQWidget* w) return config; } -KisFilterConfigWidget * KisFilterNoise::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisFilterNoise::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev) { - return new KisWdgNoise((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of noise filter").ascii()); + return new KisWdgNoise((KisFilter*)this, (TQWidget*)parent, i18n("Configuration of noise filter").ascii()); } void KisFilterNoise::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) diff --git a/chalk/plugins/filters/noisefilter/noisefilter.h b/chalk/plugins/filters/noisefilter/noisefilter.h index b73c761f4..c630e71fb 100644 --- a/chalk/plugins/filters/noisefilter/noisefilter.h +++ b/chalk/plugins/filters/noisefilter/noisefilter.h @@ -29,7 +29,7 @@ class KisFilterConfigWidget; class ChalkNoiseFilter : public KParts::Plugin { public: - ChalkNoiseFilter(TQObject *tqparent, const char *name, const TQStringList &); + ChalkNoiseFilter(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkNoiseFilter(); }; @@ -45,7 +45,7 @@ class KisFilterNoise : public KisFilter virtual bool supportsPreview() { return true; } virtual bool supportsIncrementalPainting() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc index a658b863b..2909e8a16 100644 --- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc +++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc @@ -228,12 +228,12 @@ uint KisOilPaintFilter::MostFrequentColor (KisPaintDeviceSP src, const TQRect& b } -KisFilterConfigWidget * KisOilPaintFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisOilPaintFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 1, 5, 1, i18n("Brush size"), "brushSize" ) ); param.push_back( KisIntegerWidgetParam( 10, 255, 30, i18n("Smooth"), "smooth" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisOilPaintFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h index fbc07a635..912f8b45b 100644 --- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h +++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h @@ -55,7 +55,7 @@ public: virtual bool supportsAdjustmentLayers() { return false; } virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP dev); public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisOilPaintFilterConfiguration( 1, 30); }; private: diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc index 7167b04d4..d9c9f3e6f 100644 --- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc +++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc @@ -26,12 +26,12 @@ typedef KGenericFactory<KisOilPaintFilterPlugin> KisOilPaintFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkoilpaintfilter, KisOilPaintFilterPluginFactory( "chalk" ) ) -KisOilPaintFilterPlugin::KisOilPaintFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) +KisOilPaintFilterPlugin::KisOilPaintFilterPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) { setInstance(KisOilPaintFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisOilPaintFilter()); } diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h index 1f780918a..2900f59f1 100644 --- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h +++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h @@ -25,7 +25,7 @@ class KisOilPaintFilterPlugin : public KParts::Plugin { public: - KisOilPaintFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisOilPaintFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisOilPaintFilterPlugin(); }; diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc index 267b159b5..33886f2c1 100644 --- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc +++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc @@ -163,12 +163,12 @@ void KisPixelizeFilter::pixelize(KisPaintDeviceSP src, KisPaintDeviceSP dst, int setProgressDone(); } -KisFilterConfigWidget * KisPixelizeFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisPixelizeFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 2, 40, 10, i18n("Pixel width"), "pixelWidth" ) ); param.push_back( KisIntegerWidgetParam( 2, 40, 10, i18n("Pixel height"), "pixelHeight" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisPixelizeFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.h b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.h index c7d8bb316..306921e81 100644 --- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.h +++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.h @@ -51,7 +51,7 @@ public: virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP ) { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisPixelizeFilterConfiguration(10,10)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration * configuration(); private: diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc index 93309146f..d93cad4e1 100644 --- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc +++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc @@ -26,13 +26,13 @@ typedef KGenericFactory<KisPixelizeFilterPlugin> KisPixelizeFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkpixelizefilter, KisPixelizeFilterPluginFactory( "chalk" ) ) -KisPixelizeFilterPlugin::KisPixelizeFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +KisPixelizeFilterPlugin::KisPixelizeFilterPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(KisPixelizeFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisPixelizeFilter()); } } diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h index 25d8a62f6..f662cf9d4 100644 --- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h +++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h @@ -25,7 +25,7 @@ class KisPixelizeFilterPlugin : public KParts::Plugin { public: - KisPixelizeFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisPixelizeFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisPixelizeFilterPlugin(); }; diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc index c208bb52a..81ee1448f 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc @@ -418,13 +418,13 @@ uchar KisRainDropsFilter::LimitValues (int ColorValue) return ((uchar) ColorValue); } -KisFilterConfigWidget * KisRainDropsFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP) +KisFilterConfigWidget * KisRainDropsFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 1, 200, 80, i18n("Drop size"), "dropsize" ) ); param.push_back( KisIntegerWidgetParam( 1, 500, 80, i18n("Number"), "number" ) ); param.push_back( KisIntegerWidgetParam( 1, 100, 30, i18n("Fish eyes"), "fishEyes" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisRainDropsFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.h b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.h index 0d797d7d3..91a2963c7 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.h +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.h @@ -55,7 +55,7 @@ public: { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisRainDropsFilterConfiguration( 30, 80, 20)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); private: void rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, const TQRect& rect, int DropSize, int Amount, int Coeff); diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc index 593311d50..f62196cb9 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc @@ -29,12 +29,12 @@ typedef KGenericFactory<KisRainDropsFilterPlugin> KisRainDropsFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkraindropsfilter, KisRainDropsFilterPluginFactory( "chalk" ) ) -KisRainDropsFilterPlugin::KisRainDropsFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) +KisRainDropsFilterPlugin::KisRainDropsFilterPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) { setInstance(KisRainDropsFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisRainDropsFilter()); } } diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h index ca4e05d37..edbf33bff 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h @@ -26,7 +26,7 @@ class KisRainDropsFilterPlugin : public KParts::Plugin { public: - KisRainDropsFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisRainDropsFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisRainDropsFilterPlugin(); }; diff --git a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp index 044f9613b..ba157e14d 100644 --- a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp +++ b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp @@ -26,8 +26,8 @@ #include "wdgrandompickoptions.h" -KisWdgRandomPick::KisWdgRandomPick(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name) - : KisFilterConfigWidget(tqparent,name) +KisWdgRandomPick::KisWdgRandomPick(KisFilter* /*nfilter*/, TQWidget* parent, const char* name) + : KisFilterConfigWidget(parent,name) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgRandomPickOptions(this); diff --git a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h index 54b46e204..761715307 100644 --- a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h +++ b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h @@ -31,7 +31,7 @@ class KisWdgRandomPick : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgRandomPick(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0); + KisWdgRandomPick(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0); ~KisWdgRandomPick(); public: inline WdgRandomPickOptions* widget() { return m_widget; }; diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.cc b/chalk/plugins/filters/randompickfilter/randompickfilter.cc index 3a645590c..54af3e7bd 100644 --- a/chalk/plugins/filters/randompickfilter/randompickfilter.cc +++ b/chalk/plugins/filters/randompickfilter/randompickfilter.cc @@ -49,14 +49,14 @@ typedef KGenericFactory<ChalkRandomPickFilter> ChalkRandomPickFilterFactory; K_EXPORT_COMPONENT_FACTORY( chalkrandompickfilter, ChalkRandomPickFilterFactory( "chalk" ) ) -ChalkRandomPickFilter::ChalkRandomPickFilter(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkRandomPickFilter::ChalkRandomPickFilter(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkRandomPickFilterFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterRandomPick()); } } @@ -82,9 +82,9 @@ KisFilterConfiguration* KisFilterRandomPick::configuration(TQWidget* w) return config; } -KisFilterConfigWidget * KisFilterRandomPick::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisFilterRandomPick::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev) { - return new KisWdgRandomPick((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of random pick filter").ascii()); + return new KisWdgRandomPick((KisFilter*)this, (TQWidget*)parent, i18n("Configuration of random pick filter").ascii()); } void KisFilterRandomPick::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.h b/chalk/plugins/filters/randompickfilter/randompickfilter.h index 4b50c215a..a4fa1da88 100644 --- a/chalk/plugins/filters/randompickfilter/randompickfilter.h +++ b/chalk/plugins/filters/randompickfilter/randompickfilter.h @@ -29,7 +29,7 @@ class KisFilterConfigWidget; class ChalkRandomPickFilter : public KParts::Plugin { public: - ChalkRandomPickFilter(TQObject *tqparent, const char *name, const TQStringList &); + ChalkRandomPickFilter(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkRandomPickFilter(); }; @@ -45,7 +45,7 @@ class KisFilterRandomPick : public KisFilter virtual bool supportsPreview() { return true; } virtual bool supportsIncrementalPainting() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc index 3b8177d4d..a823f8120 100644 --- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc +++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc @@ -139,11 +139,11 @@ void KisRoundCornersFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, setProgressDone(); } -KisFilterConfigWidget * KisRoundCornersFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisRoundCornersFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 2, 100, 30, i18n("Radius"), "radius" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisRoundCornersFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.h b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.h index ec5fb9fb5..3fdc83d02 100644 --- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.h +++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.h @@ -49,7 +49,7 @@ public: virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP ) { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisRoundCornersFilterConfiguration(30)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisRoundCornersFilterConfiguration( 30 ); }; private: diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc index f53acf460..14610c8e5 100644 --- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc +++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc @@ -26,13 +26,13 @@ typedef KGenericFactory<KisRoundCornersFilterPlugin> KisRoundCornersFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkroundcornersfilter, KisRoundCornersFilterPluginFactory( "chalk" ) ) -KisRoundCornersFilterPlugin::KisRoundCornersFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +KisRoundCornersFilterPlugin::KisRoundCornersFilterPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(KisRoundCornersFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisRoundCornersFilter()); } } diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h index e55239e42..cbf871081 100644 --- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h +++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h @@ -25,7 +25,7 @@ class KisRoundCornersFilterPlugin : public KParts::Plugin { public: - KisRoundCornersFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisRoundCornersFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisRoundCornersFilterPlugin(); }; diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc index 6c621e479..f1f9f5dfa 100644 --- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc +++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc @@ -168,11 +168,11 @@ void KisSmallTilesFilter::createSmallTiles(KisPaintDeviceSP src, KisPaintDeviceS setProgressDone(); } -KisFilterConfigWidget * KisSmallTilesFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisSmallTilesFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 2, 5, 1, i18n("Number of tiles"), "smalltiles" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisSmallTilesFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h index 8d82eda29..dee775bdc 100644 --- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h +++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h @@ -59,7 +59,7 @@ public: { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisSmallTilesFilterConfiguration(2)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisSmallTilesFilterConfiguration( 2 ); }; diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc index 5283980c6..6a7fe9ea8 100644 --- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc +++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc @@ -26,13 +26,13 @@ typedef KGenericFactory<KisSmallTilesFilterPlugin> KisSmallTilesFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalksmalltilesfilter, KisSmallTilesFilterPluginFactory( "chalk" ) ) -KisSmallTilesFilterPlugin::KisSmallTilesFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +KisSmallTilesFilterPlugin::KisSmallTilesFilterPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(KisSmallTilesFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisSmallTilesFilter()); } } diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h index 601568f20..26c300128 100644 --- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h +++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h @@ -25,7 +25,7 @@ class KisSmallTilesFilterPlugin : public KParts::Plugin { public: - KisSmallTilesFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisSmallTilesFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisSmallTilesFilterPlugin(); }; diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc index 9a2f56047..52424ce27 100644 --- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc +++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc @@ -195,14 +195,14 @@ void KisSobelFilter::sobel(const TQRect & rc, KisPaintDeviceSP src, KisPaintDevi } -KisFilterConfigWidget * KisSobelFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP) +KisFilterConfigWidget * KisSobelFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP) { vKisBoolWidgetParam param; param.push_back( KisBoolWidgetParam( true, i18n("Sobel horizontally"), "doHorizontally" ) ); param.push_back( KisBoolWidgetParam( true, i18n("Sobel vertically"), "doVertically" ) ); param.push_back( KisBoolWidgetParam( true, i18n("Keep sign of result"), "keepSign" ) ); param.push_back( KisBoolWidgetParam( true, i18n("Make image opaque"), "makeOpaque" ) ); - return new KisMultiBoolFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiBoolFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisSobelFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.h b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.h index 757757bc5..813f81721 100644 --- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.h +++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.h @@ -64,7 +64,7 @@ public: virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP ) { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisSobelFilterConfiguration(true,true,true,true)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisSobelFilterConfiguration( true, true, true, true); }; private: diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc index e0ef8c808..3b21c5477 100644 --- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc +++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc @@ -26,13 +26,13 @@ typedef KGenericFactory<KisSobelFilterPlugin> KisSobelFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalksobelfilter, KisSobelFilterPluginFactory( "chalk" ) ) -KisSobelFilterPlugin::KisSobelFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +KisSobelFilterPlugin::KisSobelFilterPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(KisSobelFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisSobelFilter()); } } diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h index 87564cfeb..a4cc323a0 100644 --- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h +++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h @@ -25,7 +25,7 @@ class KisSobelFilterPlugin : public KParts::Plugin { public: - KisSobelFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisSobelFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisSobelFilterPlugin(); }; diff --git a/chalk/plugins/filters/threadtest/threadtest.cc b/chalk/plugins/filters/threadtest/threadtest.cc index f96a16167..1274c55f9 100644 --- a/chalk/plugins/filters/threadtest/threadtest.cc +++ b/chalk/plugins/filters/threadtest/threadtest.cc @@ -47,13 +47,13 @@ typedef KGenericFactory<ChalkThreadTest> ChalkThreadTestFactory; K_EXPORT_COMPONENT_FACTORY( chalkthreadtest, ChalkThreadTestFactory( "chalk" ) ) -ChalkThreadTest::ChalkThreadTest(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkThreadTest::ChalkThreadTest(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkThreadTestFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * r = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * r = dynamic_cast<KisFilterRegistry *>(parent); r->add(new KisFilterInvert()); } } diff --git a/chalk/plugins/filters/threadtest/threadtest.h b/chalk/plugins/filters/threadtest/threadtest.h index 26c61a587..d7ebae7f6 100644 --- a/chalk/plugins/filters/threadtest/threadtest.h +++ b/chalk/plugins/filters/threadtest/threadtest.h @@ -27,7 +27,7 @@ class ChalkThreadTest : public KParts::Plugin { public: - ChalkThreadTest(TQObject *tqparent, const char *name, const TQStringList &); + ChalkThreadTest(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkThreadTest(); }; diff --git a/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc b/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc index d9539920e..845262b17 100644 --- a/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc +++ b/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc @@ -55,9 +55,9 @@ KisUnsharpFilter::KisUnsharpFilter() : KisFilter(id(), "enhance", i18n("&Unsharp { } -KisFilterConfigWidget * KisUnsharpFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisUnsharpFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { - return new KisWdgUnsharp(this, tqparent, "configuration of color to alpha"); + return new KisWdgUnsharp(this, parent, "configuration of color to alpha"); } KisFilterConfiguration* KisUnsharpFilter::configuration(TQWidget* w) @@ -92,10 +92,10 @@ void KisUnsharpFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi kdDebug() << " brush size = " << size << " " << halfSize << endl; KisAutobrushShape* kas = new KisAutobrushCircleShape(size, size , halfSize, halfSize); - TQImage tqmask; - kas->createBrush(&tqmask); + TQImage mask; + kas->createBrush(&mask); - KisKernelSP kernel = kernelFromTQImage(tqmask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage + KisKernelSP kernel = kernelFromTQImage(mask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage KisPaintDeviceSP interm = new KisPaintDevice(*src); KisColorSpace * cs = src->colorSpace(); diff --git a/chalk/plugins/filters/unsharp/kis_unsharp_filter.h b/chalk/plugins/filters/unsharp/kis_unsharp_filter.h index 0f25f318f..9b92e009c 100644 --- a/chalk/plugins/filters/unsharp/kis_unsharp_filter.h +++ b/chalk/plugins/filters/unsharp/kis_unsharp_filter.h @@ -33,14 +33,14 @@ class KisUnsharpFilter : public KisFilter KisUnsharpFilter(); public: virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); - static inline KisID id() { return KisID("unsharptqmask", i18n("Unsharp Mask")); }; + static inline KisID id() { return KisID("unsharpmask", i18n("Unsharp Mask")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } virtual bool supportsIncrementalPainting() { return false; } virtual bool supportsAdjustmentLayers() { return false; } virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc index 4a59a2242..627d105cf 100644 --- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc +++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc @@ -30,7 +30,7 @@ #include "wdgunsharp.h" -KisWdgUnsharp::KisWdgUnsharp( KisFilter* , TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) +KisWdgUnsharp::KisWdgUnsharp( KisFilter* , TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgUnsharp(this); diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h index 52ffb5849..3b46ff1af 100644 --- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h +++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h @@ -35,7 +35,7 @@ class KisWdgUnsharp : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgUnsharp( KisFilter* nfilter, TQWidget * tqparent, const char * name); + KisWdgUnsharp( KisFilter* nfilter, TQWidget * parent, const char * name); inline WdgUnsharp* widget() { return m_widget; }; virtual void setConfiguration(KisFilterConfiguration*); private: diff --git a/chalk/plugins/filters/unsharp/unsharp.cc b/chalk/plugins/filters/unsharp/unsharp.cc index 60516f421..3d90d49ed 100644 --- a/chalk/plugins/filters/unsharp/unsharp.cc +++ b/chalk/plugins/filters/unsharp/unsharp.cc @@ -27,8 +27,8 @@ typedef KGenericFactory<UnsharpPlugin> UnsharpPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkunsharpfilter, UnsharpPluginFactory( "chalk" ) ) -UnsharpPlugin::UnsharpPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +UnsharpPlugin::UnsharpPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(UnsharpPluginFactory::instance()); @@ -36,11 +36,11 @@ UnsharpPlugin::UnsharpPlugin(TQObject *tqparent, const char *name, const TQStrin kdDebug(41006) << "Extensions Image enhancement Filters plugin. Class: " << className() << ", Parent: " - << tqparent -> className() + << parent -> className() << "\n"; - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisUnsharpFilter()); } } diff --git a/chalk/plugins/filters/unsharp/unsharp.h b/chalk/plugins/filters/unsharp/unsharp.h index 59a926940..5717cccc3 100644 --- a/chalk/plugins/filters/unsharp/unsharp.h +++ b/chalk/plugins/filters/unsharp/unsharp.h @@ -30,7 +30,7 @@ class UnsharpPlugin : public KParts::Plugin { public: - UnsharpPlugin(TQObject *tqparent, const char *name, const TQStringList &); + UnsharpPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~UnsharpPlugin(); }; diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp index 374fc6c8c..e7537c277 100644 --- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp +++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp @@ -27,8 +27,8 @@ #include "wdgwaveoptions.h" -KisWdgWave::KisWdgWave(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name) - : KisFilterConfigWidget(tqparent,name) +KisWdgWave::KisWdgWave(KisFilter* /*nfilter*/, TQWidget* parent, const char* name) + : KisFilterConfigWidget(parent,name) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgWaveOptions(this); diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.h b/chalk/plugins/filters/wavefilter/kis_wdg_wave.h index 6f9b0744e..71732bf50 100644 --- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.h +++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.h @@ -31,7 +31,7 @@ class KisWdgWave : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgWave(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0); + KisWdgWave(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0); ~KisWdgWave(); public: inline WdgWaveOptions* widget() { return m_widget; }; diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cc b/chalk/plugins/filters/wavefilter/wavefilter.cc index 1d78bafc7..ddcfc4bd4 100644 --- a/chalk/plugins/filters/wavefilter/wavefilter.cc +++ b/chalk/plugins/filters/wavefilter/wavefilter.cc @@ -83,14 +83,14 @@ class KisTriangleWaveCurve : public KisWaveCurve { -ChalkWaveFilter::ChalkWaveFilter(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkWaveFilter::ChalkWaveFilter(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkWaveFilterFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterWave()); } } @@ -121,9 +121,9 @@ KisFilterConfiguration* KisFilterWave::configuration(TQWidget* w) return config; } -KisFilterConfigWidget * KisFilterWave::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisFilterWave::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { - return new KisWdgWave((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of wave filter").ascii()); + return new KisWdgWave((KisFilter*)this, (TQWidget*)parent, i18n("Configuration of wave filter").ascii()); } void KisFilterWave::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) diff --git a/chalk/plugins/filters/wavefilter/wavefilter.h b/chalk/plugins/filters/wavefilter/wavefilter.h index 3397ab0bd..8493c4f83 100644 --- a/chalk/plugins/filters/wavefilter/wavefilter.h +++ b/chalk/plugins/filters/wavefilter/wavefilter.h @@ -29,7 +29,7 @@ class KisFilterConfigWidget; class ChalkWaveFilter : public KParts::Plugin { public: - ChalkWaveFilter(TQObject *tqparent, const char *name, const TQStringList &); + ChalkWaveFilter(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkWaveFilter(); }; @@ -46,7 +46,7 @@ class KisFilterWave : public KisFilter virtual bool supportsIncrementalPainting() { return false; } virtual bool supportsAdjustmentLayers() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc index 5a267f57c..3b48e4396 100644 --- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc +++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc @@ -42,15 +42,15 @@ typedef KGenericFactory<DefaultPaintOpsPlugin> DefaultPaintOpsPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkdefaultpaintops, DefaultPaintOpsPluginFactory( "chalkcore" ) ) -DefaultPaintOpsPlugin::DefaultPaintOpsPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +DefaultPaintOpsPlugin::DefaultPaintOpsPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(DefaultPaintOpsPluginFactory::instance()); // This is not a gui plugin; only load it when the doc is created. - if ( tqparent->inherits("KisPaintOpRegistry") ) + if ( parent->inherits("KisPaintOpRegistry") ) { - KisPaintOpRegistry * r = dynamic_cast<KisPaintOpRegistry*>(tqparent); + KisPaintOpRegistry * r = dynamic_cast<KisPaintOpRegistry*>(parent); // Add hard-coded paint ops. Plugin paintops will add // themselves in the plugin initialization code. r->add ( new KisAirbrushOpFactory ); diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h index d7afb9d0c..7c037c9ec 100644 --- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h +++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h @@ -29,7 +29,7 @@ class DefaultPaintOpsPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - DefaultPaintOpsPlugin(TQObject *tqparent, const char *name, const TQStringList &); + DefaultPaintOpsPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~DefaultPaintOpsPlugin(); }; diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc index 1977d58b0..c5f938642 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc @@ -115,8 +115,8 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info dab = brush->image(device->colorSpace(), info, xFraction, yFraction); } else { - KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction); - dab = computeDab(tqmask); + KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction); + dab = computeDab(mask); } m_painter->setDab(dab); // Cache dab for future paints in the painter. diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc index ffa51114e..1ec165619 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc @@ -55,10 +55,10 @@ KisPaintOp * KisBrushOpFactory::createOp(const KisPaintOpSettings *settings, Kis return op; } -KisBrushOpSettings::KisBrushOpSettings(TQWidget *tqparent) - : super(tqparent) +KisBrushOpSettings::KisBrushOpSettings(TQWidget *parent) + : super(parent) { - m_optionsWidget = new TQWidget(tqparent, "brush option widget"); + m_optionsWidget = new TQWidget(parent, "brush option widget"); TQHBoxLayout * l = new TQHBoxLayout(m_optionsWidget); l->setAutoAdd(true); m_pressureVariation = new TQLabel(i18n("Pressure variation: "), m_optionsWidget); @@ -125,13 +125,13 @@ bool KisBrushOpSettings::varyDarken() const return m_darken->isChecked(); } -KisPaintOpSettings* KisBrushOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice) +KisPaintOpSettings* KisBrushOpFactory::settings(TQWidget * parent, const KisInputDevice& inputDevice) { if (inputDevice == KisInputDevice::mouse()) { // No options for mouse, only tablet devices return 0; } else { - return new KisBrushOpSettings(tqparent); + return new KisBrushOpSettings(parent); } } @@ -180,13 +180,13 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) // Painting should be implemented according to the following algorithm: // retrieve brush - // if brush == tqmask - // retrieve tqmask + // if brush == mask + // retrieve mask // else if brush == image // retrieve image - // subsample (tqmask | image) for position -- pos should be double! - // apply filters to tqmask (colour | gradient | pattern | etc. - // composite filtered tqmask into temporary layer + // subsample (mask | image) for position -- pos should be double! + // apply filters to mask (colour | gradient | pattern | etc. + // composite filtered mask into temporary layer // composite temporary layer into target layer // @see: doc/brush.txt @@ -245,8 +245,8 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) dab = brush->image(device->colorSpace(), adjustedInfo, xFraction, yFraction); } else { - KisAlphaMaskSP tqmask = brush->tqmask(adjustedInfo, xFraction, yFraction); - dab = computeDab(tqmask); + KisAlphaMaskSP mask = brush->mask(adjustedInfo, xFraction, yFraction); + dab = computeDab(mask); } m_painter->setPressure(adjustedInfo.pressure); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.h b/chalk/plugins/paintops/defaultpaintops/kis_brushop.h index 6475b3d74..4782efbd4 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.h +++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.h @@ -42,7 +42,7 @@ public: virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter); virtual KisID id() { return KisID("paintbrush", i18n("Pixel Brush")); } virtual TQString pixmap() { return "paintbrush.png"; } - virtual KisPaintOpSettings *settings(TQWidget * tqparent, const KisInputDevice& inputDevice); + virtual KisPaintOpSettings *settings(TQWidget * parent, const KisInputDevice& inputDevice); }; class KisBrushOpSettings : public TQObject, public KisPaintOpSettings { @@ -50,7 +50,7 @@ class KisBrushOpSettings : public TQObject, public KisPaintOpSettings { TQ_OBJECT typedef KisPaintOpSettings super; public: - KisBrushOpSettings(TQWidget *tqparent); + KisBrushOpSettings(TQWidget *parent); bool varySize() const; bool varyOpacity() const; diff --git a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc index 7ad4a4da8..3294d8469 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc @@ -125,8 +125,8 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf dab->convertTo(KisMetaRegistry::instance()->csRegistry()->getAlpha8()); } else { - KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction); - dab = computeDab(tqmask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); + KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction); + dab = computeDab(mask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); } m_painter->setPressure(info.pressure); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc index 794923a4e..0bfc6fd28 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc @@ -94,20 +94,20 @@ void KisEraseOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) splitCoordinate(pt.x(), &destX, &xFraction); splitCoordinate(pt.y(), &destY, &yFraction); - KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction); + KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction); KisPaintDeviceSP dab = new KisPaintDevice(device->colorSpace(), "erase op dab"); Q_CHECK_PTR(dab); - TQ_INT32 maskWidth = tqmask->width(); - TQ_INT32 maskHeight = tqmask->height(); + TQ_INT32 maskWidth = mask->width(); + TQ_INT32 maskHeight = mask->height(); TQRect dstRect; KisRectIteratorPixel it = dab->createRectIterator(0, 0, maskWidth, maskHeight, true); KisColorSpace* cs = dab->colorSpace(); while (!it.isDone()) { - cs->setAlpha(it.rawData(), TQ_UINT8_MAX - tqmask->alphaAt(it.x(), it.y()), 1); + cs->setAlpha(it.rawData(), TQ_UINT8_MAX - mask->alphaAt(it.x(), it.y()), 1); ++it; } diff --git a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc index e8780100f..41c2607eb 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc @@ -79,9 +79,9 @@ void KisPenOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) dab = brush->image(device->colorSpace(), info); } else { - // Compute tqmask without sub-pixel positioning - KisAlphaMaskSP tqmask = brush->tqmask(info); - dab = computeDab(tqmask); + // Compute mask without sub-pixel positioning + KisAlphaMaskSP mask = brush->mask(info); + dab = computeDab(mask); } m_painter->setPressure(info.pressure); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc index a493f132f..c5f4e6eb0 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc @@ -56,10 +56,10 @@ KisPaintOp * KisSmudgeOpFactory::createOp(const KisPaintOpSettings *settings, Ki return op; } -KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *tqparent, bool isTablet) - : super(tqparent) +KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *parent, bool isTablet) + : super(parent) { - m_optionsWidget = new TQWidget(tqparent, "brush option widget"); + m_optionsWidget = new TQWidget(parent, "brush option widget"); TQHBoxLayout * l = new TQHBoxLayout(m_optionsWidget); l->setAutoAdd(true); m_rateLabel = new TQLabel(i18n("Rate: "), m_optionsWidget); @@ -145,13 +145,13 @@ bool KisSmudgeOpSettings::varyOpacity() const return m_opacity ? m_opacity->isChecked() : false; } -KisPaintOpSettings* KisSmudgeOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice) +KisPaintOpSettings* KisSmudgeOpFactory::settings(TQWidget * parent, const KisInputDevice& inputDevice) { if (inputDevice == KisInputDevice::mouse()) { // No options for mouse, only tablet devices - return new KisSmudgeOpSettings(tqparent, false); + return new KisSmudgeOpSettings(parent, false); } else { - return new KisSmudgeOpSettings(tqparent, true); + return new KisSmudgeOpSettings(parent, true); } } @@ -205,13 +205,13 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) // Painting should be implemented according to the following algorithm: // retrieve brush - // if brush == tqmask - // retrieve tqmask + // if brush == mask + // retrieve mask // else if brush == image // retrieve image - // subsample (tqmask | image) for position -- pos should be double! - // apply filters to tqmask (colour | gradient | pattern | etc. - // composite filtered tqmask into temporary layer + // subsample (mask | image) for position -- pos should be double! + // apply filters to mask (colour | gradient | pattern | etc. + // composite filtered mask into temporary layer // composite temporary layer into target layer // @see: doc/brush.txt @@ -256,8 +256,8 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) dab->convertTo(KisMetaRegistry::instance()->csRegistry()->getAlpha8()); } else { - KisAlphaMaskSP tqmask = brush->tqmask(adjustedInfo, xFraction, yFraction); - dab = computeDab(tqmask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); + KisAlphaMaskSP mask = brush->mask(adjustedInfo, xFraction, yFraction); + dab = computeDab(mask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); } diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h index d9c8872d6..5fd732f56 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h +++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h @@ -40,7 +40,7 @@ public: virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter); virtual KisID id() { return KisID("smudge", i18n("Smudge Brush")); } virtual TQString pixmap() { return "paintbrush.png"; } - virtual KisPaintOpSettings *settings(TQWidget * tqparent, const KisInputDevice& inputDevice); + virtual KisPaintOpSettings *settings(TQWidget * parent, const KisInputDevice& inputDevice); }; class KisSmudgeOpSettings : public TQObject, public KisPaintOpSettings { @@ -48,7 +48,7 @@ class KisSmudgeOpSettings : public TQObject, public KisPaintOpSettings { TQ_OBJECT typedef KisPaintOpSettings super; public: - KisSmudgeOpSettings(TQWidget *tqparent, bool isTablet); + KisSmudgeOpSettings(TQWidget *parent, bool isTablet); int rate() const; bool varyRate() const; 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: diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cc b/chalk/plugins/viewplugins/colorrange/colorrange.cc index 1bf90bbc9..9a2ab407d 100644 --- a/chalk/plugins/viewplugins/colorrange/colorrange.cc +++ b/chalk/plugins/viewplugins/colorrange/colorrange.cc @@ -50,14 +50,14 @@ typedef KGenericFactory<ColorRange> ColorRangeFactory; K_EXPORT_COMPONENT_FACTORY( chalkcolorrange, ColorRangeFactory( "chalk" ) ) -ColorRange::ColorRange(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ColorRange::ColorRange(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if (tqparent->inherits("KisView")) { + if (parent->inherits("KisView")) { setInstance(ColorRangeFactory::instance()); setXMLFile(locate("data","chalkplugins/colorrange.rc"), true); - m_view = dynamic_cast<KisView*>(tqparent); + m_view = dynamic_cast<KisView*>(parent); m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Color Range..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "colorrange") ); } diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.h b/chalk/plugins/viewplugins/colorrange/colorrange.h index 38e008d9d..2cedfe7cc 100644 --- a/chalk/plugins/viewplugins/colorrange/colorrange.h +++ b/chalk/plugins/viewplugins/colorrange/colorrange.h @@ -30,7 +30,7 @@ class ColorRange : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ColorRange(TQObject *tqparent, const char *name, const TQStringList &); + ColorRange(TQObject *parent, const char *name, const TQStringList &); virtual ~ColorRange(); private slots: diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc index 22a82e554..1d2c4d611 100644 --- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc +++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc @@ -174,8 +174,8 @@ TQ_UINT32 matchColors(const TQColor & c, enumAction action) -DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget * tqparent, const char * name) - : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok) +DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget * parent, const char * name) + : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok) { m_dev = dev; m_view = view; diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.h b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.h index ce39ebd2f..6ee21c7d0 100644 --- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.h +++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.h @@ -51,7 +51,7 @@ enum enumAction { /** - * This dialog allows the user to create a selection tqmask based + * This dialog allows the user to create a selection mask based * on a (range of) colors. */ class DlgColorRange: public KDialogBase { @@ -63,7 +63,7 @@ class DlgColorRange: public KDialogBase { public: - DlgColorRange(KisView * view, KisPaintDeviceSP layer, TQWidget * tqparent = 0, const char* name = 0); + DlgColorRange(KisView * view, KisPaintDeviceSP layer, TQWidget * parent = 0, const char* name = 0); ~DlgColorRange(); private slots: diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc index 10479a3cf..0498505d1 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc +++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc @@ -58,13 +58,13 @@ typedef KGenericFactory<ColorSpaceConversion> ColorSpaceConversionFactory; K_EXPORT_COMPONENT_FACTORY( chalkcolorspaceconversion, ColorSpaceConversionFactory( "chalk" ) ) -ColorSpaceConversion::ColorSpaceConversion(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ColorSpaceConversion::ColorSpaceConversion(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; setInstance(ColorSpaceConversionFactory::instance()); setXMLFile(locate("data","chalkplugins/colorspaceconversion.rc"), true); diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h index a1f7f5c08..17722871d 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h +++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h @@ -33,7 +33,7 @@ class ColorSpaceConversion : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ColorSpaceConversion(TQObject *tqparent, const char *name, const TQStringList &); + ColorSpaceConversion(TQObject *parent, const char *name, const TQStringList &); virtual ~ColorSpaceConversion(); private slots: diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc index 616b17149..6f9af1c60 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc +++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc @@ -39,9 +39,9 @@ #include "wdgconvertcolorspace.h" #include "dlg_colorspaceconversion.h" -DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget * tqparent, +DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Image Size"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Image Size"), Ok | Cancel, Ok) { m_page = new WdgConvertColorSpace(this, "colorspace_conversion"); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h index 608989abd..472cbeaf6 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h +++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h @@ -36,7 +36,7 @@ class DlgColorSpaceConversion: public KDialogBase { public: - DlgColorSpaceConversion(TQWidget * tqparent = 0, const char* name = 0); + DlgColorSpaceConversion(TQWidget * parent = 0, const char* name = 0); ~DlgColorSpaceConversion(); WdgConvertColorSpace * m_page; diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc index 797fc0983..fedb1fd17 100644 --- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc +++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc @@ -39,9 +39,9 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/, const TQString & /*layerCS*/, - TQWidget * tqparent, + TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Drop Shadow"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Drop Shadow"), Ok | Cancel, Ok) { m_page = new WdgDropshadow(this, "dropshadow"); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.h b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.h index 9f3ca469d..c48a9ea1b 100644 --- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.h +++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.h @@ -37,7 +37,7 @@ class DlgDropshadow: public KDialogBase { public: - DlgDropshadow(const TQString & imageCS, const TQString & layerCS, TQWidget * tqparent = 0, + DlgDropshadow(const TQString & imageCS, const TQString & layerCS, TQWidget * parent = 0, const char* name = 0); ~DlgDropshadow(); diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc index 15e21400f..30339d6e1 100644 --- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc +++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc @@ -122,12 +122,12 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, TQ_INT32 if (!m_cancelRequested) { shadowDev->move (xoffset,yoffset); - KisGroupLayerSP tqparent = image->rootLayer(); + KisGroupLayerSP parent = image->rootLayer(); if (image->activeLayer()) - tqparent = image->activeLayer()->tqparent().data(); + parent = image->activeLayer()->parent().data(); KisPaintLayerSP l = new KisPaintLayer(image, i18n("Drop Shadow"), opacity, shadowDev); - image->addLayer( l.data(), tqparent, src->siblingBelow() ); + image->addLayer( l.data(), parent, src->siblingBelow() ); if (allowResize) { diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc index 5dc190f12..f9b5ad26f 100644 --- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc +++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc @@ -39,15 +39,15 @@ K_EXPORT_COMPONENT_FACTORY( chalkdropshadow, KGenericFactory<KisDropshadowPlugin>( "chalk" ) ) -KisDropshadowPlugin::KisDropshadowPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +KisDropshadowPlugin::KisDropshadowPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) { + if ( parent->inherits("KisView") ) { setInstance(KGenericFactory<KisDropshadowPlugin>::instance()); setXMLFile(locate("data","chalkplugins/dropshadow.rc"), true); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; (void) new KAction(i18n("Add Drop Shadow..."), 0, 0, this, TQT_SLOT(slotDropshadow()), actionCollection(), "dropshadow"); } } diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h index e2641ed28..5bb92da68 100644 --- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h +++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h @@ -31,7 +31,7 @@ class KisDropshadowPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KisDropshadowPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisDropshadowPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisDropshadowPlugin(); private slots: diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc index 8f70b8f71..a23acb6d0 100644 --- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc +++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc @@ -48,16 +48,16 @@ namespace FiltersGallery { typedef KGenericFactory<ChalkFiltersGallery> ChalkFiltersGalleryFactory; K_EXPORT_COMPONENT_FACTORY( chalkfiltersgallery, ChalkFiltersGalleryFactory( "chalk" ) ) -ChalkFiltersGallery::ChalkFiltersGallery(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkFiltersGallery::ChalkFiltersGallery(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(ChalkFiltersGallery::instance()); setXMLFile(locate("data","chalkplugins/chalkfiltersgallery.rc"), true); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; (void) new KAction(i18n("&Filters Gallery"), 0, 0, this, TQT_SLOT(showFiltersGalleryDialog()), actionCollection(), "chalk_filters_gallery"); diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h index 89fed3862..bfc89f81e 100644 --- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h +++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h @@ -34,7 +34,7 @@ namespace FiltersGallery { Q_OBJECT TQ_OBJECT public: - ChalkFiltersGallery(TQObject *tqparent, const char *name, const TQStringList &); + ChalkFiltersGallery(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkFiltersGallery(); public slots: void showFiltersGalleryDialog(); diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc index 766761779..60313cb22 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc +++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc @@ -43,8 +43,8 @@ namespace Plugins { namespace FiltersGallery { -KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* tqparent,const char *name) - : KDialogBase(tqparent,name, true,i18n("Filters Gallery"), Ok | Cancel), m_view(view),m_currentConfigWidget(0), m_currentFilter(0) +KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const char *name) + : KDialogBase(parent,name, true,i18n("Filters Gallery"), Ok | Cancel), m_view(view),m_currentConfigWidget(0), m_currentFilter(0) { // Initialize main widget m_widget = new KisWdgFiltersGallery(this); diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h index 09e5cb1fc..406b834d1 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h +++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h @@ -45,7 +45,7 @@ class KisDlgFiltersGallery : public KDialogBase Q_OBJECT TQ_OBJECT public: - KisDlgFiltersGallery(KisView* view, TQWidget* tqparent,const char *name = ""); + KisDlgFiltersGallery(KisView* view, TQWidget* parent,const char *name = ""); ~KisDlgFiltersGallery(); public: inline KisFilter* currentFilter() { return m_currentFilter; }; diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc index 4b781c17a..90acf1309 100644 --- a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc +++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc @@ -39,8 +39,8 @@ #include "kis_histogram_widget.h" -DlgHistogram::DlgHistogram( TQWidget * tqparent, const char * name) - : super (tqparent, name, true, i18n("Histogram"), Ok | Cancel, Ok) +DlgHistogram::DlgHistogram( TQWidget * parent, const char * name) + : super (parent, name, true, i18n("Histogram"), Ok | Cancel, Ok) { m_page = new KisHistogramWidget(this, "histogram"); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.h b/chalk/plugins/viewplugins/histogram/dlg_histogram.h index d2568f7a0..b97bf30f8 100644 --- a/chalk/plugins/viewplugins/histogram/dlg_histogram.h +++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.h @@ -39,7 +39,7 @@ class DlgHistogram: public KDialogBase { public: - DlgHistogram(TQWidget * tqparent = 0, + DlgHistogram(TQWidget * parent = 0, const char* name = 0); ~DlgHistogram(); diff --git a/chalk/plugins/viewplugins/histogram/histogram.cc b/chalk/plugins/viewplugins/histogram/histogram.cc index 8e6968b90..82d31ec06 100644 --- a/chalk/plugins/viewplugins/histogram/histogram.cc +++ b/chalk/plugins/viewplugins/histogram/histogram.cc @@ -52,18 +52,18 @@ typedef KGenericFactory<Histogram> HistogramFactory; K_EXPORT_COMPONENT_FACTORY( chalkhistogram, HistogramFactory( "chalk" ) ) -Histogram::Histogram(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +Histogram::Histogram(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) { + if ( parent->inherits("KisView") ) { setInstance(HistogramFactory::instance()); setXMLFile(locate("data","chalkplugins/histogram.rc"), true); m_action = new KAction(i18n("&Histogram"), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "histogram"); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; if (KisImageSP img = m_view->canvasSubject()->currentImg()) { connect(img, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQT_SLOT(slotLayersChanged())); connect(img, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQT_SLOT(slotLayersChanged())); diff --git a/chalk/plugins/viewplugins/histogram/histogram.h b/chalk/plugins/viewplugins/histogram/histogram.h index 2425c0c65..ca32db1a0 100644 --- a/chalk/plugins/viewplugins/histogram/histogram.h +++ b/chalk/plugins/viewplugins/histogram/histogram.h @@ -32,7 +32,7 @@ class Histogram : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - Histogram(TQObject *tqparent, const char *name, const TQStringList &); + Histogram(TQObject *parent, const char *name, const TQStringList &); virtual ~Histogram(); private slots: diff --git a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc index 12005e05d..c49838706 100644 --- a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc +++ b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc @@ -39,8 +39,8 @@ #include "kis_colorspace.h" -KisHistogramWidget::KisHistogramWidget(TQWidget *tqparent, const char *name) - : super(tqparent, name) +KisHistogramWidget::KisHistogramWidget(TQWidget *parent, const char *name) + : super(parent, name) { m_from = 0.0; m_width = 0.0; diff --git a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.h b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.h index f83394e7d..53fd174a6 100644 --- a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.h +++ b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.h @@ -33,7 +33,7 @@ class KisHistogramWidget : public WdgHistogram { TQ_OBJECT public: - KisHistogramWidget(TQWidget *tqparent, const char *name); + KisHistogramWidget(TQWidget *parent, const char *name); virtual ~KisHistogramWidget(); void setPaintDevice(KisPaintDeviceSP dev); diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc index df5de24ab..9c6795072 100644 --- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc +++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc @@ -46,12 +46,12 @@ typedef KGenericFactory<ChalkHistogramDocker> ChalkHistogramDockerFactory; K_EXPORT_COMPONENT_FACTORY( chalkhistogramdocker, ChalkHistogramDockerFactory( "chalk" ) ) -ChalkHistogramDocker::ChalkHistogramDocker(TQObject *tqparent, const char *name, const TQStringList&) - : KParts::Plugin(tqparent, name) +ChalkHistogramDocker::ChalkHistogramDocker(TQObject *parent, const char *name, const TQStringList&) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) { - m_view = dynamic_cast<KisView*>(tqparent); + if ( parent->inherits("KisView") ) { + m_view = dynamic_cast<KisView*>(parent); setInstance(ChalkHistogramDockerFactory::instance()); setXMLFile(locate("data","chalkplugins/chalkhistogramdocker.rc"), true); @@ -171,7 +171,7 @@ void ChalkHistogramDocker::colorSpaceChanged(KisColorSpace* cs) producerChanged(0); } -HistogramDockerUpdater::HistogramDockerUpdater(TQObject* /*tqparent*/, KisHistogramSP h, KisHistogramView* v, +HistogramDockerUpdater::HistogramDockerUpdater(TQObject* /*parent*/, KisHistogramSP h, KisHistogramView* v, KisAccumulatingHistogramProducer* p) : m_histogram(h), m_view(v), m_producer(p) { diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h index ade0650fb..ba571a2ab 100644 --- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h +++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h @@ -41,7 +41,7 @@ class ChalkHistogramDocker : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ChalkHistogramDocker(TQObject *tqparent, const char *name, const TQStringList &); + ChalkHistogramDocker(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkHistogramDocker(); private slots: void producerChanged(int pos); @@ -66,7 +66,7 @@ class HistogramDockerUpdater : public TQObject { Q_OBJECT TQ_OBJECT public: - HistogramDockerUpdater(TQObject* tqparent, KisHistogramSP h, KisHistogramView* v, + HistogramDockerUpdater(TQObject* parent, KisHistogramSP h, KisHistogramView* v, KisAccumulatingHistogramProducer* p); public slots: void updated(); diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.cc b/chalk/plugins/viewplugins/history_docker/historydocker.cc index e4f368139..128770065 100644 --- a/chalk/plugins/viewplugins/history_docker/historydocker.cc +++ b/chalk/plugins/viewplugins/history_docker/historydocker.cc @@ -37,13 +37,13 @@ typedef KGenericFactory<ChalkHistoryDocker> ChalkHistoryDockerFactory; K_EXPORT_COMPONENT_FACTORY( chalkhistorydocker, ChalkHistoryDockerFactory( "chalk" ) ) -ChalkHistoryDocker::ChalkHistoryDocker(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkHistoryDocker::ChalkHistoryDocker(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(ChalkHistoryDockerFactory::instance()); // Create history docker diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.h b/chalk/plugins/viewplugins/history_docker/historydocker.h index 82aee9bf1..217b882d3 100644 --- a/chalk/plugins/viewplugins/history_docker/historydocker.h +++ b/chalk/plugins/viewplugins/history_docker/historydocker.h @@ -26,7 +26,7 @@ class ChalkHistoryDocker : public KParts::Plugin { public: - ChalkHistoryDocker(TQObject *tqparent, const char *name, const TQStringList &); + ChalkHistoryDocker(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkHistoryDocker(); }; diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc index a1eba4f31..8a6567528 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc +++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc @@ -45,9 +45,9 @@ using namespace std; // XXX: I'm really real bad at arithmetic, let alone math. Here // be rounding errors. (Boudewijn) -DlgImageSize::DlgImageSize( TQWidget * tqparent, +DlgImageSize::DlgImageSize( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Image Size"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Image Size"), Ok | Cancel, Ok) { m_lock = false; diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.h b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.h index 7983e1120..df643f999 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.h +++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.h @@ -26,7 +26,7 @@ class KisFilterStrategy; class WdgImageSize; /** - * This dialog allows the user to create a selection tqmask based + * This dialog allows the user to create a selection mask based * on a (range of) colors. */ class DlgImageSize: public KDialogBase { @@ -36,7 +36,7 @@ class DlgImageSize: public KDialogBase { public: - DlgImageSize(TQWidget * tqparent = 0, + DlgImageSize(TQWidget * parent = 0, const char* name = 0); ~DlgImageSize(); diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc index 8289d693e..6d24d60ac 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc +++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc @@ -46,9 +46,9 @@ using namespace std; // XXX: I'm really real bad at arithmetic, let alone math. Here // be rounding errors. (Boudewijn) -DlgLayerSize::DlgLayerSize( TQWidget * tqparent, +DlgLayerSize::DlgLayerSize( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Scale Layer"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Scale Layer"), Ok | Cancel, Ok) { m_lock = false; diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.h b/chalk/plugins/viewplugins/imagesize/dlg_layersize.h index 0aaf84459..2edc45c9f 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.h +++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.h @@ -33,7 +33,7 @@ class DlgLayerSize: public KDialogBase { public: - DlgLayerSize(TQWidget * tqparent = 0, + DlgLayerSize(TQWidget * parent = 0, const char* name = 0); ~DlgLayerSize(); diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cc b/chalk/plugins/viewplugins/imagesize/imagesize.cc index c23d27176..76ac2328c 100644 --- a/chalk/plugins/viewplugins/imagesize/imagesize.cc +++ b/chalk/plugins/viewplugins/imagesize/imagesize.cc @@ -58,10 +58,10 @@ typedef KGenericFactory<ImageSize> ImageSizeFactory; K_EXPORT_COMPONENT_FACTORY( chalkimagesize, ImageSizeFactory( "chalk" ) ) -ImageSize::ImageSize(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ImageSize::ImageSize(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(ImageSizeFactory::instance()); setXMLFile(locate("data","chalkplugins/imagesize.rc"), true); @@ -70,7 +70,7 @@ ImageSize::ImageSize(TQObject *tqparent, const char *name, const TQStringList &) (void) new KAction(i18n("&Scale Layer..."), 0, 0, this, TQT_SLOT(slotLayerSize()), actionCollection(), "layerscale"); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; // Selection manager takes ownership? KAction * a = new KAction(i18n("&Scale Selection..."), 0, 0, this, TQT_SLOT(slotSelectionScale()), actionCollection(), "selectionscale"); Q_CHECK_PTR(a); diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.h b/chalk/plugins/viewplugins/imagesize/imagesize.h index 989a603f5..9fd9d28ea 100644 --- a/chalk/plugins/viewplugins/imagesize/imagesize.h +++ b/chalk/plugins/viewplugins/imagesize/imagesize.h @@ -30,7 +30,7 @@ class ImageSize : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ImageSize(TQObject *tqparent, const char *name, const TQStringList &); + ImageSize(TQObject *parent, const char *name, const TQStringList &); virtual ~ImageSize(); private slots: diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc index dcda5c7e3..bb21f6f77 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc @@ -39,7 +39,7 @@ using namespace std; #include "dlg_border_selection.h" #include "wdg_border_selection.h" -DlgBorderSelection::DlgBorderSelection( TQWidget * tqparent, const char * name) : super (tqparent, name, true, i18n("Border Selection"), Ok | Cancel, Ok) +DlgBorderSelection::DlgBorderSelection( TQWidget * parent, const char * name) : super (parent, name, true, i18n("Border Selection"), Ok | Cancel, Ok) { m_page = new WdgBorderSelection(this, "border_selection"); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.h b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.h index 472f01ef3..396b0573b 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.h +++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.h @@ -31,7 +31,7 @@ class DlgBorderSelection: public KDialogBase { public: - DlgBorderSelection(TQWidget * tqparent = 0, const char* name = 0); + DlgBorderSelection(TQWidget * parent = 0, const char* name = 0); ~DlgBorderSelection(); TQ_INT32 xradius(); diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc index b889ccde5..5e327aa8b 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc @@ -39,7 +39,7 @@ using namespace std; #include "dlg_grow_selection.h" #include "wdg_grow_selection.h" -DlgGrowSelection::DlgGrowSelection( TQWidget * tqparent, const char * name) : super (tqparent, name, true, i18n("Grow Selection"), Ok | Cancel, Ok) +DlgGrowSelection::DlgGrowSelection( TQWidget * parent, const char * name) : super (parent, name, true, i18n("Grow Selection"), Ok | Cancel, Ok) { m_page = new WdgGrowSelection(this, "grow_selection"); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.h b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.h index 61785b20e..0893033d7 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.h +++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.h @@ -31,7 +31,7 @@ class DlgGrowSelection: public KDialogBase { public: - DlgGrowSelection(TQWidget * tqparent = 0, const char* name = 0); + DlgGrowSelection(TQWidget * parent = 0, const char* name = 0); ~DlgGrowSelection(); TQ_INT32 xradius(); diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc index eb50c6cf3..b69b998fa 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc @@ -39,7 +39,7 @@ using namespace std; #include "dlg_shrink_selection.h" #include "wdg_shrink_selection.h" -DlgShrinkSelection::DlgShrinkSelection( TQWidget * tqparent, const char * name) : super (tqparent, name, true, i18n("Shrink Selection"), Ok | Cancel, Ok) +DlgShrinkSelection::DlgShrinkSelection( TQWidget * parent, const char * name) : super (parent, name, true, i18n("Shrink Selection"), Ok | Cancel, Ok) { m_page = new WdgShrinkSelection(this, "shrink_selection"); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.h b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.h index 53ce386bf..01ea44696 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.h +++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.h @@ -31,7 +31,7 @@ class DlgShrinkSelection: public KDialogBase { public: - DlgShrinkSelection(TQWidget * tqparent = 0, const char* name = 0); + DlgShrinkSelection(TQWidget * parent = 0, const char* name = 0); ~DlgShrinkSelection(); TQ_INT32 xradius(); diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc index 78a757789..46536e4fc 100644 --- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc @@ -55,15 +55,15 @@ typedef KGenericFactory<ModifySelection> ModifySelectionFactory; K_EXPORT_COMPONENT_FACTORY( chalkmodifyselection, ModifySelectionFactory( "chalk" ) ) -ModifySelection::ModifySelection(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ModifySelection::ModifySelection(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(ModifySelectionFactory::instance()); setXMLFile(locate("data","chalkplugins/modify_selection.rc"), true); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; // Selection manager takes ownership? KAction* a = new KAction(i18n("Grow Selection..."), 0, 0, this, TQT_SLOT(slotGrowSelection()), actionCollection(), "growselection"); diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.h b/chalk/plugins/viewplugins/modify_selection/modify_selection.h index db5dd1b73..baffc2d45 100644 --- a/chalk/plugins/viewplugins/modify_selection/modify_selection.h +++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.h @@ -29,7 +29,7 @@ class ModifySelection : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ModifySelection(TQObject *tqparent, const char *name, const TQStringList &); + ModifySelection(TQObject *parent, const char *name, const TQStringList &); virtual ~ModifySelection(); private slots: diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc index 12e3f42cb..dafb66698 100644 --- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc +++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc @@ -39,9 +39,9 @@ using namespace std; #include "wdg_perftest.h" -DlgPerfTest::DlgPerfTest( TQWidget * tqparent, +DlgPerfTest::DlgPerfTest( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Performance Test"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Performance Test"), Ok | Cancel, Ok) { m_lock = false; diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.h b/chalk/plugins/viewplugins/performancetest/dlg_perftest.h index aae398fa7..3652ebf8a 100644 --- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.h +++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.h @@ -31,7 +31,7 @@ class DlgPerfTest: public KDialogBase { public: - DlgPerfTest(TQWidget * tqparent = 0, + DlgPerfTest(TQWidget * parent = 0, const char* name = 0); ~DlgPerfTest(); diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cc index 88a50e853..8a137374a 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.cc +++ b/chalk/plugins/viewplugins/performancetest/perftest.cc @@ -78,17 +78,17 @@ typedef KGenericFactory<PerfTest> PerfTestFactory; K_EXPORT_COMPONENT_FACTORY( chalkperftest, PerfTestFactory( "chalk" ) ) -PerfTest::PerfTest(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +PerfTest::PerfTest(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(PerfTestFactory::instance()); setXMLFile(locate("data","chalkplugins/perftest.rc"), true); (void) new KAction(i18n("&Performance Test..."), 0, 0, this, TQT_SLOT(slotPerfTest()), actionCollection(), "perf_test"); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; } } diff --git a/chalk/plugins/viewplugins/performancetest/perftest.h b/chalk/plugins/viewplugins/performancetest/perftest.h index 5bae3c8cd..cbd8799fb 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.h +++ b/chalk/plugins/viewplugins/performancetest/perftest.h @@ -33,7 +33,7 @@ class PerfTest : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - PerfTest(TQObject *tqparent, const char *name, const TQStringList &); + PerfTest(TQObject *parent, const char *name, const TQStringList &); virtual ~PerfTest(); private slots: diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc index 6e3cc9f74..03bd6b52c 100644 --- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc +++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc @@ -39,9 +39,9 @@ using namespace std; #include "wdg_rotateimage.h" -DlgRotateImage::DlgRotateImage( TQWidget * tqparent, +DlgRotateImage::DlgRotateImage( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Rotate Image"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Rotate Image"), Ok | Cancel, Ok) { m_lock = false; diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.h b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.h index 47ddd344c..7e3a9365d 100644 --- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.h +++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.h @@ -39,7 +39,7 @@ class DlgRotateImage: public KDialogBase { public: - DlgRotateImage(TQWidget * tqparent = 0, + DlgRotateImage(TQWidget * parent = 0, const char* name = 0); ~DlgRotateImage(); diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc index e8961cec1..60d6f254e 100644 --- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc +++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc @@ -51,14 +51,14 @@ typedef KGenericFactory<RotateImage> RotateImageFactory; K_EXPORT_COMPONENT_FACTORY( chalkrotateimage, RotateImageFactory( "chalk" ) ) // XXX: this plugin could also provide layer scaling/resizing -RotateImage::RotateImage(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +RotateImage::RotateImage(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) { + if ( parent->inherits("KisView") ) { setInstance(RotateImageFactory::instance()); setXMLFile(locate("data","chalkplugins/rotateimage.rc"), true); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; (void) new KAction(i18n("&Rotate Image..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage()), actionCollection(), "rotateimage"); (void) new KAction(i18n("Rotate Image CW"), "rotate_cw", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90"); (void) new KAction(i18n("Rotate Image 1&80"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180"); diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.h b/chalk/plugins/viewplugins/rotateimage/rotateimage.h index 6b262608c..79c03c085 100644 --- a/chalk/plugins/viewplugins/rotateimage/rotateimage.h +++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.h @@ -29,7 +29,7 @@ class RotateImage : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - RotateImage(TQObject *tqparent, const char *name, const TQStringList &); + RotateImage(TQObject *parent, const char *name, const TQStringList &); virtual ~RotateImage(); private slots: diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index dad0ee01f..6e942c389 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -58,8 +58,8 @@ #include <kglobal.h> -KSnapshot::KSnapshot(TQWidget *tqparent, const char *name) - : super(tqparent, name, false, TQString(), Ok|Cancel) +KSnapshot::KSnapshot(TQWidget *parent, const char *name) + : super(parent, name, false, TQString(), Ok|Cancel) { grabber = new TQWidget( 0, 0, WStyle_Customize | WX11BypassWM ); Q_CHECK_PTR(grabber); @@ -319,11 +319,11 @@ Window findRealWindow( Window w, int depth = 0 ) if( type != None ) return w; } - Window root, tqparent; + Window root, parent; Window* tqchildren; unsigned int ntqchildren; Window ret = None; - if( XQueryTree( qt_xdisplay(), w, &root, &tqparent, &tqchildren, &ntqchildren ) != 0 ) { + if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) { for( unsigned int i = 0; i < ntqchildren && ret == None; ++i ) @@ -343,11 +343,11 @@ void KSnapshot::performGrab() if ( mainWidget->mode() == WindowUnderCursor ) { Window root; Window child; - uint tqmask; + uint mask; int rootX, rootY, winX, winY; XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child, &rootX, &rootY, &winX, &winY, - &tqmask); + &mask); if( child == None ) child = qt_xrootwin(); if( !mainWidget->includeDecorations()) { @@ -364,16 +364,16 @@ void KSnapshot::performGrab() w += 2 * border; h += 2 * border; - Window tqparent; + Window parent; Window* tqchildren; unsigned int ntqchildren; - if( XQueryTree( qt_xdisplay(), child, &root, &tqparent, + if( XQueryTree( qt_xdisplay(), child, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) { if( tqchildren != NULL ) XFree( tqchildren ); int newx, newy; Window dummy; - if( XTranslateCoordinates( qt_xdisplay(), tqparent, qt_xrootwin(), + if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(), x, y, &newx, &newy, &dummy )) { x = newx; y = newy; @@ -385,8 +385,8 @@ void KSnapshot::performGrab() #ifdef HAVE_X11_EXTENSIONS_SHAPE_H //No XShape - no work. if (haveXShape) { - TQBitmap tqmask(w, h); - //As the first step, get the tqmask from XShape. + TQBitmap mask(w, h); + //As the first step, get the mask from XShape. int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child, ShapeBounding, &count, &order); @@ -395,7 +395,7 @@ void KSnapshot::performGrab() //Since the border area is part of the window, we use bounding // to limit our work region if (rects) { - //Create a TQRegion from the rectangles describing the bounding tqmask. + //Create a TQRegion from the rectangles describing the bounding mask. TQRegion contents; for (int pos = 0; pos < count; pos++) contents += TQRegion(rects[pos].x, rects[pos].y, @@ -417,14 +417,14 @@ void KSnapshot::performGrab() TQRegion maskedAway = bbox - contents; TQMemArray<TQRect> maskedAwayRects = maskedAway.rects(); - //Construct a bitmap tqmask from the rectangles - TQPainter p(&tqmask); + //Construct a bitmap mask from the rectangles + TQPainter p(&mask); p.fillRect(0, 0, w, h, TQt::color1); for (uint pos = 0; pos < maskedAwayRects.count(); pos++) p.fillRect(maskedAwayRects[pos], TQt::color0); p.end(); - snapshot.setMask(tqmask); + snapshot.setMask(mask); } } #endif diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.h b/chalk/plugins/viewplugins/screenshot/ksnapshot.h index 030cad127..eb8fa60a1 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.h +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.h @@ -41,8 +41,8 @@ class KSnapshotThumb : public TQLabel TQ_OBJECT public: - KSnapshotThumb(TQWidget *tqparent, const char *name = 0) - : TQLabel(tqparent, name) + KSnapshotThumb(TQWidget *parent, const char *name = 0) + : TQLabel(parent, name) { tqsetAlignment(AlignHCenter | AlignVCenter); } @@ -82,7 +82,7 @@ class KSnapshot : public KDialogBase TQ_OBJECT public: - KSnapshot(TQWidget *tqparent= 0, const char *name= 0); + KSnapshot(TQWidget *parent= 0, const char *name= 0); ~KSnapshot(); enum CaptureMode { FullScreen=0, WindowUnderCursor=1, Region=2 }; diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index f4511554a..ec5ba7cc0 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -28,8 +28,8 @@ #include <kglobalsettings.h> -SizeTip::SizeTip( TQWidget *tqparent, const char *name ) - : TQLabel( tqparent, name, WStyle_Customize | WX11BypassWM | +SizeTip::SizeTip( TQWidget *parent, const char *name ) + : TQLabel( parent, name, WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop | WStyle_NoBorder | WStyle_Tool ) { setMargin( 2 ); diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.h b/chalk/plugins/viewplugins/screenshot/regiongrabber.h index b1da10498..13b35dcf3 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.h +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.h @@ -29,7 +29,7 @@ class TQTimer; class SizeTip : public TQLabel { public: - SizeTip( TQWidget *tqparent, const char *name=0 ); + SizeTip( TQWidget *parent, const char *name=0 ); ~SizeTip() {} void setTip( const TQRect &rect ); diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp index ff7629253..4af58e3d9 100644 --- a/chalk/plugins/viewplugins/screenshot/screenshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/screenshot.cpp @@ -41,8 +41,8 @@ K_EXPORT_COMPONENT_FACTORY( chalkscreenshot, KGenericFactory<Screenshot>( "chalk" ) ) -Screenshot::Screenshot(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +Screenshot::Screenshot(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { KGlobal::locale()->insertCatalogue("kscreenshot_plugin"); setInstance(KGenericFactory<Screenshot>::instance()); @@ -72,7 +72,7 @@ void Screenshot::slotScreenGrabbed() KTempFile temp(locateLocal("tmp", "screenshot"), ".png"); snapshot->save(temp.name()); - KisView *view = dynamic_cast<KisView *>(tqparent()); + KisView *view = dynamic_cast<KisView *>(parent()); if(view) view->importImage(temp.name()); } diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.h b/chalk/plugins/viewplugins/screenshot/screenshot.h index d1100836a..055bdb3b9 100644 --- a/chalk/plugins/viewplugins/screenshot/screenshot.h +++ b/chalk/plugins/viewplugins/screenshot/screenshot.h @@ -29,7 +29,7 @@ class Screenshot : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - Screenshot(TQObject *tqparent, const char *name, const TQStringList &); + Screenshot(TQObject *parent, const char *name, const TQStringList &); virtual ~Screenshot(); private slots: diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc index 34b4d1d83..31e9897aa 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.cc +++ b/chalk/plugins/viewplugins/scripting/scripting.cc @@ -54,16 +54,16 @@ typedef KGenericFactory<Scripting> ChalkScriptingFactory; K_EXPORT_COMPONENT_FACTORY( chalkscripting, ChalkScriptingFactory( "chalk" ) ) -Scripting::Scripting(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkScriptingFactory::instance()); - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(Scripting::instance()); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; m_scriptguiclient = new Kross::Api::ScriptGUIClient( m_view, m_view ); // m_scriptguiclient ->setXMLFile(locate("data","chalkplugins/scripting.rc"), true); //BEGIN TODO: understand why the ScriptGUIClient doesn't "link" its actions to the menu diff --git a/chalk/plugins/viewplugins/scripting/scripting.h b/chalk/plugins/viewplugins/scripting/scripting.h index a981175de..2cba6abb3 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.h +++ b/chalk/plugins/viewplugins/scripting/scripting.h @@ -39,7 +39,7 @@ class Scripting : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - Scripting(TQObject *tqparent, const char *name, const TQStringList &); + Scripting(TQObject *parent, const char *name, const TQStringList &); virtual ~Scripting(); private slots: void executionFinished(const Kross::Api::ScriptAction*); diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc index a5717a973..b7703846d 100644 --- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc +++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc @@ -53,14 +53,14 @@ typedef KGenericFactory<SelectOpaque> SelectOpaqueFactory; K_EXPORT_COMPONENT_FACTORY( chalkselectopaque, SelectOpaqueFactory( "chalk" ) ) -SelectOpaque::SelectOpaque(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +SelectOpaque::SelectOpaque(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if (tqparent->inherits("KisView")) { + if (parent->inherits("KisView")) { setInstance(SelectOpaqueFactory::instance()); setXMLFile(locate("data","chalkplugins/selectopaque.rc"), true); - m_view = dynamic_cast<KisView*>(tqparent); + m_view = dynamic_cast<KisView*>(parent); m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "selectopaque") ); } diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.h b/chalk/plugins/viewplugins/selectopaque/selectopaque.h index 47614e302..b77c352a7 100644 --- a/chalk/plugins/viewplugins/selectopaque/selectopaque.h +++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.h @@ -30,7 +30,7 @@ class SelectOpaque : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - SelectOpaque(TQObject *tqparent, const char *name, const TQStringList &); + SelectOpaque(TQObject *parent, const char *name, const TQStringList &); virtual ~SelectOpaque(); private slots: diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc index e6124046f..99078d0f2 100644 --- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc +++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc @@ -34,9 +34,9 @@ DlgSeparate::DlgSeparate( const TQString & imageCS, const TQString & layerCS, - TQWidget * tqparent, + TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Separate Image"), Ok | Cancel, Ok), + : super (parent, name, true, i18n("Separate Image"), Ok | Cancel, Ok), m_imageCS(imageCS), m_layerCS(layerCS) { diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.h b/chalk/plugins/viewplugins/separate_channels/dlg_separate.h index d3536ddaa..4d97925c6 100644 --- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.h +++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.h @@ -36,7 +36,7 @@ class DlgSeparate: public KDialogBase { public: - DlgSeparate(const TQString & imageCS, const TQString & layerCS, TQWidget * tqparent = 0, + DlgSeparate(const TQString & imageCS, const TQString & layerCS, TQWidget * parent = 0, const char* name = 0); ~DlgSeparate(); diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc index 64a83db58..f56b40a2d 100644 --- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc +++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc @@ -39,14 +39,14 @@ K_EXPORT_COMPONENT_FACTORY( chalkseparatechannels, KGenericFactory<KisSeparateChannelsPlugin>( "chalk" ) ) -KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) { + if ( parent->inherits("KisView") ) { setInstance(KGenericFactory<KisSeparateChannelsPlugin>::instance()); setXMLFile(locate("data","chalkplugins/imageseparate.rc"), true); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; (void) new KAction(i18n("Separate Image..."), 0, 0, this, TQT_SLOT(slotSeparate()), actionCollection(), "separate"); } } diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h index ce3aa7318..6f3c1579b 100644 --- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h +++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h @@ -31,7 +31,7 @@ class KisSeparateChannelsPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KisSeparateChannelsPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisSeparateChannelsPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisSeparateChannelsPlugin(); private slots: diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc index ff6dadde8..a2c43aa91 100644 --- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc +++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc @@ -39,9 +39,9 @@ using namespace std; #include "wdg_shearimage.h" -DlgShearImage::DlgShearImage( TQWidget * tqparent, +DlgShearImage::DlgShearImage( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Shear Image"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Shear Image"), Ok | Cancel, Ok) { m_lock = false; diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.h b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.h index 5c82abc72..f4a5dd8a2 100644 --- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.h +++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.h @@ -31,7 +31,7 @@ class DlgShearImage: public KDialogBase { public: - DlgShearImage(TQWidget * tqparent = 0, + DlgShearImage(TQWidget * parent = 0, const char* name = 0); ~DlgShearImage(); diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cc b/chalk/plugins/viewplugins/shearimage/shearimage.cc index 4e7e61d6a..7976c266e 100644 --- a/chalk/plugins/viewplugins/shearimage/shearimage.cc +++ b/chalk/plugins/viewplugins/shearimage/shearimage.cc @@ -51,10 +51,10 @@ typedef KGenericFactory<ShearImage> ShearImageFactory; K_EXPORT_COMPONENT_FACTORY( chalkshearimage, ShearImageFactory( "chalk" ) ) // XXX: this plugin could also provide layer scaling/resizing -ShearImage::ShearImage(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ShearImage::ShearImage(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(ShearImageFactory::instance()); setXMLFile(locate("data","chalkplugins/shearimage.rc"), true); @@ -62,7 +62,7 @@ ShearImage::ShearImage(TQObject *tqparent, const char *name, const TQStringList (void) new KAction(i18n("&Shear Image..."), 0, 0, this, TQT_SLOT(slotShearImage()), actionCollection(), "shearimage"); (void) new KAction(i18n("&Shear Layer..."), 0, 0, this, TQT_SLOT(slotShearLayer()), actionCollection(), "shearlayer"); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; } } diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.h b/chalk/plugins/viewplugins/shearimage/shearimage.h index c824fb51f..9b7e95fa7 100644 --- a/chalk/plugins/viewplugins/shearimage/shearimage.h +++ b/chalk/plugins/viewplugins/shearimage/shearimage.h @@ -29,7 +29,7 @@ class ShearImage : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ShearImage(TQObject *tqparent, const char *name, const TQStringList &); + ShearImage(TQObject *parent, const char *name, const TQStringList &); virtual ~ShearImage(); private slots: diff --git a/chalk/plugins/viewplugins/substrate/dlg_substrate.cc b/chalk/plugins/viewplugins/substrate/dlg_substrate.cc index dcecce482..b0a898568 100644 --- a/chalk/plugins/viewplugins/substrate/dlg_substrate.cc +++ b/chalk/plugins/viewplugins/substrate/dlg_substrate.cc @@ -24,9 +24,9 @@ #include "wdgsubstrate.h" -DlgSubstrate::DlgSubstrate( TQWidget * tqparent, +DlgSubstrate::DlgSubstrate( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok) { m_previewPix = TQPixmap(); m_page = new WdgSubstrate(this, "substrate"); diff --git a/chalk/plugins/viewplugins/substrate/dlg_substrate.h b/chalk/plugins/viewplugins/substrate/dlg_substrate.h index 82051ad36..ac494ba2b 100644 --- a/chalk/plugins/viewplugins/substrate/dlg_substrate.h +++ b/chalk/plugins/viewplugins/substrate/dlg_substrate.h @@ -40,7 +40,7 @@ class DlgSubstrate: public KDialogBase { public: - DlgSubstrate(TQWidget * tqparent = 0, + DlgSubstrate(TQWidget * parent = 0, const char* name = 0); ~DlgSubstrate(); diff --git a/chalk/plugins/viewplugins/substrate/substrate.cc b/chalk/plugins/viewplugins/substrate/substrate.cc index 8aa4d32ea..2e080df70 100644 --- a/chalk/plugins/viewplugins/substrate/substrate.cc +++ b/chalk/plugins/viewplugins/substrate/substrate.cc @@ -44,18 +44,18 @@ typedef KGenericFactory<SubstratePlugin> SubstrateFactory; K_EXPORT_COMPONENT_FACTORY( chalksubstrate, SubstrateFactory( "chalk" ) ) -SubstratePlugin::SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +SubstratePlugin::SubstratePlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(SubstrateFactory::instance()); setXMLFile(locate("data","chalkplugins/substrate.rc"), true); (void) new KAction(i18n("&Substrate..."), 0, 0, this, TQT_SLOT(slotSubstrateActivated()), actionCollection(), "substrate"); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; } } diff --git a/chalk/plugins/viewplugins/substrate/substrate.h b/chalk/plugins/viewplugins/substrate/substrate.h index 409a00f3b..243830452 100644 --- a/chalk/plugins/viewplugins/substrate/substrate.h +++ b/chalk/plugins/viewplugins/substrate/substrate.h @@ -30,7 +30,7 @@ class SubstratePlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &); + SubstratePlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~SubstratePlugin(); private slots: diff --git a/chalk/plugins/viewplugins/variations/dlg_variations.cc b/chalk/plugins/viewplugins/variations/dlg_variations.cc index 133246231..4f1890248 100644 --- a/chalk/plugins/viewplugins/variations/dlg_variations.cc +++ b/chalk/plugins/viewplugins/variations/dlg_variations.cc @@ -24,9 +24,9 @@ #include "wdg_variations.h" -DlgVariations::DlgVariations( TQWidget * tqparent, +DlgVariations::DlgVariations( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok) { m_previewPix = TQPixmap(); m_page = new WdgVariations(this, "variations"); diff --git a/chalk/plugins/viewplugins/variations/dlg_variations.h b/chalk/plugins/viewplugins/variations/dlg_variations.h index e160e6aab..31909fca3 100644 --- a/chalk/plugins/viewplugins/variations/dlg_variations.h +++ b/chalk/plugins/viewplugins/variations/dlg_variations.h @@ -40,7 +40,7 @@ class DlgVariations: public KDialogBase { public: - DlgVariations(TQWidget * tqparent = 0, + DlgVariations(TQWidget * parent = 0, const char* name = 0); ~DlgVariations(); diff --git a/chalk/plugins/viewplugins/variations/variations.cc b/chalk/plugins/viewplugins/variations/variations.cc index 40e8fcf8d..2c0aaa9d2 100644 --- a/chalk/plugins/viewplugins/variations/variations.cc +++ b/chalk/plugins/viewplugins/variations/variations.cc @@ -48,18 +48,18 @@ typedef KGenericFactory<Variations> VariationsFactory; K_EXPORT_COMPONENT_FACTORY( chalkvariations, VariationsFactory( "chalk" ) ) -Variations::Variations(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +Variations::Variations(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(VariationsFactory::instance()); setXMLFile(locate("data","chalkplugins/variations.rc"), true); (void) new KAction(i18n("&Variations..."), 0, 0, this, TQT_SLOT(slotVariationsActivated()), actionCollection(), "variations"); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; } } diff --git a/chalk/plugins/viewplugins/variations/variations.h b/chalk/plugins/viewplugins/variations/variations.h index d8680ba79..1b448a423 100644 --- a/chalk/plugins/viewplugins/variations/variations.h +++ b/chalk/plugins/viewplugins/variations/variations.h @@ -30,7 +30,7 @@ class Variations : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - Variations(TQObject *tqparent, const char *name, const TQStringList &); + Variations(TQObject *parent, const char *name, const TQStringList &); virtual ~Variations(); private slots: |