diff options
Diffstat (limited to 'chalk/plugins/viewplugins')
75 files changed, 164 insertions, 164 deletions
diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cc b/chalk/plugins/viewplugins/colorrange/colorrange.cc index 1bf90bbc..9a2ab407 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 38e008d9..2cedfe7c 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 22a82e55..1d2c4d61 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 ce39ebd2..6ee21c7d 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 10479a3c..0498505d 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 a1f7f5c0..17722871 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 616b1714..6f9af1c6 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 608989ab..472cbeaf 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 797fc098..fedb1fd1 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 9f3ca469..c48a9ea1 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 15e21400..30339d6e 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 5dc190f1..f9b5ad26 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 e2641ed2..5bb92da6 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 8f70b8f7..a23acb6d 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 89fed386..bfc89f81 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 76676177..60313cb2 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 09e5cb1f..406b834d 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 4b781c17..90acf130 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 d2568f7a..b97bf30f 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 8e6968b9..82d31ec0 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 2425c0c6..ca32db1a 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 12005e05..c4983870 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 f83394e7..53fd174a 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 df5de24a..9c679507 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 ade0650f..ba571a2a 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 e4f36813..12877006 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 82aee9bf..217b882d 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 a1eba4f3..8a656752 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 7983e112..df643f99 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 8289d693..6d24d60a 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 0aaf8445..2edc45c9 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 c23d2717..76ac2328 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 989a603f..9fd9d28e 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 dcda5c7e..bb21f6f7 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 472f01ef..396b0573 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 b889ccde..5e327aa8 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 61785b20..0893033d 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 eb50c6cf..b69b998f 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 53ce386b..01ea4469 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 78a75778..46536e4f 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 db5dd1b7..baffc2d4 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 12e3f42c..dafb6669 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 aae398fa..3652ebf8 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 88a50e85..8a137374 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 5bae3c8c..cbd8799f 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 6e3cc9f7..03bd6b52 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 47ddd344..7e3a9365 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 e8961cec..60d6f254 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 6b262608..79c03c08 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 dad0ee01..6e942c38 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 030cad12..eb8fa60a 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 f4511554..ec5ba7cc 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 b1da1049..13b35dcf 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 ff762925..4af58e3d 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 d1100836..055bdb3b 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 34b4d1d8..31e9897a 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 a981175d..2cba6abb 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 a5717a97..b7703846 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 47614e30..b77c352a 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 e6124046..99078d0f 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 d3536dda..4d97925c 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 64a83db5..f56b40a2 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 ce3aa731..6f3c1579 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 ff6dadde..a2c43aa9 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 5c82abc7..f4a5dd8a 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 4e7e61d6..7976c266 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 c824fb51..9b7e95fa 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 dcecce48..b0a89856 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 82051ad3..ac494ba2 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 8aa4d32e..2e080df7 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 409a00f3..24383045 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 13324623..4f189024 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 e160e6aa..31909fca 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 40e8fcf8..2c0aaa9d 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 d8680ba7..1b448a42 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: |