diff options
Diffstat (limited to 'krita/plugins')
381 files changed, 5153 insertions, 5044 deletions
diff --git a/krita/plugins/filters/blur/blur.cc b/krita/plugins/filters/blur/blur.cc index 14d815b4..9df83c13 100644 --- a/krita/plugins/filters/blur/blur.cc +++ b/krita/plugins/filters/blur/blur.cc @@ -27,8 +27,8 @@ typedef KGenericFactory<BlurFilterPlugin> BlurFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( kritablurfilter, BlurFilterPluginFactory( "krita" ) ) -BlurFilterPlugin::BlurFilterPlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +BlurFilterPlugin::BlurFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(BlurFilterPluginFactory::instance()); @@ -36,11 +36,11 @@ BlurFilterPlugin::BlurFilterPlugin(QObject *parent, const char *name, const QStr kdDebug(41006) << "Extensions Convolution Filters plugin. Class: " << className() << ", Parent: " - << parent -> className() + << tqparent -> className() << "\n"; - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisBlurFilter()); } } diff --git a/krita/plugins/filters/blur/blur.h b/krita/plugins/filters/blur/blur.h index a0c51579..0f90902e 100644 --- a/krita/plugins/filters/blur/blur.h +++ b/krita/plugins/filters/blur/blur.h @@ -30,7 +30,7 @@ class BlurFilterPlugin : public KParts::Plugin { public: - BlurFilterPlugin(QObject *parent, const char *name, const QStringList &); + BlurFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~BlurFilterPlugin(); }; diff --git a/krita/plugins/filters/blur/kis_blur_filter.cc b/krita/plugins/filters/blur/kis_blur_filter.cc index 5970cb6e..3a5fb7de 100644 --- a/krita/plugins/filters/blur/kis_blur_filter.cc +++ b/krita/plugins/filters/blur/kis_blur_filter.cc @@ -33,16 +33,16 @@ #include "kis_wdg_blur.h" #include "wdgblur.h" -KisKernelSP kernelFromQImage(const QImage& img) +KisKernelSP kernelFromTQImage(const TQImage& img) { KisKernelSP k = new KisKernel; k->width = img.width(); k->height = img.height(); k->offset = 0; uint count = k->width * k->height; - k->data = new Q_INT32[count]; - Q_INT32* itData = k->data; - Q_UINT8* itImg = img.bits(); + k->data = new TQ_INT32[count]; + TQ_INT32* itData = k->data; + TQ_UINT8* itImg = img.bits(); k->factor = 0; for(uint i = 0; i < count; ++i , ++itData, itImg+=4) { @@ -56,12 +56,12 @@ KisBlurFilter::KisBlurFilter() : KisFilter(id(), "blur", i18n("&Blur...")) { } -KisFilterConfigWidget * KisBlurFilter::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisBlurFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) { - return new KisWdgBlur(this, parent, "configuration of color to alpha"); + return new KisWdgBlur(this, tqparent, "configuration of color to alpha"); } -KisFilterConfiguration* KisBlurFilter::configuration(QWidget* w) +KisFilterConfiguration* KisBlurFilter::configuration(TQWidget* w) { KisWdgBlur * wCTA = dynamic_cast<KisWdgBlur*>(w); if(!wCTA) return 0; @@ -72,12 +72,12 @@ KisFilterConfiguration* KisBlurFilter::configuration(QWidget* w) config->setProperty("halfHeight", wCTA->widget()->intHalfWidth->value() ); config->setProperty("rotate", wCTA->widget()->intAngle->value() ); config->setProperty("strength", wCTA->widget()->intStrength->value() ); - config->setProperty("shape", wCTA->widget()->cbShape->currentItem()); + config->setProperty("tqshape", wCTA->widget()->cbShape->currentItem()); } return config; } -void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { Q_ASSERT(src != 0); Q_ASSERT(dst != 0); @@ -86,8 +86,8 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte if(!config) config = new KisFilterConfiguration(id().id(), 1); - QVariant value; - int shape = (config->getProperty("shape", value)) ? value.toInt() : 0; + TQVariant value; + int tqshape = (config->getProperty("tqshape", value)) ? value.toInt() : 0; uint halfWidth = (config->getProperty("halfWidth", value)) ? value.toUInt() : 5; uint width = 2 * halfWidth + 1; uint halfHeight = (config->getProperty("halfHeight", value)) ? value.toUInt() : 5; @@ -100,7 +100,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte KisAutobrushShape* kas; kdDebug() << width << " " << height << " " << hFade << " " << vFade << endl; - switch(shape) + switch(tqshape) { case 1: kas = new KisAutobrushRectShape(width, height , hFade, vFade); @@ -110,19 +110,19 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte kas = new KisAutobrushCircleShape(width, height, hFade, vFade); break; } - QImage mask; - kas->createBrush(&mask); + TQImage tqmask; + kas->createBrush(&tqmask); - mask.convertDepth(1); + tqmask.convertDepth(1); if( rotate != 0) { - QWMatrix m; + TQWMatrix m; m.rotate( rotate ); - mask = mask.xForm( m ); - if( (mask.height() & 1) || mask.width() & 1) + tqmask = tqmask.xForm( m ); + if( (tqmask.height() & 1) || tqmask.width() & 1) { - mask.smoothScale( mask.width() + !(mask.width() & 1), mask.height() + !(mask.height() & 1) ); + tqmask.smoothScale( tqmask.width() + !(tqmask.width() & 1), tqmask.height() + !(tqmask.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 = kernelFromQImage(mask); // TODO: for 1.6 reuse the krita's core function for creating kernel : KisKernel::fromQImage + KisKernelSP kernel = kernelFromTQImage(tqmask); // TODO: for 1.6 reuse the krita'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/krita/plugins/filters/blur/kis_blur_filter.h b/krita/plugins/filters/blur/kis_blur_filter.h index 781c090e..87bf0c20 100644 --- a/krita/plugins/filters/blur/kis_blur_filter.h +++ b/krita/plugins/filters/blur/kis_blur_filter.h @@ -33,7 +33,7 @@ class KisBlurFilter : public KisFilter public: KisBlurFilter(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); static inline KisID id() { return KisID("blur", i18n("Blur")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } @@ -42,8 +42,8 @@ class KisBlurFilter : public KisFilter virtual bool supportsThreading() { return false; } virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); }; #endif diff --git a/krita/plugins/filters/blur/kis_wdg_blur.cc b/krita/plugins/filters/blur/kis_wdg_blur.cc index dd53e09a..550989b5 100644 --- a/krita/plugins/filters/blur/kis_wdg_blur.cc +++ b/krita/plugins/filters/blur/kis_wdg_blur.cc @@ -20,8 +20,8 @@ #include "kis_wdg_blur.h" -#include <qlayout.h> -#include <qtoolbutton.h> +#include <tqlayout.h> +#include <tqtoolbutton.h> #include <kcombobox.h> #include <knuminput.h> @@ -32,30 +32,30 @@ #include "wdgblur.h" -KisWdgBlur::KisWdgBlur( KisFilter* nfilter, QWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) +KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) { Q_UNUSED( nfilter ); - QGridLayout *widgetLayout = new QGridLayout(this, 1, 1); + TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgBlur(this); widgetLayout -> addWidget(m_widget,0,0); linkSpacingToggled(true); - connect( widget()->bnLinkSize, SIGNAL(toggled(bool)), this, SLOT(linkSpacingToggled( bool ))); - connect( widget()->intHalfWidth, SIGNAL(valueChanged(int)),this,SLOT(spinBoxHalfWidthChanged(int))); - connect( widget()->intHalfHeight, SIGNAL(valueChanged(int)),this,SLOT(spinBoxHalfHeightChanged(int))); + connect( widget()->bnLinkSize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(linkSpacingToggled( bool ))); + connect( widget()->intHalfWidth, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHalfWidthChanged(int))); + connect( widget()->intHalfHeight, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHalfHeightChanged(int))); - connect( widget()->intStrength, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intAngle, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->cbShape, SIGNAL( activated(int)), SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intStrength, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intAngle, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->cbShape, TQT_SIGNAL( activated(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); } void KisWdgBlur::setConfiguration(KisFilterConfiguration* config) { - QVariant value; - if (config->getProperty("shape", value)) + TQVariant value; + if (config->getProperty("tqshape", value)) { widget()->cbShape->setCurrentItem( value.toUInt() ); } diff --git a/krita/plugins/filters/blur/kis_wdg_blur.h b/krita/plugins/filters/blur/kis_wdg_blur.h index a1946f80..49df8a31 100644 --- a/krita/plugins/filters/blur/kis_wdg_blur.h +++ b/krita/plugins/filters/blur/kis_wdg_blur.h @@ -33,8 +33,9 @@ class WdgBlur; class KisWdgBlur : public KisFilterConfigWidget { Q_OBJECT + TQ_OBJECT public: - KisWdgBlur( KisFilter* nfilter, QWidget * parent, const char * name); + KisWdgBlur( KisFilter* nfilter, TQWidget * tqparent, const char * name); inline WdgBlur* widget() { return m_widget; }; virtual void setConfiguration(KisFilterConfiguration*); private slots: diff --git a/krita/plugins/filters/blur/wdgblur.ui b/krita/plugins/filters/blur/wdgblur.ui index ded12e44..06119596 100644 --- a/krita/plugins/filters/blur/wdgblur.ui +++ b/krita/plugins/filters/blur/wdgblur.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgBlur</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgBlur</cstring> </property> @@ -32,7 +32,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -49,22 +49,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QToolButton" row="0" column="2" rowspan="2" colspan="1"> + <widget class="TQToolButton" row="0" column="2" rowspan="2" colspan="1"> <property name="name"> <cstring>bnLinkSize</cstring> </property> @@ -76,13 +76,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>16</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>16</width> <height>32767</height> @@ -113,7 +113,7 @@ <cstring>cbShape</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -124,7 +124,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -160,7 +160,7 @@ <number>1000</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -168,7 +168,7 @@ <string>Half-width:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -187,7 +187,7 @@ <number>100</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -212,7 +212,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/filters/bumpmap/bumpmap.cc b/krita/plugins/filters/bumpmap/bumpmap.cc index 833fc655..9e83bb6f 100644 --- a/krita/plugins/filters/bumpmap/bumpmap.cc +++ b/krita/plugins/filters/bumpmap/bumpmap.cc @@ -30,15 +30,15 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> -#include <qlayout.h> -#include <qcombobox.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qstring.h> -#include <qpushbutton.h> -#include <qlineedit.h> +#include <tqpoint.h> +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqstring.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> #include <knuminput.h> #include <klocale.h> @@ -72,14 +72,14 @@ typedef KGenericFactory<KritaBumpmap> KritaBumpmapFactory; K_EXPORT_COMPONENT_FACTORY( kritabumpmap, KritaBumpmapFactory( "krita" ) ) -KritaBumpmap::KritaBumpmap(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaBumpmap::KritaBumpmap(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaBumpmapFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisFilterBumpmap()); } } @@ -93,7 +93,7 @@ KisFilterBumpmap::KisFilterBumpmap() : KisFilter(id(), "map", i18n("&Bumpmap..." } namespace { - void convertRow(KisPaintDevice * orig, Q_UINT8 * row, Q_INT32 x, Q_INT32 y, Q_INT32 w, Q_UINT8 * lut, Q_INT32 waterlevel) + void convertRow(KisPaintDevice * orig, TQ_UINT8 * row, TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_UINT8 * lut, TQ_INT32 waterlevel) { KisColorSpace * csOrig = orig->colorSpace(); @@ -109,7 +109,7 @@ namespace { } -void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* cfg, const QRect& rect) +void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* cfg, const TQRect& rect) { if (!src) return; if (!dst) return; @@ -120,17 +120,17 @@ void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi KisBumpmapConfiguration * config = (KisBumpmapConfiguration*)cfg; - Q_INT32 xofs, yofs; /// The x,y offset values - Q_INT32 lx, ly; /* X and Y components of light vector */ - Q_INT32 nz2, nzlz; /* nz^2, nz*lz */ - Q_INT32 background; /* Shade for vertical normals */ + TQ_INT32 xofs, yofs; /// The x,y offset values + TQ_INT32 lx, ly; /* X and Y components of light vector */ + TQ_INT32 nz2, nzlz; /* nz^2, nz*lz */ + TQ_INT32 background; /* Shade for vertical normals */ double compensation; /* Background compensation */ - Q_UINT8 lut[256]; /* Look-up table for modes */ + TQ_UINT8 lut[256]; /* Look-up table for modes */ double azimuth; double elevation; - Q_INT32 lz, nz; - Q_INT32 i; + TQ_INT32 lz, nz; + TQ_INT32 i; double n; // ------------------ Prepare parameters @@ -144,13 +144,13 @@ void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi elevation = M_PI * config->elevation / 180.0; /* Calculate the light vector */ - lx = (Q_INT32)(cos(azimuth) * cos(elevation) * 255.0); - ly = (Q_INT32)(sin(azimuth) * cos(elevation) * 255.0); + lx = (TQ_INT32)(cos(azimuth) * cos(elevation) * 255.0); + ly = (TQ_INT32)(sin(azimuth) * cos(elevation) * 255.0); - lz = (Q_INT32)(sin(elevation) * 255.0); + lz = (TQ_INT32)(sin(elevation) * 255.0); /* Calculate constant Z component of surface normal */ - nz = (Q_INT32)((6 * 255) / config->depth); + nz = (TQ_INT32)((6 * 255) / config->depth); nz2 = nz * nz; nzlz = nz * lz; @@ -188,7 +188,7 @@ void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi // Crate a grayscale layer from the bumpmap layer. - QRect bmRect; + TQRect bmRect; KisPaintDevice * bumpmap; if (!config->bumpmap.isNull() && src->image()) { @@ -235,16 +235,16 @@ void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi // ---------------------- Load initial three bumpmap scanlines KisColorSpace * srcCs = src->colorSpace(); - QValueVector<KisChannelInfo *> channels = srcCs->channels(); + TQValueVector<KisChannelInfo *> channels = srcCs->channels(); // One byte per pixel, converted from the bumpmap layer. - Q_UINT8 * bm_row1 = new Q_UINT8[bmRect.width()]; - Q_UINT8 * bm_row2 = new Q_UINT8[bmRect.width()]; - Q_UINT8 * bm_row3 = new Q_UINT8[bmRect.width()]; - Q_UINT8 * tmp_row; + TQ_UINT8 * bm_row1 = new TQ_UINT8[bmRect.width()]; + TQ_UINT8 * bm_row2 = new TQ_UINT8[bmRect.width()]; + TQ_UINT8 * bm_row3 = new TQ_UINT8[bmRect.width()]; + TQ_UINT8 * tmp_row; // ------------------- Map the bumps - Q_INT32 yofs1, yofs2, yofs3; + TQ_INT32 yofs1, yofs2, yofs3; // ------------------- Initialize offsets if (config->tiled) { @@ -262,7 +262,7 @@ void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi convertRow(bumpmap, bm_row3, bmRect.x(), yofs3+bmRect.top(), bmRect.width(), lut, config->waterlevel); for (int y = rect.top(); y<=rect.bottom(); y++) { - const Q_INT32 yBump = y+yofs; + const TQ_INT32 yBump = y+yofs; if(config->tiled || (bmRect.top()<=yBump && yBump<=bmRect.bottom()) ) { // Get the iterators KisHLineIteratorPixel dstIt = dst->createHLineIterator(rect.x(), y, rect.width(), true); @@ -272,12 +272,12 @@ void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi while (!srcIt.isDone() && !cancelRequested()) { if (srcIt.isSelected()) { - const Q_INT32 xBump = srcIt.x()+xofs; - Q_INT32 nx, ny; + const TQ_INT32 xBump = srcIt.x()+xofs; + TQ_INT32 nx, ny; // Calculate surface normal from bumpmap if (config->tiled || bmRect.left() <= xBump && xBump <= bmRect.right()) { - Q_INT32 xofs1, xofs2, xofs3; + TQ_INT32 xofs1, xofs2, xofs3; if (config->tiled) { xofs2 = MOD (xBump-bmRect.left(), bmRect.width()); xofs1 = MOD (xofs2 - 1, bmRect.width()); @@ -298,17 +298,17 @@ void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi } // Shade - Q_INT32 shade; + TQ_INT32 shade; if ((nx == 0) && (ny == 0)) { shade = background; } else { - Q_INT32 ndotl = (nx * lx) + (ny * ly) + nzlz; + TQ_INT32 ndotl = (nx * lx) + (ny * ly) + nzlz; if (ndotl < 0) { - shade = (Q_INT32)(compensation * config->ambient); + shade = (TQ_INT32)(compensation * config->ambient); } else { - shade = (Q_INT32)(ndotl / sqrt(nx * nx + ny * ny + nz2)); - shade = (Q_INT32)(shade + QMAX(0, (255 * compensation - shade)) * config->ambient / 255); + shade = (TQ_INT32)(ndotl / sqrt(nx * nx + ny * ny + nz2)); + shade = (TQ_INT32)(shade + TQMAX(0, (255 * compensation - shade)) * config->ambient / 255); } } @@ -347,15 +347,15 @@ void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi } -KisFilterConfigWidget * KisFilterBumpmap::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisFilterBumpmap::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev) { - KisBumpmapConfigWidget * w = new KisBumpmapConfigWidget(this, dev, parent); + KisBumpmapConfigWidget * w = new KisBumpmapConfigWidget(this, dev, tqparent); return w; } -KisFilterConfiguration * KisFilterBumpmap::configuration(QWidget * w) +KisFilterConfiguration * KisFilterBumpmap::configuration(TQWidget * w) { KisBumpmapConfigWidget * widget = dynamic_cast<KisBumpmapConfigWidget *>(w); @@ -376,7 +376,7 @@ KisFilterConfiguration * KisFilterBumpmap::configuration() KisBumpmapConfiguration::KisBumpmapConfiguration() : KisFilterConfiguration( "bumpmap", 1 ) { - bumpmap = QString::null; + bumpmap = TQString(); azimuth = 135.0; elevation = 45.0; depth = 3; @@ -389,11 +389,11 @@ KisBumpmapConfiguration::KisBumpmapConfiguration() tiled = true; type = krita::LINEAR; } -void KisBumpmapConfiguration::fromXML(const QString & s) +void KisBumpmapConfiguration::fromXML(const TQString & s) { KisFilterConfiguration::fromXML( s ); - bumpmap = QString::null; + bumpmap = TQString(); azimuth = 135.0; elevation = 45.0; depth = 3; @@ -406,7 +406,7 @@ void KisBumpmapConfiguration::fromXML(const QString & s) tiled = true; type = krita::LINEAR; - QVariant v; + TQVariant v; v = getProperty("bumpmap"); if (v.isValid()) { bumpmap = v.asString(); } @@ -436,31 +436,31 @@ void KisBumpmapConfiguration::fromXML(const QString & s) } -QString KisBumpmapConfiguration::toString() +TQString KisBumpmapConfiguration::toString() { m_properties.clear(); - //setProperty("bumpmap", QVariant(bumpmap)); - setProperty("azimuth", QVariant(azimuth)); - setProperty("elevation", QVariant(elevation)); - setProperty("depth", QVariant(depth)); - setProperty("xofs", QVariant(xofs)); - setProperty("yofs", QVariant(yofs)); - setProperty("waterlevel", QVariant(waterlevel)); - setProperty("ambient", QVariant(ambient)); - setProperty("compensate", QVariant(compensate)); - setProperty("invert", QVariant(invert)); - setProperty("tiled", QVariant(tiled)); - setProperty("type", QVariant(type)); + //setProperty("bumpmap", TQVariant(bumpmap)); + setProperty("azimuth", TQVariant(azimuth)); + setProperty("elevation", TQVariant(elevation)); + setProperty("depth", TQVariant(depth)); + setProperty("xofs", TQVariant(xofs)); + setProperty("yofs", TQVariant(yofs)); + setProperty("waterlevel", TQVariant(waterlevel)); + setProperty("ambient", TQVariant(ambient)); + setProperty("compensate", TQVariant(compensate)); + setProperty("invert", TQVariant(invert)); + setProperty("tiled", TQVariant(tiled)); + setProperty("type", TQVariant(type)); return KisFilterConfiguration::toString(); } -KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter *, KisPaintDeviceSP dev, QWidget * parent, const char * name, WFlags f) - : KisFilterConfigWidget(parent, name, f) +KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter *, KisPaintDeviceSP dev, TQWidget * tqparent, const char * name, WFlags f) + : KisFilterConfigWidget(tqparent, name, f) { m_page = new WdgBumpmap(this); - QHBoxLayout * l = new QHBoxLayout(this); + TQHBoxLayout * l = new TQHBoxLayout(this); Q_CHECK_PTR(l); l->add(m_page); @@ -475,19 +475,19 @@ KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter *, KisPaintDeviceSP dev } // Connect all of the widgets to update signal - connect( m_page->radioLinear, SIGNAL( toggled(bool)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->radioSpherical, SIGNAL( toggled(bool)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->radioSinusoidal, SIGNAL( toggled(bool)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->chkCompensate, SIGNAL( toggled(bool)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->chkInvert, SIGNAL( toggled(bool)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->chkTiled, SIGNAL( toggled(bool)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->dblAzimuth, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->dblElevation, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->dblDepth, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->intXOffset, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->intYOffset, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->intWaterLevel, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->intAmbient, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->radioLinear, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->radioSpherical, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->radioSinusoidal, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->chkCompensate, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->chkInvert, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->chkTiled, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->dblAzimuth, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->dblElevation, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->dblDepth, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->intXOffset, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->intYOffset, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->intWaterLevel, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->intAmbient, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); } KisBumpmapConfiguration * KisBumpmapConfigWidget::config() diff --git a/krita/plugins/filters/bumpmap/bumpmap.h b/krita/plugins/filters/bumpmap/bumpmap.h index 1813b922..2b221632 100644 --- a/krita/plugins/filters/bumpmap/bumpmap.h +++ b/krita/plugins/filters/bumpmap/bumpmap.h @@ -22,7 +22,7 @@ #ifndef BUMPMAP_H #define BUMPMAP_H -#include <qwidget.h> +#include <tqwidget.h> #include <kparts/plugin.h> @@ -49,7 +49,7 @@ using namespace krita; class KritaBumpmap : public KParts::Plugin { public: - KritaBumpmap(QObject *parent, const char *name, const QStringList &); + KritaBumpmap(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaBumpmap(); }; @@ -67,7 +67,7 @@ class KisFilterBumpmap : public KisFilter public: KisFilterBumpmap(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); virtual ColorSpaceIndependence colorSpaceIndependence() { return TO_LAB16; }; static inline KisID id() { return KisID("bumpmap", i18n("Bumpmap")); }; virtual bool supportsPainting() { return true; } @@ -76,8 +76,8 @@ public: virtual bool supportsAdjustmentLayers() { return false; } virtual bool supportsThreading() { return false; } - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration * configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration(); }; @@ -89,19 +89,19 @@ class KisBumpmapConfiguration : public KisFilterConfiguration { public: KisBumpmapConfiguration(); - virtual void fromXML( const QString& ); - virtual QString toString(); + virtual void fromXML( const TQString& ); + virtual TQString toString(); public: - QString bumpmap; + TQString bumpmap; double azimuth; double elevation; double depth; - Q_INT32 xofs; - Q_INT32 yofs; - Q_INT32 waterlevel; - Q_INT32 ambient; + TQ_INT32 xofs; + TQ_INT32 yofs; + TQ_INT32 waterlevel; + TQ_INT32 ambient; bool compensate; bool invert; bool tiled; @@ -113,9 +113,10 @@ public: class KisBumpmapConfigWidget : public KisFilterConfigWidget { Q_OBJECT + TQ_OBJECT public: - KisBumpmapConfigWidget(KisFilter * filter, KisPaintDeviceSP dev, QWidget * parent, const char * name = 0, WFlags f = 0 ); + KisBumpmapConfigWidget(KisFilter * filter, KisPaintDeviceSP dev, TQWidget * tqparent, const char * name = 0, WFlags f = 0 ); virtual ~KisBumpmapConfigWidget() {}; KisBumpmapConfiguration * config(); diff --git a/krita/plugins/filters/bumpmap/wdgbumpmap.ui b/krita/plugins/filters/bumpmap/wdgbumpmap.ui index 000b15f6..a783dd85 100644 --- a/krita/plugins/filters/bumpmap/wdgbumpmap.ui +++ b/krita/plugins/filters/bumpmap/wdgbumpmap.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgBumpmap</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgBumpmap</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQFrame" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>frame3</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -52,7 +52,7 @@ layer, the current layer will be used.</string> <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -66,7 +66,7 @@ layer, the current layer will be used.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -75,14 +75,14 @@ layer, the current layer will be used.</string> </spacer> </grid> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>grpSettings</cstring> </property> <property name="title"> <string>Settings</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignAuto</set> </property> <grid> @@ -103,7 +103,7 @@ layer, the current layer will be used.</string> <number>45</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -114,7 +114,7 @@ layer, the current layer will be used.</string> <cstring>dblElevation</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -139,7 +139,7 @@ layer, the current layer will be used.</string> <number>3</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -174,7 +174,7 @@ layer, the current layer will be used.</string> <number>255</number> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -185,7 +185,7 @@ layer, the current layer will be used.</string> <cstring>intWaterLevel</cstring> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -204,7 +204,7 @@ layer, the current layer will be used.</string> <number>-99</number> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -215,7 +215,7 @@ layer, the current layer will be used.</string> <cstring>intYOffset</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -239,7 +239,7 @@ layer, the current layer will be used.</string> </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpType</cstring> </property> @@ -250,7 +250,7 @@ layer, the current layer will be used.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioLinear</cstring> </property> @@ -261,7 +261,7 @@ layer, the current layer will be used.</string> <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioSpherical</cstring> </property> @@ -269,7 +269,7 @@ layer, the current layer will be used.</string> <string>&Spherical</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>radioSinusoidal</cstring> </property> @@ -279,7 +279,7 @@ layer, the current layer will be used.</string> </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="2"> + <widget class="TQGroupBox" row="1" column="2"> <property name="name"> <cstring>grpOptions</cstring> </property> @@ -290,7 +290,7 @@ layer, the current layer will be used.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>chkCompensate</cstring> </property> @@ -301,7 +301,7 @@ layer, the current layer will be used.</string> <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>chkTiled</cstring> </property> @@ -309,7 +309,7 @@ layer, the current layer will be used.</string> <string>&Tile bumpmap</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>chkInvert</cstring> </property> @@ -319,7 +319,7 @@ layer, the current layer will be used.</string> </widget> </grid> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblLayer</cstring> </property> @@ -360,7 +360,7 @@ layer, the current layer will be used.</string> <tabstop>intWaterLevel</tabstop> <tabstop>intAmbient</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/filters/cimg/CImg.h b/krita/plugins/filters/cimg/CImg.h index 23c7e221..8a13b54d 100644 --- a/krita/plugins/filters/cimg/CImg.h +++ b/krita/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 parent class CImgException may be thrown itself when errors that cannot be classified in one of + The tqparent 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 @@ -3749,8 +3749,8 @@ namespace cimg_library { then this image is displayed in the current display window. \param list : The list of images to display. \param axe : The axe used to append the image for visualization. Can be 'x' (default),'y','z' or 'v'. - \param align : Defines the relative alignment of images when displaying images of different sizes. - Can be '\p c' (centered, which is the default), '\p p' (top alignment) and '\p n' (bottom aligment). + \param align : Defines the relative tqalignment of images when displaying images of different sizes. + Can be '\p c' (centered, which is the default), '\p p' (top tqalignment) and '\p n' (bottom aligment). \see CImg::get_append() **/ @@ -4241,7 +4241,7 @@ namespace cimg_library { vtemplate.visualid = XVisualIDFromVisual(visual); int nb_visuals; XVisualInfo *vinfo = XGetVisualInfo(cimg::X11attr().display,VisualIDMask,&vtemplate,&nb_visuals); - if (vinfo && vinfo->red_mask<vinfo->blue_mask) cimg::X11attr().blue_first = true; + if (vinfo && vinfo->red_tqmask<vinfo->blue_tqmask) cimg::X11attr().blue_first = true; cimg::X11attr().byte_order = ImageByteOrder(cimg::X11attr().display); cimg::X11attr().event_thread = new pthread_t; pthread_create(cimg::X11attr().event_thread,NULL,thread_lowlevel,NULL); @@ -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 emask = + const unsigned int etqmask = ((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,emask); + XSelectInput(cimg::X11attr().display,cimg::X11attr().wins[i]->window,etqmask); } 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 - emask = ExposureMask|StructureNotifyMask| + etqmask = ExposureMask|StructureNotifyMask| ((events>=2)?ButtonPressMask|KeyPressMask|PointerMotionMask|LeaveWindowMask:0)| ((events>=3)?ButtonReleaseMask|KeyReleaseMask:0); - XSelectInput(cimg::X11attr().display,window,emask); + XSelectInput(cimg::X11attr().display,window,etqmask); XPeekEvent(cimg::X11attr().display,&event); cimg::X11attr().thread_finished = false; pthread_mutex_unlock(cimg::X11attr().mutex); @@ -5144,7 +5144,7 @@ namespace cimg_library { \par Image structure - The \ref CImg<\c T> structure contains \a five fields : + The \ref CImg<\c T> structure tqcontains \a five fields : - \ref width defines the number of \a columns of the image (size along the X-axis). - \ref height defines the number of \a rows of the image (size along the Y-axis). - \ref depth defines the number of \a slices of the image (size along the Z-axis). @@ -7772,7 +7772,7 @@ namespace cimg_library { //! Return a resized image. /** - \param src = Image giving the geometry of the resize. + \param src = Image giving the tqgeometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -7788,7 +7788,7 @@ namespace cimg_library { //! Return a resized image. /** - \param disp = Display giving the geometry of the resize. + \param disp = Display giving the tqgeometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -7830,7 +7830,7 @@ namespace cimg_library { //! Resize the image. /** - \param src = Image giving the geometry of the resize. + \param src = Image giving the tqgeometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -7846,7 +7846,7 @@ namespace cimg_library { //! Resize the image /** - \param disp = Display giving the geometry of the resize. + \param disp = Display giving the tqgeometry of the resize. \param interp = Resizing type : - 0 = no interpolation : additionnal space is filled with 0. - 1 = bloc interpolation (nearest point). @@ -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> mask = CImg<ftype>::matrix(0.07842776544f, 0.1231940459f, 0.07842776544f, + CImg<ftype> tqmask = 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,mask); + if (x%2 && y%2) dest(x/2,y/2,z,k) = (T)cimg_conv3x3x1(I,tqmask); return dest; } @@ -8799,8 +8799,8 @@ namespace cimg_library { - -1 = Backward finite differences - 0 = Centered finite differences - 1 = Forward finite differences - - 2 = Using Sobel masks - - 3 = Using rotation invariant masks + - 2 = Using Sobel tqmasks + - 3 = Using rotation invariant tqmasks - 4 = Using Deriche recusrsive filter. **/ CImgl<typename cimg::largest<T,float>::type> get_gradientXY(const int scheme=0) const { @@ -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 mask + case 2: { // using Sobel tqmask 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 mask + case 3: { // using rotation invariant tqmask 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) { @@ -9822,45 +9822,45 @@ namespace cimg_library { } #endif - //! Draw a masked sprite image in the instance image, at coordinates (\c x0,\c y0,\c z0,\c v0). + //! Draw a tqmasked sprite image in the instance image, at coordinates (\c x0,\c y0,\c z0,\c v0). /** \param sprite = sprite image. - \param mask = mask image. + \param tqmask = tqmask 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 mask image \c mask. + \param tqmask_valmax = Maximum pixel value of the tqmask image \c tqmask. \param opacity = opacity of the drawing. - \note Pixel values of \c mask set the opacity of the corresponding pixels in \c sprite. + \note Pixel values of \c tqmask 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 mask must be the same. + \note Dimensions along x,y and z of \c sprite and \c tqmask must be the same. **/ - template<typename ti,typename tm> CImg& draw_image(const CImg<ti>& sprite,const CImg<tm>& mask, + template<typename ti,typename tm> CImg& draw_image(const CImg<ti>& sprite,const CImg<tm>& tqmask, 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) { + const tm tqmask_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 (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) + 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) throw CImgArgumentException("CImg<%s>::draw_image() : Mask dimension is (%u,%u,%u,%u), while sprite is (%u,%u,%u,%u)", - pixel_type(),mask.width,mask.height,mask.depth,mask.dim,sprite.width,sprite.height,sprite.depth,sprite.dim); + pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.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*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 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 ti *ptrs = sprite.ptr() + coff; - const tm *ptrm = mask.ptr() + coff; + const tm *ptrm = tqmask.ptr() + coff; const unsigned int offX = width-lX, soffX = sprite.width-lX, offY = width*(height-lY), soffY = sprite.width*(sprite.height-lY), @@ -9868,13 +9868,13 @@ 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 = mask.data + (ptrm - mask.data)%ssize; + ptrm = tqmask.data + (ptrm - tqmask.data)%ssize; for (int z=0; z<lZ; z++) { for (int y=0; y<lY; y++) { for (int x=0; x<lX; x++) { const float mopacity = *(ptrm++)*opacity, - nopacity = cimg::abs(mopacity), copacity = mask_valmax-cimg::max(mopacity,0.0f); - *ptrd = (T)((nopacity*(*(ptrs++))+copacity*(*ptrd))/mask_valmax); + nopacity = cimg::abs(mopacity), copacity = tqmask_valmax-cimg::max(mopacity,0.0f); + *ptrd = (T)((nopacity*(*(ptrs++))+copacity*(*ptrd))/tqmask_valmax); ptrd++; } ptrd+=offX; ptrs+=soffX; ptrm+=soffX; @@ -10785,12 +10785,12 @@ namespace cimg_library { case '\t': x+=4*font[' '].width; break; default: if (c<font.size) { letter = font[c]; - const CImg& mask = (c+256)<(int)font.size?font[c+256]:font[c]; + const CImg& tqmask = (c+256)<(int)font.size?font[c+256]:font[c]; if (fgcolor) for (unsigned int p=0; p<letter.width*letter.height; p++) - if (mask(p)) cimg_mapV(*this,k) letter(p,0,0,k)=(T)(letter(p,0,0,k)*fgcolor[k]); + if (tqmask(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 (!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); + 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); 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 mask of the filled region mask, as an output. + \param region = image that will contain the tqmask of the filled region tqmask, as an output. \param sigma = tolerance concerning neighborhood values. \param opacity = opacity of the drawing. - \return \p region is initialized with the binary mask of the filled region. + \return \p region is initialized with the binary tqmask 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 mask. + //! Return the correlation of the image by a tqmask. /** - The result \p res of the correlation of an image \p img by a mask \p mask is defined to be : + The result \p res of the correlation of an image \p img by a tqmask \p tqmask is defined to be : - res(x,y,z) = sum_{i,j,k} img(x+i,y+j,z+k)*mask(i,j,k) + res(x,y,z) = sum_{i,j,k} img(x+i,y+j,z+k)*tqmask(i,j,k) - \param mask = the correlation kernel. + \param tqmask = 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>& mask,const unsigned int cond=1,const bool weighted_correl=false) const { + get_correlate(const CImg<t>& tqmask,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 (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); + 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); CImg<restype> dest(*this,false); - 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) { + 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) { 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,mask); + 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); 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,mask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x3(I,tqmask)/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,mask); + 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); 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,mask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x2(I,tqmask)/std::sqrt(norm)):0; } } break; default: case 1: - switch (mask.width) { + switch (tqmask.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,mask); + 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); 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,mask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr5x5x1(I,tqmask)/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,mask); + 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); 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,mask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr4x4x1(I,tqmask)/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,mask); + 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); 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,mask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x1(I,tqmask)/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,mask); + 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); 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,mask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x1(I,tqmask)/std::sqrt(norm)):0; } } break; - case 1: dest = mask(0)*(*this); break; + case 1: dest = tqmask(0)*(*this); break; } } } else { - // Generic version for other masks - 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); + // Generic version for other tqmasks + 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); 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)*mask(cxm+xm,cym+ym,czm+zm,0); + val+= (*this)(x+xm,y+ym,z+zm,v)*tqmask(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)*mask(cxm+xm,cym+ym,czm+zm,0); + val+= pix3d(x+xm,y+ym,z+zm,v)*tqmask(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)*mask(cxm+xm,cym+ym,czm+zm,0); + val+= pix3d(x+xm,y+ym,z+zm,v,0)*tqmask(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*mask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*tqmask(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*mask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*tqmask(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*mask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*tqmask(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 mask + //! Correlate the image by a tqmask /** This is the in-place version of get_correlate. \see get_correlate **/ - 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); + 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); } - //! Return the convolution of the image by a mask + //! Return the convolution of the image by a tqmask /** - The result \p res of the convolution of an image \p img by a mask \p mask is defined to be : + The result \p res of the convolution of an image \p img by a tqmask \p tqmask is defined to be : - res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*mask(i,j,k) + res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*tqmask(i,j,k) - \param mask = the correlation kernel. + \param tqmask = 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>& mask,const unsigned int cond=1,const bool weighted_convol=false) const { + get_convolve(const CImg<t>& tqmask,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 (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); + 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); CImg<restype> dest(*this,false); - if (cond && mask.width==mask.height && ((mask.depth==1 && mask.width<=5) || (mask.depth==mask.width && mask.width<=3))) { // optimized version - switch (mask.depth) { + if (cond && tqmask.width==tqmask.height && ((tqmask.depth==1 && tqmask.width<=5) || (tqmask.depth==tqmask.width && tqmask.width<=3))) { // optimized version + switch (tqmask.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,mask); + 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); 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,mask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x3(I,tqmask)/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,mask); + 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); 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,mask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x2(I,tqmask)/std::sqrt(norm)):0; } } break; default: case 1: - switch (mask.width) { + switch (tqmask.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,mask); + 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); 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,mask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv5x5x1(I,tqmask)/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,mask); + 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); 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,mask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv4x4x1(I,tqmask)/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,mask); + 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); 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,mask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x1(I,tqmask)/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,mask); + 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); 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,mask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x1(I,tqmask)/std::sqrt(norm)):0; } } break; - case 1: dest = mask(0)*(*this); break; + case 1: dest = tqmask(0)*(*this); break; } } } else { // generic version - 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); + 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); 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)*mask(cxm+xm,cym+ym,czm+zm,0); + val+= (*this)(x-xm,y-ym,z-zm,v)*tqmask(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)*mask(cxm+xm,cym+ym,czm+zm,0); + val+= pix3d(x-xm,y-ym,z-zm,v)*tqmask(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)*mask(cxm+xm,cym+ym,czm+zm,0); + val+= pix3d(x-xm,y-ym,z-zm,v,0)*tqmask(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*mask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*tqmask(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*mask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*tqmask(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*mask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*tqmask(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 mask + //! Convolve the image by a tqmask /** This is the in-place version of get_convolve(). \see get_convolve() **/ - 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); + 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); } //! 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>& mask, const unsigned int cond=1, const bool weighted_erosion=false) const { + get_erode(const CImg<t>& tqmask, 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 (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); + 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); CImg<restype> dest(*this,false); - 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); + 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); 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 (mask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)(*this)(x+xm,y+ym,z+zm,v),min_val); + if (tqmask(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 (mask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v),min_val); + if (tqmask(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 (mask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v,0),min_val); + 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); 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=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); + 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); 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=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); + 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); 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=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); + 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); 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>& mask,const unsigned int cond=1,const bool weighted_erosion=false) { - return get_erode(mask,cond,weighted_erosion).swap(*this); + 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); } //! 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> mask(3,3,1,1,1); - return get_erode(mask,cond,false); + static const CImg<T> tqmask(3,3,1,1,1); + return get_erode(tqmask,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>& mask, const unsigned int cond=1, const bool weighted_dilatation=false) const { + get_dilate(const CImg<t>& tqmask, 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 (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); + 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); CImg<restype> dest(*this,false); - 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); + 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); 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 (mask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)(*this)(x+xm,y+ym,z+zm,v),max_val); + if (tqmask(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 (mask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v),max_val); + if (tqmask(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 (mask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v,0),max_val); + 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); 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=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); + 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); 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=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); + 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); 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=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); + 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); 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>& mask,const unsigned int cond=1,const bool weighted_dilatation=false) { - return get_dilate(mask,cond,weighted_dilatation).swap(*this); + 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); } //! 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> mask(3,3,1,1,1); - return get_dilate(mask,cond,false); + static const CImg<T> tqmask(3,3,1,1,1); + return get_dilate(tqmask,cond,false); } //! Dilate the image by a square structuring element of size n @@ -12881,7 +12881,7 @@ namespace cimg_library { \param sharpness = define the contour preservation. \param anisotropy = define the smoothing anisotropy. \param alpha = image pre-blurring (gaussian). - \param sigma = regularity of the tensor-valued geometry. + \param sigma = regularity of the tensor-valued tqgeometry. \param dl = spatial discretization. \param da = angular discretization. \param gauss_prec = precision of the gaussian function. @@ -14723,27 +14723,27 @@ namespace cimg_library { switch (bpp) { case 1: { // Monochrome for (int y=res.height-1; y>=0; y--) { - unsigned char mask = 0x80, val = 0; + unsigned char tqmask = 0x80, val = 0; cimg_mapX(res,x) { - if (mask==0x80) val = *(ptrs++); - const unsigned char *col = (unsigned char*)(palette+(val&mask?1:0)); + if (tqmask==0x80) val = *(ptrs++); + const unsigned char *col = (unsigned char*)(palette+(val&tqmask?1:0)); res(x,y,2) = (T)*(col++); res(x,y,1) = (T)*(col++); res(x,y,0) = (T)*(col++); - mask = cimg::ror(mask); + tqmask = cimg::ror(tqmask); } ptrs+=align; } } break; case 4: { // 16 colors for (int y=res.height-1; y>=0; y--) { - unsigned char mask = 0xF0, val = 0; + unsigned char tqmask = 0xF0, val = 0; cimg_mapX(res,x) { - if (mask==0xF0) val = *(ptrs++); - const unsigned char color = (mask<16)?(val&mask):((val&mask)>>4); + if (tqmask==0xF0) val = *(ptrs++); + const unsigned char color = (tqmask<16)?(val&tqmask):((val&tqmask)>>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++); - mask = cimg::ror(mask,4); + tqmask = cimg::ror(tqmask,4); } ptrs+=align; } } break; case 8: { // 256 colors @@ -17550,7 +17550,7 @@ namespace cimg_library { //! Return a single image which is the concatenation of all images of the current CImgl instance. /** \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \return A CImg<T> image corresponding to the concatenation is returned. **/ CImg<T> get_append(const char axe='x',const char align='c') const { @@ -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], &mask = res[x/w+256]; + CImg<T>& img = res[x/w], &tqmask = res[x/w+256]; unsigned int xm = x%w; - img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = mask(xm,y,0) = (T)((val&m)?1:0); + img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = tqmask(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); @@ -17740,7 +17740,7 @@ namespace cimg_library { The function returns immediately. \param disp : reference to an existing CImgDisplay instance, where the current image list will be displayed. \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \return A reference to the current CImgl instance is returned. **/ const CImgl& display(CImgDisplay& disp,const char axe='x',const char align='c') const { @@ -17755,7 +17755,7 @@ namespace cimg_library { The function returns when a key is pressed or the display window is closed by the user. \param title : specify the title of the opening display window. \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \param min_size : specify the minimum size of the opening display window. Images having dimensions below this size will be upscaled. \param max_size : specify the maximum size of the opening display window. Images having dimensions above this @@ -17774,7 +17774,7 @@ namespace cimg_library { Images of the list are concatenated in a single temporarly image for visualization purposes. The function returns when a key is pressed or the display window is closed by the user. \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'. - \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). + \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom). \param min_size : specify the minimum size of the opening display window. Images having dimensions below this size will be upscaled. \param max_size : specify the maximum size of the opening display window. Images having dimensions above this diff --git a/krita/plugins/filters/cimg/kis_cimg_filter.cc b/krita/plugins/filters/cimg/kis_cimg_filter.cc index 53f7e3c1..3d92ab4e 100644 --- a/krita/plugins/filters/cimg/kis_cimg_filter.cc +++ b/krita/plugins/filters/cimg/kis_cimg_filter.cc @@ -24,8 +24,8 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> -#include <qspinbox.h> +#include <tqpoint.h> +#include <tqspinbox.h> #include <klocale.h> #include <kiconloader.h> @@ -72,7 +72,7 @@ KisCImgFilterConfiguration::KisCImgFilterConfiguration() linear = true; } -void KisCImgFilterConfiguration::fromXML(const QString & s) +void KisCImgFilterConfiguration::fromXML(const TQString & s) { KisFilterConfiguration::fromXML( s ); @@ -89,7 +89,7 @@ void KisCImgFilterConfiguration::fromXML(const QString & s) } -QString KisCImgFilterConfiguration::toString() +TQString KisCImgFilterConfiguration::toString() { m_properties.clear(); @@ -159,12 +159,12 @@ KisCImgFilter::KisCImgFilter() } -void KisCImgFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const QRect& rect) +void KisCImgFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const TQRect& rect) { Q_UNUSED(dst); - Q_INT32 width = rect.width(); - Q_INT32 height = rect.height(); + TQ_INT32 width = rect.width(); + TQ_INT32 height = rect.height(); // Copy the src data into a CImg type image with three channels and no alpha. // XXX: This means that a CImg is always rgba; find the quickest way to get 8-bit rgb from any colorspace & find a way @@ -181,10 +181,10 @@ void KisCImgFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte srcRGB16->convertTo(rgb16CS); KisRectIteratorPixel it = srcRGB16->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), false); while (!it.isDone()) { - Q_UINT16* data = reinterpret_cast<Q_UINT16*>(it.rawData()); + TQ_UINT16* data = reinterpret_cast<TQ_UINT16*>(it.rawData()); - Q_INT32 x = it.x() - rect.x(); - Q_INT32 y = it.y() - rect.y(); + TQ_INT32 x = it.x() - rect.x(); + TQ_INT32 y = it.y() - rect.y(); img(x, y, 0) = data[0]; img(x, y, 1) = data[1]; @@ -197,11 +197,11 @@ void KisCImgFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte KisRectIteratorPixel it = src->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), false); while (!it.isDone()) { - QColor color; - cs->toQColor(it.rawData(), &color); + TQColor color; + cs->toTQColor(it.rawData(), &color); - Q_INT32 x = it.x() - rect.x(); - Q_INT32 y = it.y() - rect.y(); + TQ_INT32 x = it.x() - rect.x(); + TQ_INT32 y = it.y() - rect.y(); img(x, y, 0) = color.red(); img(x, y, 1) = color.green(); @@ -234,10 +234,10 @@ void KisCImgFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte { KisRectIteratorPixel it = srcRGB16->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true); while (!it.isDone()) { - Q_INT32 x = it.x() - rect.x(); - Q_INT32 y = it.y() - rect.y(); + TQ_INT32 x = it.x() - rect.x(); + TQ_INT32 y = it.y() - rect.y(); - Q_UINT16* data = reinterpret_cast<Q_UINT16*>(it.rawData()); + TQ_UINT16* data = reinterpret_cast<TQ_UINT16*>(it.rawData()); data[0] = img(x, y, 0) ; data[1] = img(x, y, 1) ; @@ -256,12 +256,12 @@ void KisCImgFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte if (it.isSelected()) { - Q_INT32 x = it.x() - rect.x(); - Q_INT32 y = it.y() - rect.y(); + TQ_INT32 x = it.x() - rect.x(); + TQ_INT32 y = it.y() - rect.y(); - QColor color((int)img(x, y, 0), (int)img(x, y, 1), (int)img(x, y, 2)); + TQColor color((int)img(x, y, 0), (int)img(x, y, 1), (int)img(x, y, 2)); - cs->fromQColor(color, it.rawData()); + cs->fromTQColor(color, it.rawData()); } ++it; @@ -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<>(); - mask = CImg<uchar> (); + tqmask = 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 mask"); + const char *file_m = NULL; //cimg_option("-m",(const char*)NULL,"Input inpainting tqmask"); if (!file_m) { // XXX: Do KDE messagebox - // g_message ("You need to specify an inpainting mask (option '-m') !"); + // g_message ("You need to specify an inpainting tqmask (option '-m') !"); return false; } - const unsigned int dilate = 0; //cimg_option("-dilate",0,"Inpainting mask dilatation"); + const unsigned int dilate = 0; //cimg_option("-dilate",0,"Inpainting tqmask 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)) - mask = CImg<uchar>(file_m); + tqmask = CImg<uchar>(file_m); else { int l=16; std::sscanf(file_m,"block%d",&l); - mask = CImg<uchar>(img.width/l,img.height/l); - cimg_mapXY(mask,x,y) mask(x,y)=(x+y)%2; + tqmask = CImg<uchar>(img.width/l,img.height/l); + cimg_mapXY(tqmask,x,y) tqmask(x,y)=(x+y)%2; } - mask.resize(img.width,img.height,1,1); - if (dilate) mask.dilate(dilate); + tqmask.resize(img.width,img.height,1,1); + if (dilate) tqmask.dilate(dilate); switch (ip_init) { - 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 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 3 : break; case 4 : { - CImg<uchar> tmask(mask),ntmask(tmask); + CImg<uchar> ttqmask(tqmask),nttqmask(ttqmask); CImg_3x3(M,uchar); CImg_3x3(I,float); - while (CImgStats(ntmask,false).max>0) { - cimg_map3x3(tmask,x,y,0,0,M) if (Mcc && (!Mpc || !Mnc || !Mcp || !Mcn)) { + while (CImgStats(nttqmask,false).max>0) { + cimg_map3x3(ttqmask,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; } - ntmask(x,y) = 0; + nttqmask(x,y) = 0; } - tmask = ntmask; + ttqmask = nttqmask; } } 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(mask,x,y,0,0,g) if (!gcc && !(gnc-gcc) && !(gcc-gpc) && !(gcn-gcc) && !(gcc-gcp)) cimg_mapV(img,k) { + cimg_map3x3(tqmask,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; @@ -429,12 +429,12 @@ bool KisCImgFilter::prepare_inpaint() bool KisCImgFilter::prepare_resize() { - const char *geom = NULL; //cimg_option("-g",(const char*)NULL,"Output image geometry"); + const char *geom = NULL; //cimg_option("-g",(const char*)NULL,"Output image tqgeometry"); 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); - 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); + 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); img0 = img.get_resize(w,h,1,-100,1); img.resize(w,h,1,-100,3); G = CImg<>(img.width,img.height,1,3); @@ -445,7 +445,7 @@ bool KisCImgFilter::prepare_resize() bool KisCImgFilter::prepare_visuflow() { - const char *geom = "100%x100%"; //cimg_option("-g","100%x100%","Output geometry"); + const char *geom = "100%x100%"; //cimg_option("-g","100%x100%","Output tqgeometry"); //const char *file_i = (const char *)NULL; //cimg_option("-i",(const char*)NULL,"Input init image"); const bool normalize = false; //cimg_option("-norm",false,"Normalize input flow"); @@ -618,7 +618,7 @@ void KisCImgFilter::compute_LIC(int &progressSteps) return; } - if (!mask.data || mask(x,y)) compute_LIC_back_forward(x,y); + if (!tqmask.data || tqmask(x,y)) compute_LIC_back_forward(x,y); } } @@ -680,12 +680,12 @@ bool KisCImgFilter::process() return true; } -KisFilterConfigWidget * KisCImgFilter::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisCImgFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) { - return new KisCImgconfigWidget(this, parent); + return new KisCImgconfigWidget(this, tqparent); } -KisFilterConfiguration* KisCImgFilter::configuration(QWidget* nwidget) +KisFilterConfiguration* KisCImgFilter::configuration(TQWidget* nwidget) { KisCImgconfigWidget * widget = (KisCImgconfigWidget *) nwidget; if( widget == 0 ) diff --git a/krita/plugins/filters/cimg/kis_cimg_filter.h b/krita/plugins/filters/cimg/kis_cimg_filter.h index da336471..3b745476 100644 --- a/krita/plugins/filters/cimg/kis_cimg_filter.h +++ b/krita/plugins/filters/cimg/kis_cimg_filter.h @@ -31,12 +31,12 @@ class KisCImgFilterConfiguration : public KisFilterConfiguration public: KisCImgFilterConfiguration(); - virtual QString toString(); - virtual void fromXML(const QString & s); + virtual TQString toString(); + virtual void fromXML(const TQString & s); public: - Q_INT32 nb_iter; // Number of smoothing iterations + TQ_INT32 nb_iter; // Number of smoothing iterations double dt; // Time step double dlength; // Integration step double dtheta; // Angular step (in degrees) @@ -54,14 +54,14 @@ class KisCImgFilter : public KisFilter public: KisCImgFilter(); public: - virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("cimg", i18n("Image Restoration (cimg-based)")); }; virtual bool supportsPainting() { return false; } virtual bool supportsPreview() { return false; } virtual ColorSpaceIndependence colorSpaceIndependence(); public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration * configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, 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> mask; + cimg_library::CImg<unsigned char> tqmask; diff --git a/krita/plugins/filters/cimg/kis_cimg_plugin.cc b/krita/plugins/filters/cimg/kis_cimg_plugin.cc index 569a247e..faab6668 100644 --- a/krita/plugins/filters/cimg/kis_cimg_plugin.cc +++ b/krita/plugins/filters/cimg/kis_cimg_plugin.cc @@ -28,12 +28,12 @@ typedef KGenericFactory<KisCImgPlugin> KisCImgPluginFactory; K_EXPORT_COMPONENT_FACTORY( kritacimg, KisCImgPluginFactory( "krita" ) ) -KisCImgPlugin::KisCImgPlugin(QObject *parent, const char *name, const QStringList &) : KParts::Plugin(parent, name) +KisCImgPlugin::KisCImgPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) { setInstance(KisCImgPluginFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisCImgFilter()); } } diff --git a/krita/plugins/filters/cimg/kis_cimg_plugin.h b/krita/plugins/filters/cimg/kis_cimg_plugin.h index 385ba34f..5674012b 100644 --- a/krita/plugins/filters/cimg/kis_cimg_plugin.h +++ b/krita/plugins/filters/cimg/kis_cimg_plugin.h @@ -25,7 +25,7 @@ class KisCImgPlugin : public KParts::Plugin { public: - KisCImgPlugin(QObject *parent, const char *name, const QStringList &); + KisCImgPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KisCImgPlugin(); }; diff --git a/krita/plugins/filters/cimg/kis_cimgconfig_widget.cc b/krita/plugins/filters/cimg/kis_cimgconfig_widget.cc index 7b98c4cd..8b67b6f9 100644 --- a/krita/plugins/filters/cimg/kis_cimgconfig_widget.cc +++ b/krita/plugins/filters/cimg/kis_cimgconfig_widget.cc @@ -19,9 +19,9 @@ * * Ported from the CImg Gimp plugin by Victor Stinner and David Tschumperlé. */ -#include "qlayout.h" -#include "qcheckbox.h" -#include "qpushbutton.h" +#include "tqlayout.h" +#include "tqcheckbox.h" +#include "tqpushbutton.h" #include "knuminput.h" @@ -29,29 +29,29 @@ #include "kis_cimgconfig_widget.h" #include "kis_cimg_filter.h" -KisCImgconfigWidget::KisCImgconfigWidget(KisFilter* nfilter, QWidget * parent, const char * name, WFlags f) - : KisFilterConfigWidget(parent, name, f) +KisCImgconfigWidget::KisCImgconfigWidget(KisFilter* nfilter, TQWidget * tqparent, const char * name, WFlags f) + : KisFilterConfigWidget(tqparent, name, f) { m_page = new WdgCImg(this); Q_CHECK_PTR(m_page); - QHBoxLayout * l = new QHBoxLayout(this); + TQHBoxLayout * l = new TQHBoxLayout(this); Q_CHECK_PTR(l); l->add(m_page); nfilter->setAutoUpdate(false); -// connect( m_page->bnRefresh, SIGNAL(clicked()), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numDetail, SIGNAL(valueChanged (double)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numGradient, SIGNAL(valueChanged (double)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numTimeStep, SIGNAL(valueChanged (double)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numBlur, SIGNAL(valueChanged (double)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numBlurIterations, SIGNAL(valueChanged (int)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numAngularStep, SIGNAL(valueChanged (double)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numIntegralStep, SIGNAL(valueChanged (double)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->numGaussian, SIGNAL(valueChanged (double)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->chkLinearInterpolation, SIGNAL(toggled(bool)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->chkNormalize, SIGNAL(toggled(bool)), SIGNAL(sigPleaseUpdatePreview())); +// connect( m_page->bnRefresh, TQT_SIGNAL(clicked()), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numDetail, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numGradient, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numTimeStep, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numBlur, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numBlurIterations, TQT_SIGNAL(valueChanged (int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numAngularStep, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numIntegralStep, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->numGaussian, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->chkLinearInterpolation, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->chkNormalize, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview())); } diff --git a/krita/plugins/filters/cimg/kis_cimgconfig_widget.h b/krita/plugins/filters/cimg/kis_cimgconfig_widget.h index 803d4907..b9c5cbe9 100644 --- a/krita/plugins/filters/cimg/kis_cimgconfig_widget.h +++ b/krita/plugins/filters/cimg/kis_cimgconfig_widget.h @@ -30,10 +30,11 @@ class KisCImgconfigWidget : public KisFilterConfigWidget { Q_OBJECT + TQ_OBJECT public: - KisCImgconfigWidget(KisFilter* nfilter, QWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + KisCImgconfigWidget(KisFilter* nfilter, TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); virtual ~KisCImgconfigWidget() {}; public: diff --git a/krita/plugins/filters/cimg/wdg_cimg.ui b/krita/plugins/filters/cimg/wdg_cimg.ui index b4767045..80476616 100644 --- a/krita/plugins/filters/cimg/wdg_cimg.ui +++ b/krita/plugins/filters/cimg/wdg_cimg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgCImg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgCImg</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -42,14 +42,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox" row="1" column="2" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>grpPrecision</cstring> </property> @@ -60,7 +60,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -110,7 +110,7 @@ <number>10</number> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkNormalize</cstring> </property> @@ -121,7 +121,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkLinearInterpolation</cstring> </property> @@ -132,7 +132,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -140,7 +140,7 @@ <string>Integral step:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -150,7 +150,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpSmooth</cstring> </property> @@ -205,7 +205,7 @@ <number>10</number> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -213,7 +213,7 @@ <string>Blurring iterations:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -221,7 +221,7 @@ <string>Blur:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -229,7 +229,7 @@ <string>Time step:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -237,7 +237,7 @@ <string>Gradient factor:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -276,7 +276,7 @@ <tabstop>chkLinearInterpolation</tabstop> <tabstop>chkNormalize</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/filters/colorify/Colorify.cpp b/krita/plugins/filters/colorify/Colorify.cpp index d23c6594..46e8203f 100644 --- a/krita/plugins/filters/colorify/Colorify.cpp +++ b/krita/plugins/filters/colorify/Colorify.cpp @@ -31,8 +31,8 @@ typedef KGenericFactory<KritaColorify> KritaColorifyFactory; K_EXPORT_COMPONENT_FACTORY( kritacolorify, KritaColorifyFactory( "krita" ) ) -KritaColorify::KritaColorify(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaColorify::KritaColorify(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaColorifyFactory::instance()); @@ -40,11 +40,11 @@ KritaColorify::KritaColorify(QObject *parent, const char *name, const QStringLis kdDebug(41006) << "Colorify Filter plugin. Class: " << className() << ", Parent: " - << parent -> className() + << tqparent -> className() << "\n"; - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisColorify()); } } @@ -59,12 +59,12 @@ KisColorify::KisColorify() : KisFilter(id(), "colors", i18n("&Colorify...")) { } -KisFilterConfigWidget * KisColorify::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisColorify::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) { - return new KisWdgColorify(this, parent, "configuration of colorify"); + return new KisWdgColorify(this, tqparent, "configuration of colorify"); } -KisFilterConfiguration* KisColorify::configuration(QWidget* w) +KisFilterConfiguration* KisColorify::configuration(TQWidget* w) { KisWdgColorify * wCTA = dynamic_cast<KisWdgColorify*>(w); KisFilterConfiguration* config = new KisFilterConfiguration("colorify", 1); @@ -75,41 +75,41 @@ KisFilterConfiguration* KisColorify::configuration(QWidget* w) return config; } -void KisColorify::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisColorify::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { Q_ASSERT(src != 0); Q_ASSERT(dst != 0); if(config == 0) config = new KisFilterConfiguration("colorify", 1); - QVariant value; - QColor cTA = (config->getProperty("color", value)) ? value.toColor() : QColor(200,175,125); + TQVariant value; + TQColor cTA = (config->getProperty("color", value)) ? value.toColor() : TQColor(200,175,125); KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); KisRectIteratorPixel srcIt = src->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), false); KisColorSpace * cs = src->colorSpace(); - Q_UINT8* colorpixel = new Q_UINT8[ cs->pixelSize() ]; + TQ_UINT8* colorpixel = new TQ_UINT8[ cs->pixelSize() ]; - cs->fromQColor(cTA, colorpixel); + cs->fromTQColor(cTA, colorpixel); - Q_UINT16 labcTA[4]; - Q_UINT16 lab[4]; + TQ_UINT16 labcTA[4]; + TQ_UINT16 lab[4]; - cs->toLabA16(colorpixel, (Q_UINT8*)labcTA, 1); + cs->toLabA16(colorpixel, (TQ_UINT8*)labcTA, 1); int pixelsProcessed = 0; setProgressTotalSteps(rect.width() * rect.height()); - //Q_INT32 pixelsize = cs->pixelSize(); + //TQ_INT32 pixelsize = cs->pixelSize(); while( ! srcIt.isDone() ) { if(srcIt.isSelected()) { - cs->toLabA16(srcIt.oldRawData(), (Q_UINT8*)lab, 1); + cs->toLabA16(srcIt.oldRawData(), (TQ_UINT8*)lab, 1); labcTA[0] = lab[0]; - cs->fromLabA16((Q_UINT8*)labcTA, dstIt.rawData(), 1); + cs->fromLabA16((TQ_UINT8*)labcTA, dstIt.rawData(), 1); } setProgress(++pixelsProcessed); ++srcIt; diff --git a/krita/plugins/filters/colorify/Colorify.h b/krita/plugins/filters/colorify/Colorify.h index 8ba0e18b..247daa2e 100644 --- a/krita/plugins/filters/colorify/Colorify.h +++ b/krita/plugins/filters/colorify/Colorify.h @@ -32,7 +32,7 @@ class KritaColorify : public KParts::Plugin { public: - KritaColorify(QObject *parent, const char *name, const QStringList &); + KritaColorify(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaColorify(); }; @@ -41,7 +41,7 @@ class KisColorify : public KisFilter { public: KisColorify(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); static inline KisID id() { return KisID("colorify", i18n("Colorify...")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } @@ -49,8 +49,8 @@ class KisColorify : public KisFilter { virtual bool supportsAdjustmentLayers() { return false; } virtual ColorSpaceIndependence colorSpaceIndendendence() { return TO_LAB16; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); }; #endif diff --git a/krita/plugins/filters/colorify/KisWdgColorify.cpp b/krita/plugins/filters/colorify/KisWdgColorify.cpp index 4ee48444..d2b87e48 100644 --- a/krita/plugins/filters/colorify/KisWdgColorify.cpp +++ b/krita/plugins/filters/colorify/KisWdgColorify.cpp @@ -20,9 +20,9 @@ #include "KisWdgColorify.h" -#include <qcheckbox.h> -#include <qlayout.h> -#include <qspinbox.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqspinbox.h> #include <kcolorbutton.h> @@ -30,17 +30,17 @@ #include "WdgColorifyBase.h" -KisWdgColorify::KisWdgColorify( KisFilter* nfilter, QWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) +KisWdgColorify::KisWdgColorify( KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) { - QGridLayout *widgetLayout = new QGridLayout(this, 1, 1); + TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgColorifyBase(this); widgetLayout -> addWidget(m_widget,0,0); - connect( m_widget->colorTarget, SIGNAL( changed(const QColor&)), SIGNAL(sigPleaseUpdatePreview())); + connect( m_widget->colorTarget, TQT_SIGNAL( changed(const TQColor&)), TQT_SIGNAL(sigPleaseUpdatePreview())); } void KisWdgColorify::setConfiguration(KisFilterConfiguration* config) { - QVariant value; + TQVariant value; if(config->getProperty("color", value)) { m_widget->colorTarget->setColor( value.toColor() ); diff --git a/krita/plugins/filters/colorify/KisWdgColorify.h b/krita/plugins/filters/colorify/KisWdgColorify.h index b4101f06..22187aaf 100644 --- a/krita/plugins/filters/colorify/KisWdgColorify.h +++ b/krita/plugins/filters/colorify/KisWdgColorify.h @@ -33,8 +33,9 @@ class WdgColorifyBase; class KisWdgColorify : public KisFilterConfigWidget { Q_OBJECT + TQ_OBJECT public: - KisWdgColorify( KisFilter* nfilter, QWidget * parent, const char * name); + KisWdgColorify( KisFilter* nfilter, TQWidget * tqparent, const char * name); inline WdgColorifyBase* widget() { return m_widget; }; virtual void setConfiguration(KisFilterConfiguration*); private: diff --git a/krita/plugins/filters/colorify/WdgColorifyBase.ui b/krita/plugins/filters/colorify/WdgColorifyBase.ui index e8387c64..a5fcebf9 100644 --- a/krita/plugins/filters/colorify/WdgColorifyBase.ui +++ b/krita/plugins/filters/colorify/WdgColorifyBase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgColorifyBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgColorifyBase</cstring> </property> @@ -29,22 +29,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> @@ -90,7 +90,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/krita/plugins/filters/colors/colors.cc b/krita/plugins/filters/colors/colors.cc index b0a8bcc7..ab691400 100644 --- a/krita/plugins/filters/colors/colors.cc +++ b/krita/plugins/filters/colors/colors.cc @@ -28,8 +28,8 @@ typedef KGenericFactory<KritaExtensionsColors> KritaExtensionsColorsFactory; K_EXPORT_COMPONENT_FACTORY( kritaextensioncolorsfilters, KritaExtensionsColorsFactory( "krita" ) ) -KritaExtensionsColors::KritaExtensionsColors(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaExtensionsColors::KritaExtensionsColors(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaExtensionsColorsFactory::instance()); @@ -37,11 +37,11 @@ KritaExtensionsColors::KritaExtensionsColors(QObject *parent, const char *name, kdDebug(41006) << "Extensions Colors Filter plugin. Class: " << className() << ", Parent: " - << parent -> className() + << tqparent -> className() << "\n"; - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisFilterMax()); manager->add(new KisFilterMin()); manager->add(new KisFilterColorToAlpha()); diff --git a/krita/plugins/filters/colors/colors.h b/krita/plugins/filters/colors/colors.h index 169ae83d..034fa2af 100644 --- a/krita/plugins/filters/colors/colors.h +++ b/krita/plugins/filters/colors/colors.h @@ -30,7 +30,7 @@ class KritaExtensionsColors : public KParts::Plugin { public: - KritaExtensionsColors(QObject *parent, const char *name, const QStringList &); + KritaExtensionsColors(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaExtensionsColors(); }; diff --git a/krita/plugins/filters/colors/kis_color_to_alpha.cc b/krita/plugins/filters/colors/kis_color_to_alpha.cc index f4547a28..0ddf07c6 100644 --- a/krita/plugins/filters/colors/kis_color_to_alpha.cc +++ b/krita/plugins/filters/colors/kis_color_to_alpha.cc @@ -20,8 +20,8 @@ #include "kis_color_to_alpha.h" -#include <qcheckbox.h> -#include <qspinbox.h> +#include <tqcheckbox.h> +#include <tqspinbox.h> #include <kcolorbutton.h> @@ -34,12 +34,12 @@ KisFilterColorToAlpha::KisFilterColorToAlpha() : KisFilter(id(), "colors", i18n( { } -KisFilterConfigWidget * KisFilterColorToAlpha::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisFilterColorToAlpha::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) { - return new KisWdgColorToAlpha(this, parent, "configuration of color to alpha"); + return new KisWdgColorToAlpha(this, tqparent, "configuration of color to alpha"); } -KisFilterConfiguration* KisFilterColorToAlpha::configuration(QWidget* w) +KisFilterConfiguration* KisFilterColorToAlpha::configuration(TQWidget* w) { KisWdgColorToAlpha * wCTA = dynamic_cast<KisWdgColorToAlpha*>(w); KisFilterConfiguration* config = new KisFilterConfiguration("colortoalpha", 1); @@ -51,15 +51,15 @@ KisFilterConfiguration* KisFilterColorToAlpha::configuration(QWidget* w) return config; } -void KisFilterColorToAlpha::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisFilterColorToAlpha::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { Q_ASSERT(src != 0); Q_ASSERT(dst != 0); if(config == 0) config = new KisFilterConfiguration("colortoalpha", 1); - QVariant value; - QColor cTA = (config->getProperty("targetcolor", value)) ? value.toColor() : QColor(255,255,255); + TQVariant value; + TQColor cTA = (config->getProperty("targetcolor", value)) ? value.toColor() : TQColor(255,255,255); int threshold = (config->getProperty("threshold", value)) ? value.toInt() : 0; KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); @@ -69,16 +69,16 @@ void KisFilterColorToAlpha::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, setProgressTotalSteps(rect.width() * rect.height()); KisColorSpace * cs = src->colorSpace(); - Q_INT32 pixelsize = cs->pixelSize(); + TQ_INT32 pixelsize = cs->pixelSize(); - Q_UINT8* color = new Q_UINT8[pixelsize]; - cs->fromQColor(cTA, color); + TQ_UINT8* color = new TQ_UINT8[pixelsize]; + cs->fromTQColor(cTA, color); while( ! srcIt.isDone() ) { if(srcIt.isSelected()) { - Q_UINT8 d = cs->difference(color, srcIt.oldRawData()); + TQ_UINT8 d = cs->difference(color, srcIt.oldRawData()); if( d >= threshold ) { cs->setAlpha(dstIt.rawData(), 255, 1); diff --git a/krita/plugins/filters/colors/kis_color_to_alpha.h b/krita/plugins/filters/colors/kis_color_to_alpha.h index 1f9c8a08..cd3ca0fe 100644 --- a/krita/plugins/filters/colors/kis_color_to_alpha.h +++ b/krita/plugins/filters/colors/kis_color_to_alpha.h @@ -31,7 +31,7 @@ class KisFilterColorToAlpha : public KisFilter { public: KisFilterColorToAlpha(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); static inline KisID id() { return KisID("colortoalpha", i18n("Color to Alpha")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } @@ -39,8 +39,8 @@ class KisFilterColorToAlpha : public KisFilter { virtual bool supportsAdjustmentLayers() { return false; } virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/krita/plugins/filters/colors/kis_minmax_filters.cc b/krita/plugins/filters/colors/kis_minmax_filters.cc index 3e6fa197..40776b11 100644 --- a/krita/plugins/filters/colors/kis_minmax_filters.cc +++ b/krita/plugins/filters/colors/kis_minmax_filters.cc @@ -22,10 +22,10 @@ #include <kis_iterators_pixel.h> -typedef void (*funcMaxMin)(const Q_UINT8* , Q_UINT8* , uint ); +typedef void (*funcMaxMin)(const TQ_UINT8* , TQ_UINT8* , uint ); template<typename _TYPE> -void maximize(const Q_UINT8* s, Q_UINT8* d, uint nbpixels) +void maximize(const TQ_UINT8* s, TQ_UINT8* d, uint nbpixels) { const _TYPE* sT = (_TYPE*)(s); _TYPE* dT = (_TYPE*)(d); @@ -47,7 +47,7 @@ void maximize(const Q_UINT8* s, Q_UINT8* d, uint nbpixels) } template<typename _TYPE> - void minimize(const Q_UINT8* s, Q_UINT8* d, uint nbpixels) + void minimize(const TQ_UINT8* s, TQ_UINT8* d, uint nbpixels) { const _TYPE* sT = (_TYPE*)(s); _TYPE* dT = (_TYPE*)(d); @@ -72,7 +72,7 @@ KisFilterMax::KisFilterMax() : KisFilter(id(), "colors", i18n("M&aximize Channel { } -void KisFilterMax::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* /*config*/, const QRect& rect) +void KisFilterMax::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* /*config*/, const TQRect& rect) { Q_ASSERT(src != 0); Q_ASSERT(dst != 0); @@ -84,16 +84,16 @@ void KisFilterMax::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilter setProgressTotalSteps(rect.width() * rect.height()); KisColorSpace * cs = src->colorSpace(); - Q_INT32 nC = cs->nColorChannels(); + TQ_INT32 nC = cs->nColorChannels(); funcMaxMin F; KisChannelInfo::enumChannelValueType cT = cs->channels()[0]->channelValueType(); if( cT == KisChannelInfo::UINT8 || cT == KisChannelInfo::INT8 ) { - F = & maximize<Q_UINT8>; + F = & maximize<TQ_UINT8>; } else if( cT == KisChannelInfo::UINT16 || cT == KisChannelInfo::INT16 ) { - F = & maximize<Q_UINT8>; + F = & maximize<TQ_UINT8>; } else if( cT == KisChannelInfo::FLOAT32 ) { F = & maximize<float>; @@ -118,7 +118,7 @@ KisFilterMin::KisFilterMin() : KisFilter(id(), "colors", i18n("M&inimize Channel { } -void KisFilterMin::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* /*config*/, const QRect& rect) +void KisFilterMin::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* /*config*/, const TQRect& rect) { Q_ASSERT(src != 0); Q_ASSERT(dst != 0); @@ -130,16 +130,16 @@ void KisFilterMin::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilter setProgressTotalSteps(rect.width() * rect.height()); KisColorSpace * cs = src->colorSpace(); - Q_INT32 nC = cs->nColorChannels(); + TQ_INT32 nC = cs->nColorChannels(); funcMaxMin F; KisChannelInfo::enumChannelValueType cT = cs->channels()[0]->channelValueType(); if( cT == KisChannelInfo::UINT8 || cT == KisChannelInfo::INT8 ) { - F = & minimize<Q_UINT8>; + F = & minimize<TQ_UINT8>; } else if( cT == KisChannelInfo::UINT16 || cT == KisChannelInfo::INT16 ) { - F = & minimize<Q_UINT8>; + F = & minimize<TQ_UINT8>; } else if( cT == KisChannelInfo::FLOAT32 ) { F = & minimize<float>; diff --git a/krita/plugins/filters/colors/kis_minmax_filters.h b/krita/plugins/filters/colors/kis_minmax_filters.h index 1d8300fc..44618167 100644 --- a/krita/plugins/filters/colors/kis_minmax_filters.h +++ b/krita/plugins/filters/colors/kis_minmax_filters.h @@ -32,7 +32,7 @@ class KisFilterMax : public KisFilter public: KisFilterMax(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); static inline KisID id() { return KisID("maximize", i18n("Maximize Channel")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } @@ -45,7 +45,7 @@ class KisFilterMin : public KisFilter public: KisFilterMin(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); static inline KisID id() { return KisID("minimize", i18n("Minimize Channel")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } diff --git a/krita/plugins/filters/colors/kis_wdg_color_to_alpha.cc b/krita/plugins/filters/colors/kis_wdg_color_to_alpha.cc index fd37487e..9829c703 100644 --- a/krita/plugins/filters/colors/kis_wdg_color_to_alpha.cc +++ b/krita/plugins/filters/colors/kis_wdg_color_to_alpha.cc @@ -20,9 +20,9 @@ #include "kis_wdg_color_to_alpha.h" -#include <qcheckbox.h> -#include <qlayout.h> -#include <qspinbox.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqspinbox.h> #include <kcolorbutton.h> @@ -30,18 +30,18 @@ #include "wdgcolortoalphabase.h" -KisWdgColorToAlpha::KisWdgColorToAlpha( KisFilter* nfilter, QWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) +KisWdgColorToAlpha::KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) { - QGridLayout *widgetLayout = new QGridLayout(this, 1, 1); + TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgColorToAlphaBase(this); widgetLayout -> addWidget(m_widget,0,0); - connect( m_widget->colorTarget, SIGNAL( changed(const QColor&)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_widget->intThreshold, SIGNAL( valueChanged ( int value) ), SIGNAL(sigPleaseUpdatePreview())); + connect( m_widget->colorTarget, TQT_SIGNAL( changed(const TQColor&)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_widget->intThreshold, TQT_SIGNAL( valueChanged ( int value) ), TQT_SIGNAL(sigPleaseUpdatePreview())); } void KisWdgColorToAlpha::setConfiguration(KisFilterConfiguration* config) { - QVariant value; + TQVariant value; if(config->getProperty("targetcolor", value)) { m_widget->colorTarget->setColor( value.toColor() ); diff --git a/krita/plugins/filters/colors/kis_wdg_color_to_alpha.h b/krita/plugins/filters/colors/kis_wdg_color_to_alpha.h index e3350e74..058237b2 100644 --- a/krita/plugins/filters/colors/kis_wdg_color_to_alpha.h +++ b/krita/plugins/filters/colors/kis_wdg_color_to_alpha.h @@ -33,8 +33,9 @@ class WdgColorToAlphaBase; class KisWdgColorToAlpha : public KisFilterConfigWidget { Q_OBJECT + TQ_OBJECT public: - KisWdgColorToAlpha( KisFilter* nfilter, QWidget * parent, const char * name); + KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * tqparent, const char * name); inline WdgColorToAlphaBase* widget() { return m_widget; }; virtual void setConfiguration(KisFilterConfiguration*); private: diff --git a/krita/plugins/filters/colors/wdgcolortoalphabase.ui b/krita/plugins/filters/colors/wdgcolortoalphabase.ui index b6cd3145..f824a9ab 100644 --- a/krita/plugins/filters/colors/wdgcolortoalphabase.ui +++ b/krita/plugins/filters/colors/wdgcolortoalphabase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgColorToAlphaBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgColorToAlphaBase</cstring> </property> @@ -29,22 +29,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -69,7 +69,7 @@ </widget> </hbox> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>intThreshold</cstring> </property> @@ -77,7 +77,7 @@ <number>255</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> @@ -106,7 +106,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/krita/plugins/filters/colorsfilters/colorsfilters.cc b/krita/plugins/filters/colorsfilters/colorsfilters.cc index e73cf284..7bf36228 100644 --- a/krita/plugins/filters/colorsfilters/colorsfilters.cc +++ b/krita/plugins/filters/colorsfilters/colorsfilters.cc @@ -23,9 +23,9 @@ #include <stdlib.h> #include <string.h> -#include <qslider.h> -#include <qpoint.h> -#include <qcolor.h> +#include <tqslider.h> +#include <tqpoint.h> +#include <tqcolor.h> #include <klocale.h> #include <kiconloader.h> @@ -54,13 +54,13 @@ typedef KGenericFactory<ColorsFilters> ColorsFiltersFactory; K_EXPORT_COMPONENT_FACTORY( kritacolorsfilters, ColorsFiltersFactory( "krita" ) ) -ColorsFilters::ColorsFilters(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ColorsFilters::ColorsFilters(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(ColorsFiltersFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisBrightnessContrastFilter()); manager->add(new KisAutoContrast()); manager->add(new KisPerChannelFilter()); @@ -85,7 +85,7 @@ bool KisAutoContrast::workWith(KisColorSpace* cs) return (cs->getProfile() != 0); } -void KisAutoContrast::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* , const QRect& rect) +void KisAutoContrast::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* , const TQRect& rect) { // initialize KisHistogramProducerSP producer = new KisGenericLabHistogramProducer(); @@ -137,7 +137,7 @@ void KisAutoContrast::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFil cfg->transfer[i] = 0x0; for(int i=minvalue; i <maxvalue; i++) { - Q_INT32 val = (i-minvalue)/diff; + TQ_INT32 val = (i-minvalue)/diff; val = int((0xFFFF * (i-minvalue)) / diff); if(val >0xFFFF) @@ -168,12 +168,12 @@ void KisAutoContrast::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFil KisRectIteratorPixel iter = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); setProgressTotalSteps(rect.width() * rect.height()); - Q_INT32 pixelsProcessed = 0; + TQ_INT32 pixelsProcessed = 0; while( ! iter.isDone() && !cancelRequested()) { - Q_UINT32 npix=0, maxpix = iter.nConseqPixels(); - Q_UINT8 selectedness = iter.selectedness(); + TQ_UINT32 npix=0, maxpix = iter.nConseqPixels(); + TQ_UINT8 selectedness = iter.selectedness(); // The idea here is to handle stretches of completely selected and completely unselected pixels. // Partially selected pixels are handled one pixel at a time. switch(selectedness) @@ -190,7 +190,7 @@ void KisAutoContrast::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFil case MAX_SELECTED: { - Q_UINT8 *firstPixel = iter.rawData(); + TQ_UINT8 *firstPixel = iter.rawData(); while(iter.selectedness()==MAX_SELECTED && maxpix) { --maxpix; @@ -208,8 +208,8 @@ void KisAutoContrast::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFil default: // adjust, but since it's partially selected we also only partially adjust src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), adj, 1); - const Q_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; - Q_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness}; + const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; + TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness}; src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData()); ++iter; pixelsProcessed++; @@ -246,7 +246,7 @@ bool KisDesaturateFilter::workWith(KisColorSpace* cs) return (cs->getProfile() != 0); } -void KisDesaturateFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* /*config*/, const QRect& rect) +void KisDesaturateFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* /*config*/, const TQRect& rect) { if (dst != src) { KisPainter gc(dst); @@ -262,12 +262,12 @@ void KisDesaturateFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, Ki KisRectIteratorPixel iter = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); setProgressTotalSteps(rect.width() * rect.height()); - Q_INT32 pixelsProcessed = 0; + TQ_INT32 pixelsProcessed = 0; while( ! iter.isDone() && !cancelRequested()) { - Q_UINT32 npix=0, maxpix = iter.nConseqPixels(); - Q_UINT8 selectedness = iter.selectedness(); + TQ_UINT32 npix=0, maxpix = iter.nConseqPixels(); + TQ_UINT8 selectedness = iter.selectedness(); // The idea here is to handle stretches of completely selected and completely unselected pixels. // Partially selected pixels are handled one pixel at a time. switch(selectedness) @@ -284,7 +284,7 @@ void KisDesaturateFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, Ki case MAX_SELECTED: { - Q_UINT8 *firstPixel = iter.rawData(); + TQ_UINT8 *firstPixel = iter.rawData(); while(iter.selectedness()==MAX_SELECTED && maxpix) { --maxpix; @@ -302,8 +302,8 @@ void KisDesaturateFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, Ki default: // adjust, but since it's partially selected we also only partially adjust src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), m_adj, 1); - const Q_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; - Q_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness}; + const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; + TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness}; src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData()); ++iter; pixelsProcessed++; diff --git a/krita/plugins/filters/colorsfilters/colorsfilters.h b/krita/plugins/filters/colorsfilters/colorsfilters.h index 79c467fd..27e265d2 100644 --- a/krita/plugins/filters/colorsfilters/colorsfilters.h +++ b/krita/plugins/filters/colorsfilters/colorsfilters.h @@ -29,7 +29,7 @@ class KisColorAdjustment; class ColorsFilters : public KParts::Plugin { public: - ColorsFilters(QObject *parent, const char *name, const QStringList &); + ColorsFilters(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ColorsFilters(); }; @@ -37,7 +37,7 @@ class KisAutoContrast : public KisFilter { public: KisAutoContrast(); public: - virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("autocontrast", i18n("Auto Contrast")); }; virtual bool supportsPreview() { return true; } virtual bool supportsPainting() { return false; } @@ -55,7 +55,7 @@ class KisDesaturateFilter : public KisFilter { KisDesaturateFilter(); ~KisDesaturateFilter(); public: - virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("desaturate", i18n("Desaturate")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } diff --git a/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc index 4169f008..dfc5bd59 100644 --- a/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc +++ b/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc @@ -23,14 +23,14 @@ #include <klocale.h> -#include <qlayout.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qlabel.h> -#include <qdom.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqlabel.h> +#include <tqdom.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqpushbutton.h> #include "kis_filter_config_widget.h" #include "kis_brightness_contrast_filter.h" @@ -47,7 +47,7 @@ KisBrightnessContrastFilterConfiguration::KisBrightnessContrastFilterConfiguration() : KisFilterConfiguration( "brightnesscontrast", 1 ) { - for (Q_UINT32 i = 0; i < 256; ++i) { + for (TQ_UINT32 i = 0; i < 256; ++i) { transfer[i] = i * 257; } curve.setAutoDelete(true); @@ -59,36 +59,36 @@ KisBrightnessContrastFilterConfiguration::~KisBrightnessContrastFilterConfigurat delete m_adjustment; } -void KisBrightnessContrastFilterConfiguration::fromXML( const QString& s ) +void KisBrightnessContrastFilterConfiguration::fromXML( const TQString& s ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( s ); - QDomElement e = doc.documentElement(); - QDomNode n = e.firstChild(); + TQDomElement e = doc.documentElement(); + TQDomNode n = e.firstChild(); while (!n.isNull()) { e = n.toElement(); if (!e.isNull()) { if (e.tagName() == "transfer") { - QStringList data = QStringList::split( ",", e.text() ); - QStringList::Iterator start = data.begin(); - QStringList::Iterator end = data.end(); + TQStringList data = TQStringList::split( ",", e.text() ); + TQStringList::Iterator start = data.begin(); + TQStringList::Iterator end = data.end(); int i = 0; - for ( QStringList::Iterator it = start; it != end && i < 256; ++it ) { - QString s = *it; + for ( TQStringList::Iterator it = start; it != end && i < 256; ++it ) { + TQString s = *it; transfer[i] = s.toUShort(); i++; } } else if (e.tagName() == "curve") { - QStringList data = QStringList::split( ";", e.text() ); - QStringList::Iterator pairStart = data.begin(); - QStringList::Iterator pairEnd = data.end(); - curve.clear(); // XXX QPtrList, sure I won't leak stuff here? - for (QStringList::Iterator it = pairStart; it != pairEnd; ++it) { - QString pair = * it; - if (pair.find(",") > -1) { - QPair<double,double> *p = new QPair<double,double>; + TQStringList data = TQStringList::split( ";", e.text() ); + TQStringList::Iterator pairStart = data.begin(); + TQStringList::Iterator pairEnd = data.end(); + curve.clear(); // XXX TQPtrList, sure I won't leak stuff here? + for (TQStringList::Iterator it = pairStart; it != pairEnd; ++it) { + TQString pair = * it; + if (pair.tqfind(",") > -1) { + TQPair<double,double> *p = new TQPair<double,double>; p->first = pair.section(",", 0, 0).toDouble(); p->second = pair.section(",", 1, 1).toDouble(); curve.append(p); @@ -98,37 +98,37 @@ void KisBrightnessContrastFilterConfiguration::fromXML( const QString& s ) } n = n.nextSibling(); } - // If the adjustment was cached, it now has changed - invalidate it + // If the adjustment was cached, it now has changed - tqinvalidate it delete m_adjustment; m_adjustment = 0; } -QString KisBrightnessContrastFilterConfiguration::toString() +TQString KisBrightnessContrastFilterConfiguration::toString() { - QDomDocument doc = QDomDocument("filterconfig"); - QDomElement root = doc.createElement( "filterconfig" ); + TQDomDocument doc = TQDomDocument("filterconfig"); + TQDomElement root = doc.createElement( "filterconfig" ); root.setAttribute( "name", name() ); root.setAttribute( "version", version() ); doc.appendChild( root ); - QDomElement e = doc.createElement( "transfer" ); - QString sTransfer; + TQDomElement e = doc.createElement( "transfer" ); + TQString sTransfer; for ( uint i = 0; i < 255 ; ++i ) { - sTransfer += QString::number( transfer[i] ); + sTransfer += TQString::number( transfer[i] ); sTransfer += ","; } - QDomText text = doc.createCDATASection(sTransfer); + TQDomText text = doc.createCDATASection(sTransfer); e.appendChild(text); root.appendChild(e); e = doc.createElement("curve"); - QString sCurve; - QPair<double,double> * pair; + TQString sCurve; + TQPair<double,double> * pair; for ( pair = curve.first(); pair; pair = curve.next() ) { - sCurve += QString::number(pair->first); + sCurve += TQString::number(pair->first); sCurve += ","; - sCurve += QString::number(pair->second); + sCurve += TQString::number(pair->second); sCurve += ";"; } text = doc.createCDATASection(sCurve); @@ -144,12 +144,12 @@ KisBrightnessContrastFilter::KisBrightnessContrastFilter() } -KisFilterConfigWidget * KisBrightnessContrastFilter::createConfigurationWidget(QWidget *parent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisBrightnessContrastFilter::createConfigurationWidget(TQWidget *tqparent, KisPaintDeviceSP dev) { - return new KisBrightnessContrastConfigWidget(parent, dev); + return new KisBrightnessContrastConfigWidget(tqparent, dev); } -KisFilterConfiguration* KisBrightnessContrastFilter::configuration(QWidget *nwidget) +KisFilterConfiguration* KisBrightnessContrastFilter::configuration(TQWidget *nwidget) { KisBrightnessContrastConfigWidget* widget = (KisBrightnessContrastConfigWidget*)nwidget; @@ -175,7 +175,7 @@ bool KisBrightnessContrastFilter::workWith(KisColorSpace* cs) } -void KisBrightnessContrastFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisBrightnessContrastFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { if (!config) { @@ -199,12 +199,12 @@ void KisBrightnessContrastFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP KisRectIteratorPixel iter = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); setProgressTotalSteps(rect.width() * rect.height()); - Q_INT32 pixelsProcessed = 0; + TQ_INT32 pixelsProcessed = 0; while( ! iter.isDone() && !cancelRequested()) { - Q_UINT32 npix=0, maxpix = iter.nConseqPixels(); - Q_UINT8 selectedness = iter.selectedness(); + TQ_UINT32 npix=0, maxpix = iter.nConseqPixels(); + TQ_UINT8 selectedness = iter.selectedness(); // The idea here is to handle stretches of completely selected and completely unselected pixels. // Partially selected pixels are handled one pixel at a time. switch(selectedness) @@ -221,7 +221,7 @@ void KisBrightnessContrastFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP case MAX_SELECTED: { - Q_UINT8 *firstPixel = iter.rawData(); + TQ_UINT8 *firstPixel = iter.rawData(); while(iter.selectedness()==MAX_SELECTED && maxpix) { --maxpix; @@ -239,8 +239,8 @@ void KisBrightnessContrastFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP default: // adjust, but since it's partially selected we also only partially adjust src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), configBC->m_adjustment, 1); - const Q_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; - Q_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness}; + const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; + TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness}; src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData()); ++iter; pixelsProcessed++; @@ -252,13 +252,13 @@ void KisBrightnessContrastFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP setProgressDone(); } -KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f) - : KisFilterConfigWidget(parent, name, f) +KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name, WFlags f) + : KisFilterConfigWidget(tqparent, name, f) { int i; int height; m_page = new WdgBrightnessContrast(this); - QHBoxLayout * l = new QHBoxLayout(this); + TQHBoxLayout * l = new TQHBoxLayout(this); Q_CHECK_PTR(l); //Hide these buttons and labels as they are not implemented in 1.5 @@ -269,41 +269,41 @@ KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(QWidget * p m_page->textLabelBrightness->hide(); m_page->textLabelContrast->hide(); - l->addWidget(m_page, 0, Qt::AlignTop); + l->addWidget(m_page, 0, TQt::AlignTop); height = 256; - connect( m_page->kCurve, SIGNAL(modified()), SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->kCurve, TQT_SIGNAL(modified()), TQT_SIGNAL(sigPleaseUpdatePreview())); // Create the horizontal gradient label - QPixmap hgradientpix(256, 1); - QPainter hgp(&hgradientpix); - hgp.setPen(QPen::QPen(QColor(0,0,0),1, Qt::SolidLine)); + TQPixmap hgradientpix(256, 1); + TQPainter hgp(&hgradientpix); + hgp.setPen(TQPen::TQPen(TQColor(0,0,0),1, TQt::SolidLine)); for( i=0; i<256; ++i ) { - hgp.setPen(QColor(i,i,i)); + hgp.setPen(TQColor(i,i,i)); hgp.drawPoint(i, 0); } m_page->hgradient->setPixmap(hgradientpix); // Create the vertical gradient label - QPixmap vgradientpix(1, 256); - QPainter vgp(&vgradientpix); - vgp.setPen(QPen::QPen(QColor(0,0,0),1, Qt::SolidLine)); + TQPixmap vgradientpix(1, 256); + TQPainter vgp(&vgradientpix); + vgp.setPen(TQPen::TQPen(TQColor(0,0,0),1, TQt::SolidLine)); for( i=0; i<256; ++i ) { - vgp.setPen(QColor(i,i,i)); + vgp.setPen(TQColor(i,i,i)); vgp.drawPoint(0, 255-i); } m_page->vgradient->setPixmap(vgradientpix); KisHistogramProducerSP producer = new KisGenericLabHistogramProducer(); KisHistogram histogram(dev, producer, LINEAR); - QPixmap pix(256, height); + TQPixmap pix(256, height); pix.fill(); - QPainter p(&pix); - p.setPen(QPen::QPen(Qt::gray,1, Qt::SolidLine)); + TQPainter p(&pix); + p.setPen(TQPen::TQPen(TQt::gray,1, TQt::SolidLine)); double highest = (double)histogram.calculations().getHighest(); - Q_INT32 bins = histogram.producer()->numberOfBins(); + TQ_INT32 bins = histogram.producer()->numberOfBins(); if (histogram.getHistogramType() == LINEAR) { double factor = (double)height / highest; @@ -327,7 +327,7 @@ KisBrightnessContrastFilterConfiguration * KisBrightnessContrastConfigWidget::co for(int i=0; i <256; i++) { - Q_INT32 val; + TQ_INT32 val; val = int(0xFFFF * m_page->kCurve->getCurveValue( i / 255.0)); if(val >0xFFFF) val=0xFFFF; diff --git a/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h b/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h index eb2b2080..f99cb2ba 100644 --- a/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h +++ b/krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h @@ -25,7 +25,7 @@ #include "kis_filter_config_widget.h" class WdgBrightnessContrast; -class QWidget; +class TQWidget; class KisColorAdjustment; class KisBrightnessContrastFilterConfiguration : public KisFilterConfiguration { @@ -34,12 +34,12 @@ public: KisBrightnessContrastFilterConfiguration(); virtual ~KisBrightnessContrastFilterConfiguration(); - virtual void fromXML( const QString& ); - virtual QString toString(); + virtual void fromXML( const TQString& ); + virtual TQString toString(); public: - Q_UINT16 transfer[256]; - QPtrList<QPair<double,double> > curve; + TQ_UINT16 transfer[256]; + TQPtrList<TQPair<double,double> > curve; KisColorAdjustment * m_adjustment; }; @@ -55,10 +55,10 @@ public: public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration * configuration(QWidget *); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration * configuration(TQWidget *); virtual KisFilterConfiguration * configuration() { return new KisBrightnessContrastFilterConfiguration(); }; - virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("brightnesscontrast", i18n("Brightness / Contrast")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } @@ -73,7 +73,7 @@ public: class KisBrightnessContrastConfigWidget : public KisFilterConfigWidget { public: - KisBrightnessContrastConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); + KisBrightnessContrastConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); virtual ~KisBrightnessContrastConfigWidget() {}; KisBrightnessContrastFilterConfiguration * config(); diff --git a/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cc index 75b19a21..5b8d2b62 100644 --- a/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cc +++ b/krita/plugins/filters/colorsfilters/kis_perchannel_filter.cc @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlayout.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qdom.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqdom.h> #include "kis_filter_configuration.h" #include "kis_filter_config_widget.h" @@ -39,11 +39,11 @@ KisPerChannelFilterConfiguration::KisPerChannelFilterConfiguration(int n) : KisFilterConfiguration( "perchannel", 1 ) { - curves = new QSortedList<QPair<double,double> >[n]; + curves = new TQSortedList<TQPair<double,double> >[n]; for(int i=0;i<n;i++) { - transfers[i] = new Q_UINT16[256]; + transfers[i] = new TQ_UINT16[256]; - for (Q_UINT32 j = 0; j < 256; ++j) { + for (TQ_UINT32 j = 0; j < 256; ++j) { transfers[i][j] = j * 257; } } @@ -61,33 +61,33 @@ KisPerChannelFilterConfiguration::~KisPerChannelFilterConfiguration() delete adjustment; } -void KisPerChannelFilterConfiguration::fromXML( const QString& s ) +void KisPerChannelFilterConfiguration::fromXML( const TQString& s ) { - QDomDocument doc; + TQDomDocument doc; doc.setContent( s ); - QDomElement e = doc.documentElement(); - QDomNode n = e.firstChild(); + TQDomElement e = doc.documentElement(); + TQDomNode n = e.firstChild(); while (!n.isNull()) { e = n.toElement(); if (!e.isNull()) { if (e.attribute("name") == "curves") { - QDomNode curvesNode = e.firstChild(); + TQDomNode curvesNode = e.firstChild(); int count = 0; nTransfers = e.attribute("number").toUShort(); - curves = new QSortedList<QPair<double,double> >[nTransfers]; + curves = new TQSortedList<TQPair<double,double> >[nTransfers]; while (!curvesNode.isNull()) { - QDomElement curvesElement = curvesNode.toElement(); + TQDomElement curvesElement = curvesNode.toElement(); if (!curvesElement.isNull() && !curvesElement.text().isEmpty()) { - QStringList data = QStringList::split( ";", + TQStringList data = TQStringList::split( ";", curvesElement.text() ); - QStringList::Iterator pairStart = data.begin(); - QStringList::Iterator pairEnd = data.end(); - for (QStringList::Iterator it = pairStart; it != pairEnd; ++it) { - QString pair = * it; - if (pair.find(",") > -1) { - QPair<double,double> *p = new QPair<double,double>; + TQStringList::Iterator pairStart = data.begin(); + TQStringList::Iterator pairEnd = data.end(); + for (TQStringList::Iterator it = pairStart; it != pairEnd; ++it) { + TQString pair = * it; + if (pair.tqfind(",") > -1) { + TQPair<double,double> *p = new TQPair<double,double>; p->first = pair.section(",", 0, 0).toDouble(); p->second = pair.section(",", 1, 1).toDouble(); curves[count].append(p); @@ -104,10 +104,10 @@ curvesElement.text() ); for(int ch = 0; ch < nTransfers; ++ch) { - transfers[ch] = new Q_UINT16[256]; + transfers[ch] = new TQ_UINT16[256]; for(int i = 0; i < 256; ++i) { - Q_INT32 val; + TQ_INT32 val; val = int(0xFFFF * KCurve::getCurveValue(curves[ch], i / 255.0)); if(val > 0xFFFF) @@ -121,28 +121,28 @@ curvesElement.text() ); dirty = true; } -QString KisPerChannelFilterConfiguration::toString() +TQString KisPerChannelFilterConfiguration::toString() { - QDomDocument doc = QDomDocument("filterconfig"); - QDomElement root = doc.createElement( "filterconfig" ); + TQDomDocument doc = TQDomDocument("filterconfig"); + TQDomElement root = doc.createElement( "filterconfig" ); root.setAttribute( "name", name() ); root.setAttribute( "version", version() ); - QDomElement c = doc.createElement("curves"); + TQDomElement c = doc.createElement("curves"); c.setAttribute("number", nTransfers); c.setAttribute("name", "curves"); for (int i = 0; i < nTransfers; ++i) { - QDomElement t = doc.createElement("curve"); - QPtrList<QPair<double,double> > curve = curves[i]; - QString sCurve; - QPair<double,double> * pair; + TQDomElement t = doc.createElement("curve"); + TQPtrList<TQPair<double,double> > curve = curves[i]; + TQString sCurve; + TQPair<double,double> * pair; for ( pair = curve.first(); pair; pair = curve.next() ) { - sCurve += QString::number(pair->first); + sCurve += TQString::number(pair->first); sCurve += ","; - sCurve += QString::number(pair->second); + sCurve += TQString::number(pair->second); sCurve += ";"; } - QDomText text = doc.createCDATASection(sCurve); + TQDomText text = doc.createCDATASection(sCurve); t.appendChild(text); c.appendChild(t); } @@ -154,12 +154,12 @@ QString KisPerChannelFilterConfiguration::toString() } -KisFilterConfigWidget * KisPerChannelFilter::createConfigurationWidget(QWidget *parent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisPerChannelFilter::createConfigurationWidget(TQWidget *tqparent, KisPaintDeviceSP dev) { - return new KisPerChannelConfigWidget(parent, dev); + return new KisPerChannelConfigWidget(tqparent, dev); } -KisFilterConfiguration* KisPerChannelFilter::configuration(QWidget *nwidget) +KisFilterConfiguration* KisPerChannelFilter::configuration(TQWidget *nwidget) { KisPerChannelConfigWidget* widget = (KisPerChannelConfigWidget*)nwidget; @@ -179,7 +179,7 @@ std::list<KisFilterConfiguration*> KisPerChannelFilter::listOfExamplesConfigurat } -void KisPerChannelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisPerChannelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { if (!config) { kdWarning() << "No configuration object for per-channel filter\n"; @@ -213,12 +213,12 @@ void KisPerChannelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, Ki KisRectIteratorPixel iter = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); setProgressTotalSteps(rect.width() * rect.height()); - Q_INT32 pixelsProcessed = 0; + TQ_INT32 pixelsProcessed = 0; while( ! iter.isDone() && !cancelRequested()) { - Q_UINT32 npix=0, maxpix = iter.nConseqPixels(); - Q_UINT8 selectedness = iter.selectedness(); + TQ_UINT32 npix=0, maxpix = iter.nConseqPixels(); + TQ_UINT8 selectedness = iter.selectedness(); // The idea here is to handle stretches of completely selected and completely unselected pixels. // Partially selected pixels are handled one pixel at a time. switch(selectedness) @@ -235,7 +235,7 @@ void KisPerChannelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, Ki case MAX_SELECTED: { - Q_UINT8 *firstPixel = iter.rawData(); + TQ_UINT8 *firstPixel = iter.rawData(); while(iter.selectedness()==MAX_SELECTED && maxpix) { --maxpix; @@ -253,8 +253,8 @@ void KisPerChannelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, Ki default: // adjust, but since it's partially selected we also only partially adjust src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), adj, 1); - const Q_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; - Q_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness}; + const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; + TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness}; src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData()); ++iter; pixelsProcessed++; @@ -270,15 +270,15 @@ void KisPerChannelConfigWidget::setActiveChannel(int ch) { int i; int height = 256; - QPixmap pix(256, height); + TQPixmap pix(256, height); pix.fill(); - QPainter p(&pix); - p.setPen(QPen::QPen(Qt::gray,1, Qt::SolidLine)); + TQPainter p(&pix); + p.setPen(TQPen::TQPen(TQt::gray,1, TQt::SolidLine)); m_histogram->setChannel(ch); double highest = (double)m_histogram->calculations().getHighest(); - Q_INT32 bins = m_histogram->producer()->numberOfBins(); + TQ_INT32 bins = m_histogram->producer()->numberOfBins(); if (m_histogram->getHistogramType() == LINEAR) { double factor = (double)height / highest; @@ -300,52 +300,52 @@ void KisPerChannelConfigWidget::setActiveChannel(int ch) m_page->kCurve->setPixmap(pix); } -KisPerChannelConfigWidget::KisPerChannelConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f) - : KisFilterConfigWidget(parent, name, f) +KisPerChannelConfigWidget::KisPerChannelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name, WFlags f) + : KisFilterConfigWidget(tqparent, name, f) { int i; int height; m_page = new WdgPerChannel(this); - QHBoxLayout * l = new QHBoxLayout(this); + TQHBoxLayout * l = new TQHBoxLayout(this); Q_CHECK_PTR(l); m_dev = dev; - m_curves = new QSortedList<QPair<double,double> >[m_dev->colorSpace()->nColorChannels()]; + m_curves = new TQSortedList<TQPair<double,double> >[m_dev->colorSpace()->nColorChannels()]; m_activeCh = 0; for(unsigned int ch=0; ch <m_dev->colorSpace()->nColorChannels(); ch++) { - m_curves[ch].append(new QPair<double,double>(0, 0)); - m_curves[ch].append(new QPair<double,double>(1, 1)); + m_curves[ch].append(new TQPair<double,double>(0, 0)); + m_curves[ch].append(new TQPair<double,double>(1, 1)); } l->add(m_page); height = 256; - connect( m_page->kCurve, SIGNAL(modified()), SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->kCurve, TQT_SIGNAL(modified()), TQT_SIGNAL(sigPleaseUpdatePreview())); // Fill in the channel chooser - QValueVector<KisChannelInfo *> channels = dev->colorSpace()->channels(); + TQValueVector<KisChannelInfo *> channels = dev->colorSpace()->channels(); for(unsigned int val=0; val < dev->colorSpace()->nColorChannels(); val++) m_page->cmbChannel->insertItem(channels.at(val)->name()); - connect( m_page->cmbChannel, SIGNAL(activated(int)), this, SLOT(setActiveChannel(int))); + connect( m_page->cmbChannel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setActiveChannel(int))); // Create the horizontal gradient label - QPixmap hgradientpix(256, 1); - QPainter hgp(&hgradientpix); - hgp.setPen(QPen::QPen(QColor(0,0,0),1, Qt::SolidLine)); + TQPixmap hgradientpix(256, 1); + TQPainter hgp(&hgradientpix); + hgp.setPen(TQPen::TQPen(TQColor(0,0,0),1, TQt::SolidLine)); for( i=0; i<256; ++i ) { - hgp.setPen(QColor(i,i,i)); + hgp.setPen(TQColor(i,i,i)); hgp.drawPoint(i, 0); } m_page->hgradient->setPixmap(hgradientpix); // Create the vertical gradient label - QPixmap vgradientpix(1, 256); - QPainter vgp(&vgradientpix); - vgp.setPen(QPen::QPen(QColor(0,0,0),1, Qt::SolidLine)); + TQPixmap vgradientpix(1, 256); + TQPainter vgp(&vgradientpix); + vgp.setPen(TQPen::TQPen(TQColor(0,0,0),1, TQt::SolidLine)); for( i=0; i<256; ++i ) { - vgp.setPen(QColor(i,i,i)); + vgp.setPen(TQColor(i,i,i)); vgp.drawPoint(0, 255-i); } m_page->vgradient->setPixmap(vgradientpix); @@ -371,18 +371,18 @@ KisPerChannelFilterConfiguration * KisPerChannelConfigWidget::config() { cfg->curves[ch].setAutoDelete(true); cfg->curves[ch].clear(); - QPair<double, double> *p, *inpoint; + TQPair<double, double> *p, *inpoint; inpoint = m_curves[ch].first(); while(inpoint) { - p = new QPair<double, double>(inpoint->first, inpoint->second); + p = new TQPair<double, double>(inpoint->first, inpoint->second); cfg->curves[ch].append(p); inpoint = m_curves[ch].next(); } for(int i=0; i <256; i++) { - Q_INT32 val; + TQ_INT32 val; val = int(0xFFFF * m_page->kCurve->getCurveValue(m_curves[ch], i / 255.0)); if ( val > 0xFFFF ) val = 0xFFFF; @@ -405,11 +405,11 @@ void KisPerChannelConfigWidget::setConfiguration(KisFilterConfiguration * config { m_curves[ch].setAutoDelete(true); m_curves[ch].clear(); - QPair<double, double> *p, *inpoint; + TQPair<double, double> *p, *inpoint; inpoint = cfg->curves[ch].first(); while(inpoint) { - p = new QPair<double, double>(inpoint->first, inpoint->second); + p = new TQPair<double, double>(inpoint->first, inpoint->second); m_curves[ch].append(p); inpoint = cfg->curves[ch].next(); } diff --git a/krita/plugins/filters/colorsfilters/kis_perchannel_filter.h b/krita/plugins/filters/colorsfilters/kis_perchannel_filter.h index a34e9aac..2c526acc 100644 --- a/krita/plugins/filters/colorsfilters/kis_perchannel_filter.h +++ b/krita/plugins/filters/colorsfilters/kis_perchannel_filter.h @@ -21,8 +21,8 @@ #ifndef _KIS_PERCHANNEL_FILTER_H_ #define _KIS_PERCHANNEL_FILTER_H_ -#include <qpair.h> -#include <qptrlist.h> +#include <tqpair.h> +#include <tqptrlist.h> #include "kis_filter.h" #include "kis_filter_configuration.h" #include "kis_filter_config_widget.h" @@ -36,13 +36,13 @@ public: KisPerChannelFilterConfiguration(int n); ~KisPerChannelFilterConfiguration(); - virtual void fromXML( const QString& ); - virtual QString toString(); + virtual void fromXML( const TQString& ); + virtual TQString toString(); public: - QPtrList<QPair<double,double> > *curves; - Q_UINT16 *transfers[256]; - Q_UINT16 nTransfers; + TQPtrList<TQPair<double,double> > *curves; + TQ_UINT16 *transfers[256]; + TQ_UINT16 nTransfers; // Caching of adjustment bool dirty; KisColorSpace* oldCs; @@ -59,10 +59,10 @@ class KisPerChannelFilter public: KisPerChannelFilter() : KisFilter( id(), "adjust", i18n("&Color Adjustment...")) {}; public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration* configuration() { return new KisPerChannelFilterConfiguration(0); }; - virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("perchannel", i18n("Color Adjustment")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } @@ -77,9 +77,10 @@ class KisPerChannelConfigWidget : public KisFilterConfigWidget { typedef KisFilterConfigWidget super; Q_OBJECT + TQ_OBJECT public: - KisPerChannelConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); + KisPerChannelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); virtual ~KisPerChannelConfigWidget() {}; KisPerChannelFilterConfiguration * config(); @@ -92,7 +93,7 @@ private: WdgPerChannel * m_page; KisPaintDeviceSP m_dev; KisHistogram *m_histogram; - QPtrList<QPair<double,double> > *m_curves; + TQPtrList<TQPair<double,double> > *m_curves; int m_activeCh; }; diff --git a/krita/plugins/filters/colorsfilters/wdg_brightness_contrast.ui b/krita/plugins/filters/colorsfilters/wdg_brightness_contrast.ui index bf09239e..9474462b 100644 --- a/krita/plugins/filters/colorsfilters/wdg_brightness_contrast.ui +++ b/krita/plugins/filters/colorsfilters/wdg_brightness_contrast.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgBrightnessContrast</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgBrightnessContrast</cstring> </property> @@ -30,15 +30,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>hgradient</cstring> </property> @@ -50,13 +50,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>250</width> <height>20</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>250</width> <height>20</height> @@ -72,7 +72,7 @@ <bool>true</bool> </property> </widget> - <widget class="QFrame" row="0" column="1"> + <widget class="TQFrame" row="0" column="1"> <property name="name"> <cstring>frame3</cstring> </property> @@ -84,13 +84,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>254</width> <height>254</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>254</width> <height>254</height> @@ -116,13 +116,13 @@ <property name="name"> <cstring>kCurve</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>250</width> <height>250</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>250</width> <height>250</height> @@ -131,7 +131,7 @@ </widget> </vbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>vgradient</cstring> </property> @@ -143,13 +143,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>20</width> <height>250</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>20</width> <height>250</height> @@ -167,15 +167,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>pb_more_contrast</cstring> </property> @@ -186,18 +186,18 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabelContrast</cstring> </property> <property name="text"> <string>Contrast</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>pb_less_contrast</cstring> </property> @@ -208,7 +208,7 @@ <string></string> </property> </widget> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>pb_less_brightness</cstring> </property> @@ -219,18 +219,18 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabelBrightness</cstring> </property> <property name="text"> <string>Brightness</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>pb_more_brightness</cstring> </property> @@ -253,7 +253,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>20</height> @@ -285,7 +285,7 @@ <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcurve.h</includehint> </includehints> diff --git a/krita/plugins/filters/colorsfilters/wdg_perchannel.ui b/krita/plugins/filters/colorsfilters/wdg_perchannel.ui index 464e97fd..243d628f 100644 --- a/krita/plugins/filters/colorsfilters/wdg_perchannel.ui +++ b/krita/plugins/filters/colorsfilters/wdg_perchannel.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgPerChannel</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgPerChannel</cstring> </property> @@ -22,15 +22,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -38,22 +38,22 @@ <string>Channel:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>cmbChannel</cstring> </property> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>hgradient</cstring> </property> @@ -65,13 +65,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>20</height> @@ -87,7 +87,7 @@ <bool>true</bool> </property> </widget> - <widget class="QFrame" row="0" column="1"> + <widget class="TQFrame" row="0" column="1"> <property name="name"> <cstring>frame3</cstring> </property> @@ -122,7 +122,7 @@ </widget> </vbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>vgradient</cstring> </property> @@ -134,13 +134,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>20</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>20</width> <height>32767</height> @@ -183,7 +183,7 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcurve.h</includehint> </includehints> diff --git a/krita/plugins/filters/convolutionfilters/convolutionfilters.cc b/krita/plugins/filters/convolutionfilters/convolutionfilters.cc index 1eaf788d..f0eb7fef 100644 --- a/krita/plugins/filters/convolutionfilters/convolutionfilters.cc +++ b/krita/plugins/filters/convolutionfilters/convolutionfilters.cc @@ -29,10 +29,10 @@ #include "kis_custom_convolution_filter.h" -KisKernelSP createKernel( Q_INT32 i0, Q_INT32 i1, Q_INT32 i2, - Q_INT32 i3, Q_INT32 i4, Q_INT32 i5, - Q_INT32 i6, Q_INT32 i7, Q_INT32 i8, - Q_INT32 factor, Q_INT32 offset ) +KisKernelSP createKernel( TQ_INT32 i0, TQ_INT32 i1, TQ_INT32 i2, + TQ_INT32 i3, TQ_INT32 i4, TQ_INT32 i5, + TQ_INT32 i6, TQ_INT32 i7, TQ_INT32 i8, + TQ_INT32 factor, TQ_INT32 offset ) { KisKernelSP kernel = new KisKernel(); kernel->width = 3; @@ -41,7 +41,7 @@ KisKernelSP createKernel( Q_INT32 i0, Q_INT32 i1, Q_INT32 i2, kernel->factor = factor; kernel->offset = offset; - kernel->data = new Q_INT32[9]; + kernel->data = new TQ_INT32[9]; kernel->data[0] = i0; kernel->data[1] = i1; kernel->data[2] = i2; @@ -60,13 +60,13 @@ KisKernelSP createKernel( Q_INT32 i0, Q_INT32 i1, Q_INT32 i2, typedef KGenericFactory<KritaConvolutionFilters> KritaConvolutionFiltersFactory; K_EXPORT_COMPONENT_FACTORY( kritaconvolutionfilters, KritaConvolutionFiltersFactory( "krita" ) ) -KritaConvolutionFilters::KritaConvolutionFilters(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaConvolutionFilters::KritaConvolutionFilters(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaConvolutionFiltersFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisGaussianBlurFilter()); manager->add(new KisSharpenFilter()); manager->add(new KisMeanRemovalFilter()); @@ -121,20 +121,20 @@ KisEmbossInAllDirectionsFilter::KisEmbossInAllDirectionsFilter() } KisEmbossHorizontalVerticalFilter::KisEmbossHorizontalVerticalFilter() - : KisConvolutionConstFilter(id(), "emboss", i18n("Emboss Horizontal && Vertical")) + : KisConvolutionConstFilter(id(), "emboss", i18n("EmbossQt::Horizontal &&Qt::Vertical")) { m_matrix = createKernel( 0, -1, 0 , -1, 4, -1 , 0, -1, 0, 1, 127); m_channelFlags = KisChannelInfo::FLAG_COLOR; } KisEmbossVerticalFilter::KisEmbossVerticalFilter() - : KisConvolutionConstFilter(id(), "emboss", i18n("Emboss Vertical Only")) + : KisConvolutionConstFilter(id(), "emboss", i18n("EmbossQt::Vertical Only")) { m_matrix = createKernel( 0, -1, 0 , 0, 2, 0 , 0, -1, 0, 1, 127); } KisEmbossHorizontalFilter::KisEmbossHorizontalFilter() : - KisConvolutionConstFilter(id(), "emboss", i18n("Emboss Horizontal Only")) + KisConvolutionConstFilter(id(), "emboss", i18n("EmbossQt::Horizontal Only")) { m_matrix = createKernel( 0, 0, 0 , -1, 4, -1 , 0, 0, 0, 1, 127); diff --git a/krita/plugins/filters/convolutionfilters/convolutionfilters.h b/krita/plugins/filters/convolutionfilters/convolutionfilters.h index 15a23c2b..39b2372a 100644 --- a/krita/plugins/filters/convolutionfilters/convolutionfilters.h +++ b/krita/plugins/filters/convolutionfilters/convolutionfilters.h @@ -73,7 +73,7 @@ class KisEmbossHorizontalVerticalFilter : public KisConvolutionConstFilter { public: KisEmbossHorizontalVerticalFilter(); public: - static inline KisID id() { return KisID("", i18n("Emboss Horizontal & Vertical")); }; + static inline KisID id() { return KisID("", i18n("EmbossQt::Horizontal &Qt::Vertical")); }; virtual bool supportsPainting() { return false; } }; @@ -82,7 +82,7 @@ class KisEmbossVerticalFilter : public KisConvolutionConstFilter { public: KisEmbossVerticalFilter(); public: - static inline KisID id() { return KisID("emboss vertical only", i18n("Emboss Vertical Only")); }; + static inline KisID id() { return KisID("emboss vertical only", i18n("EmbossQt::Vertical Only")); }; virtual bool supportsPainting() { return false; } }; @@ -91,7 +91,7 @@ class KisEmbossHorizontalFilter : public KisConvolutionConstFilter { public: KisEmbossHorizontalFilter(); public: - static inline KisID id() { return KisID("emboss horizontal only", i18n("Emboss Horizontal Only")); }; + static inline KisID id() { return KisID("emboss horizontal only", i18n("EmbossQt::Horizontal Only")); }; virtual bool supportsPainting() { return false; } }; @@ -145,7 +145,7 @@ public: class KritaConvolutionFilters : public KParts::Plugin { public: - KritaConvolutionFilters(QObject *parent, const char *name, const QStringList &); + KritaConvolutionFilters(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaConvolutionFilters(); }; diff --git a/krita/plugins/filters/convolutionfilters/kis_convolution_filter.cc b/krita/plugins/filters/convolutionfilters/kis_convolution_filter.cc index dc86b8d2..39a395b4 100644 --- a/krita/plugins/filters/convolutionfilters/kis_convolution_filter.cc +++ b/krita/plugins/filters/convolutionfilters/kis_convolution_filter.cc @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "qdom.h" +#include "tqdom.h" #include "klocale.h" #include "kdebug.h" @@ -27,60 +27,60 @@ #include "kis_progress_display_interface.h" #include "kis_progress_subject.h" -void KisConvolutionConfiguration::fromXML(const QString & s) +void KisConvolutionConfiguration::fromXML(const TQString & s) { m_matrix = new KisKernel(); - QDomDocument doc; + TQDomDocument doc; doc.setContent( s ); - QDomElement e = doc.documentElement(); - QDomNode n = e.firstChild(); + TQDomElement e = doc.documentElement(); + TQDomNode n = e.firstChild(); m_name = e.attribute("name"); m_version = e.attribute("version").toInt(); - QDomElement matrix = n.toElement(); - m_matrix->width = QString( matrix.attribute( "width" ) ).toInt(); - m_matrix->height = QString( matrix.attribute( "height" ) ).toInt(); - m_matrix->offset = QString( matrix.attribute( "offset" ) ).toInt(); - m_matrix->factor = QString( matrix.attribute( "factor" ) ).toInt(); + TQDomElement matrix = n.toElement(); + m_matrix->width = TQString( matrix.attribute( "width" ) ).toInt(); + m_matrix->height = TQString( matrix.attribute( "height" ) ).toInt(); + m_matrix->offset = TQString( matrix.attribute( "offset" ) ).toInt(); + m_matrix->factor = TQString( matrix.attribute( "factor" ) ).toInt(); - m_matrix->data = new Q_INT32[m_matrix->width * m_matrix->height]; + m_matrix->data = new TQ_INT32[m_matrix->width * m_matrix->height]; - QStringList data = QStringList::split( ",", e.text() ); - QStringList::Iterator start = data.begin(); - QStringList::Iterator end = data.end(); + TQStringList data = TQStringList::split( ",", e.text() ); + TQStringList::Iterator start = data.begin(); + TQStringList::Iterator end = data.end(); int i = 0; - for ( QStringList::Iterator it = start; it != end; ++it ) { - QString s = *it; + for ( TQStringList::Iterator it = start; it != end; ++it ) { + TQString s = *it; m_matrix->data[i] = s.toInt(); i++; } } -QString KisConvolutionConfiguration::toString() +TQString KisConvolutionConfiguration::toString() { - QDomDocument doc = QDomDocument("filterconfig"); - QDomElement root = doc.createElement( "filterconfig" ); + TQDomDocument doc = TQDomDocument("filterconfig"); + TQDomElement root = doc.createElement( "filterconfig" ); root.setAttribute( "name", name() ); root.setAttribute( "version", version() ); doc.appendChild( root ); - QDomElement e = doc.createElement( "kernel" ); + TQDomElement e = doc.createElement( "kernel" ); e.setAttribute( "width", m_matrix->width ); e.setAttribute( "height", m_matrix->height ); e.setAttribute( "offset", m_matrix->offset ); e.setAttribute( "factor", m_matrix->factor ); - QString data; + TQString data; for ( uint i = 0; i < m_matrix->width * m_matrix->height; ++i ) { - data += QString::number( m_matrix->data[i] ); + data += TQString::number( m_matrix->data[i] ); data += ","; } - QDomText text = doc.createCDATASection(data); + TQDomText text = doc.createCDATASection(data); e.appendChild(text); root.appendChild(e); @@ -91,7 +91,7 @@ QString KisConvolutionConfiguration::toString() void KisConvolutionFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, - const QRect& rect) + const TQRect& rect) { if (!configuration) { setProgressDone(); @@ -127,10 +127,10 @@ int KisConvolutionFilter::overlapMarginNeeded(KisFilterConfiguration* c) const { if (!config) return 0; KisKernelSP kernel = config->matrix(); - return QMAX(kernel->width / 2, kernel->height / 2); + return TQMAX(kernel->width / 2, kernel->height / 2); } -KisFilterConfiguration* KisConvolutionConstFilter::configuration(QWidget*) +KisFilterConfiguration* KisConvolutionConstFilter::configuration(TQWidget*) { return new KisConvolutionConfiguration( id().id(), m_matrix, m_channelFlags); } diff --git a/krita/plugins/filters/convolutionfilters/kis_convolution_filter.h b/krita/plugins/filters/convolutionfilters/kis_convolution_filter.h index f33ddc27..5a2d5a72 100644 --- a/krita/plugins/filters/convolutionfilters/kis_convolution_filter.h +++ b/krita/plugins/filters/convolutionfilters/kis_convolution_filter.h @@ -27,15 +27,15 @@ class KisConvolutionConfiguration : public KisFilterConfiguration { public: - KisConvolutionConfiguration(const QString & name, KisKernel * matrix, + KisConvolutionConfiguration(const TQString & name, KisKernel * matrix, KisChannelInfo::enumChannelFlags channelFlags = KisChannelInfo::FLAG_COLOR_AND_ALPHA) : KisFilterConfiguration( name, 1 ) , m_matrix(matrix) , m_channelFlags(channelFlags) {}; - void fromXML(const QString & s); - QString toString(); + void fromXML(const TQString & s); + TQString toString(); public: @@ -53,16 +53,17 @@ private: class KisConvolutionFilter : public KisFilter { Q_OBJECT + TQ_OBJECT public: - KisConvolutionFilter(const KisID& id, const QString & category, const QString & entry) + KisConvolutionFilter(const KisID& id, const TQString & category, const TQString & entry) : KisFilter( id, category, entry ) {}; public: - virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); virtual bool supportsIncrementalPainting() { return false; } virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; virtual int overlapMarginNeeded(KisFilterConfiguration* c) const; @@ -76,7 +77,7 @@ class KisConvolutionConstFilter : public KisConvolutionFilter { public: - KisConvolutionConstFilter(const KisID& id, const QString & category, const QString & entry) + KisConvolutionConstFilter(const KisID& id, const TQString & category, const TQString & entry) : KisConvolutionFilter(id, category, entry) { m_channelFlags = KisChannelInfo::FLAG_COLOR_AND_ALPHA; @@ -86,7 +87,7 @@ public: public: - virtual KisFilterConfiguration * configuration(QWidget*); + virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return configuration(0); }; protected: diff --git a/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc b/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc index 06998e3c..8d48d25d 100644 --- a/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc +++ b/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc @@ -22,7 +22,7 @@ #include "kis_custom_convolution_filter.h" -#include <qspinbox.h> +#include <tqspinbox.h> #include "kis_convolution_painter.h" #include "kis_custom_convolution_filter_configuration_widget.h" @@ -30,14 +30,14 @@ #include "kis_matrix_widget.h" -KisFilterConfigWidget * KisCustomConvolutionFilter::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP) +KisFilterConfigWidget * KisCustomConvolutionFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP) { - KisCustomConvolutionFilterConfigurationWidget* ccfcw = new KisCustomConvolutionFilterConfigurationWidget(this,parent, "custom convolution config widget"); + KisCustomConvolutionFilterConfigurationWidget* ccfcw = new KisCustomConvolutionFilterConfigurationWidget(this,tqparent, "custom convolution config widget"); Q_CHECK_PTR(ccfcw); return ccfcw; } -KisFilterConfiguration * KisCustomConvolutionFilter::configuration(QWidget* nwidget) +KisFilterConfiguration * KisCustomConvolutionFilter::configuration(TQWidget* nwidget) { KisCustomConvolutionFilterConfigurationWidget* widget = (KisCustomConvolutionFilterConfigurationWidget*) nwidget; @@ -51,7 +51,7 @@ KisFilterConfiguration * KisCustomConvolutionFilter::configuration(QWidget* nwid kernel->factor = 1; kernel->offset = 127; - kernel->data = new Q_INT32[9]; + kernel->data = new TQ_INT32[9]; kernel->data[0] = 0; kernel->data[1] = 0; kernel->data[2] = 0; @@ -71,7 +71,7 @@ KisFilterConfiguration * KisCustomConvolutionFilter::configuration(QWidget* nwid kernel->width = 3; kernel->height = 3; - kernel->data = new Q_INT32[9]; + kernel->data = new TQ_INT32[9]; KisCustomConvolutionFilterConfigurationBaseWidget* mw = widget->matrixWidget(); diff --git a/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h b/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h index 39845cd5..479de21f 100644 --- a/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h +++ b/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h @@ -26,7 +26,7 @@ #include "kis_id.h" #include "kis_types.h" -class QWidget; +class TQWidget; class KisCustomConvolutionFilter : public KisConvolutionFilter { @@ -39,8 +39,8 @@ public: virtual bool supportsIncrementalPainting() { return true; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration * configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return configuration(0); }; protected: virtual KisKernelSP matrix() { return m_matrix; }; diff --git a/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui b/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui index 5c94934e..495fd3bc 100644 --- a/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui +++ b/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KisCustomConvolutionFilterConfigurationBaseWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KisCustomConvolutionFilterConfigurationBaseWidget</cstring> </property> @@ -19,9 +19,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> @@ -32,15 +32,15 @@ <cstring>matrixWidget</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabelFactor</cstring> </property> @@ -48,7 +48,7 @@ <string>Factor:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>spinBoxFactor</cstring> </property> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -78,15 +78,15 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabelOffset</cstring> </property> @@ -94,7 +94,7 @@ <string>Offset:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>spinBoxOffset</cstring> </property> @@ -115,7 +115,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>24</width> <height>20</height> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -185,5 +185,5 @@ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc b/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc index 51ad5e62..b1905d30 100644 --- a/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc +++ b/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc @@ -18,8 +18,8 @@ #include "kis_custom_convolution_filter_configuration_widget.h" -#include <qlayout.h> -#include <qspinbox.h> +#include <tqlayout.h> +#include <tqspinbox.h> #include <klocale.h> @@ -34,30 +34,30 @@ #include "kis_custom_convolution_filter_configuration_base_widget.h" #include "kis_matrix_widget.h" -KisCustomConvolutionFilterConfigurationWidget::KisCustomConvolutionFilterConfigurationWidget( KisFilter* /*nfilter*/, QWidget * parent, const char * name) - : KisFilterConfigWidget ( parent, name ) +KisCustomConvolutionFilterConfigurationWidget::KisCustomConvolutionFilterConfigurationWidget( KisFilter* /*nfilter*/, TQWidget * tqparent, const char * name) + : KisFilterConfigWidget ( tqparent, name ) { - QGridLayout *widgetLayout = new QGridLayout(this, 2, 1); + TQGridLayout *widgetLayout = new TQGridLayout(this, 2, 1); Q_CHECK_PTR(widgetLayout); -// QPushButton *bnRefresh = new QPushButton(i18n("Refresh Preview"), this, "bnrefresh"); +// TQPushButton *bnRefresh = new TQPushButton(i18n("Refresh Preview"), this, "bnrefresh"); // Q_CHECK_PTR(bnRefresh); -// QSpacerItem *spacer = new QSpacerItem(100, 30, QSizePolicy::Expanding, QSizePolicy::Minimum); +// TQSpacerItem *spacer = new TQSpacerItem(100, 30, TQSizePolicy::Expanding, TQSizePolicy::Minimum); // Q_CHECK_PTR(spacer); // widgetLayout->addWidget(bnRefresh, 0, 0); // widgetLayout->addItem(spacer, 0, 1); - m_ccfcws = new KisCustomConvolutionFilterConfigurationBaseWidget((QWidget*)this); + m_ccfcws = new KisCustomConvolutionFilterConfigurationBaseWidget((TQWidget*)this); Q_CHECK_PTR(m_ccfcws); widgetLayout->addMultiCellWidget(m_ccfcws, 1, 1, 0, 1); -// connect( bnRefresh, SIGNAL(clicked()), nfilter, SLOT(refreshPreview())); - connect( m_ccfcws->matrixWidget, SIGNAL(valueChanged()), SIGNAL(sigPleaseUpdatePreview())); - connect( m_ccfcws->spinBoxFactor, SIGNAL(valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_ccfcws->spinBoxOffset, SIGNAL(valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); +// connect( bnRefresh, TQT_SIGNAL(clicked()), nfilter, TQT_SLOT(refreshPreview())); + connect( m_ccfcws->matrixWidget, TQT_SIGNAL(valueChanged()), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_ccfcws->spinBoxFactor, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_ccfcws->spinBoxOffset, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); } void KisCustomConvolutionFilterConfigurationWidget::setConfiguration(KisFilterConfiguration * cfg) diff --git a/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h b/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h index 40389554..b5819e39 100644 --- a/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h +++ b/krita/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h @@ -21,7 +21,7 @@ #include "kis_filter_config_widget.h" -class QWidget; +class TQWidget; class KisCustomConvolutionFilterConfigurationBaseWidget; class KisMatrixWidget; class KisFilter; @@ -30,10 +30,11 @@ class KisCustomConvolutionFilterConfigurationWidget : public KisFilterConfigWidg { Q_OBJECT + TQ_OBJECT public: - KisCustomConvolutionFilterConfigurationWidget( KisFilter* nfilter, QWidget * parent, const char * name); + KisCustomConvolutionFilterConfigurationWidget( KisFilter* nfilter, TQWidget * tqparent, const char * name); inline KisCustomConvolutionFilterConfigurationBaseWidget* matrixWidget() { return m_ccfcws; }; void setConfiguration(KisFilterConfiguration * config); diff --git a/krita/plugins/filters/cubismfilter/kis_cubism_filter.cc b/krita/plugins/filters/cubismfilter/kis_cubism_filter.cc index aa374419..904168d3 100644 --- a/krita/plugins/filters/cubismfilter/kis_cubism_filter.cc +++ b/krita/plugins/filters/cubismfilter/kis_cubism_filter.cc @@ -25,8 +25,8 @@ #include <time.h> #include <vector> -#include <qpoint.h> -#include <qspinbox.h> +#include <tqpoint.h> +#include <tqspinbox.h> #include <klocale.h> #include <kiconloader.h> @@ -72,18 +72,18 @@ bool KisCubismFilter::workWith(KisColorSpace* /*cs*/) void KisCubismFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, - KisFilterConfiguration* configuration, const QRect& rect) + KisFilterConfiguration* configuration, const TQRect& rect) { Q_ASSERT(src); Q_ASSERT(dst); Q_ASSERT(configuration); //read the filter configuration values from the KisFilterConfiguration object - Q_UINT32 tileSize = ((KisCubismFilterConfiguration*)configuration)->tileSize(); - Q_UINT32 tileSaturation = ((KisCubismFilterConfiguration*)configuration)->tileSaturation(); + TQ_UINT32 tileSize = ((KisCubismFilterConfiguration*)configuration)->tileSize(); + TQ_UINT32 tileSaturation = ((KisCubismFilterConfiguration*)configuration)->tileSaturation(); KisColorSpace * cs = src->colorSpace(); - QString id = cs->id().id(); + TQString id = cs->id().id(); if (id == "RGBA" || id == "GRAY" || id == "CMYK") { cubism(src, dst, rect, tileSize, tileSaturation); @@ -97,7 +97,7 @@ void KisCubismFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, gc.end(); kdDebug() << src->colorSpace()->id().id() << endl; - cubism(dev, dev, QRect(0, 0, rect.width(), rect.height()), tileSize, tileSaturation); + cubism(dev, dev, TQRect(0, 0, rect.width(), rect.height()), tileSize, tileSaturation); gc.begin(dst); gc.bitBlt(rect.x(), rect.y(), COMPOSITE_COPY, dev, 0, 0, rect.width(), rect.height()); @@ -108,15 +108,15 @@ void KisCubismFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, } } -void KisCubismFilter::randomizeIndices (Q_INT32 count, Q_INT32* indices) +void KisCubismFilter::randomizeIndices (TQ_INT32 count, TQ_INT32* indices) { - Q_INT32 index1, index2; - Q_INT32 tmp; + TQ_INT32 index1, index2; + TQ_INT32 tmp; //initialize random number generator with time srand(static_cast<unsigned int>(time(0))); - for (Q_INT32 i = 0; i < count * RANDOMNESS; i++) + for (TQ_INT32 i = 0; i < count * RANDOMNESS; i++) { index1 = randomIntNumber(0, count); index2 = randomIntNumber(0, count); @@ -126,11 +126,11 @@ void KisCubismFilter::randomizeIndices (Q_INT32 count, Q_INT32* indices) } } -Q_INT32 KisCubismFilter::randomIntNumber(Q_INT32 lowestNumber, Q_INT32 highestNumber) +TQ_INT32 KisCubismFilter::randomIntNumber(TQ_INT32 lowestNumber, TQ_INT32 highestNumber) { if(lowestNumber > highestNumber) { - Q_INT32 temp = lowestNumber; + TQ_INT32 temp = lowestNumber; lowestNumber = highestNumber; highestNumber = temp; } @@ -167,20 +167,20 @@ double KisCubismFilter::calcAlphaBlend (double* vec, double oneOverDist, double } } -void KisCubismFilter::convertSegment (Q_INT32 x1, Q_INT32 y1, Q_INT32 x2, Q_INT32 y2, Q_INT32 offset, Q_INT32* min, Q_INT32* max, Q_INT32 xmin, Q_INT32 xmax) +void KisCubismFilter::convertSegment (TQ_INT32 x1, TQ_INT32 y1, TQ_INT32 x2, TQ_INT32 y2, TQ_INT32 offset, TQ_INT32* min, TQ_INT32* max, TQ_INT32 xmin, TQ_INT32 xmax) { if (y1 > y2) { - Q_INT32 tmp = y2; y2 = y1; y1 = tmp; + TQ_INT32 tmp = y2; y2 = y1; y1 = tmp; tmp = x2; x2 = x1; x1 = tmp; } - Q_INT32 ydiff = (y2 - y1); + TQ_INT32 ydiff = (y2 - y1); if (ydiff) { double xinc = static_cast<double>(x2 - x1) / static_cast<double>(ydiff); double xstart = x1 + 0.5 * xinc; - for (Q_INT32 y = y1 ; y < y2; y++) + for (TQ_INT32 y = y1 ; y < y2; y++) { if(xstart >= xmin && xstart <= xmax) { @@ -200,25 +200,25 @@ void KisCubismFilter::convertSegment (Q_INT32 x1, Q_INT32 y1, Q_INT32 x2, Q_INT3 #define USE_READABLE_BUT_SLOW_CODE -void KisCubismFilter::fillPolyColor (KisPaintDeviceSP src, KisPaintDeviceSP dst, KisPolygon* poly, const Q_UINT8* col, Q_UINT8* /*s*/, QRect rect) +void KisCubismFilter::fillPolyColor (KisPaintDeviceSP src, KisPaintDeviceSP dst, KisPolygon* poly, const TQ_UINT8* col, TQ_UINT8* /*s*/, TQRect rect) { - Q_INT32 val; - Q_INT32 alpha; - Q_UINT8 buf[4]; - Q_INT32 x, y; + TQ_INT32 val; + TQ_INT32 alpha; + TQ_UINT8 buf[4]; + TQ_INT32 x, y; double xx, yy; double vec[2]; - Q_INT32 x1 = rect.left(), y1 = rect.top(), x2 = rect.right(), y2 = rect.bottom(); -// Q_INT32 selWidth, selHeight; - Q_INT32 *vals, *valsIter, *valsEnd; - Q_INT32 b; - Q_INT32 xs, ys, xe, ye; + TQ_INT32 x1 = rect.left(), y1 = rect.top(), x2 = rect.right(), y2 = rect.bottom(); +// TQ_INT32 selWidth, selHeight; + TQ_INT32 *vals, *valsIter, *valsEnd; + TQ_INT32 b; + TQ_INT32 xs, ys, xe, ye; - Q_INT32 sx = (Q_INT32) (*poly)[0].x(); - Q_INT32 sy = (Q_INT32) (*poly)[0].y(); - Q_INT32 ex = (Q_INT32) (*poly)[1].x(); - Q_INT32 ey = (Q_INT32) (*poly)[1].y(); + TQ_INT32 sx = (TQ_INT32) (*poly)[0].x(); + TQ_INT32 sy = (TQ_INT32) (*poly)[0].y(); + TQ_INT32 ex = (TQ_INT32) (*poly)[1].x(); + TQ_INT32 ey = (TQ_INT32) (*poly)[1].y(); double dist = sqrt (SQR (ex - sx) + SQR (ey - sy)); double oneOverDist = 0.0; @@ -229,23 +229,23 @@ void KisCubismFilter::fillPolyColor (KisPaintDeviceSP src, KisPaintDeviceSP dst, vec[1] = (ey - sy) * oneOverDist; } - Q_INT32 pixelSize = src->pixelSize(); + TQ_INT32 pixelSize = src->pixelSize(); //get the extents of the polygon double dMinX, dMinY, dMaxX, dMaxY; poly->extents (dMinX, dMinY, dMaxX, dMaxY); - Q_INT32 minX = static_cast<Q_INT32>(dMinX); - Q_INT32 minY = static_cast<Q_INT32>(dMinY); - Q_INT32 maxX = static_cast<Q_INT32>(dMaxX); - Q_INT32 maxY = static_cast<Q_INT32>(dMaxY); - Q_INT32 sizeX = (maxX - minX) * SUPERSAMPLE; - Q_INT32 sizeY = (maxY - minY) * SUPERSAMPLE; - - Q_INT32 *minScanlines = new Q_INT32[sizeY]; - Q_INT32 *minScanlinesIter = minScanlines; - Q_INT32 *maxScanlines = new Q_INT32[sizeY]; - Q_INT32 *maxScanlinesIter = maxScanlines; - - for (Q_INT32 i = 0; i < sizeY; i++) + TQ_INT32 minX = static_cast<TQ_INT32>(dMinX); + TQ_INT32 minY = static_cast<TQ_INT32>(dMinY); + TQ_INT32 maxX = static_cast<TQ_INT32>(dMaxX); + TQ_INT32 maxY = static_cast<TQ_INT32>(dMaxY); + TQ_INT32 sizeX = (maxX - minX) * SUPERSAMPLE; + TQ_INT32 sizeY = (maxY - minY) * SUPERSAMPLE; + + TQ_INT32 *minScanlines = new TQ_INT32[sizeY]; + TQ_INT32 *minScanlinesIter = minScanlines; + TQ_INT32 *maxScanlines = new TQ_INT32[sizeY]; + TQ_INT32 *maxScanlinesIter = maxScanlines; + + for (TQ_INT32 i = 0; i < sizeY; i++) { minScanlines[i] = maxX * SUPERSAMPLE; maxScanlines[i] = minX * SUPERSAMPLE; @@ -253,12 +253,12 @@ void KisCubismFilter::fillPolyColor (KisPaintDeviceSP src, KisPaintDeviceSP dst, if ( poly->numberOfPoints() ) { - Q_INT32 polyNpts = poly->numberOfPoints(); + TQ_INT32 polyNpts = poly->numberOfPoints(); - xs = static_cast<Q_INT32>((*poly)[polyNpts-1].x()); - ys = static_cast<Q_INT32>((*poly)[polyNpts-1].y()); - xe = static_cast<Q_INT32>((*poly)[0].x()); - ye = static_cast<Q_INT32>((*poly)[0].y()); + xs = static_cast<TQ_INT32>((*poly)[polyNpts-1].x()); + ys = static_cast<TQ_INT32>((*poly)[polyNpts-1].y()); + xe = static_cast<TQ_INT32>((*poly)[0].x()); + ye = static_cast<TQ_INT32>((*poly)[0].y()); xs *= SUPERSAMPLE; ys *= SUPERSAMPLE; @@ -271,14 +271,14 @@ void KisCubismFilter::fillPolyColor (KisPaintDeviceSP src, KisPaintDeviceSP dst, for ( it = poly->begin(); it != poly->end(); ) { - xs = static_cast<Q_INT32>((*it).x()); - ys = static_cast<Q_INT32>((*it).y()); + xs = static_cast<TQ_INT32>((*it).x()); + ys = static_cast<TQ_INT32>((*it).y()); ++it; if( it != poly->end() ) { - xe = static_cast<Q_INT32>((*it).x()); - ye = static_cast<Q_INT32>((*it).y()); + xe = static_cast<TQ_INT32>((*it).x()); + ye = static_cast<TQ_INT32>((*it).y()); xs *= SUPERSAMPLE; ys *= SUPERSAMPLE; @@ -290,18 +290,18 @@ void KisCubismFilter::fillPolyColor (KisPaintDeviceSP src, KisPaintDeviceSP dst, } } - vals = new Q_INT32[sizeX]; + vals = new TQ_INT32[sizeX]; // x1 = minX; x2 = maxX; y1 = minY; y2 = maxY; - for (Q_INT32 i = 0; i < sizeY; i++, minScanlinesIter++, maxScanlinesIter++) + for (TQ_INT32 i = 0; i < sizeY; i++, minScanlinesIter++, maxScanlinesIter++) { if (! (i % SUPERSAMPLE)) { - memset (vals, 0, sizeof( Q_INT32 ) * sizeX); + memset (vals, 0, sizeof( TQ_INT32 ) * sizeX); } yy = static_cast<double>(i) / static_cast<double>(SUPERSAMPLE) + minY; - for (Q_INT32 j = *minScanlinesIter; j < *maxScanlinesIter; j++) + for (TQ_INT32 j = *minScanlinesIter; j < *maxScanlinesIter; j++) { x = j - minX * SUPERSAMPLE; vals[x] += 255; @@ -312,7 +312,7 @@ void KisCubismFilter::fillPolyColor (KisPaintDeviceSP src, KisPaintDeviceSP dst, y = (i / SUPERSAMPLE) + minY; if (y >= y1 && y <= y2) { - for (Q_INT32 j = 0; j < sizeX; j += SUPERSAMPLE) + for (TQ_INT32 j = 0; j < sizeX; j += SUPERSAMPLE) { x = (j / SUPERSAMPLE) + minX; @@ -327,20 +327,20 @@ void KisCubismFilter::fillPolyColor (KisPaintDeviceSP src, KisPaintDeviceSP dst, if (val > 0) { xx = static_cast<double>(j) / static_cast<double>(SUPERSAMPLE) + minX; - alpha = static_cast<Q_INT32>(val * calcAlphaBlend (vec, oneOverDist, xx - sx, yy - sy)); + alpha = static_cast<TQ_INT32>(val * calcAlphaBlend (vec, oneOverDist, xx - sx, yy - sy)); // KisRectIteratorPixel srcIt = src->createRectIterator(x,y,1,1, false); -// const Q_UINT8* srcPixel = srcIt.oldRawData(); -// memcpy( buf, srcPixel, sizeof(Q_UINT8) * pixelSize ); +// const TQ_UINT8* srcPixel = srcIt.oldRawData(); +// memcpy( buf, srcPixel, sizeof(TQ_UINT8) * pixelSize ); src->readBytes(buf, x, y, 1, 1); #ifndef USE_READABLE_BUT_SLOW_CODE - Q_UINT8 *bufIter = buf; - const Q_UINT8 *colIter = col; - Q_UINT8 *bufEnd = buf+pixelSize; + TQ_UINT8 *bufIter = buf; + const TQ_UINT8 *colIter = col; + TQ_UINT8 *bufEnd = buf+pixelSize; for(; bufIter < bufEnd; bufIter++, colIter++) - *bufIter = (static_cast<Q_UINT8>(*colIter * alpha) - + (static_cast<Q_UINT8>(*bufIter) + *bufIter = (static_cast<TQ_UINT8>(*colIter * alpha) + + (static_cast<TQ_UINT8>(*bufIter) * (256 - alpha))) >> 8; #else //original, pre-ECL code for (b = 0; b < pixelSize; b++) @@ -361,17 +361,17 @@ void KisCubismFilter::fillPolyColor (KisPaintDeviceSP src, KisPaintDeviceSP dst, delete[] maxScanlines; } -void KisCubismFilter::cubism(KisPaintDeviceSP src, KisPaintDeviceSP dst, const QRect& rect, Q_UINT32 tileSize, Q_UINT32 tileSaturation) +void KisCubismFilter::cubism(KisPaintDeviceSP src, KisPaintDeviceSP dst, const TQRect& rect, TQ_UINT32 tileSize, TQ_UINT32 tileSaturation) { Q_ASSERT(src); Q_ASSERT(dst); //fill the destination image with the background color (black for now) KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); - Q_INT32 depth = src->colorSpace()->nColorChannels(); + TQ_INT32 depth = src->colorSpace()->nColorChannels(); while( ! dstIt.isDone() ) { - for( Q_INT32 i = 0; i < depth; i++) + for( TQ_INT32 i = 0; i < depth; i++) { dstIt.rawData()[i] = 0; } @@ -379,27 +379,27 @@ void KisCubismFilter::cubism(KisPaintDeviceSP src, KisPaintDeviceSP dst, const Q } //compute number of rows and columns - Q_INT32 cols = ( rect.width() + tileSize - 1) / tileSize; - Q_INT32 rows = ( rect.height() + tileSize - 1) / tileSize; - Q_INT32 numTiles = (rows + 1) * (cols + 1); + TQ_INT32 cols = ( rect.width() + tileSize - 1) / tileSize; + TQ_INT32 rows = ( rect.height() + tileSize - 1) / tileSize; + TQ_INT32 numTiles = (rows + 1) * (cols + 1); setProgressTotalSteps(numTiles); setProgressStage(i18n("Applying cubism filter..."),0); - Q_INT32* randomIndices = new Q_INT32[numTiles]; - for (Q_INT32 i = 0; i < numTiles; i++) + TQ_INT32* randomIndices = new TQ_INT32[numTiles]; + for (TQ_INT32 i = 0; i < numTiles; i++) { randomIndices[i] = i; } randomizeIndices (numTiles, randomIndices); - Q_INT32 count = 0; - Q_INT32 i, j, ix, iy; + TQ_INT32 count = 0; + TQ_INT32 i, j, ix, iy; double x, y, width, height, theta; KisPolygon *poly = new KisPolygon(); - Q_INT32 pixelSize = src->pixelSize(); - const Q_UINT8 *srcPixel /*= new Q_UINT8[ pixelSize ]*/; - Q_UINT8 *dstPixel = 0; + TQ_INT32 pixelSize = src->pixelSize(); + const TQ_UINT8 *srcPixel /*= new TQ_UINT8[ pixelSize ]*/; + TQ_UINT8 *dstPixel = 0; while (count < numTiles) { i = randomIndices[count] / (cols + 1); @@ -417,8 +417,8 @@ void KisCubismFilter::cubism(KisPaintDeviceSP src, KisPaintDeviceSP dst, const Q poly->rotate( theta ); poly->translate ( x, y ); // bounds check on x, y - ix = (Q_INT32) CLAMP (x, rect.x(), rect.x() + rect.width() - 1); - iy = (Q_INT32) CLAMP (y, rect.y(), rect.y() + rect.height() - 1); + ix = (TQ_INT32) CLAMP (x, rect.x(), rect.x() + rect.width() - 1); + iy = (TQ_INT32) CLAMP (y, rect.y(), rect.y() + rect.height() - 1); //read the pixel at ix, iy KisRectIteratorPixel srcIt = src->createRectIterator(ix,iy,1,1, false); @@ -433,15 +433,15 @@ void KisCubismFilter::cubism(KisPaintDeviceSP src, KisPaintDeviceSP dst, const Q setProgressDone(); } -KisFilterConfigWidget * KisCubismFilter::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisCubismFilter::createConfigurationWidget(TQWidget* tqparent, 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(parent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); } -KisFilterConfiguration* KisCubismFilter::configuration(QWidget* nwidget) +KisFilterConfiguration* KisCubismFilter::configuration(TQWidget* nwidget) { KisMultiIntegerFilterWidget* widget = (KisMultiIntegerFilterWidget*) nwidget; if( widget == 0 ) diff --git a/krita/plugins/filters/cubismfilter/kis_cubism_filter.h b/krita/plugins/filters/cubismfilter/kis_cubism_filter.h index bd611d38..f2624030 100644 --- a/krita/plugins/filters/cubismfilter/kis_cubism_filter.h +++ b/krita/plugins/filters/cubismfilter/kis_cubism_filter.h @@ -30,7 +30,7 @@ class KisPolygon; class KisCubismFilterConfiguration : public KisFilterConfiguration { public: - KisCubismFilterConfiguration(Q_UINT32 tileSize, Q_UINT32 tileSaturation) + KisCubismFilterConfiguration(TQ_UINT32 tileSize, TQ_UINT32 tileSaturation) : KisFilterConfiguration( "cubism", 1 ) , m_tileSize(tileSize) , m_tileSaturation(tileSaturation) @@ -39,11 +39,11 @@ public: setProperty("tileSaturation", tileSaturation); }; public: - inline Q_UINT32 tileSize() { return getInt("tileSize"); }; - inline Q_UINT32 tileSaturation() {return getInt("tileSaturation"); }; + inline TQ_UINT32 tileSize() { return getInt("tileSize"); }; + inline TQ_UINT32 tileSaturation() {return getInt("tileSaturation"); }; private: - Q_UINT32 m_tileSize; - Q_UINT32 m_tileSaturation; + TQ_UINT32 m_tileSize; + TQ_UINT32 m_tileSaturation; }; class KisCubismFilter : public KisFilter @@ -51,7 +51,7 @@ class KisCubismFilter : public KisFilter public: KisCubismFilter(); public: - virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("cubism", i18n("Cubism")); }; virtual bool supportsPainting() { return false; } virtual bool supportsPreview() { return true; } @@ -60,18 +60,18 @@ public: virtual bool workWith(KisColorSpace* cs); virtual ColorSpaceIndependence colorSpaceIndependence() { return TO_RGBA8; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration* configuration() { return new KisCubismFilterConfiguration( 10, 10); }; private: //this function takes an array of ordered indices i1,i2,i3,... and randomizes them i3,i1,i2,... - void randomizeIndices (Q_INT32 count, Q_INT32* indices); - Q_INT32 randomIntNumber(Q_INT32 lowestNumber, Q_INT32 highestNumber); + void randomizeIndices (TQ_INT32 count, TQ_INT32* indices); + TQ_INT32 randomIntNumber(TQ_INT32 lowestNumber, TQ_INT32 highestNumber); double randomDoubleNumber(double lowestNumber, double highestNumber); double calcAlphaBlend(double *vec, double oneOverDist, double x, double y); - void convertSegment(Q_INT32 x1, Q_INT32 y1, Q_INT32 x2, Q_INT32 y2, Q_INT32 offset, Q_INT32* min, Q_INT32* max, Q_INT32 xmin, Q_INT32 xmax); - void fillPolyColor(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisPolygon* poly, const Q_UINT8* col, Q_UINT8* dest, QRect rect); - void cubism(KisPaintDeviceSP src, KisPaintDeviceSP dst, const QRect& rect, Q_UINT32 tileSize, Q_UINT32 tileSaturation); + void convertSegment(TQ_INT32 x1, TQ_INT32 y1, TQ_INT32 x2, TQ_INT32 y2, TQ_INT32 offset, TQ_INT32* min, TQ_INT32* max, TQ_INT32 xmin, TQ_INT32 xmax); + void fillPolyColor(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisPolygon* poly, const TQ_UINT8* col, TQ_UINT8* dest, TQRect rect); + void cubism(KisPaintDeviceSP src, KisPaintDeviceSP dst, const TQRect& rect, TQ_UINT32 tileSize, TQ_UINT32 tileSaturation); }; diff --git a/krita/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc b/krita/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc index d4cb2a23..d2742ec8 100644 --- a/krita/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc +++ b/krita/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc @@ -25,13 +25,13 @@ typedef KGenericFactory<KisCubismFilterPlugin> KisCubismFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( kritacubismfilter, KisCubismFilterPluginFactory( "krita" ) ) -KisCubismFilterPlugin::KisCubismFilterPlugin(QObject *parent, const char *name, const QStringList &) : KParts::Plugin(parent, name) +KisCubismFilterPlugin::KisCubismFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) { setInstance(KisCubismFilterPluginFactory::instance()); - if ( parent->inherits("KisFilterRegistry") ) + if ( tqparent->inherits("KisFilterRegistry") ) { - KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(parent); + KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(tqparent); r->add(new KisCubismFilter()); } } diff --git a/krita/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h b/krita/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h index 09217b1c..7c7d1a9c 100644 --- a/krita/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h +++ b/krita/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h @@ -25,7 +25,7 @@ class KisCubismFilterPlugin : public KParts::Plugin { public: - KisCubismFilterPlugin(QObject *parent, const char *name, const QStringList &); + KisCubismFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KisCubismFilterPlugin(); }; diff --git a/krita/plugins/filters/cubismfilter/kis_polygon.cc b/krita/plugins/filters/cubismfilter/kis_polygon.cc index de5547af..309bd656 100644 --- a/krita/plugins/filters/cubismfilter/kis_polygon.cc +++ b/krita/plugins/filters/cubismfilter/kis_polygon.cc @@ -22,7 +22,7 @@ */ #include <math.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> #include <kis_point.h> @@ -62,7 +62,7 @@ void KisPolygon::translate(double tx, double ty) } } -Q_INT32 KisPolygon::extents (double& x1, double& y1, double& x2, double& y2) +TQ_INT32 KisPolygon::extents (double& x1, double& y1, double& x2, double& y2) { if ( empty() ) { @@ -95,7 +95,7 @@ Q_INT32 KisPolygon::extents (double& x1, double& y1, double& x2, double& y2) return 1; } -Q_INT32 KisPolygon::numberOfPoints() +TQ_INT32 KisPolygon::numberOfPoints() { return count(); } diff --git a/krita/plugins/filters/cubismfilter/kis_polygon.h b/krita/plugins/filters/cubismfilter/kis_polygon.h index 1e5f8aa2..372ef18b 100644 --- a/krita/plugins/filters/cubismfilter/kis_polygon.h +++ b/krita/plugins/filters/cubismfilter/kis_polygon.h @@ -21,17 +21,17 @@ #ifndef _KIS_POLYGON_H_ #define _KIS_POLYGON_H_ -#include <qvaluevector.h> +#include <tqvaluevector.h> -typedef QValueVector<KisPoint> KisPointVector; +typedef TQValueVector<KisPoint> KisPointVector; class KisPolygon : public KisPointVector { public: void addPoint(double x, double y); void translate(double tx, double ty); void rotate(double theta); - Q_INT32 extents(double &minX, double &minY, double &maxX, double &maxY); - Q_INT32 numberOfPoints(); + TQ_INT32 extents(double &minX, double &minY, double &maxX, double &maxY); + TQ_INT32 numberOfPoints(); }; #endif diff --git a/krita/plugins/filters/embossfilter/kis_emboss_filter.cc b/krita/plugins/filters/embossfilter/kis_emboss_filter.cc index 3fea6bb6..fa74f416 100644 --- a/krita/plugins/filters/embossfilter/kis_emboss_filter.cc +++ b/krita/plugins/filters/embossfilter/kis_emboss_filter.cc @@ -25,8 +25,8 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> -#include <qspinbox.h> +#include <tqpoint.h> +#include <tqspinbox.h> #include <klocale.h> #include <kiconloader.h> @@ -54,15 +54,15 @@ KisEmbossFilter::KisEmbossFilter() : KisFilter(id(), "emboss", i18n("&Emboss wit { } -void KisEmbossFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const QRect& rect) +void KisEmbossFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const TQRect& rect) { Q_UNUSED(dst); //read the filter configuration values from the KisFilterConfiguration object - Q_UINT32 embossdepth = ((KisEmbossFilterConfiguration*)configuration)->depth(); + TQ_UINT32 embossdepth = ((KisEmbossFilterConfiguration*)configuration)->depth(); - //the actual filter function from digikam. It needs a pointer to a Q_UINT8 array + //the actual filter function from digikam. It needs a pointer to a TQ_UINT8 array //with the actual pixel data. Emboss(src, dst, rect, embossdepth); @@ -82,7 +82,7 @@ void KisEmbossFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFil * increase it. After this, get the gray tone */ -void KisEmbossFilter::Emboss(KisPaintDeviceSP src, KisPaintDeviceSP dst, const QRect& rect, int d) +void KisEmbossFilter::Emboss(KisPaintDeviceSP src, KisPaintDeviceSP dst, const TQRect& rect, int d) { float Depth = d / 10.0; int R = 0, G = 0, B = 0; @@ -95,10 +95,10 @@ void KisEmbossFilter::Emboss(KisPaintDeviceSP src, KisPaintDeviceSP dst, const Q KisHLineIteratorPixel it = src->createHLineIterator(rect.x(), rect.y(), rect.width(), false); KisHLineIteratorPixel dstIt = dst->createHLineIterator(rect.x(), rect.y(), rect.width(), true); - QColor color1; - QColor color2; - Q_UINT8 opacity; - Q_UINT8 opacity2; + TQColor color1; + TQColor color2; + TQ_UINT8 opacity; + TQ_UINT8 opacity2; for (int y = 0 ; !cancelRequested() && (y < Height) ; ++y) { @@ -111,17 +111,17 @@ void KisEmbossFilter::Emboss(KisPaintDeviceSP src, KisPaintDeviceSP dst, const Q opacity = 0; opacity2 = 0; - src->colorSpace()->toQColor(it.rawData(), &color1, &opacity); + src->colorSpace()->toTQColor(it.rawData(), &color1, &opacity); src->pixel(rect.x() + x + Lim_Max(x, 1, Width), rect.y() + y + Lim_Max(y, 1, Height), &color2, &opacity2); - R = abs((int)((color1.red() - color2.red()) * Depth + (Q_UINT8_MAX / 2))); - G = abs((int)((color1.green() - color2.green()) * Depth + (Q_UINT8_MAX / 2))); - B = abs((int)((color1.blue() - color2.blue()) * Depth + (Q_UINT8_MAX / 2))); + R = abs((int)((color1.red() - color2.red()) * Depth + (TQ_UINT8_MAX / 2))); + G = abs((int)((color1.green() - color2.green()) * Depth + (TQ_UINT8_MAX / 2))); + B = abs((int)((color1.blue() - color2.blue()) * Depth + (TQ_UINT8_MAX / 2))); - Gray = CLAMP((R + G + B) / 3, 0, Q_UINT8_MAX); + Gray = CLAMP((R + G + B) / 3, 0, TQ_UINT8_MAX); - dst->colorSpace()->fromQColor(QColor(Gray, Gray, Gray), opacity, dstIt.rawData()); + dst->colorSpace()->fromTQColor(TQColor(Gray, Gray, Gray), opacity, dstIt.rawData()); } } @@ -158,16 +158,16 @@ int KisEmbossFilter::Lim_Max (int Now, int Up, int Max) return (Up); } -KisFilterConfigWidget * KisEmbossFilter::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP) +KisFilterConfigWidget * KisEmbossFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 10, 300, 30, i18n("Depth"), "depth" ) ); - KisFilterConfigWidget * w = new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); + KisFilterConfigWidget * w = new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); Q_CHECK_PTR(w); return w; } -KisFilterConfiguration* KisEmbossFilter::configuration(QWidget* nwidget) +KisFilterConfiguration* KisEmbossFilter::configuration(TQWidget* nwidget) { KisMultiIntegerFilterWidget* widget = (KisMultiIntegerFilterWidget*) nwidget; if( widget == 0 ) diff --git a/krita/plugins/filters/embossfilter/kis_emboss_filter.h b/krita/plugins/filters/embossfilter/kis_emboss_filter.h index 9ab9ba7c..fe4410ed 100644 --- a/krita/plugins/filters/embossfilter/kis_emboss_filter.h +++ b/krita/plugins/filters/embossfilter/kis_emboss_filter.h @@ -27,13 +27,13 @@ class KisEmbossFilterConfiguration : public KisFilterConfiguration { public: - KisEmbossFilterConfiguration(Q_UINT32 depth) + KisEmbossFilterConfiguration(TQ_UINT32 depth) : KisFilterConfiguration( "emboss", 1 ) { setProperty("depth", depth); }; public: - inline Q_UINT32 depth() { return getInt("depth"); }; + inline TQ_UINT32 depth() { return getInt("depth"); }; }; class KisEmbossFilter : public KisFilter @@ -41,7 +41,7 @@ class KisEmbossFilter : public KisFilter public: KisEmbossFilter(); public: - virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("emboss", i18n("Emboss")); }; virtual bool supportsPainting() { return false; } virtual bool supportsPreview() { return true; } @@ -50,12 +50,12 @@ public: virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP ) { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisEmbossFilterConfiguration(100)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration* configuration() {return new KisEmbossFilterConfiguration( 30 );}; private: - void Emboss(KisPaintDeviceSP src, KisPaintDeviceSP dst, const QRect& rect, int d); + void Emboss(KisPaintDeviceSP src, KisPaintDeviceSP dst, const TQRect& rect, int d); inline int Lim_Max (int Now, int Up, int Max); }; diff --git a/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc b/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc index b5b45524..527a1b5c 100644 --- a/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc +++ b/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc @@ -25,12 +25,12 @@ typedef KGenericFactory<KisEmbossFilterPlugin> KisEmbossFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( kritaembossfilter, KisEmbossFilterPluginFactory( "krita" ) ) -KisEmbossFilterPlugin::KisEmbossFilterPlugin(QObject *parent, const char *name, const QStringList &) : KParts::Plugin(parent, name) +KisEmbossFilterPlugin::KisEmbossFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) { setInstance(KisEmbossFilterPluginFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisEmbossFilter()); } } diff --git a/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.h b/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.h index 6a05d555..39803418 100644 --- a/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.h +++ b/krita/plugins/filters/embossfilter/kis_emboss_filter_plugin.h @@ -24,7 +24,7 @@ class KisEmbossFilterPlugin : public KParts::Plugin { public: - KisEmbossFilterPlugin(QObject *parent, const char *name, const QStringList &); + KisEmbossFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KisEmbossFilterPlugin(); }; diff --git a/krita/plugins/filters/example/example.cc b/krita/plugins/filters/example/example.cc index 83a03f86..8a9525e6 100644 --- a/krita/plugins/filters/example/example.cc +++ b/krita/plugins/filters/example/example.cc @@ -19,7 +19,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -44,14 +44,14 @@ typedef KGenericFactory<KritaExample> KritaExampleFactory; K_EXPORT_COMPONENT_FACTORY( kritaexample, KritaExampleFactory( "krita" ) ) -KritaExample::KritaExample(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaExample::KritaExample(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaExampleFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisFilterInvert()); } } @@ -64,7 +64,7 @@ KisFilterInvert::KisFilterInvert() : KisFilter(id(), "adjust", i18n("&Invert")) { } -void KisFilterInvert::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* /*config*/, const QRect& rect) +void KisFilterInvert::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* /*config*/, const TQRect& rect) { Q_ASSERT(src != 0); Q_ASSERT(dst != 0); @@ -76,7 +76,7 @@ void KisFilterInvert::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFil setProgressTotalSteps(rect.width() * rect.height()); KisColorSpace * cs = src->colorSpace(); - Q_INT32 psize = cs->pixelSize(); + TQ_INT32 psize = cs->pixelSize(); while( ! srcIt.isDone() ) { diff --git a/krita/plugins/filters/example/example.h b/krita/plugins/filters/example/example.h index 4e55da93..90e7757e 100644 --- a/krita/plugins/filters/example/example.h +++ b/krita/plugins/filters/example/example.h @@ -27,7 +27,7 @@ class KritaExample : public KParts::Plugin { public: - KritaExample(QObject *parent, const char *name, const QStringList &); + KritaExample(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaExample(); }; @@ -36,7 +36,7 @@ class KisFilterInvert : public KisFilter public: KisFilterInvert(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; static inline KisID id() { return KisID("invert", i18n("Invert")); }; virtual bool supportsPainting() { return true; } diff --git a/krita/plugins/filters/fastcolortransfer/fastcolortransfer.cc b/krita/plugins/filters/fastcolortransfer/fastcolortransfer.cc index ce9a7a90..1b3c811c 100644 --- a/krita/plugins/filters/fastcolortransfer/fastcolortransfer.cc +++ b/krita/plugins/filters/fastcolortransfer/fastcolortransfer.cc @@ -37,19 +37,19 @@ typedef KGenericFactory<FastColorTransferPlugin> KritaFastColorTransferFactory; K_EXPORT_COMPONENT_FACTORY( kritafastcolortransfer, KritaFastColorTransferFactory( "krita" ) ) -FastColorTransferPlugin::FastColorTransferPlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +FastColorTransferPlugin::FastColorTransferPlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaFastColorTransferFactory::instance()); kdDebug(41006) << "Color Transfer Filter plugin. Class: " << className() << ", Parent: " - << parent -> className() + << tqparent -> className() << "\n"; - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisFilterFastColorTransfer()); } } @@ -63,12 +63,12 @@ KisFilterFastColorTransfer::KisFilterFastColorTransfer() : KisFilter(id(), "colo } -KisFilterConfigWidget * KisFilterFastColorTransfer::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisFilterFastColorTransfer::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) { - return new KisWdgFastColorTransfer(this, parent, "configuration of color to alpha"); + return new KisWdgFastColorTransfer(this, tqparent, "configuration of color to alpha"); } -KisFilterConfiguration* KisFilterFastColorTransfer::configuration(QWidget* w) +KisFilterConfiguration* KisFilterFastColorTransfer::configuration(TQWidget* w) { KisWdgFastColorTransfer * wCTA = dynamic_cast<KisWdgFastColorTransfer*>(w); KisFilterConfiguration* config = new KisFilterConfiguration(id().id(), 1); @@ -79,11 +79,11 @@ KisFilterConfiguration* KisFilterFastColorTransfer::configuration(QWidget* w) return config; } -void KisFilterFastColorTransfer::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisFilterFastColorTransfer::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { kdDebug() << "Start transfering color" << endl; - QVariant value; - QString fileName; + TQVariant value; + TQString fileName; if (config && config->getProperty("filename", value)) { fileName = value.toString(); @@ -131,10 +131,10 @@ void KisFilterFastColorTransfer::process(KisPaintDeviceSP src, KisPaintDeviceSP KisRectIteratorPixel srcLABIt = srcLAB->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), false ); while(!srcLABIt.isDone()) { - const Q_UINT16* data = reinterpret_cast<const Q_UINT16*>(srcLABIt.oldRawData()); - Q_UINT32 L = data[0]; - Q_UINT32 A = data[1]; - Q_UINT32 B = data[2]; + const TQ_UINT16* data = reinterpret_cast<const TQ_UINT16*>(srcLABIt.oldRawData()); + TQ_UINT32 L = data[0]; + TQ_UINT32 A = data[1]; + TQ_UINT32 B = data[2]; meanL_src += L; meanA_src += A; meanB_src += B; @@ -160,10 +160,10 @@ void KisFilterFastColorTransfer::process(KisPaintDeviceSP src, KisPaintDeviceSP KisRectIteratorPixel refIt = ref->createRectIterator(0, 0, importedImage->width(), importedImage->height(), false ); while(!refIt.isDone()) { - const Q_UINT16* data = reinterpret_cast<const Q_UINT16*>(refIt.oldRawData()); - Q_UINT32 L = data[0]; - Q_UINT32 A = data[1]; - Q_UINT32 B = data[2]; + const TQ_UINT16* data = reinterpret_cast<const TQ_UINT16*>(refIt.oldRawData()); + TQ_UINT32 L = data[0]; + TQ_UINT32 A = data[1]; + TQ_UINT32 B = data[2]; meanL_ref += L; meanA_ref += A; meanB_ref += B; @@ -194,10 +194,10 @@ void KisFilterFastColorTransfer::process(KisPaintDeviceSP src, KisPaintDeviceSP KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); while(!dstIt.isDone()) { - Q_UINT16* data = reinterpret_cast<Q_UINT16*>(dstIt.rawData()); - data[0] = (Q_UINT16)CLAMP( ( (double)data[0] - meanL_src) * coefL + meanL_ref, 0., 65535.); - data[1] = (Q_UINT16)CLAMP( ( (double)data[1] - meanA_src) * coefA + meanA_ref, 0., 65535.); - data[2] = (Q_UINT16)CLAMP( ( (double)data[2] - meanB_src) * coefB + meanB_ref, 0., 65535.); + TQ_UINT16* data = reinterpret_cast<TQ_UINT16*>(dstIt.rawData()); + data[0] = (TQ_UINT16)CLAMP( ( (double)data[0] - meanL_src) * coefL + meanL_ref, 0., 65535.); + data[1] = (TQ_UINT16)CLAMP( ( (double)data[1] - meanA_src) * coefA + meanA_ref, 0., 65535.); + data[2] = (TQ_UINT16)CLAMP( ( (double)data[2] - meanB_src) * coefB + meanB_ref, 0., 65535.); ++dstIt; } } diff --git a/krita/plugins/filters/fastcolortransfer/fastcolortransfer.h b/krita/plugins/filters/fastcolortransfer/fastcolortransfer.h index 0a156a4f..9c0c3c87 100644 --- a/krita/plugins/filters/fastcolortransfer/fastcolortransfer.h +++ b/krita/plugins/filters/fastcolortransfer/fastcolortransfer.h @@ -31,7 +31,7 @@ class FastColorTransferPlugin : public KParts::Plugin { public: - FastColorTransferPlugin(QObject *parent, const char *name, const QStringList &); + FastColorTransferPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~FastColorTransferPlugin(); }; @@ -40,7 +40,7 @@ class KisFilterFastColorTransfer : public KisFilter public: KisFilterFastColorTransfer(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; static inline KisID id() { return KisID("colortransfer", i18n("Color Transfer")); }; virtual bool supportsPainting() { return true; } @@ -48,8 +48,8 @@ class KisFilterFastColorTransfer : public KisFilter virtual bool supportsIncrementalPainting() { return false; } virtual bool supportsAdjustmentLayers() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); }; #endif diff --git a/krita/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp b/krita/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp index f6a3e735..c5057286 100644 --- a/krita/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp +++ b/krita/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp @@ -20,18 +20,18 @@ #include "kis_wdg_fastcolortransfer.h" -#include <qlayout.h> +#include <tqlayout.h> #include <kurlrequester.h> #include "wdgfastcolortransfer.h" -KisWdgFastColorTransfer::KisWdgFastColorTransfer(KisFilter* nfilter, QWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) +KisWdgFastColorTransfer::KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) { - QGridLayout *widgetLayout = new QGridLayout(this, 1, 1); + TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgFastColorTransfer(this); widgetLayout -> addWidget(m_widget,0,0); - connect(m_widget->fileNameURLRequester, SIGNAL(textChanged(const QString&)), this, SIGNAL(sigPleaseUpdatePreview())); + connect(m_widget->fileNameURLRequester, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(sigPleaseUpdatePreview())); } @@ -41,7 +41,7 @@ KisWdgFastColorTransfer::~KisWdgFastColorTransfer() void KisWdgFastColorTransfer::setConfiguration(KisFilterConfiguration* config) { - QVariant value; + TQVariant value; if (config->getProperty("filename", value)) { widget()->fileNameURLRequester->setURL( value.toString() ); diff --git a/krita/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h b/krita/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h index 1110551a..aa1f60fb 100644 --- a/krita/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h +++ b/krita/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h @@ -36,7 +36,7 @@ class WdgFastColorTransfer; class KisWdgFastColorTransfer : public KisFilterConfigWidget { public: - KisWdgFastColorTransfer(KisFilter* nfilter, QWidget * parent, const char * name); + KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * tqparent, const char * name); ~KisWdgFastColorTransfer(); virtual void setConfiguration(KisFilterConfiguration*); inline WdgFastColorTransfer* widget() { return m_widget; } diff --git a/krita/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui b/krita/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui index fe67e79e..a7184b4b 100644 --- a/krita/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui +++ b/krita/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgFastColorTransfer</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgFastColorTransfer</cstring> </property> @@ -19,15 +19,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>label1</cstring> </property> @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>101</height> @@ -66,7 +66,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/krita/plugins/filters/halftone/kis_halftone.cpp b/krita/plugins/filters/halftone/kis_halftone.cpp index f67da1b5..0efb5978 100644 --- a/krita/plugins/filters/halftone/kis_halftone.cpp +++ b/krita/plugins/filters/halftone/kis_halftone.cpp @@ -36,21 +36,21 @@ typedef KGenericFactory<KritaHalftone> KritaHalftoneFactory; K_EXPORT_COMPONENT_FACTORY( kritahalftone, KritaHalftoneFactory( "krita" ) ) - KritaHalftone::KritaHalftone(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) + KritaHalftone::KritaHalftone(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaHalftoneFactory::instance()); kdDebug(41006) << "Halftone filter plugin. Class: " << className() << ", Parent: " - << parent->className() + << tqparent->className() << "\n"; - if ( parent->inherits("KisFilterRegistry") ) + if ( tqparent->inherits("KisFilterRegistry") ) { - KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(parent); + KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(tqparent); r->add(new KisHalftoneReduction()); } } @@ -71,15 +71,15 @@ KisHalftoneReduction::~KisHalftoneReduction() { } -KisFilterConfigWidget * KisHalftoneReduction::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisHalftoneReduction::createConfigurationWidget(TQWidget* tqparent, 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(parent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); } -KisFilterConfiguration* KisHalftoneReduction::configuration(QWidget* nwidget ) +KisFilterConfiguration* KisHalftoneReduction::configuration(TQWidget* nwidget ) { KisMultiIntegerFilterWidget* widget = (KisMultiIntegerFilterWidget*) nwidget; if( widget == 0 ) @@ -90,7 +90,7 @@ KisFilterConfiguration* KisHalftoneReduction::configuration(QWidget* nwidget ) } } -void KisHalftoneReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisHalftoneReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { float frequency = 1.0; @@ -105,7 +105,7 @@ void KisHalftoneReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, K } - Q_INT32 depth = src->colorSpace()->nColorChannels(); + TQ_INT32 depth = src->colorSpace()->nColorChannels(); int size; int maxrectsize = (rect.height() < rect.width()) ? rect.width() : rect.height(); @@ -113,7 +113,7 @@ void KisHalftoneReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, K KisMathToolbox* mathToolbox = KisMetaRegistry::instance()->mtRegistry()->get( src->colorSpace()->mathToolboxID() ); setProgressTotalSteps(mathToolbox->fastWaveletTotalSteps(rect) * 2 + size*size*depth ); - connect(mathToolbox, SIGNAL(nextStep()), this, SLOT(incProgress())); + connect(mathToolbox, TQT_SIGNAL(nextStep()), this, TQT_SLOT(incProgress())); kdDebug(41005) << size << " " << maxrectsize << " " << rect.x() << " " << rect.y() << endl; @@ -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); - QImage mask; - kas->createBrush(&mask); + TQImage tqmask; + kas->createBrush(&tqmask); - KisKernelSP kernel = KisKernel::fromQImage(mask); // TODO: for 1.6 reuse the krita's core function for creating kernel : KisKernel::fromQImage - mask.save("testmask.png", "PNG"); + KisKernelSP kernel = KisKernel::fromTQImage(tqmask); // TODO: for 1.6 reuse the krita's core function for creating kernel : KisKernel::fromTQImage + tqmask.save("testtqmask.png", "PNG"); KisPaintDeviceSP interm = new KisPaintDevice(*src); KisColorSpace * cs = src->colorSpace(); @@ -184,7 +184,7 @@ void KisHalftoneReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, K delete wav; delete blurwav; delete buff; - disconnect(mathToolbox, SIGNAL(nextStep()), this, SLOT(incProgress())); + disconnect(mathToolbox, TQT_SIGNAL(nextStep()), this, TQT_SLOT(incProgress())); setProgressDone(); // Must be called even if you don't really support progression } diff --git a/krita/plugins/filters/halftone/kis_halftone.h b/krita/plugins/filters/halftone/kis_halftone.h index 57c0d874..1125c97b 100644 --- a/krita/plugins/filters/halftone/kis_halftone.h +++ b/krita/plugins/filters/halftone/kis_halftone.h @@ -32,7 +32,7 @@ class KritaHalftone : public KParts::Plugin { public: - KritaHalftone(QObject *parent, const char *name, const QStringList &); + KritaHalftone(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaHalftone(); }; @@ -62,10 +62,10 @@ public: ~KisHalftoneReduction(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); - virtual KisFilterConfiguration * configuration(QWidget* nwidget); + 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(QWidget* parent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); static inline KisID id() { return KisID("halftone", i18n("Halftone Reducer")); }; virtual bool supportsPainting() { return false; } diff --git a/krita/plugins/filters/imageenhancement/imageenhancement.cpp b/krita/plugins/filters/imageenhancement/imageenhancement.cpp index 12a0f22a..c455d8cd 100644 --- a/krita/plugins/filters/imageenhancement/imageenhancement.cpp +++ b/krita/plugins/filters/imageenhancement/imageenhancement.cpp @@ -20,7 +20,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -47,21 +47,21 @@ typedef KGenericFactory<KritaImageEnhancement> KritaImageEnhancementFactory; K_EXPORT_COMPONENT_FACTORY( kritaimageenhancement, KritaImageEnhancementFactory( "krita" ) ) - KritaImageEnhancement::KritaImageEnhancement(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) + KritaImageEnhancement::KritaImageEnhancement(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaImageEnhancementFactory::instance()); kdDebug(41006) << "Image enhancement filter plugin. Class: " << className() << ", Parent: " - << parent->className() + << tqparent->className() << "\n"; - if ( parent->inherits("KisFilterRegistry") ) + if ( tqparent->inherits("KisFilterRegistry") ) { - KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(parent); + KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(tqparent); r->add(new KisSimpleNoiseReducer()); r->add(new KisWaveletNoiseReduction()); } diff --git a/krita/plugins/filters/imageenhancement/imageenhancement.h b/krita/plugins/filters/imageenhancement/imageenhancement.h index 0d06c9b0..8c8f9d91 100644 --- a/krita/plugins/filters/imageenhancement/imageenhancement.h +++ b/krita/plugins/filters/imageenhancement/imageenhancement.h @@ -27,7 +27,7 @@ class KritaImageEnhancement : public KParts::Plugin { public: - KritaImageEnhancement(QObject *parent, const char *name, const QStringList &); + KritaImageEnhancement(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaImageEnhancement(); }; diff --git a/krita/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp b/krita/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp index a4fa8f50..0ff7a958 100644 --- a/krita/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp +++ b/krita/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp @@ -37,15 +37,15 @@ KisSimpleNoiseReducer::~KisSimpleNoiseReducer() { } -KisFilterConfigWidget * KisSimpleNoiseReducer::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP) +KisFilterConfigWidget * KisSimpleNoiseReducer::createConfigurationWidget(TQWidget* tqparent, 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(parent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); } -KisFilterConfiguration* KisSimpleNoiseReducer::configuration(QWidget* nwidget) +KisFilterConfiguration* KisSimpleNoiseReducer::configuration(TQWidget* nwidget) { KisMultiIntegerFilterWidget* widget = (KisMultiIntegerFilterWidget*) nwidget; if( widget == 0 ) @@ -62,7 +62,7 @@ inline int ABS(int v) return v; } -void KisSimpleNoiseReducer::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisSimpleNoiseReducer::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { int threshold, windowsize; if(config !=0) @@ -77,13 +77,13 @@ void KisSimpleNoiseReducer::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisColorSpace* cs = src->colorSpace(); - // Compute the blur mask + // Compute the blur tqmask KisAutobrushShape* kas = new KisAutobrushCircleShape(2*windowsize+1, 2*windowsize+1, windowsize, windowsize); - QImage mask; - kas->createBrush(&mask); + TQImage tqmask; + kas->createBrush(&tqmask); - KisKernelSP kernel = KisKernel::fromQImage(mask); + KisKernelSP kernel = KisKernel::fromTQImage(tqmask); KisPaintDeviceSP interm = new KisPaintDevice(*src); KisConvolutionPainter painter( interm ); @@ -108,7 +108,7 @@ void KisSimpleNoiseReducer::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, { if(srcIt.isSelected()) { - Q_UINT8 diff = cs->difference(srcIt.oldRawData(), intermIt.rawData()); + TQ_UINT8 diff = cs->difference(srcIt.oldRawData(), intermIt.rawData()); if( diff > threshold) { cs->bitBlt( dstIt.rawData(), 0, cs, intermIt.rawData(), 0, 0, 0, 255, 1, 1, KisCompositeOp(COMPOSITE_COPY) ); diff --git a/krita/plugins/filters/imageenhancement/kis_simple_noise_reducer.h b/krita/plugins/filters/imageenhancement/kis_simple_noise_reducer.h index 40523823..a233bb85 100644 --- a/krita/plugins/filters/imageenhancement/kis_simple_noise_reducer.h +++ b/krita/plugins/filters/imageenhancement/kis_simple_noise_reducer.h @@ -44,10 +44,10 @@ class KisSimpleNoiseReducer : public KisFilter KisSimpleNoiseReducer(); ~KisSimpleNoiseReducer(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); - virtual KisFilterConfiguration * configuration(QWidget* nwidget); + 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(QWidget* parent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); static inline KisID id() { return KisID("gaussiannoisereducer", i18n("Gaussian Noise Reducer")); }; virtual bool supportsPainting() { return false; } diff --git a/krita/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp b/krita/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp index 8792928b..021bf5c6 100644 --- a/krita/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp +++ b/krita/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp @@ -38,14 +38,14 @@ KisWaveletNoiseReduction::~KisWaveletNoiseReduction() { } -KisFilterConfigWidget * KisWaveletNoiseReduction::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisWaveletNoiseReduction::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) { vKisDoubleWidgetParam param; param.push_back( KisDoubleWidgetParam( 0.0, 256.0, BEST_WAVELET_THRESHOLD_VALUE, i18n("Threshold"), "threshold" ) ); - return new KisMultiDoubleFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiDoubleFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); } -KisFilterConfiguration* KisWaveletNoiseReduction::configuration(QWidget* nwidget ) +KisFilterConfiguration* KisWaveletNoiseReduction::configuration(TQWidget* nwidget ) { KisMultiDoubleFilterWidget* widget = (KisMultiDoubleFilterWidget*) nwidget; if( widget == 0 ) @@ -56,7 +56,7 @@ KisFilterConfiguration* KisWaveletNoiseReduction::configuration(QWidget* nwidget } } -void KisWaveletNoiseReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisWaveletNoiseReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { float threshold = 1.0; @@ -69,7 +69,7 @@ void KisWaveletNoiseReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP ds } - Q_INT32 depth = src->colorSpace()->nColorChannels(); + TQ_INT32 depth = src->colorSpace()->nColorChannels(); int size; int maxrectsize = (rect.height() < rect.width()) ? rect.width() : rect.height(); @@ -77,7 +77,7 @@ void KisWaveletNoiseReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP ds KisMathToolbox* mathToolbox = KisMetaRegistry::instance()->mtRegistry()->get( src->colorSpace()->mathToolboxID() ); setProgressTotalSteps(mathToolbox->fastWaveletTotalSteps(rect) * 2 + size*size*depth ); - connect(mathToolbox, SIGNAL(nextStep()), this, SLOT(incProgress())); + connect(mathToolbox, TQT_SIGNAL(nextStep()), this, TQT_SLOT(incProgress())); kdDebug(41005) << size << " " << maxrectsize << " " << rect.x() << " " << rect.y() << endl; @@ -124,7 +124,7 @@ void KisWaveletNoiseReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP ds delete wav; delete buff; - disconnect(mathToolbox, SIGNAL(nextStep()), this, SLOT(incProgress())); + disconnect(mathToolbox, TQT_SIGNAL(nextStep()), this, TQT_SLOT(incProgress())); setProgressDone(); // Must be called even if you don't really support progression } diff --git a/krita/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h b/krita/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h index 289cb487..85a96ec8 100644 --- a/krita/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h +++ b/krita/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h @@ -51,10 +51,10 @@ public: ~KisWaveletNoiseReduction(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); - virtual KisFilterConfiguration * configuration(QWidget* nwidget); + 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(QWidget* parent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); static inline KisID id() { return KisID("waveletnoisereducer", i18n("Wavelet Noise Reducer")); }; virtual bool supportsPainting() { return false; } diff --git a/krita/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp b/krita/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp index 17178379..fc513f90 100644 --- a/krita/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp +++ b/krita/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp @@ -20,24 +20,24 @@ #include "kis_wdg_lens_correction.h" -#include <qlayout.h> +#include <tqlayout.h> #include <knuminput.h> #include "wdglenscorrectionoptions.h" -KisWdgLensCorrection::KisWdgLensCorrection(KisFilter* /*nfilter*/, QWidget* parent, const char* name) - : KisFilterConfigWidget(parent,name) +KisWdgLensCorrection::KisWdgLensCorrection(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name) + : KisFilterConfigWidget(tqparent,name) { - QGridLayout *widgetLayout = new QGridLayout(this, 1, 1); + TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgLensCorrectionOptions(this); widgetLayout -> addWidget(m_widget, 0, 0); - connect( widget()->intXCenter, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intYCenter, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->dblCorrectionNearCenter, SIGNAL( valueChanged(double)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->dblCorrectionNearEdges, SIGNAL( valueChanged(double)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->dblBrightness, SIGNAL( valueChanged(double)), SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intXCenter, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intYCenter, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->dblCorrectionNearCenter, TQT_SIGNAL( valueChanged(double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->dblCorrectionNearEdges, TQT_SIGNAL( valueChanged(double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->dblBrightness, TQT_SIGNAL( valueChanged(double)), TQT_SIGNAL(sigPleaseUpdatePreview())); } KisWdgLensCorrection::~KisWdgLensCorrection() @@ -46,7 +46,7 @@ KisWdgLensCorrection::~KisWdgLensCorrection() void KisWdgLensCorrection::setConfiguration(KisFilterConfiguration* config) { - QVariant value; + TQVariant value; if (config->getProperty("xcenter", value)) { widget()->intXCenter->setValue( value.toUInt() ); diff --git a/krita/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h b/krita/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h index 9bb8aef5..b426c6c5 100644 --- a/krita/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h +++ b/krita/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h @@ -29,8 +29,9 @@ class KisFilter; class KisWdgLensCorrection : public KisFilterConfigWidget { Q_OBJECT + TQ_OBJECT public: - KisWdgLensCorrection(KisFilter* nfilter, QWidget* parent = 0, const char* name = 0); + KisWdgLensCorrection(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0); ~KisWdgLensCorrection(); public: inline WdgLensCorrectionOptions* widget() { return m_widget; }; diff --git a/krita/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc b/krita/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc index 3dbd25d8..c013a963 100644 --- a/krita/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc +++ b/krita/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc @@ -26,7 +26,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <kdebug.h> #include <kgenericfactory.h> @@ -52,14 +52,14 @@ typedef KGenericFactory<KritaLensCorrectionFilter> KritaLensCorrectionFilterFactory; K_EXPORT_COMPONENT_FACTORY( kritalenscorrectionfilter, KritaLensCorrectionFilterFactory( "krita" ) ) -KritaLensCorrectionFilter::KritaLensCorrectionFilter(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaLensCorrectionFilter::KritaLensCorrectionFilter(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaLensCorrectionFilterFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisFilterLensCorrection()); } } @@ -72,9 +72,9 @@ KisFilterLensCorrection::KisFilterLensCorrection() : KisFilter(id(), "other", i1 { } -KisFilterConfiguration* KisFilterLensCorrection::configuration(QWidget* w) +KisFilterConfiguration* KisFilterLensCorrection::configuration(TQWidget* w) { - QVariant value; + TQVariant value; KisWdgLensCorrection* wN = dynamic_cast<KisWdgLensCorrection*>(w); KisFilterConfiguration* config = new KisFilterConfiguration(id().id(), 1); if(wN) @@ -88,25 +88,25 @@ KisFilterConfiguration* KisFilterLensCorrection::configuration(QWidget* w) return config; } -KisFilterConfigWidget * KisFilterLensCorrection::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisFilterLensCorrection::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) { - return new KisWdgLensCorrection((KisFilter*)this, (QWidget*)parent, i18n("Configuration of lens correction filter").ascii()); + return new KisWdgLensCorrection((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of lens correction filter").ascii()); } -void KisFilterLensCorrection::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rawrect) +void KisFilterLensCorrection::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rawrect) { Q_ASSERT(src != 0); Q_ASSERT(dst != 0); - QRect layerrect = src->exactBounds(); + TQRect layerrect = src->exactBounds(); - QRect workingrect = layerrect.intersect( rawrect ); + TQRect workingrect = layerrect.intersect( rawrect ); setProgressTotalSteps(workingrect.width() * workingrect.height()); KisColorSpace* cs = dst->colorSpace(); - QVariant value; + TQVariant value; double xcenter = (config && config->getProperty("xcenter", value)) ? value.toInt() : 50; double ycenter = (config && config->getProperty("ycenter", value)) ? value.toInt() : 50; double correctionnearcenter = (config && config->getProperty("correctionnearcenter", value)) ? value.toDouble() : 0.; @@ -122,7 +122,7 @@ void KisFilterLensCorrection::process(KisPaintDeviceSP src, KisPaintDeviceSP dst double mult_sq = correctionnearcenter / 200.0; double mult_qd = correctionnearedges / 200.0; - Q_UINT16 lab[4]; + TQ_UINT16 lab[4]; while(!dstIt.isDone()) { @@ -141,9 +141,9 @@ void KisFilterLensCorrection::process(KisPaintDeviceSP src, KisPaintDeviceSP dst srcRSA.moveTo( KisPoint( srcX, srcY ) ); srcRSA.sampledOldRawData( dstIt.rawData() ); - cs->toLabA16( dstIt.rawData(), (Q_UINT8*)lab, 1); - lab[0] = CLAMP( lab[0] * static_cast<Q_UINT16>( brighten ), 0, 65535); - cs->fromLabA16( (Q_UINT8*)lab, dstIt.rawData(), 1); + cs->toLabA16( dstIt.rawData(), (TQ_UINT8*)lab, 1); + lab[0] = CLAMP( lab[0] * static_cast<TQ_UINT16>( brighten ), 0, 65535); + cs->fromLabA16( (TQ_UINT8*)lab, dstIt.rawData(), 1); ++dstIt; incProgress(); diff --git a/krita/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h b/krita/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h index a73ac30b..e8c4cb91 100644 --- a/krita/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h +++ b/krita/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h @@ -29,7 +29,7 @@ class KisFilterConfigWidget; class KritaLensCorrectionFilter : public KParts::Plugin { public: - KritaLensCorrectionFilter(QObject *parent, const char *name, const QStringList &); + KritaLensCorrectionFilter(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaLensCorrectionFilter(); }; @@ -38,7 +38,7 @@ class KisFilterLensCorrection : public KisFilter public: KisFilterLensCorrection(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; static inline KisID id() { return KisID("lenscorrection", i18n("Lens Correction")); }; virtual bool supportsPainting() { return true; } @@ -46,8 +46,8 @@ class KisFilterLensCorrection : public KisFilter virtual bool supportsIncrementalPainting() { return false; } virtual bool supportsAdjustmentLayers() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); }; #endif diff --git a/krita/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui b/krita/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui index 4d60a8bd..d5ef416d 100644 --- a/krita/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui +++ b/krita/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgLensCorrectionOptions</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgLensCorrectionOptions</cstring> </property> @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>90</height> @@ -46,14 +46,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -64,7 +64,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>Center_3</cstring> </property> @@ -72,7 +72,7 @@ <string>Y:</string> </property> </widget> - <widget class="QLabel" row="3" column="1" rowspan="2" colspan="1"> + <widget class="TQLabel" row="3" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Center_2</cstring> </property> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -135,14 +135,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -150,7 +150,7 @@ <string>Near center:</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -158,7 +158,7 @@ <string>Near edges:</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>Center</cstring> </property> @@ -190,7 +190,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2_2_2</cstring> </property> @@ -213,7 +213,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/filters/levelfilter/kgradientslider.cc b/krita/plugins/filters/levelfilter/kgradientslider.cc index 15fd16fc..905583b2 100644 --- a/krita/plugins/filters/levelfilter/kgradientslider.cc +++ b/krita/plugins/filters/levelfilter/kgradientslider.cc @@ -23,38 +23,38 @@ #include <cmath> #include <cstdlib> -// Qt includes. +// TQt includes. -#include <qpixmap.h> -#include <qpainter.h> -#include <qpoint.h> -#include <qpen.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqpoint.h> +#include <tqpen.h> // Local includes. #include "kgradientslider.h" -KGradientSlider::KGradientSlider(QWidget *parent, const char *name, WFlags f) - : QWidget(parent, name, f) +KGradientSlider::KGradientSlider(TQWidget *tqparent, const char *name, WFlags f) + : TQWidget(tqparent, name, f) { m_dragging = false; setMouseTracking(true); - setPaletteBackgroundColor(Qt::NoBackground); + setPaletteBackgroundColor(TQt::NoBackground); setMaximumSize(255, 28); m_blackcursor = 0; m_whitecursor = 255; m_gamma = 1.0; m_gammaEnabled = false; - setFocusPolicy(QWidget::StrongFocus); + setFocusPolicy(TQ_StrongFocus); } KGradientSlider::~KGradientSlider() { } -void KGradientSlider::paintEvent(QPaintEvent *) +void KGradientSlider::paintEvent(TQPaintEvent *) { int x, y; int wWidth = width(); @@ -62,71 +62,71 @@ void KGradientSlider::paintEvent(QPaintEvent *) int gradientHeight = (wHeight / 3); - // A QPixmap is used for enable the double buffering. + // A TQPixmap is used for enable the double buffering. /*if (!m_dragging) {*/ - QPixmap pm(size()); - QPainter p1; + TQPixmap pm(size()); + TQPainter p1; p1.begin(&pm, this); pm.fill(); // Draw first gradient y = 0; - p1.setPen(QPen::QPen(QColor(0,0,0),1, Qt::SolidLine)); + p1.setPen(TQPen::TQPen(TQColor(0,0,0),1, TQt::SolidLine)); for( x=0; x<255; ++x ) { int gray = (255 * x) / wWidth; - p1.setPen(QColor(gray, gray, gray)); + p1.setPen(TQColor(gray, gray, gray)); p1.drawLine(x, y, x, y + gradientHeight - 1); } // Draw second gradient y = (wHeight / 3); if (m_blackcursor > 0) { - p1.fillRect(0, y, (int)m_blackcursor, gradientHeight, QBrush(Qt::black)); + p1.fillRect(0, y, (int)m_blackcursor, gradientHeight, TQBrush(TQt::black)); } if (m_whitecursor < 255) { - p1.fillRect((int)m_whitecursor, y, 255, gradientHeight, QBrush(Qt::white)); + p1.fillRect((int)m_whitecursor, y, 255, gradientHeight, TQBrush(TQt::white)); } for(x = (int)m_blackcursor; x < (int)m_whitecursor; ++x ) { double inten = (double)(x - m_blackcursor) / (double)(m_whitecursor - m_blackcursor); inten = pow (inten, (1.0 / m_gamma)); int gray = (int)(255 * inten); - p1.setPen(QColor(gray, gray, gray)); + p1.setPen(TQColor(gray, gray, gray)); p1.drawLine(x, y, x, y + gradientHeight - 1); } // Draw cursors y = (2 * wHeight / 3); - QPointArray *a = new QPointArray(3); - p1.setPen(Qt::black); + TQPointArray *a = new TQPointArray(3); + p1.setPen(TQt::black); a->setPoint(0, m_blackcursor, y); a->setPoint(1, m_blackcursor + 3, wHeight - 1); a->setPoint(2, m_blackcursor - 3, wHeight - 1); - p1.setBrush(Qt::black); + p1.setBrush(TQt::black); p1.drawPolygon(*a); if (m_gammaEnabled) { a->setPoint(0, m_gammacursor, y); a->setPoint(1, m_gammacursor + 3, wHeight - 1); a->setPoint(2, m_gammacursor - 3, wHeight - 1); - p1.setBrush(Qt::gray); + p1.setBrush(TQt::gray); p1.drawPolygon(*a); } a->setPoint(0, m_whitecursor, y); a->setPoint(1, m_whitecursor + 3, wHeight - 1); a->setPoint(2, m_whitecursor - 3, wHeight - 1); - p1.setBrush(Qt::white); + p1.setBrush(TQt::white); p1.drawPolygon(*a); p1.end(); bitBlt(this, 0, 0, &pm); } -void KGradientSlider::mousePressEvent ( QMouseEvent * e ) +void KGradientSlider::mousePressEvent ( TQMouseEvent * e ) { eCursor closest_cursor; int distance; @@ -176,7 +176,7 @@ void KGradientSlider::mousePressEvent ( QMouseEvent * e ) double delta = (double) (m_whitecursor - m_blackcursor) / 2.0; double mid = (double)m_blackcursor + delta; double tmp = log10 (1.0 / m_gamma); - m_gammacursor = (unsigned int)qRound(mid + delta * tmp); + m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); } break; case WhiteCursor: @@ -188,7 +188,7 @@ void KGradientSlider::mousePressEvent ( QMouseEvent * e ) double delta = (double) (m_whitecursor - m_blackcursor) / 2.0; double mid = (double)m_blackcursor + delta; double tmp = log10 (1.0 / m_gamma); - m_gammacursor = (unsigned int)qRound(mid + delta * tmp); + m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); } break; case GammaCursor: @@ -203,16 +203,16 @@ void KGradientSlider::mousePressEvent ( QMouseEvent * e ) m_gamma = 1.0 / pow (10, tmp); break; } - repaint(false); + tqrepaint(false); } -void KGradientSlider::mouseReleaseEvent ( QMouseEvent * e ) +void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e ) { if (e->button() != Qt::LeftButton) return; m_dragging = false; - repaint(false); + tqrepaint(false); switch (m_grab_cursor) { case BlackCursor: @@ -227,7 +227,7 @@ void KGradientSlider::mouseReleaseEvent ( QMouseEvent * e ) } } -void KGradientSlider::mouseMoveEvent ( QMouseEvent * e ) +void KGradientSlider::mouseMoveEvent ( TQMouseEvent * e ) { unsigned int x = abs(e->pos().x()); @@ -254,7 +254,7 @@ void KGradientSlider::mouseMoveEvent ( QMouseEvent * e ) double delta = (double) (m_whitecursor - m_blackcursor) / 2.0; double mid = (double)m_blackcursor + delta; double tmp = log10 (1.0 / m_gamma); - m_gammacursor = (unsigned int)qRound(mid + delta * tmp); + m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); } } break; @@ -266,7 +266,7 @@ void KGradientSlider::mouseMoveEvent ( QMouseEvent * e ) double delta = (double) (m_whitecursor - m_blackcursor) / 2.0; double mid = (double)m_blackcursor + delta; double tmp = log10 (1.0 / m_gamma); - m_gammacursor = (unsigned int)qRound(mid + delta * tmp); + m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); } } break; @@ -283,10 +283,10 @@ void KGradientSlider::mouseMoveEvent ( QMouseEvent * e ) } } - repaint(false); + tqrepaint(false); } -void KGradientSlider::leaveEvent( QEvent * ) +void KGradientSlider::leaveEvent( TQEvent * ) { } @@ -294,7 +294,7 @@ void KGradientSlider::leaveEvent( QEvent * ) void KGradientSlider::enableGamma(bool b) { m_gammaEnabled = b; - repaint(false); + tqrepaint(false); } double KGradientSlider::getGamma(void) @@ -309,9 +309,9 @@ void KGradientSlider::modifyBlack(int v) { double delta = (double) (m_whitecursor - m_blackcursor) / 2.0; double mid = (double)m_blackcursor + delta; double tmp = log10 (1.0 / m_gamma); - m_gammacursor = (unsigned int)qRound(mid + delta * tmp); + m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); } - repaint(false); + tqrepaint(false); } } void KGradientSlider::modifyWhite(int v) { @@ -321,9 +321,9 @@ void KGradientSlider::modifyWhite(int v) { double delta = (double) (m_whitecursor - m_blackcursor) / 2.0; double mid = (double)m_blackcursor + delta; double tmp = log10 (1.0 / m_gamma); - m_gammacursor = (unsigned int)qRound(mid + delta * tmp); + m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); } - repaint(false); + tqrepaint(false); } } void KGradientSlider::modifyGamma(double v) { @@ -331,8 +331,8 @@ void KGradientSlider::modifyGamma(double v) { double delta = (double) (m_whitecursor - m_blackcursor) / 2.0; double mid = (double)m_blackcursor + delta; double tmp = log10 (1.0 / m_gamma); - m_gammacursor = (unsigned int)qRound(mid + delta * tmp); - repaint(false); + m_gammacursor = (unsigned int)tqRound(mid + delta * tmp); + tqrepaint(false); } #include "kgradientslider.moc" diff --git a/krita/plugins/filters/levelfilter/kgradientslider.h b/krita/plugins/filters/levelfilter/kgradientslider.h index 1640d018..7acb74b8 100644 --- a/krita/plugins/filters/levelfilter/kgradientslider.h +++ b/krita/plugins/filters/levelfilter/kgradientslider.h @@ -21,16 +21,17 @@ #ifndef KGRADIENTSLIDER_H #define KGRADIENTSLIDER_H -// Qt includes. +// TQt includes. -#include <qwidget.h> -#include <qcolor.h> -#include <qptrlist.h> -#include <qpair.h> +#include <tqwidget.h> +#include <tqcolor.h> +#include <tqptrlist.h> +#include <tqpair.h> -class KGradientSlider : public QWidget +class KGradientSlider : public TQWidget { Q_OBJECT + TQ_OBJECT typedef enum { BlackCursor, @@ -39,7 +40,7 @@ Q_OBJECT } eCursor; public: - KGradientSlider(QWidget *parent = 0, const char *name = 0, WFlags f = 0); + KGradientSlider(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); virtual ~KGradientSlider(); @@ -55,11 +56,11 @@ signals: void modifiedGamma(double); protected: - void paintEvent(QPaintEvent *); - void mousePressEvent (QMouseEvent * e); - void mouseReleaseEvent ( QMouseEvent * e ); - void mouseMoveEvent ( QMouseEvent * e ); - void leaveEvent ( QEvent * ); + void paintEvent(TQPaintEvent *); + void mousePressEvent (TQMouseEvent * e); + void mouseReleaseEvent ( TQMouseEvent * e ); + void mouseMoveEvent ( TQMouseEvent * e ); + void leaveEvent ( TQEvent * ); public: void enableGamma(bool b); diff --git a/krita/plugins/filters/levelfilter/kis_level_filter.cc b/krita/plugins/filters/levelfilter/kis_level_filter.cc index 95f1ad9e..cf89e9c6 100644 --- a/krita/plugins/filters/levelfilter/kis_level_filter.cc +++ b/krita/plugins/filters/levelfilter/kis_level_filter.cc @@ -22,11 +22,11 @@ #include <klocale.h> -#include <qlayout.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qlabel.h> -#include <qspinbox.h> +#include <tqlayout.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqlabel.h> +#include <tqspinbox.h> #include "kis_filter_config_widget.h" #include "kis_level_filter.h" @@ -58,7 +58,7 @@ KisLevelFilterConfiguration::~KisLevelFilterConfiguration() delete m_adjustment; } -void KisLevelFilterConfiguration::fromXML( const QString& s ) +void KisLevelFilterConfiguration::fromXML( const TQString& s ) { KisFilterConfiguration::fromXML(s); blackvalue = getInt( "blackvalue" ); @@ -68,7 +68,7 @@ void KisLevelFilterConfiguration::fromXML( const QString& s ) outwhitevalue = getInt( "outwhitevalue" ); } -QString KisLevelFilterConfiguration::toString() +TQString KisLevelFilterConfiguration::toString() { m_properties.clear(); setProperty("blackvalue", blackvalue); @@ -86,12 +86,12 @@ KisLevelFilter::KisLevelFilter() } -KisFilterConfigWidget * KisLevelFilter::createConfigurationWidget(QWidget *parent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisLevelFilter::createConfigurationWidget(TQWidget *tqparent, KisPaintDeviceSP dev) { - return new KisLevelConfigWidget(parent, dev); + return new KisLevelConfigWidget(tqparent, dev); } -KisFilterConfiguration* KisLevelFilter::configuration(QWidget *nwidget) +KisFilterConfiguration* KisLevelFilter::configuration(TQWidget *nwidget) { KisLevelConfigWidget* widget = (KisLevelConfigWidget*)nwidget; @@ -117,7 +117,7 @@ bool KisLevelFilter::workWith(KisColorSpace* cs) } -void KisLevelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisLevelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { if (!config) { @@ -135,7 +135,7 @@ void KisLevelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilt } if (configBC->m_adjustment == 0) { - Q_UINT16 transfer[256]; + TQ_UINT16 transfer[256]; for (int i = 0; i < 256; i++) { if (i <= configBC->blackvalue) transfer[i] = configBC->outblackvalue; @@ -154,12 +154,12 @@ void KisLevelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilt KisRectIteratorPixel iter = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); setProgressTotalSteps(rect.width() * rect.height()); - Q_INT32 pixelsProcessed = 0; + TQ_INT32 pixelsProcessed = 0; while( ! iter.isDone() && !cancelRequested()) { - Q_UINT32 npix=0, maxpix = iter.nConseqPixels(); - Q_UINT8 selectedness = iter.selectedness(); + TQ_UINT32 npix=0, maxpix = iter.nConseqPixels(); + TQ_UINT8 selectedness = iter.selectedness(); // The idea here is to handle stretches of completely selected and completely unselected pixels. // Partially selected pixels are handled one pixel at a time. switch(selectedness) @@ -176,7 +176,7 @@ void KisLevelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilt case MAX_SELECTED: { - Q_UINT8 *firstPixel = iter.rawData(); + TQ_UINT8 *firstPixel = iter.rawData(); while(iter.selectedness()==MAX_SELECTED && maxpix) { --maxpix; @@ -194,8 +194,8 @@ void KisLevelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilt default: // adjust, but since it's partially selected we also only partially adjust src->colorSpace()->applyAdjustment(iter.oldRawData(), iter.rawData(), configBC->m_adjustment, 1); - const Q_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; - Q_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness}; + const TQ_UINT8 *pixels[2] = {iter.oldRawData(), iter.rawData()}; + TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness}; src->colorSpace()->mixColors(pixels, weights, 2, iter.rawData()); ++iter; pixelsProcessed++; @@ -207,8 +207,8 @@ void KisLevelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilt setProgressDone(); } -KisLevelConfigWidget::KisLevelConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f) - : KisFilterConfigWidget(parent, name, f) +KisLevelConfigWidget::KisLevelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name, WFlags f) + : KisFilterConfigWidget(tqparent, name, f) { m_page = new WdgLevel(this); histogram = NULL; @@ -221,33 +221,33 @@ KisLevelConfigWidget::KisLevelConfigWidget(QWidget * parent, KisPaintDeviceSP de m_page->outblackspin->setValue(0); m_page->outwhitespin->setValue(255); - QHBoxLayout * l = new QHBoxLayout(this); + TQHBoxLayout * l = new TQHBoxLayout(this); Q_CHECK_PTR(l); - l->addWidget(m_page, 0, Qt::AlignTop); + l->addWidget(m_page, 0, TQt::AlignTop); - connect( m_page->blackspin, SIGNAL(valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->whitespin, SIGNAL(valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->ingradient, SIGNAL(modifiedGamma(double)), SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->blackspin, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->whitespin, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->ingradient, TQT_SIGNAL(modifiedGamma(double)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->blackspin, SIGNAL(valueChanged(int)), m_page->ingradient, SLOT(modifyBlack(int))); - connect( m_page->whitespin, SIGNAL(valueChanged(int)), m_page->ingradient, SLOT(modifyWhite(int))); - //connect( m_page->whitespin, SIGNAL(valueChanged(int)), m_page->ingradient, SLOT(modifyGamma())); + connect( m_page->blackspin, TQT_SIGNAL(valueChanged(int)), m_page->ingradient, TQT_SLOT(modifyBlack(int))); + connect( m_page->whitespin, TQT_SIGNAL(valueChanged(int)), m_page->ingradient, TQT_SLOT(modifyWhite(int))); + //connect( m_page->whitespin, TQT_SIGNAL(valueChanged(int)), m_page->ingradient, TQT_SLOT(modifyGamma())); - connect( m_page->ingradient, SIGNAL(modifiedBlack(int)), m_page->blackspin, SLOT(setValue(int))); - connect( m_page->ingradient, SIGNAL(modifiedWhite(int)), m_page->whitespin, SLOT(setValue(int))); - connect( m_page->ingradient, SIGNAL(modifiedGamma(double)), m_page->gammaspin, SLOT(setNum(double))); + connect( m_page->ingradient, TQT_SIGNAL(modifiedBlack(int)), m_page->blackspin, TQT_SLOT(setValue(int))); + connect( m_page->ingradient, TQT_SIGNAL(modifiedWhite(int)), m_page->whitespin, TQT_SLOT(setValue(int))); + connect( m_page->ingradient, TQT_SIGNAL(modifiedGamma(double)), m_page->gammaspin, TQT_SLOT(setNum(double))); - connect( m_page->outblackspin, SIGNAL(valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->outwhitespin, SIGNAL(valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->outblackspin, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( m_page->outwhitespin, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); - connect( m_page->outblackspin, SIGNAL(valueChanged(int)), m_page->outgradient, SLOT(modifyBlack(int))); - connect( m_page->outwhitespin, SIGNAL(valueChanged(int)), m_page->outgradient, SLOT(modifyWhite(int))); + connect( m_page->outblackspin, TQT_SIGNAL(valueChanged(int)), m_page->outgradient, TQT_SLOT(modifyBlack(int))); + connect( m_page->outwhitespin, TQT_SIGNAL(valueChanged(int)), m_page->outgradient, TQT_SLOT(modifyWhite(int))); - connect( m_page->outgradient, SIGNAL(modifiedBlack(int)), m_page->outblackspin, SLOT(setValue(int))); - connect( m_page->outgradient, SIGNAL(modifiedWhite(int)), m_page->outwhitespin, SLOT(setValue(int))); + connect( m_page->outgradient, TQT_SIGNAL(modifiedBlack(int)), m_page->outblackspin, TQT_SLOT(setValue(int))); + connect( m_page->outgradient, TQT_SIGNAL(modifiedWhite(int)), m_page->outwhitespin, TQT_SLOT(setValue(int))); - connect( (QObject*)(m_page->chkLogarithmic), SIGNAL(toggled(bool)), this, SLOT(drawHistogram(bool))); + connect( (TQObject*)(m_page->chkLogarithmic), TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(drawHistogram(bool))); KisHistogramProducerSP producer = new KisGenericLabHistogramProducer(); histogram = new KisHistogram(dev, producer, LINEAR); @@ -274,13 +274,13 @@ void KisLevelConfigWidget::drawHistogram(bool logarithmic) m_histlog = logarithmic; } - QPixmap pix(256, height); + TQPixmap pix(256, height); pix.fill(); - QPainter p(&pix); - p.setPen(QPen::QPen(Qt::gray,1, Qt::SolidLine)); + TQPainter p(&pix); + p.setPen(TQPen::TQPen(TQt::gray,1, TQt::SolidLine)); double highest = (double)histogram->calculations().getHighest(); - Q_INT32 bins = histogram->producer()->numberOfBins(); + TQ_INT32 bins = histogram->producer()->numberOfBins(); if (histogram->getHistogramType() == LINEAR) { double factor = (double)height / highest; diff --git a/krita/plugins/filters/levelfilter/kis_level_filter.h b/krita/plugins/filters/levelfilter/kis_level_filter.h index 5759fe75..fc18aeb1 100644 --- a/krita/plugins/filters/levelfilter/kis_level_filter.h +++ b/krita/plugins/filters/levelfilter/kis_level_filter.h @@ -25,7 +25,7 @@ #include "kis_filter_config_widget.h" class WdgLevel; -class QWidget; +class TQWidget; class KisColorAdjustment; class KisHistogram; @@ -35,13 +35,13 @@ public: KisLevelFilterConfiguration(); virtual ~KisLevelFilterConfiguration(); - virtual void fromXML( const QString& ); - virtual QString toString(); + virtual void fromXML( const TQString& ); + virtual TQString toString(); public: - Q_UINT8 blackvalue, whitevalue; + TQ_UINT8 blackvalue, whitevalue; double gammavalue; - Q_UINT16 outblackvalue, outwhitevalue; + TQ_UINT16 outblackvalue, outwhitevalue; KisColorAdjustment * m_adjustment; }; @@ -57,10 +57,10 @@ public: public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration * configuration(QWidget *); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration * configuration(TQWidget *); virtual KisFilterConfiguration * configuration() { return new KisLevelFilterConfiguration(); }; - virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("levels", i18n("Levels")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } @@ -74,8 +74,9 @@ public: class KisLevelConfigWidget : public KisFilterConfigWidget { Q_OBJECT + TQ_OBJECT public: - KisLevelConfigWidget(QWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); + KisLevelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); virtual ~KisLevelConfigWidget(); KisLevelFilterConfiguration * config(); diff --git a/krita/plugins/filters/levelfilter/levelfilter.cc b/krita/plugins/filters/levelfilter/levelfilter.cc index ac7fd4e6..f9109811 100644 --- a/krita/plugins/filters/levelfilter/levelfilter.cc +++ b/krita/plugins/filters/levelfilter/levelfilter.cc @@ -23,9 +23,9 @@ #include <stdlib.h> #include <string.h> -#include <qslider.h> -#include <qpoint.h> -#include <qcolor.h> +#include <tqslider.h> +#include <tqpoint.h> +#include <tqcolor.h> #include <klocale.h> #include <kiconloader.h> @@ -51,13 +51,13 @@ typedef KGenericFactory<LevelFilter> LevelFilterFactory; K_EXPORT_COMPONENT_FACTORY( kritalevelfilter, LevelFilterFactory( "krita" ) ) -LevelFilter::LevelFilter(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +LevelFilter::LevelFilter(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(LevelFilterFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisLevelFilter()); } } diff --git a/krita/plugins/filters/levelfilter/levelfilter.h b/krita/plugins/filters/levelfilter/levelfilter.h index e382e8a9..75716571 100644 --- a/krita/plugins/filters/levelfilter/levelfilter.h +++ b/krita/plugins/filters/levelfilter/levelfilter.h @@ -28,7 +28,7 @@ class KisColorAdjustment; class LevelFilter : public KParts::Plugin { public: - LevelFilter(QObject *parent, const char *name, const QStringList &); + LevelFilter(TQObject *tqparent, const char *name, const TQStringList &); virtual ~LevelFilter(); }; diff --git a/krita/plugins/filters/levelfilter/wdg_level.ui b/krita/plugins/filters/levelfilter/wdg_level.ui index 8a568aeb..0db94640 100644 --- a/krita/plugins/filters/levelfilter/wdg_level.ui +++ b/krita/plugins/filters/levelfilter/wdg_level.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgLevel</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgLevel</cstring> </property> @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -42,7 +42,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>chkLogarithmic</cstring> </property> @@ -50,7 +50,7 @@ <string>Logarithmic</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -58,25 +58,25 @@ <string><b>Input levels</b></string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>histview</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>256</width> <height>256</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>256</width> <height>256</height> @@ -86,9 +86,9 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> @@ -98,22 +98,22 @@ <property name="name"> <cstring>ingradient</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>256</width> <height>20</height> </size> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>blackspin</cstring> </property> @@ -134,21 +134,21 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>25</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>gammaspin</cstring> </property> <property name="text"> <string>1.0</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -162,14 +162,14 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>25</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>whitespin</cstring> </property> @@ -184,7 +184,7 @@ </widget> </vbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -192,9 +192,9 @@ <string><b>Output levels</b></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -204,22 +204,22 @@ <property name="name"> <cstring>outgradient</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>256</width> <height>20</height> </size> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>outblackspin</cstring> </property> @@ -240,14 +240,14 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>outwhitespin</cstring> </property> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -291,7 +291,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -323,7 +323,7 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kgradientslider.h</includehint> <includehint>kgradientslider.h</includehint> diff --git a/krita/plugins/filters/noisefilter/kis_wdg_noise.cpp b/krita/plugins/filters/noisefilter/kis_wdg_noise.cpp index ae2da57f..aafd868a 100644 --- a/krita/plugins/filters/noisefilter/kis_wdg_noise.cpp +++ b/krita/plugins/filters/noisefilter/kis_wdg_noise.cpp @@ -20,21 +20,21 @@ #include "kis_wdg_noise.h" -#include <qlayout.h> +#include <tqlayout.h> #include <knuminput.h> #include "wdgnoiseoptions.h" -KisWdgNoise::KisWdgNoise(KisFilter* /*nfilter*/, QWidget* parent, const char* name) - : KisFilterConfigWidget(parent,name) +KisWdgNoise::KisWdgNoise(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name) + : KisFilterConfigWidget(tqparent,name) { - QGridLayout *widgetLayout = new QGridLayout(this, 1, 1); + TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgNoiseOptions(this); widgetLayout -> addWidget(m_widget,0,0); - connect( widget()->intLevel, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intOpacity, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intLevel, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intOpacity, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); } KisWdgNoise::~KisWdgNoise() @@ -43,7 +43,7 @@ KisWdgNoise::~KisWdgNoise() void KisWdgNoise::setConfiguration(KisFilterConfiguration* config) { - QVariant value; + TQVariant value; if (config->getProperty("level", value)) { widget()->intLevel->setValue( value.toUInt() ); diff --git a/krita/plugins/filters/noisefilter/kis_wdg_noise.h b/krita/plugins/filters/noisefilter/kis_wdg_noise.h index 297e78a7..53c0100d 100644 --- a/krita/plugins/filters/noisefilter/kis_wdg_noise.h +++ b/krita/plugins/filters/noisefilter/kis_wdg_noise.h @@ -29,8 +29,9 @@ class KisFilter; class KisWdgNoise : public KisFilterConfigWidget { Q_OBJECT + TQ_OBJECT public: - KisWdgNoise(KisFilter* nfilter, QWidget* parent = 0, const char* name = 0); + KisWdgNoise(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0); ~KisWdgNoise(); public: inline WdgNoiseOptions* widget() { return m_widget; }; diff --git a/krita/plugins/filters/noisefilter/noisefilter.cc b/krita/plugins/filters/noisefilter/noisefilter.cc index 03e73f81..ae5e1e62 100644 --- a/krita/plugins/filters/noisefilter/noisefilter.cc +++ b/krita/plugins/filters/noisefilter/noisefilter.cc @@ -23,7 +23,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <kdebug.h> #include <kiconloader.h> @@ -48,14 +48,14 @@ typedef KGenericFactory<KritaNoiseFilter> KritaNoiseFilterFactory; K_EXPORT_COMPONENT_FACTORY( kritanoisefilter, KritaNoiseFilterFactory( "krita" ) ) -KritaNoiseFilter::KritaNoiseFilter(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaNoiseFilter::KritaNoiseFilter(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaNoiseFilterFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisFilterNoise()); } } @@ -68,7 +68,7 @@ KisFilterNoise::KisFilterNoise() : KisFilter(id(), "other", i18n("&Random Noise. { } -KisFilterConfiguration* KisFilterNoise::configuration(QWidget* w) +KisFilterConfiguration* KisFilterNoise::configuration(TQWidget* w) { KisWdgNoise* wN = dynamic_cast<KisWdgNoise*>(w); KisFilterConfiguration* config = new KisFilterConfiguration(id().id(), 1); @@ -80,12 +80,12 @@ KisFilterConfiguration* KisFilterNoise::configuration(QWidget* w) return config; } -KisFilterConfigWidget * KisFilterNoise::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisFilterNoise::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev) { - return new KisWdgNoise((KisFilter*)this, (QWidget*)parent, i18n("Configuration of noise filter").ascii()); + return new KisWdgNoise((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of noise filter").ascii()); } -void KisFilterNoise::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisFilterNoise::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { Q_ASSERT(src != 0); Q_ASSERT(dst != 0); @@ -93,28 +93,28 @@ void KisFilterNoise::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilt setProgressTotalSteps(rect.width() * rect.height()); KisColorSpace * cs = src->colorSpace(); - Q_INT32 psize = cs->pixelSize(); + TQ_INT32 psize = cs->pixelSize(); - QVariant value; + TQVariant value; int level = (config && config->getProperty("level", value)) ? value.toInt() : 50; int opacity = (config && config->getProperty("opacity", value)) ? value.toInt() : 100; KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); KisRectIteratorPixel srcIt = src->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), false); - Q_UINT8* interm = new Q_UINT8[ cs->pixelSize() ]; - Q_UINT32 threshold = (RAND_MAX / 100) * (100 - level); + TQ_UINT8* interm = new TQ_UINT8[ cs->pixelSize() ]; + TQ_UINT32 threshold = (RAND_MAX / 100) * (100 - level); - Q_UINT8 weights[2]; + TQ_UINT8 weights[2]; weights[0] = (255 * opacity) / 100; weights[1] = 255 - weights[0]; - const Q_UINT8* pixels[2]; + const TQ_UINT8* pixels[2]; pixels[0] = interm; while(!srcIt.isDone()) { if(rand() > threshold) { - QColor c = qRgb((double)rand()/RAND_MAX * 255,(double)rand()/RAND_MAX * 255,(double)rand()/RAND_MAX * 255); - cs->fromQColor( c, interm, 0 ); + TQColor c = tqRgb((double)rand()/RAND_MAX * 255,(double)rand()/RAND_MAX * 255,(double)rand()/RAND_MAX * 255); + cs->fromTQColor( c, interm, 0 ); pixels[1] = srcIt.oldRawData(); cs->mixColors( pixels, weights, 2, dstIt.rawData() ); } diff --git a/krita/plugins/filters/noisefilter/noisefilter.h b/krita/plugins/filters/noisefilter/noisefilter.h index 176129c7..4f838b16 100644 --- a/krita/plugins/filters/noisefilter/noisefilter.h +++ b/krita/plugins/filters/noisefilter/noisefilter.h @@ -29,7 +29,7 @@ class KisFilterConfigWidget; class KritaNoiseFilter : public KParts::Plugin { public: - KritaNoiseFilter(QObject *parent, const char *name, const QStringList &); + KritaNoiseFilter(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaNoiseFilter(); }; @@ -38,15 +38,15 @@ class KisFilterNoise : public KisFilter public: KisFilterNoise(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; static inline KisID id() { return KisID("noise", i18n("Noise")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } virtual bool supportsIncrementalPainting() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); }; #endif diff --git a/krita/plugins/filters/noisefilter/wdgnoiseoptions.ui b/krita/plugins/filters/noisefilter/wdgnoiseoptions.ui index 3a7862ad..969d4153 100644 --- a/krita/plugins/filters/noisefilter/wdgnoiseoptions.ui +++ b/krita/plugins/filters/noisefilter/wdgnoiseoptions.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgNoiseOptions</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgNoiseOptions</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -27,7 +27,7 @@ <string>Opacity:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -101,7 +101,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc index bafa2644..2e280f52 100644 --- a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc +++ b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc @@ -25,8 +25,8 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> -#include <qspinbox.h> +#include <tqpoint.h> +#include <tqspinbox.h> #include <klocale.h> #include <kiconloader.h> @@ -54,7 +54,7 @@ KisOilPaintFilter::KisOilPaintFilter() : KisFilter(id(), "artistic", i18n("&Oilp { } -void KisOilPaintFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const QRect& rect) +void KisOilPaintFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const TQRect& rect) { if (!configuration) { @@ -64,13 +64,13 @@ void KisOilPaintFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisF Q_UNUSED(dst); - Q_INT32 x = rect.x(), y = rect.y(); - Q_INT32 width = rect.width(); - Q_INT32 height = rect.height(); + TQ_INT32 x = rect.x(), y = rect.y(); + TQ_INT32 width = rect.width(); + TQ_INT32 height = rect.height(); //read the filter configuration values from the KisFilterConfiguration object - Q_UINT32 brushSize = ((KisOilPaintFilterConfiguration*)configuration)->brushSize(); - Q_UINT32 smooth = ((KisOilPaintFilterConfiguration*)configuration)->smooth(); + TQ_UINT32 brushSize = ((KisOilPaintFilterConfiguration*)configuration)->brushSize(); + TQ_UINT32 smooth = ((KisOilPaintFilterConfiguration*)configuration)->smooth(); OilPaint(src, dst, x, y, width, height, brushSize, smooth); @@ -95,9 +95,9 @@ void KisOilPaintFilter::OilPaint(KisPaintDeviceSP src, KisPaintDeviceSP dst, int setProgressTotalSteps(h); setProgressStage(i18n("Applying oilpaint filter..."),0); - QRect bounds(x, y, w, h); + TQRect bounds(x, y, w, h); - for (Q_INT32 yOffset = 0; yOffset < h; yOffset++) { + for (TQ_INT32 yOffset = 0; yOffset < h; yOffset++) { KisHLineIteratorPixel it = src->createHLineIterator(x, y + yOffset, w, false); KisHLineIteratorPixel dstIt = dst->createHLineIterator(x, y + yOffset, w, true); @@ -107,7 +107,7 @@ void KisOilPaintFilter::OilPaint(KisPaintDeviceSP src, KisPaintDeviceSP dst, int if (it.isSelected()) { uint color = MostFrequentColor(src, bounds, it.x(), it.y(), BrushSize, Smoothness); - dst->colorSpace()->fromQColor(QColor(qRed(color), qGreen(color), qBlue(color)), qAlpha(color), dstIt.rawData()); + dst->colorSpace()->fromTQColor(TQColor(tqRed(color), tqGreen(color), tqBlue(color)), tqAlpha(color), dstIt.rawData()); } ++it; @@ -136,7 +136,7 @@ void KisOilPaintFilter::OilPaint(KisPaintDeviceSP src, KisPaintDeviceSP dst, int * the center of this matrix and find the most frequenty color */ -uint KisOilPaintFilter::MostFrequentColor (KisPaintDeviceSP src, const QRect& bounds, int X, int Y, int Radius, int Intensity) +uint KisOilPaintFilter::MostFrequentColor (KisPaintDeviceSP src, const TQRect& bounds, int X, int Y, int Radius, int Intensity) { uint color; uint I; @@ -159,12 +159,12 @@ uint KisOilPaintFilter::MostFrequentColor (KisPaintDeviceSP src, const QRect& bo while (!it.isDone()) { - if (bounds.contains(it.x(), it.y())) { + if (bounds.tqcontains(it.x(), it.y())) { // XXX: COLORSPACE_INDEPENDENCE - QColor c; - src->colorSpace()->toQColor(it.rawData(), &c); + TQColor c; + src->colorSpace()->toTQColor(it.rawData(), &c); // Swapping red and blue here is done because that gives the same // output as digikam, even though it might be interpreted as a bug @@ -217,7 +217,7 @@ uint KisOilPaintFilter::MostFrequentColor (KisPaintDeviceSP src, const QRect& bo } // Swap red and blue back to get the correct colour. - color = qRgb (B, G, R); + color = tqRgb (B, G, R); delete [] IntensityCount; // free all the arrays delete [] AverageColorR; @@ -228,15 +228,15 @@ uint KisOilPaintFilter::MostFrequentColor (KisPaintDeviceSP src, const QRect& bo } -KisFilterConfigWidget * KisOilPaintFilter::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisOilPaintFilter::createConfigurationWidget(TQWidget* tqparent, 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(parent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); } -KisFilterConfiguration* KisOilPaintFilter::configuration(QWidget* nwidget) +KisFilterConfiguration* KisOilPaintFilter::configuration(TQWidget* nwidget) { KisMultiIntegerFilterWidget* widget = (KisMultiIntegerFilterWidget*) nwidget; if( widget == 0 ) diff --git a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h index 5397cb65..fbc07a63 100644 --- a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h +++ b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h @@ -29,7 +29,7 @@ class KisOilPaintFilterConfiguration : public KisFilterConfiguration public: - KisOilPaintFilterConfiguration(Q_UINT32 brushSize, Q_UINT32 smooth) + KisOilPaintFilterConfiguration(TQ_UINT32 brushSize, TQ_UINT32 smooth) : KisFilterConfiguration( "oilpaint", 1 ) { setProperty("brushSize", brushSize); @@ -37,8 +37,8 @@ public: }; public: - inline Q_UINT32 brushSize() { return getInt("brushSize"); }; - inline Q_UINT32 smooth() {return getInt("smooth"); }; + inline TQ_UINT32 brushSize() { return getInt("brushSize"); }; + inline TQ_UINT32 smooth() {return getInt("smooth"); }; }; @@ -48,19 +48,19 @@ class KisOilPaintFilter : public KisFilter public: KisOilPaintFilter(); public: - virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("oilpaint", i18n("Oilpaint")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } virtual bool supportsAdjustmentLayers() { return false; } virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP dev); public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration * configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisOilPaintFilterConfiguration( 1, 30); }; private: void OilPaint(KisPaintDeviceSP src, KisPaintDeviceSP dst, int x, int y, int w, int h, int BrushSize, int Smoothness); - uint MostFrequentColor(KisPaintDeviceSP, const QRect& bounds, int X, int Y, int Radius, int Intensity); + uint MostFrequentColor(KisPaintDeviceSP, const TQRect& bounds, int X, int Y, int Radius, int Intensity); // Function to calcule the color intensity and return the luminance (Y) // component of YIQ color model. inline uint GetIntensity(uint Red, uint Green, uint Blue) { return ((uint)(Red * 0.3 + Green * 0.59 + Blue * 0.11)); } diff --git a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc index 95defb56..1d572938 100644 --- a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc +++ b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc @@ -26,12 +26,12 @@ typedef KGenericFactory<KisOilPaintFilterPlugin> KisOilPaintFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( kritaoilpaintfilter, KisOilPaintFilterPluginFactory( "krita" ) ) -KisOilPaintFilterPlugin::KisOilPaintFilterPlugin(QObject *parent, const char *name, const QStringList &) : KParts::Plugin(parent, name) +KisOilPaintFilterPlugin::KisOilPaintFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) { setInstance(KisOilPaintFilterPluginFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisOilPaintFilter()); } diff --git a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h index e4066a77..847b8e0e 100644 --- a/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h +++ b/krita/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h @@ -25,7 +25,7 @@ class KisOilPaintFilterPlugin : public KParts::Plugin { public: - KisOilPaintFilterPlugin(QObject *parent, const char *name, const QStringList &); + KisOilPaintFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KisOilPaintFilterPlugin(); }; diff --git a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter.cc b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter.cc index dadf9590..a87faeac 100644 --- a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter.cc +++ b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter.cc @@ -24,8 +24,8 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> -#include <qspinbox.h> +#include <tqpoint.h> +#include <tqspinbox.h> #include <klocale.h> #include <kiconloader.h> @@ -55,20 +55,20 @@ KisPixelizeFilter::KisPixelizeFilter() : KisFilter(id(), "artistic", i18n("&Pixe { } -void KisPixelizeFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const QRect& rect) +void KisPixelizeFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const TQRect& rect) { Q_ASSERT( src ); Q_ASSERT( dst ); Q_ASSERT( configuration ); Q_ASSERT( rect.isValid() ); - Q_INT32 x = rect.x(), y = rect.y(); - Q_INT32 width = rect.width(); - Q_INT32 height = rect.height(); + TQ_INT32 x = rect.x(), y = rect.y(); + TQ_INT32 width = rect.width(); + TQ_INT32 height = rect.height(); //read the filter configuration values from the KisFilterConfiguration object - Q_UINT32 pixelWidth = ((KisPixelizeFilterConfiguration*)configuration)->pixelWidth(); - Q_UINT32 pixelHeight = ((KisPixelizeFilterConfiguration*)configuration)->pixelHeight(); + TQ_UINT32 pixelWidth = ((KisPixelizeFilterConfiguration*)configuration)->pixelWidth(); + TQ_UINT32 pixelHeight = ((KisPixelizeFilterConfiguration*)configuration)->pixelHeight(); pixelize(src, dst, x, y, width, height, pixelWidth, pixelHeight); } @@ -81,20 +81,20 @@ void KisPixelizeFilter::pixelize(KisPaintDeviceSP src, KisPaintDeviceSP dst, int if (!src) return; if (!dst) return; - Q_INT32 pixelSize = src->pixelSize(); - QMemArray<Q_INT32> average( pixelSize ); + TQ_INT32 pixelSize = src->pixelSize(); + TQMemArray<TQ_INT32> average( pixelSize ); - Q_INT32 count; + TQ_INT32 count; //calculate the total number of pixels - Q_INT32 numX=0; - Q_INT32 numY=0; + TQ_INT32 numX=0; + TQ_INT32 numY=0; - for (Q_INT32 x = startx; x < startx + width; x += pixelWidth - (x % pixelWidth)) + for (TQ_INT32 x = startx; x < startx + width; x += pixelWidth - (x % pixelWidth)) { numX++; } - for (Q_INT32 y = starty; y < starty + height; y += pixelHeight - (y % pixelHeight)) + for (TQ_INT32 y = starty; y < starty + height; y += pixelHeight - (y % pixelHeight)) { numY++; } @@ -102,19 +102,19 @@ void KisPixelizeFilter::pixelize(KisPaintDeviceSP src, KisPaintDeviceSP dst, int setProgressTotalSteps( numX * numY ); setProgressStage(i18n("Applying pixelize filter..."),0); - Q_INT32 numberOfPixelsProcessed = 0; + TQ_INT32 numberOfPixelsProcessed = 0; - for (Q_INT32 y = starty; y < starty + height; y += pixelHeight - (y % pixelHeight)) + for (TQ_INT32 y = starty; y < starty + height; y += pixelHeight - (y % pixelHeight)) { - Q_INT32 h = pixelHeight - (y % pixelHeight); + TQ_INT32 h = pixelHeight - (y % pixelHeight); h = MIN(h, starty + height - y); - for (Q_INT32 x = startx; x < startx + width; x += pixelWidth - (x % pixelWidth)) + for (TQ_INT32 x = startx; x < startx + width; x += pixelWidth - (x % pixelWidth)) { - Q_INT32 w = pixelWidth - (x % pixelWidth); + TQ_INT32 w = pixelWidth - (x % pixelWidth); w = MIN(w, startx + width - x); - for (Q_INT32 i = 0; i < pixelSize; i++) + for (TQ_INT32 i = 0; i < pixelSize; i++) { average[i] = 0; } @@ -125,7 +125,7 @@ void KisPixelizeFilter::pixelize(KisPaintDeviceSP src, KisPaintDeviceSP dst, int while( ! srcIt.isDone() ) { if(srcIt.isSelected()) { - for (Q_INT32 i = 0; i < pixelSize; i++) + for (TQ_INT32 i = 0; i < pixelSize; i++) { average[i] += srcIt.oldRawData()[i]; } @@ -137,7 +137,7 @@ void KisPixelizeFilter::pixelize(KisPaintDeviceSP src, KisPaintDeviceSP dst, int //average if (count > 0) { - for (Q_INT32 i = 0; i < pixelSize; i++) + for (TQ_INT32 i = 0; i < pixelSize; i++) average[i] /= count; } //write @@ -163,15 +163,15 @@ void KisPixelizeFilter::pixelize(KisPaintDeviceSP src, KisPaintDeviceSP dst, int setProgressDone(); } -KisFilterConfigWidget * KisPixelizeFilter::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisPixelizeFilter::createConfigurationWidget(TQWidget* tqparent, 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(parent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); } -KisFilterConfiguration* KisPixelizeFilter::configuration(QWidget* nwidget) +KisFilterConfiguration* KisPixelizeFilter::configuration(TQWidget* nwidget) { KisMultiIntegerFilterWidget* widget = (KisMultiIntegerFilterWidget*) nwidget; if( widget == 0 ) diff --git a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter.h b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter.h index 16ce62e7..c7d8bb31 100644 --- a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter.h +++ b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter.h @@ -27,15 +27,15 @@ class KisPixelizeFilterConfiguration : public KisFilterConfiguration { public: - KisPixelizeFilterConfiguration(Q_UINT32 pixelWidth, Q_UINT32 pixelHeight) + KisPixelizeFilterConfiguration(TQ_UINT32 pixelWidth, TQ_UINT32 pixelHeight) : KisFilterConfiguration( "pixelize", 1 ) { setProperty("pixelWidth", pixelWidth); setProperty("pixelHeight", pixelHeight); }; public: - inline Q_UINT32 pixelWidth() { return getInt("pixelWidth"); }; - inline Q_UINT32 pixelHeight() {return getInt("pixelHeight"); }; + inline TQ_UINT32 pixelWidth() { return getInt("pixelWidth"); }; + inline TQ_UINT32 pixelHeight() {return getInt("pixelHeight"); }; }; class KisPixelizeFilter : public KisFilter @@ -43,7 +43,7 @@ class KisPixelizeFilter : public KisFilter public: KisPixelizeFilter(); public: - virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("pixelize", i18n("Pixelize")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } @@ -51,8 +51,8 @@ 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(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration * configuration(); private: void pixelize(KisPaintDeviceSP src, KisPaintDeviceSP dst, int x, int y, int w, int h, int pixelWidth, int pixelHeight); diff --git a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc index 39a56ec5..a5922b5c 100644 --- a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc +++ b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc @@ -26,13 +26,13 @@ typedef KGenericFactory<KisPixelizeFilterPlugin> KisPixelizeFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( kritapixelizefilter, KisPixelizeFilterPluginFactory( "krita" ) ) -KisPixelizeFilterPlugin::KisPixelizeFilterPlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KisPixelizeFilterPlugin::KisPixelizeFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KisPixelizeFilterPluginFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisPixelizeFilter()); } } diff --git a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h index 33edf4d0..5cbeeef3 100644 --- a/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h +++ b/krita/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h @@ -25,7 +25,7 @@ class KisPixelizeFilterPlugin : public KParts::Plugin { public: - KisPixelizeFilterPlugin(QObject *parent, const char *name, const QStringList &); + KisPixelizeFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KisPixelizeFilterPlugin(); }; diff --git a/krita/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/krita/plugins/filters/raindropsfilter/kis_raindrops_filter.cc index a2bd633e..c208bb52 100644 --- a/krita/plugins/filters/raindropsfilter/kis_raindrops_filter.cc +++ b/krita/plugins/filters/raindropsfilter/kis_raindrops_filter.cc @@ -25,8 +25,8 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> -#include <qspinbox.h> +#include <tqpoint.h> +#include <tqspinbox.h> #include <klocale.h> #include <kiconloader.h> @@ -57,15 +57,15 @@ KisRainDropsFilter::KisRainDropsFilter() : KisFilter(id(), "artistic", i18n("&Ra { } -void KisRainDropsFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const QRect& rect) +void KisRainDropsFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const TQRect& rect) { Q_UNUSED(dst); //read the filter configuration values from the KisFilterConfiguration object - Q_UINT32 dropSize = ((KisRainDropsFilterConfiguration*)configuration)->dropSize(); - Q_UINT32 number = ((KisRainDropsFilterConfiguration*)configuration)->number(); - Q_UINT32 fishEyes = ((KisRainDropsFilterConfiguration*)configuration)->fishEyes(); + TQ_UINT32 dropSize = ((KisRainDropsFilterConfiguration*)configuration)->dropSize(); + TQ_UINT32 number = ((KisRainDropsFilterConfiguration*)configuration)->number(); + TQ_UINT32 fishEyes = ((KisRainDropsFilterConfiguration*)configuration)->fishEyes(); rainDrops(src, dst, rect, dropSize, number, fishEyes); @@ -90,7 +90,7 @@ void KisRainDropsFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, Kis * and after this, a blur function will finish the effect. */ -void KisRainDropsFilter::rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, const QRect& rect, int DropSize, int Amount, int Coeff) +void KisRainDropsFilter::rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, const TQRect& rect, int DropSize, int Amount, int Coeff) { setProgressTotalSteps(Amount); setProgressStage(i18n("Applying oilpaint filter..."),0); @@ -124,8 +124,8 @@ void KisRainDropsFilter::rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, c KisColorSpace * cs = src->colorSpace(); - QDateTime dt = QDateTime::currentDateTime(); - QDateTime Y2000( QDate(2000, 1, 1), QTime(0, 0, 0) ); + TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) ); srand ((uint) dt.secsTo(Y2000)); @@ -265,19 +265,19 @@ void KisRainDropsFilter::rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, c BoolMatrix[n][m] = true; - QColor originalColor; + TQColor originalColor; oldIt.moveTo(rect.x() + l, rect.y() + k); - cs->toQColor(oldIt.oldRawData(), &originalColor); + cs->toTQColor(oldIt.oldRawData(), &originalColor); - int newRed = CLAMP(originalColor.red() + Bright, 0, Q_UINT8_MAX); - int newGreen = CLAMP(originalColor.green() + Bright, 0, Q_UINT8_MAX); - int newBlue = CLAMP(originalColor.blue() + Bright, 0, Q_UINT8_MAX); + int newRed = CLAMP(originalColor.red() + Bright, 0, TQ_UINT8_MAX); + int newGreen = CLAMP(originalColor.green() + Bright, 0, TQ_UINT8_MAX); + int newBlue = CLAMP(originalColor.blue() + Bright, 0, TQ_UINT8_MAX); - QColor newColor; + TQColor newColor; newColor.setRgb(newRed, newGreen, newBlue); dstIt.moveTo(rect.x() + n, rect.y() + m); - cs->fromQColor(newColor, dstIt.rawData()); + cs->fromTQColor(newColor, dstIt.rawData()); } } } @@ -305,10 +305,10 @@ void KisRainDropsFilter::rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, c if ((m >= 0) && (m < Height) && (n >= 0) && (n < Width)) { - QColor color; + TQColor color; dstIt.moveTo(rect.x() + n, rect.y() + m); - cs->toQColor(dstIt.rawData(), &color); + cs->toTQColor(dstIt.rawData(), &color); R += color.red(); G += color.green(); @@ -322,12 +322,12 @@ void KisRainDropsFilter::rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, c if ((m >= 0) && (m < Height) && (n >= 0) && (n < Width)) { - QColor color; + TQColor color; color.setRgb((int)(R / BlurPixels), (int)(G / BlurPixels), (int)(B / BlurPixels)); dstIt.moveTo(rect.x() + n, rect.y() + m); - cs->fromQColor(color, dstIt.rawData()); + cs->fromTQColor(color, dstIt.rawData()); } } } @@ -418,16 +418,16 @@ uchar KisRainDropsFilter::LimitValues (int ColorValue) return ((uchar) ColorValue); } -KisFilterConfigWidget * KisRainDropsFilter::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP) +KisFilterConfigWidget * KisRainDropsFilter::createConfigurationWidget(TQWidget* tqparent, 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(parent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); } -KisFilterConfiguration* KisRainDropsFilter::configuration(QWidget* nwidget) +KisFilterConfiguration* KisRainDropsFilter::configuration(TQWidget* nwidget) { KisMultiIntegerFilterWidget* widget = (KisMultiIntegerFilterWidget*) nwidget; if( widget == 0 ) diff --git a/krita/plugins/filters/raindropsfilter/kis_raindrops_filter.h b/krita/plugins/filters/raindropsfilter/kis_raindrops_filter.h index c4a4d4da..eccb8917 100644 --- a/krita/plugins/filters/raindropsfilter/kis_raindrops_filter.h +++ b/krita/plugins/filters/raindropsfilter/kis_raindrops_filter.h @@ -27,7 +27,7 @@ class KisRainDropsFilterConfiguration : public KisFilterConfiguration { public: - KisRainDropsFilterConfiguration(Q_UINT32 dropSize, Q_UINT32 number, Q_UINT32 fishEyes) + KisRainDropsFilterConfiguration(TQ_UINT32 dropSize, TQ_UINT32 number, TQ_UINT32 fishEyes) : KisFilterConfiguration( "raindrops", 1 ) { setProperty("dropsize", dropSize); @@ -35,9 +35,9 @@ public: setProperty("fishEyes", fishEyes); }; public: - inline Q_UINT32 dropSize() { return getInt("dropsize"); }; - inline Q_UINT32 number() {return getInt("number"); }; - inline Q_UINT32 fishEyes() {return getInt("fishEyes"); }; + inline TQ_UINT32 dropSize() { return getInt("dropsize"); }; + inline TQ_UINT32 number() {return getInt("number"); }; + inline TQ_UINT32 fishEyes() {return getInt("fishEyes"); }; }; @@ -46,7 +46,7 @@ class KisRainDropsFilter : public KisFilter public: KisRainDropsFilter(); public: - virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("raindrops", i18n("Raindrops")); }; virtual bool supportsPainting() { return false; } virtual bool supportsPreview() { return true; } @@ -55,10 +55,10 @@ public: { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisRainDropsFilterConfiguration( 30, 80, 20)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); private: - void rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, const QRect& rect, int DropSize, int Amount, int Coeff); + void rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, const TQRect& rect, int DropSize, int Amount, int Coeff); bool** CreateBoolArray (uint Columns, uint Rows); void FreeBoolArray (bool** lpbArray, uint Columns); uchar LimitValues (int ColorValue); diff --git a/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc b/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc index 9b06b0c0..29106c62 100644 --- a/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc +++ b/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc @@ -29,12 +29,12 @@ typedef KGenericFactory<KisRainDropsFilterPlugin> KisRainDropsFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( kritaraindropsfilter, KisRainDropsFilterPluginFactory( "krita" ) ) -KisRainDropsFilterPlugin::KisRainDropsFilterPlugin(QObject *parent, const char *name, const QStringList &) : KParts::Plugin(parent, name) +KisRainDropsFilterPlugin::KisRainDropsFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) { setInstance(KisRainDropsFilterPluginFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisRainDropsFilter()); } } diff --git a/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h b/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h index 455f8f69..49834d37 100644 --- a/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h +++ b/krita/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h @@ -26,7 +26,7 @@ class KisRainDropsFilterPlugin : public KParts::Plugin { public: - KisRainDropsFilterPlugin(QObject *parent, const char *name, const QStringList &); + KisRainDropsFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KisRainDropsFilterPlugin(); }; diff --git a/krita/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp b/krita/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp index 380b405a..073382d4 100644 --- a/krita/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp +++ b/krita/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp @@ -20,22 +20,22 @@ #include "kis_wdg_random_pick.h" -#include <qlayout.h> +#include <tqlayout.h> #include <knuminput.h> #include "wdgrandompickoptions.h" -KisWdgRandomPick::KisWdgRandomPick(KisFilter* /*nfilter*/, QWidget* parent, const char* name) - : KisFilterConfigWidget(parent,name) +KisWdgRandomPick::KisWdgRandomPick(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name) + : KisFilterConfigWidget(tqparent,name) { - QGridLayout *widgetLayout = new QGridLayout(this, 1, 1); + TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgRandomPickOptions(this); widgetLayout -> addWidget(m_widget,0,0); - connect( widget()->intLevel, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intWindowSize, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intOpacity, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intLevel, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intWindowSize, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intOpacity, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); } KisWdgRandomPick::~KisWdgRandomPick() @@ -44,7 +44,7 @@ KisWdgRandomPick::~KisWdgRandomPick() void KisWdgRandomPick::setConfiguration(KisFilterConfiguration* config) { - QVariant value; + TQVariant value; if (config->getProperty("level", value)) { widget()->intLevel->setValue( value.toUInt() ); diff --git a/krita/plugins/filters/randompickfilter/kis_wdg_random_pick.h b/krita/plugins/filters/randompickfilter/kis_wdg_random_pick.h index f7d86079..a6919cb0 100644 --- a/krita/plugins/filters/randompickfilter/kis_wdg_random_pick.h +++ b/krita/plugins/filters/randompickfilter/kis_wdg_random_pick.h @@ -29,8 +29,9 @@ class KisFilter; class KisWdgRandomPick : public KisFilterConfigWidget { Q_OBJECT + TQ_OBJECT public: - KisWdgRandomPick(KisFilter* nfilter, QWidget* parent = 0, const char* name = 0); + KisWdgRandomPick(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0); ~KisWdgRandomPick(); public: inline WdgRandomPickOptions* widget() { return m_widget; }; diff --git a/krita/plugins/filters/randompickfilter/randompickfilter.cc b/krita/plugins/filters/randompickfilter/randompickfilter.cc index 3289f683..b0bd0fdb 100644 --- a/krita/plugins/filters/randompickfilter/randompickfilter.cc +++ b/krita/plugins/filters/randompickfilter/randompickfilter.cc @@ -23,7 +23,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <kdebug.h> #include <kiconloader.h> @@ -49,14 +49,14 @@ typedef KGenericFactory<KritaRandomPickFilter> KritaRandomPickFilterFactory; K_EXPORT_COMPONENT_FACTORY( kritarandompickfilter, KritaRandomPickFilterFactory( "krita" ) ) -KritaRandomPickFilter::KritaRandomPickFilter(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaRandomPickFilter::KritaRandomPickFilter(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaRandomPickFilterFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisFilterRandomPick()); } } @@ -69,7 +69,7 @@ KisFilterRandomPick::KisFilterRandomPick() : KisFilter(id(), "other", i18n("&Ran { } -KisFilterConfiguration* KisFilterRandomPick::configuration(QWidget* w) +KisFilterConfiguration* KisFilterRandomPick::configuration(TQWidget* w) { KisWdgRandomPick* wN = dynamic_cast<KisWdgRandomPick*>(w); KisFilterConfiguration* config = new KisFilterConfiguration(id().id(), 1); @@ -82,12 +82,12 @@ KisFilterConfiguration* KisFilterRandomPick::configuration(QWidget* w) return config; } -KisFilterConfigWidget * KisFilterRandomPick::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisFilterRandomPick::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev) { - return new KisWdgRandomPick((KisFilter*)this, (QWidget*)parent, i18n("Configuration of random pick filter").ascii()); + return new KisWdgRandomPick((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of random pick filter").ascii()); } -void KisFilterRandomPick::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisFilterRandomPick::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { Q_ASSERT(src != 0); Q_ASSERT(dst != 0); @@ -95,9 +95,9 @@ void KisFilterRandomPick::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, Ki setProgressTotalSteps(rect.height() * rect.width()); KisColorSpace * cs = src->colorSpace(); - Q_INT32 psize = cs->pixelSize(); + TQ_INT32 psize = cs->pixelSize(); - QVariant value; + TQVariant value; int level = (config && config->getProperty("level", value)) ? value.toInt() : 50; double windowsize = (config && config->getProperty("windowsize", value)) ? value.toInt() / 2. : 2.5; int opacity = (config && config->getProperty("opacity", value)) ? value.toInt() : 100; @@ -106,11 +106,11 @@ void KisFilterRandomPick::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, Ki KisRectIteratorPixel srcIt = src->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), false); KisRandomAccessorPixel srcRA = src->createRandomAccessor(0, 0, false); - Q_UINT32 threshold = (RAND_MAX / 100) * (100 - level); + TQ_UINT32 threshold = (RAND_MAX / 100) * (100 - level); - Q_UINT8 weights[2]; + TQ_UINT8 weights[2]; weights[0] = (255 * opacity) / 100; weights[1] = 255 - weights[0]; - const Q_UINT8* pixels[2]; + const TQ_UINT8* pixels[2]; while(!srcIt.isDone()) { if(rand() > threshold) diff --git a/krita/plugins/filters/randompickfilter/randompickfilter.h b/krita/plugins/filters/randompickfilter/randompickfilter.h index 1d7f2c8f..88bd63b4 100644 --- a/krita/plugins/filters/randompickfilter/randompickfilter.h +++ b/krita/plugins/filters/randompickfilter/randompickfilter.h @@ -29,7 +29,7 @@ class KisFilterConfigWidget; class KritaRandomPickFilter : public KParts::Plugin { public: - KritaRandomPickFilter(QObject *parent, const char *name, const QStringList &); + KritaRandomPickFilter(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaRandomPickFilter(); }; @@ -38,15 +38,15 @@ class KisFilterRandomPick : public KisFilter public: KisFilterRandomPick(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; static inline KisID id() { return KisID("randompick", i18n("Random Pick")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } virtual bool supportsIncrementalPainting() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); }; #endif diff --git a/krita/plugins/filters/randompickfilter/wdgrandompickoptions.ui b/krita/plugins/filters/randompickfilter/wdgrandompickoptions.ui index c4cb8947..5bdae980 100644 --- a/krita/plugins/filters/randompickfilter/wdgrandompickoptions.ui +++ b/krita/plugins/filters/randompickfilter/wdgrandompickoptions.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgRandomPickOptions</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgRandomPickOptions</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -37,14 +37,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -80,7 +80,7 @@ <number>100</number> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -123,7 +123,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/filters/roundcorners/kis_round_corners_filter.cc b/krita/plugins/filters/roundcorners/kis_round_corners_filter.cc index 715a2d58..0f8ee0cf 100644 --- a/krita/plugins/filters/roundcorners/kis_round_corners_filter.cc +++ b/krita/plugins/filters/roundcorners/kis_round_corners_filter.cc @@ -25,8 +25,8 @@ #include <vector> #include <math.h> -#include <qpoint.h> -#include <qspinbox.h> +#include <tqpoint.h> +#include <tqspinbox.h> #include <klocale.h> #include <kiconloader.h> @@ -56,22 +56,22 @@ KisRoundCornersFilter::KisRoundCornersFilter() : KisFilter(id(), "map", i18n("&R { } -void KisRoundCornersFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const QRect& rect) +void KisRoundCornersFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const TQRect& rect) { //read the filter configuration values from the KisFilterConfiguration object - Q_INT32 radius = (Q_INT32)((KisRoundCornersFilterConfiguration*)configuration)->radius(); - Q_UINT32 pixelSize = src->pixelSize(); + TQ_INT32 radius = (TQ_INT32)((KisRoundCornersFilterConfiguration*)configuration)->radius(); + TQ_UINT32 pixelSize = src->pixelSize(); setProgressTotalSteps( rect.height() ); setProgressStage(i18n("Applying pixelize filter..."),0); - for (Q_INT32 y = rect.y(); y < rect.height(); y++) + for (TQ_INT32 y = rect.y(); y < rect.height(); y++) { - Q_INT32 x = rect.x(); - Q_INT32 x0 = rect.x(); - Q_INT32 y0 = rect.x(); - Q_INT32 width = rect.width(); - Q_INT32 height = rect.height(); + TQ_INT32 x = rect.x(); + TQ_INT32 x0 = rect.x(); + TQ_INT32 y0 = rect.x(); + TQ_INT32 width = rect.width(); + TQ_INT32 height = rect.height(); KisHLineIteratorPixel dstIt = dst->createHLineIterator(x, y, width, true ); KisHLineIteratorPixel srcIt = src->createHLineIterator(x, y, width, false); while( ! srcIt.isDone() ) @@ -139,14 +139,14 @@ void KisRoundCornersFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, setProgressDone(); } -KisFilterConfigWidget * KisRoundCornersFilter::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisRoundCornersFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 2, 100, 30, i18n("Radius"), "radius" ) ); - return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); } -KisFilterConfiguration* KisRoundCornersFilter::configuration(QWidget* nwidget) +KisFilterConfiguration* KisRoundCornersFilter::configuration(TQWidget* nwidget) { KisMultiIntegerFilterWidget* widget = (KisMultiIntegerFilterWidget*) nwidget; if( widget == 0 ) diff --git a/krita/plugins/filters/roundcorners/kis_round_corners_filter.h b/krita/plugins/filters/roundcorners/kis_round_corners_filter.h index 2b965b5d..ec5fb9fb 100644 --- a/krita/plugins/filters/roundcorners/kis_round_corners_filter.h +++ b/krita/plugins/filters/roundcorners/kis_round_corners_filter.h @@ -27,13 +27,13 @@ class KisRoundCornersFilterConfiguration : public KisFilterConfiguration { public: - KisRoundCornersFilterConfiguration(Q_INT32 radius) + KisRoundCornersFilterConfiguration(TQ_INT32 radius) : KisFilterConfiguration( "roundcorners", 1 ) { setProperty("radius", radius); }; public: - inline Q_INT32 radius() { return getInt("radius"); }; + inline TQ_INT32 radius() { return getInt("radius"); }; }; class KisRoundCornersFilter : public KisFilter @@ -41,7 +41,7 @@ class KisRoundCornersFilter : public KisFilter public: KisRoundCornersFilter(); public: - virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("roundcorners", i18n("Round Corners")); }; virtual bool supportsPainting() { return false; } virtual bool supportsPreview() { return true; } @@ -49,8 +49,8 @@ public: virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP ) { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisRoundCornersFilterConfiguration(30)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisRoundCornersFilterConfiguration( 30 ); }; private: }; diff --git a/krita/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc b/krita/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc index c21be444..46f1a2f4 100644 --- a/krita/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc +++ b/krita/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc @@ -26,13 +26,13 @@ typedef KGenericFactory<KisRoundCornersFilterPlugin> KisRoundCornersFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( kritaroundcornersfilter, KisRoundCornersFilterPluginFactory( "krita" ) ) -KisRoundCornersFilterPlugin::KisRoundCornersFilterPlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KisRoundCornersFilterPlugin::KisRoundCornersFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KisRoundCornersFilterPluginFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisRoundCornersFilter()); } } diff --git a/krita/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h b/krita/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h index cb82b9fb..207d346e 100644 --- a/krita/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h +++ b/krita/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h @@ -25,7 +25,7 @@ class KisRoundCornersFilterPlugin : public KParts::Plugin { public: - KisRoundCornersFilterPlugin(QObject *parent, const char *name, const QStringList &); + KisRoundCornersFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KisRoundCornersFilterPlugin(); }; diff --git a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc index 541a5ab2..31d0bc43 100644 --- a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc +++ b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc @@ -24,9 +24,9 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> -#include <qspinbox.h> -#include <qvaluevector.h> +#include <tqpoint.h> +#include <tqspinbox.h> +#include <tqvaluevector.h> #include <klocale.h> #include <kiconloader.h> @@ -58,13 +58,13 @@ #define MIN(a,b) (((a)<(b))?(a):(b)) -void KisSmallTilesFilterConfiguration::fromXML(const QString & s) +void KisSmallTilesFilterConfiguration::fromXML(const TQString & s) { KisFilterConfiguration::fromXML(s); m_numberOfTiles = getInt("numberOfTiles"); } -QString KisSmallTilesFilterConfiguration::toString() +TQString KisSmallTilesFilterConfiguration::toString() { m_properties.clear(); setProperty("numberOfTiles()", m_numberOfTiles); @@ -76,20 +76,20 @@ KisSmallTilesFilter::KisSmallTilesFilter() : KisFilter(id(), "map", i18n("&Small { } -void KisSmallTilesFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const QRect& rect) +void KisSmallTilesFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const TQRect& rect) { //read the filter configuration values from the KisFilterConfiguration object - Q_UINT32 numberOfTiles = ((KisSmallTilesFilterConfiguration*)configuration)->numberOfTiles(); + TQ_UINT32 numberOfTiles = ((KisSmallTilesFilterConfiguration*)configuration)->numberOfTiles(); createSmallTiles(src, dst, rect, numberOfTiles); } -void KisSmallTilesFilter::createSmallTiles(KisPaintDeviceSP src, KisPaintDeviceSP dst, const QRect& rect, Q_UINT32 numberOfTiles) +void KisSmallTilesFilter::createSmallTiles(KisPaintDeviceSP src, KisPaintDeviceSP dst, const TQRect& rect, TQ_UINT32 numberOfTiles) { if (!src) return; if (!dst) return; - QRect srcRect = src->exactBounds(); + TQRect srcRect = src->exactBounds(); int w = static_cast<int>(srcRect.width() / numberOfTiles); int h = static_cast<int>(srcRect.height() / numberOfTiles); @@ -138,13 +138,13 @@ void KisSmallTilesFilter::createSmallTiles(KisPaintDeviceSP src, KisPaintDeviceS //KisScaleWorker worker(tmp, 1.0 / static_cast<double>(numberOfTiles), 1.0 / static_cast<double>(numberOfTiles), new KisMitchellFilterStrategy() ); //worker.run(); -// QRect tmpRect = tmp->exactBounds(); +// TQRect tmpRect = tmp->exactBounds(); // -// for( Q_UINT32 i=0; i < numberOfTiles; i++ ) +// for( TQ_UINT32 i=0; i < numberOfTiles; i++ ) // { -// for( Q_UINT32 j=0; j < numberOfTiles; j++ ) +// for( TQ_UINT32 j=0; j < numberOfTiles; j++ ) // { -// for( Q_INT32 row = tmpRect.y(); row < tmpRect.height(); row++ ) +// for( TQ_INT32 row = tmpRect.y(); row < tmpRect.height(); row++ ) // { // KisHLineIteratorPixel tmpIt = tmp->createHLineIterator(tmpRect.x(), row, tmpRect.width() , false); // KisHLineIteratorPixel dstIt = dst->createHLineIterator( tmpRect.x() + i * tmpRect.width(), row + j * tmpRect.height(), tmpRect.width() , true); @@ -168,14 +168,14 @@ void KisSmallTilesFilter::createSmallTiles(KisPaintDeviceSP src, KisPaintDeviceS setProgressDone(); } -KisFilterConfigWidget * KisSmallTilesFilter::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisSmallTilesFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 2, 5, 1, i18n("Number of tiles"), "smalltiles" ) ); - return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); } -KisFilterConfiguration* KisSmallTilesFilter::configuration(QWidget* nwidget) +KisFilterConfiguration* KisSmallTilesFilter::configuration(TQWidget* nwidget) { KisMultiIntegerFilterWidget* widget = (KisMultiIntegerFilterWidget*) nwidget; if( widget == 0 ) diff --git a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h index 41346a1e..8d82eda2 100644 --- a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h +++ b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h @@ -27,19 +27,19 @@ class KisSmallTilesFilterConfiguration : public KisFilterConfiguration { public: - KisSmallTilesFilterConfiguration(Q_UINT32 numberOfTiles) + KisSmallTilesFilterConfiguration(TQ_UINT32 numberOfTiles) : KisFilterConfiguration( "smalltiles", 1 ) , m_numberOfTiles(numberOfTiles) {}; - virtual void fromXML( const QString& ); - virtual QString toString(); + virtual void fromXML( const TQString& ); + virtual TQString toString(); public: - inline Q_UINT32 numberOfTiles() { return m_numberOfTiles; }; + inline TQ_UINT32 numberOfTiles() { return m_numberOfTiles; }; private: - Q_UINT32 m_numberOfTiles; + TQ_UINT32 m_numberOfTiles; }; class KisSmallTilesFilter : public KisFilter @@ -49,7 +49,7 @@ public: KisSmallTilesFilter(); public: - virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("smalltiles", i18n("Small Tiles")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } @@ -59,12 +59,12 @@ public: { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisSmallTilesFilterConfiguration(2)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration * configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisSmallTilesFilterConfiguration( 2 ); }; private: - void createSmallTiles(KisPaintDeviceSP src, KisPaintDeviceSP dst, const QRect& rect, Q_UINT32 numberOfTiles); + void createSmallTiles(KisPaintDeviceSP src, KisPaintDeviceSP dst, const TQRect& rect, TQ_UINT32 numberOfTiles); }; #endif diff --git a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc index 6c51632c..5a514b75 100644 --- a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc +++ b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc @@ -26,13 +26,13 @@ typedef KGenericFactory<KisSmallTilesFilterPlugin> KisSmallTilesFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( kritasmalltilesfilter, KisSmallTilesFilterPluginFactory( "krita" ) ) -KisSmallTilesFilterPlugin::KisSmallTilesFilterPlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KisSmallTilesFilterPlugin::KisSmallTilesFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KisSmallTilesFilterPluginFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisSmallTilesFilter()); } } diff --git a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h index f26fc155..0ca6edaa 100644 --- a/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h +++ b/krita/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h @@ -25,7 +25,7 @@ class KisSmallTilesFilterPlugin : public KParts::Plugin { public: - KisSmallTilesFilterPlugin(QObject *parent, const char *name, const QStringList &); + KisSmallTilesFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KisSmallTilesFilterPlugin(); }; diff --git a/krita/plugins/filters/sobelfilter/kis_sobel_filter.cc b/krita/plugins/filters/sobelfilter/kis_sobel_filter.cc index 122887b4..1eff06c7 100644 --- a/krita/plugins/filters/sobelfilter/kis_sobel_filter.cc +++ b/krita/plugins/filters/sobelfilter/kis_sobel_filter.cc @@ -24,8 +24,8 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> -#include <qspinbox.h> +#include <tqpoint.h> +#include <tqspinbox.h> #include <klocale.h> #include <kiconloader.h> @@ -51,7 +51,7 @@ #define MIN(a,b) (((a)<(b))?(a):(b)) -void KisSobelFilterConfiguration::fromXML(const QString & s) +void KisSobelFilterConfiguration::fromXML(const TQString & s) { KisFilterConfiguration::fromXML(s); m_doHorizontally = getBool( "doHorizontally" ); @@ -59,7 +59,7 @@ void KisSobelFilterConfiguration::fromXML(const QString & s) m_keepSign = getBool( "makeOpaque" ); } -QString KisSobelFilterConfiguration::toString() +TQString KisSobelFilterConfiguration::toString() { m_properties.clear(); setProperty("doHorizontally", m_doHorizontally); @@ -74,7 +74,7 @@ KisSobelFilter::KisSobelFilter() : KisFilter(id(), "edge", i18n("&Sobel...")) { } -void KisSobelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const QRect& rect) +void KisSobelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* configuration, const TQRect& rect) { //read the filter configuration values from the KisFilterConfiguration object bool doHorizontally = ((KisSobelFilterConfiguration*)configuration)->doHorizontally(); @@ -86,14 +86,14 @@ void KisSobelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilt sobel(rect, src, dst, doHorizontally, doVertically, keepSign, makeOpaque); } -void KisSobelFilter::prepareRow (KisPaintDeviceSP src, Q_UINT8* data, Q_UINT32 x, Q_UINT32 y, Q_UINT32 w, Q_UINT32 h) +void KisSobelFilter::prepareRow (KisPaintDeviceSP src, TQ_UINT8* data, TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 w, TQ_UINT32 h) { if (y > h -1) y = h -1; - Q_UINT32 pixelSize = src->pixelSize(); + TQ_UINT32 pixelSize = src->pixelSize(); src->readBytes( data, x, y, w, 1 ); - for (Q_UINT32 b = 0; b < pixelSize; b++) { + for (TQ_UINT32 b = 0; b < pixelSize; b++) { int offset = pixelSize - b; data[-offset] = data[b]; data[w * pixelSize + b] = data[(w - 1) * pixelSize + b]; @@ -103,48 +103,48 @@ void KisSobelFilter::prepareRow (KisPaintDeviceSP src, Q_UINT8* data, Q_UINT32 x #define RMS(a, b) (sqrt ((a) * (a) + (b) * (b))) #define ROUND(x) ((int) ((x) + 0.5)) -void KisSobelFilter::sobel(const QRect & rc, KisPaintDeviceSP src, KisPaintDeviceSP dst, bool doHorizontal, bool doVertical, bool keepSign, bool makeOpaque) +void KisSobelFilter::sobel(const TQRect & rc, KisPaintDeviceSP src, KisPaintDeviceSP dst, bool doHorizontal, bool doVertical, bool keepSign, bool makeOpaque) { - QRect rect = rc; //src->exactBounds(); - Q_UINT32 x = rect.x(); - Q_UINT32 y = rect.y(); - Q_UINT32 width = rect.width(); - Q_UINT32 height = rect.height(); - Q_UINT32 pixelSize = src->pixelSize(); + TQRect rect = rc; //src->exactBounds(); + TQ_UINT32 x = rect.x(); + TQ_UINT32 y = rect.y(); + TQ_UINT32 width = rect.width(); + TQ_UINT32 height = rect.height(); + TQ_UINT32 pixelSize = src->pixelSize(); setProgressTotalSteps( height ); setProgressStage(i18n("Applying sobel filter..."),0); /* allocate row buffers */ - Q_UINT8* prevRow = new Q_UINT8[ (width + 2) * pixelSize]; + TQ_UINT8* prevRow = new TQ_UINT8[ (width + 2) * pixelSize]; Q_CHECK_PTR(prevRow); - Q_UINT8* curRow = new Q_UINT8[ (width + 2) * pixelSize]; + TQ_UINT8* curRow = new TQ_UINT8[ (width + 2) * pixelSize]; Q_CHECK_PTR(curRow); - Q_UINT8* nextRow = new Q_UINT8[ (width + 2) * pixelSize]; + TQ_UINT8* nextRow = new TQ_UINT8[ (width + 2) * pixelSize]; Q_CHECK_PTR(nextRow); - Q_UINT8* dest = new Q_UINT8[ width * pixelSize]; + TQ_UINT8* dest = new TQ_UINT8[ width * pixelSize]; Q_CHECK_PTR(dest); - Q_UINT8* pr = prevRow + pixelSize; - Q_UINT8* cr = curRow + pixelSize; - Q_UINT8* nr = nextRow + pixelSize; + TQ_UINT8* pr = prevRow + pixelSize; + TQ_UINT8* cr = curRow + pixelSize; + TQ_UINT8* nr = nextRow + pixelSize; prepareRow (src, pr, x, y - 1, width, height); prepareRow (src, cr, x, y, width, height); - Q_UINT32 counter =0; - Q_UINT8* d; - Q_UINT8* tmp; - Q_INT32 gradient, horGradient, verGradient; + TQ_UINT32 counter =0; + TQ_UINT8* d; + TQ_UINT8* tmp; + TQ_INT32 gradient, horGradient, verGradient; // loop through the rows, applying the sobel convolution - for (Q_UINT32 row = 0; row < height; row++) + for (TQ_UINT32 row = 0; row < height; row++) { // prepare the next row prepareRow (src, nr, x, row + 1, width, height); d = dest; - for (Q_UINT32 col = 0; col < width * pixelSize; col++) + for (TQ_UINT32 col = 0; col < width * pixelSize; col++) { int positive = col + pixelSize; int negative = col - pixelSize; @@ -157,10 +157,10 @@ void KisSobelFilter::sobel(const QRect & rc, KisPaintDeviceSP src, KisPaintDevic ((pr[negative] + 2 * cr[negative] + nr[negative]) - (pr[positive] + 2 * cr[positive] + nr[positive])) : 0); - gradient = (Q_INT32)((doVertical && doHorizontal) ? + gradient = (TQ_INT32)((doVertical && doHorizontal) ? (ROUND (RMS (horGradient, verGradient)) / 5.66) // always >0 : (keepSign ? (127 + (ROUND ((horGradient + verGradient) / 8.0))) - : (ROUND (QABS (horGradient + verGradient) / 4.0)))); + : (ROUND (TQABS (horGradient + verGradient) / 4.0)))); *d++ = gradient; if (gradient > 10) counter ++; @@ -195,17 +195,17 @@ void KisSobelFilter::sobel(const QRect & rc, KisPaintDeviceSP src, KisPaintDevic } -KisFilterConfigWidget * KisSobelFilter::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP) +KisFilterConfigWidget * KisSobelFilter::createConfigurationWidget(TQWidget* tqparent, 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(parent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiBoolFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); } -KisFilterConfiguration* KisSobelFilter::configuration(QWidget* nwidget) +KisFilterConfiguration* KisSobelFilter::configuration(TQWidget* nwidget) { KisMultiBoolFilterWidget* widget = (KisMultiBoolFilterWidget*) nwidget; if( widget == 0 ) diff --git a/krita/plugins/filters/sobelfilter/kis_sobel_filter.h b/krita/plugins/filters/sobelfilter/kis_sobel_filter.h index 9127cd3a..757757bc 100644 --- a/krita/plugins/filters/sobelfilter/kis_sobel_filter.h +++ b/krita/plugins/filters/sobelfilter/kis_sobel_filter.h @@ -35,8 +35,8 @@ public: , m_makeOpaque(makeOpaque) {}; - virtual void fromXML( const QString& ); - virtual QString toString(); + virtual void fromXML( const TQString& ); + virtual TQString toString(); public: inline bool doHorizontally() { return m_doHorizontally; }; @@ -56,7 +56,7 @@ class KisSobelFilter : public KisFilter public: KisSobelFilter(); public: - virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const QRect&); + virtual void process(KisPaintDeviceSP,KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); static inline KisID id() { return KisID("sobel", i18n("Sobel")); }; virtual bool supportsPainting() { return false; } virtual bool supportsPreview() { return true; } @@ -64,12 +64,12 @@ 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(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisSobelFilterConfiguration( true, true, true, true); }; private: - void prepareRow (KisPaintDeviceSP src, Q_UINT8* data, Q_UINT32 x, Q_UINT32 y, Q_UINT32 w, Q_UINT32 h); - void sobel(const QRect & rc, KisPaintDeviceSP src, KisPaintDeviceSP dst, bool doHorizontal, bool doVertical, bool keepSign, bool makeOpaque); + void prepareRow (KisPaintDeviceSP src, TQ_UINT8* data, TQ_UINT32 x, TQ_UINT32 y, TQ_UINT32 w, TQ_UINT32 h); + void sobel(const TQRect & rc, KisPaintDeviceSP src, KisPaintDeviceSP dst, bool doHorizontal, bool doVertical, bool keepSign, bool makeOpaque); }; #endif diff --git a/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc b/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc index cc3b31b1..72f0103d 100644 --- a/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc +++ b/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc @@ -26,13 +26,13 @@ typedef KGenericFactory<KisSobelFilterPlugin> KisSobelFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( kritasobelfilter, KisSobelFilterPluginFactory( "krita" ) ) -KisSobelFilterPlugin::KisSobelFilterPlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KisSobelFilterPlugin::KisSobelFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KisSobelFilterPluginFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisSobelFilter()); } } diff --git a/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h b/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h index 95a80905..1d6948df 100644 --- a/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h +++ b/krita/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h @@ -25,7 +25,7 @@ class KisSobelFilterPlugin : public KParts::Plugin { public: - KisSobelFilterPlugin(QObject *parent, const char *name, const QStringList &); + KisSobelFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KisSobelFilterPlugin(); }; diff --git a/krita/plugins/filters/threadtest/threadtest.cc b/krita/plugins/filters/threadtest/threadtest.cc index f965b7f3..c3b2cf55 100644 --- a/krita/plugins/filters/threadtest/threadtest.cc +++ b/krita/plugins/filters/threadtest/threadtest.cc @@ -19,9 +19,9 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> -#include <qrect.h> -#include <qthread.h> +#include <tqpoint.h> +#include <tqrect.h> +#include <tqthread.h> #include <klocale.h> #include <kiconloader.h> @@ -47,13 +47,13 @@ typedef KGenericFactory<KritaThreadTest> KritaThreadTestFactory; K_EXPORT_COMPONENT_FACTORY( kritathreadtest, KritaThreadTestFactory( "krita" ) ) -KritaThreadTest::KritaThreadTest(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaThreadTest::KritaThreadTest(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaThreadTestFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * r = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * r = dynamic_cast<KisFilterRegistry *>(tqparent); r->add(new KisFilterInvert()); } } @@ -62,35 +62,35 @@ KritaThreadTest::~KritaThreadTest() { } -class InversionThread : public QThread +class InversionThread : public TQThread { public: - InversionThread(const QString & name, KisPaintDeviceSP src, KisPaintDeviceSP dst, const QRect& rect) - : QThread() + InversionThread(const TQString & name, KisPaintDeviceSP src, KisPaintDeviceSP dst, const TQRect& rect) + : TQThread() , m_name(name) , m_src(src) , m_dst(dst) , m_rect(rect) { - kdDebug() << "Thread created " << m_name << ", " << QThread::currentThread() << ", " << m_rect << "\n"; + kdDebug() << "Thread created " << m_name << ", " << TQThread::currentThread() << ", " << m_rect << "\n"; }; void run() { - kdDebug() << "Thread started:" << m_name << ", " << QThread::currentThread() << "\n"; + kdDebug() << "Thread started:" << m_name << ", " << TQThread::currentThread() << "\n"; KisRectIteratorPixel dstIt = m_dst->createRectIterator(m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height(), true ); KisRectIteratorPixel srcIt = m_src->createRectIterator(m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height(), false); - Q_INT32 depth = m_src -> colorSpace() -> nColorChannels(); + TQ_INT32 depth = m_src -> colorSpace() -> nColorChannels(); kdDebug() << "Thread " << m_name << " starts loop \n"; while( ! srcIt.isDone() ) { if ( srcIt.isSelected() ) { for( int i = 0; i < depth; i++) { - dstIt.rawData()[i] = Q_UINT8_MAX - srcIt.oldRawData()[i]; + dstIt.rawData()[i] = TQ_UINT8_MAX - srcIt.oldRawData()[i]; } } ++srcIt; @@ -100,10 +100,10 @@ public: }; private: - QString m_name; + TQString m_name; KisPaintDeviceSP m_src; KisPaintDeviceSP m_dst; - QRect m_rect; + TQRect m_rect; }; @@ -111,17 +111,17 @@ KisFilterInvert::KisFilterInvert() : KisFilter(id(), "colors", i18n("Invert with { } -void KisFilterInvert::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* /*config*/, const QRect& rect) +void KisFilterInvert::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* /*config*/, const TQRect& rect) { kdDebug() << "Going to invert " << rect << "\n"; int h2 = rect.height() / 2; int w2 = rect.width() / 2; setProgressTotalSteps(4); - InversionThread t1("t1", src, dst, QRect(0, 0, w2, h2)); - InversionThread t2("t2", src, dst, QRect(w2, 0, w2, h2)); - InversionThread t3("t3", src, dst, QRect(0, h2, w2, h2)); - InversionThread t4("t4", src, dst, QRect(w2, h2, w2, h2)); + InversionThread t1("t1", src, dst, TQRect(0, 0, w2, h2)); + InversionThread t2("t2", src, dst, TQRect(w2, 0, w2, h2)); + InversionThread t3("t3", src, dst, TQRect(0, h2, w2, h2)); + InversionThread t4("t4", src, dst, TQRect(w2, h2, w2, h2)); t1.start(); t2.start(); diff --git a/krita/plugins/filters/threadtest/threadtest.h b/krita/plugins/filters/threadtest/threadtest.h index da3ff44e..8c1e5a32 100644 --- a/krita/plugins/filters/threadtest/threadtest.h +++ b/krita/plugins/filters/threadtest/threadtest.h @@ -27,7 +27,7 @@ class KritaThreadTest : public KParts::Plugin { public: - KritaThreadTest(QObject *parent, const char *name, const QStringList &); + KritaThreadTest(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaThreadTest(); }; @@ -36,7 +36,7 @@ class KisFilterInvert : public KisFilter public: KisFilterInvert(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); static inline KisID id() { return KisID("invertthread", i18n("Invert with Threads")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } diff --git a/krita/plugins/filters/unsharp/kis_unsharp_filter.cc b/krita/plugins/filters/unsharp/kis_unsharp_filter.cc index aeecd7db..7ca942bd 100644 --- a/krita/plugins/filters/unsharp/kis_unsharp_filter.cc +++ b/krita/plugins/filters/unsharp/kis_unsharp_filter.cc @@ -31,16 +31,16 @@ #include "kis_wdg_unsharp.h" #include "wdgunsharp.h" -KisKernelSP kernelFromQImage(const QImage& img) +KisKernelSP kernelFromTQImage(const TQImage& img) { KisKernelSP k = new KisKernel; k->width = img.width(); k->height = img.height(); k->offset = 0; uint count = k->width * k->height; - k->data = new Q_INT32[count]; - Q_INT32* itData = k->data; - Q_UINT8* itImg = img.bits(); + k->data = new TQ_INT32[count]; + TQ_INT32* itData = k->data; + TQ_UINT8* itImg = img.bits(); k->factor = 0; for(uint i = 0; i < count; ++i , ++itData, itImg+=4) { @@ -55,12 +55,12 @@ KisUnsharpFilter::KisUnsharpFilter() : KisFilter(id(), "enhance", i18n("&Unsharp { } -KisFilterConfigWidget * KisUnsharpFilter::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisUnsharpFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) { - return new KisWdgUnsharp(this, parent, "configuration of color to alpha"); + return new KisWdgUnsharp(this, tqparent, "configuration of color to alpha"); } -KisFilterConfiguration* KisUnsharpFilter::configuration(QWidget* w) +KisFilterConfiguration* KisUnsharpFilter::configuration(TQWidget* w) { KisWdgUnsharp * wCTA = dynamic_cast<KisWdgUnsharp*>(w); KisFilterConfiguration* config = new KisFilterConfiguration(id().id(), 1); @@ -74,7 +74,7 @@ KisFilterConfiguration* KisUnsharpFilter::configuration(QWidget* w) return 0; } -void KisUnsharpFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisUnsharpFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { Q_ASSERT(src != 0); Q_ASSERT(dst != 0); @@ -83,7 +83,7 @@ void KisUnsharpFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi if(!config) config = new KisFilterConfiguration(id().id(), 1); - QVariant value; + TQVariant value; uint halfSize = (config->getProperty("halfSize", value)) ? value.toUInt() : 4; uint size = 2 * halfSize + 1; double amount = (config->getProperty("amount", value)) ? value.toDouble() : 0.5; @@ -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); - QImage mask; - kas->createBrush(&mask); + TQImage tqmask; + kas->createBrush(&tqmask); - KisKernelSP kernel = kernelFromQImage(mask); // TODO: for 1.6 reuse the krita's core function for creating kernel : KisKernel::fromQImage + KisKernelSP kernel = kernelFromTQImage(tqmask); // TODO: for 1.6 reuse the krita's core function for creating kernel : KisKernel::fromTQImage KisPaintDeviceSP interm = new KisPaintDevice(*src); KisColorSpace * cs = src->colorSpace(); @@ -112,14 +112,14 @@ void KisUnsharpFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi KisHLineIteratorPixel srcIt = src->createHLineIterator(rect.x(), rect.y(), rect.width(), false); KisHLineIteratorPixel intermIt = interm->createHLineIterator(rect.x(), rect.y(), rect.width(), false); - Q_UINT8 *colors[2]; + TQ_UINT8 *colors[2]; int pixelsProcessed = 0; - Q_INT32 weights[2]; + TQ_INT32 weights[2]; /* weights[0] = 128; - Q_INT32 factor = (Q_UINT32) 128 / amount; + TQ_INT32 factor = (TQ_UINT32) 128 / amount; weights[1] = (factor - 128);*/ - Q_INT32 factor = 128; + TQ_INT32 factor = 128; weights[0] = factor * ( 1. + amount); weights[1] = -factor * amount; kdDebug() << (int) weights[0] << " " << (int)weights[1] << " " << factor << endl; @@ -129,7 +129,7 @@ void KisUnsharpFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi { if(srcIt.isSelected()) { - Q_UINT8 diff = cs->difference(srcIt.oldRawData(), intermIt.rawData()); + TQ_UINT8 diff = cs->difference(srcIt.oldRawData(), intermIt.rawData()); if( diff > threshold) { colors[0] = srcIt.rawData(); diff --git a/krita/plugins/filters/unsharp/kis_unsharp_filter.h b/krita/plugins/filters/unsharp/kis_unsharp_filter.h index 3b1dc882..e7b251f0 100644 --- a/krita/plugins/filters/unsharp/kis_unsharp_filter.h +++ b/krita/plugins/filters/unsharp/kis_unsharp_filter.h @@ -32,16 +32,16 @@ class KisUnsharpFilter : public KisFilter public: KisUnsharpFilter(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); - static inline KisID id() { return KisID("unsharpmask", i18n("Unsharp Mask")); }; + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); + static inline KisID id() { return KisID("unsharptqmask", 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(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); }; #endif diff --git a/krita/plugins/filters/unsharp/kis_wdg_unsharp.cc b/krita/plugins/filters/unsharp/kis_wdg_unsharp.cc index 101d5601..10b989e0 100644 --- a/krita/plugins/filters/unsharp/kis_wdg_unsharp.cc +++ b/krita/plugins/filters/unsharp/kis_wdg_unsharp.cc @@ -20,8 +20,8 @@ #include "kis_wdg_unsharp.h" -#include <qlayout.h> -#include <qtoolbutton.h> +#include <tqlayout.h> +#include <tqtoolbutton.h> #include <kcombobox.h> #include <knuminput.h> @@ -30,20 +30,20 @@ #include "wdgunsharp.h" -KisWdgUnsharp::KisWdgUnsharp( KisFilter* , QWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) +KisWdgUnsharp::KisWdgUnsharp( KisFilter* , TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) { - QGridLayout *widgetLayout = new QGridLayout(this, 1, 1); + TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgUnsharp(this); widgetLayout -> addWidget(m_widget,0,0); - connect( widget()->intHalfSize, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->doubleAmount, SIGNAL( valueChanged(double)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intThreshold, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intHalfSize, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->doubleAmount, TQT_SIGNAL( valueChanged(double)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intThreshold, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); } void KisWdgUnsharp::setConfiguration(KisFilterConfiguration* config) { - QVariant value; + TQVariant value; widget()->intHalfSize->setValue( (config->getProperty("halfSize", value)) ? value.toUInt() : 4 ); widget()->doubleAmount->setValue( (config->getProperty("amount", value)) ? value.toDouble() : 0.1 ); widget()->intThreshold->setValue( (config->getProperty("threshold", value)) ? value.toUInt() : 20 ); diff --git a/krita/plugins/filters/unsharp/kis_wdg_unsharp.h b/krita/plugins/filters/unsharp/kis_wdg_unsharp.h index 1c4fd560..173916ac 100644 --- a/krita/plugins/filters/unsharp/kis_wdg_unsharp.h +++ b/krita/plugins/filters/unsharp/kis_wdg_unsharp.h @@ -33,8 +33,9 @@ class WdgUnsharp; class KisWdgUnsharp : public KisFilterConfigWidget { Q_OBJECT + TQ_OBJECT public: - KisWdgUnsharp( KisFilter* nfilter, QWidget * parent, const char * name); + KisWdgUnsharp( KisFilter* nfilter, TQWidget * tqparent, const char * name); inline WdgUnsharp* widget() { return m_widget; }; virtual void setConfiguration(KisFilterConfiguration*); private: diff --git a/krita/plugins/filters/unsharp/unsharp.cc b/krita/plugins/filters/unsharp/unsharp.cc index 15170eff..cee34e77 100644 --- a/krita/plugins/filters/unsharp/unsharp.cc +++ b/krita/plugins/filters/unsharp/unsharp.cc @@ -27,8 +27,8 @@ typedef KGenericFactory<UnsharpPlugin> UnsharpPluginFactory; K_EXPORT_COMPONENT_FACTORY( kritaunsharpfilter, UnsharpPluginFactory( "krita" ) ) -UnsharpPlugin::UnsharpPlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +UnsharpPlugin::UnsharpPlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(UnsharpPluginFactory::instance()); @@ -36,11 +36,11 @@ UnsharpPlugin::UnsharpPlugin(QObject *parent, const char *name, const QStringLis kdDebug(41006) << "Extensions Image enhancement Filters plugin. Class: " << className() << ", Parent: " - << parent -> className() + << tqparent -> className() << "\n"; - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisUnsharpFilter()); } } diff --git a/krita/plugins/filters/unsharp/unsharp.h b/krita/plugins/filters/unsharp/unsharp.h index 410b7568..95a12ffa 100644 --- a/krita/plugins/filters/unsharp/unsharp.h +++ b/krita/plugins/filters/unsharp/unsharp.h @@ -30,7 +30,7 @@ class UnsharpPlugin : public KParts::Plugin { public: - UnsharpPlugin(QObject *parent, const char *name, const QStringList &); + UnsharpPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~UnsharpPlugin(); }; diff --git a/krita/plugins/filters/unsharp/wdgunsharp.ui b/krita/plugins/filters/unsharp/wdgunsharp.ui index 1acaadab..376ed16e 100644 --- a/krita/plugins/filters/unsharp/wdgunsharp.ui +++ b/krita/plugins/filters/unsharp/wdgunsharp.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgUnsharp</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgUnsharp</cstring> </property> @@ -36,7 +36,7 @@ <number>1000</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -58,7 +58,7 @@ <number>2</number> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -66,7 +66,7 @@ <string>Threshold:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -115,7 +115,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -126,7 +126,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/filters/wavefilter/kis_wdg_wave.cpp b/krita/plugins/filters/wavefilter/kis_wdg_wave.cpp index bcc47103..1947277c 100644 --- a/krita/plugins/filters/wavefilter/kis_wdg_wave.cpp +++ b/krita/plugins/filters/wavefilter/kis_wdg_wave.cpp @@ -20,28 +20,28 @@ #include "kis_wdg_wave.h" -#include <qlayout.h> +#include <tqlayout.h> #include <kcombobox.h> #include <knuminput.h> #include "wdgwaveoptions.h" -KisWdgWave::KisWdgWave(KisFilter* /*nfilter*/, QWidget* parent, const char* name) - : KisFilterConfigWidget(parent,name) +KisWdgWave::KisWdgWave(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name) + : KisFilterConfigWidget(tqparent,name) { - QGridLayout *widgetLayout = new QGridLayout(this, 1, 1); + TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgWaveOptions(this); widgetLayout -> addWidget(m_widget, 0, 0); - connect( widget()->intHWavelength, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intHShift, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intHAmplitude, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->cbHShape, SIGNAL( activated(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intVWavelength, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intVShift, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->intVAmplitude, SIGNAL( valueChanged(int)), SIGNAL(sigPleaseUpdatePreview())); - connect( widget()->cbVShape, SIGNAL( activated(int)), SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intHWavelength, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intHShift, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intHAmplitude, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->cbHShape, TQT_SIGNAL( activated(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intVWavelength, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intVShift, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->intVAmplitude, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); + connect( widget()->cbVShape, TQT_SIGNAL( activated(int)), TQT_SIGNAL(sigPleaseUpdatePreview())); } KisWdgWave::~KisWdgWave() @@ -50,7 +50,7 @@ KisWdgWave::~KisWdgWave() void KisWdgWave::setConfiguration(KisFilterConfiguration* config) { - QVariant value; + TQVariant value; if (config->getProperty("horizontalwavelength", value)) { widget()->intHWavelength->setValue( value.toUInt() ); @@ -63,7 +63,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config) { widget()->intHAmplitude->setValue( value.toUInt() ); } - if (config->getProperty("horizontalshape", value)) + if (config->getProperty("horizontaltqshape", value)) { widget()->cbHShape->setCurrentItem( value.toUInt() ); } @@ -79,7 +79,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config) { widget()->intVAmplitude->setValue( value.toUInt() ); } - if (config->getProperty("verticalshape", value)) + if (config->getProperty("verticaltqshape", value)) { widget()->cbVShape->setCurrentItem( value.toUInt() ); } diff --git a/krita/plugins/filters/wavefilter/kis_wdg_wave.h b/krita/plugins/filters/wavefilter/kis_wdg_wave.h index e71082d1..edb5fddf 100644 --- a/krita/plugins/filters/wavefilter/kis_wdg_wave.h +++ b/krita/plugins/filters/wavefilter/kis_wdg_wave.h @@ -29,8 +29,9 @@ class KisFilter; class KisWdgWave : public KisFilterConfigWidget { Q_OBJECT + TQ_OBJECT public: - KisWdgWave(KisFilter* nfilter, QWidget* parent = 0, const char* name = 0); + KisWdgWave(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0); ~KisWdgWave(); public: inline WdgWaveOptions* widget() { return m_widget; }; diff --git a/krita/plugins/filters/wavefilter/wavefilter.cc b/krita/plugins/filters/wavefilter/wavefilter.cc index af6332bb..00977a84 100644 --- a/krita/plugins/filters/wavefilter/wavefilter.cc +++ b/krita/plugins/filters/wavefilter/wavefilter.cc @@ -23,7 +23,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <kcombobox.h> #include <kdebug.h> @@ -83,14 +83,14 @@ class KisTriangleWaveCurve : public KisWaveCurve { -KritaWaveFilter::KritaWaveFilter(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaWaveFilter::KritaWaveFilter(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaWaveFilterFactory::instance()); - if (parent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); + if (tqparent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); manager->add(new KisFilterWave()); } } @@ -103,7 +103,7 @@ KisFilterWave::KisFilterWave() : KisFilter(id(), "other", i18n("&Wave...")) { } -KisFilterConfiguration* KisFilterWave::configuration(QWidget* w) +KisFilterConfiguration* KisFilterWave::configuration(TQWidget* w) { KisWdgWave* wN = dynamic_cast<KisWdgWave*>(w); KisFilterConfiguration* config = new KisFilterConfiguration(id().id(), 1); @@ -112,44 +112,44 @@ KisFilterConfiguration* KisFilterWave::configuration(QWidget* w) config->setProperty("horizontalwavelength", wN->widget()->intHWavelength->value() ); config->setProperty("horizontalshift", wN->widget()->intHShift->value() ); config->setProperty("horizontalamplitude", wN->widget()->intHAmplitude->value() ); - config->setProperty("horizontalshape", wN->widget()->cbHShape->currentItem() ); + config->setProperty("horizontaltqshape", wN->widget()->cbHShape->currentItem() ); config->setProperty("verticalwavelength", wN->widget()->intVWavelength->value() ); config->setProperty("verticalshift", wN->widget()->intVShift->value() ); config->setProperty("verticalamplitude", wN->widget()->intVAmplitude->value() ); - config->setProperty("verticalshape", wN->widget()->cbVShape->currentItem() ); + config->setProperty("verticaltqshape", wN->widget()->cbVShape->currentItem() ); } return config; } -KisFilterConfigWidget * KisFilterWave::createConfigurationWidget(QWidget* parent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisFilterWave::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) { - return new KisWdgWave((KisFilter*)this, (QWidget*)parent, i18n("Configuration of wave filter").ascii()); + return new KisWdgWave((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of wave filter").ascii()); } -void KisFilterWave::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const QRect& rect) +void KisFilterWave::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) { Q_ASSERT(src != 0); Q_ASSERT(dst != 0); setProgressTotalSteps(rect.width() * rect.height()); - QVariant value; + TQVariant value; int horizontalwavelength = (config && config->getProperty("horizontalwavelength", value)) ? value.toInt() : 50; int horizontalshift = (config && config->getProperty("horizontalshift", value)) ? value.toInt() : 50; int horizontalamplitude = (config && config->getProperty("horizontalamplitude", value)) ? value.toInt() : 4; - int horizontalshape = (config && config->getProperty("horizontalshape", value)) ? value.toInt() : 0; + int horizontaltqshape = (config && config->getProperty("horizontaltqshape", value)) ? value.toInt() : 0; int verticalwavelength = (config && config->getProperty("verticalwavelength", value)) ? value.toInt() : 50; int verticalshift = (config && config->getProperty("verticalshift", value)) ? value.toInt() : 50; int verticalamplitude = (config && config->getProperty("verticalamplitude", value)) ? value.toInt() : 4; - int verticalshape = (config && config->getProperty("verticalshape", value)) ? value.toInt() : 0; + int verticaltqshape = (config && config->getProperty("verticaltqshape", value)) ? value.toInt() : 0; KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true ); KisWaveCurve* verticalcurve; - if(verticalshape == 1) + if(verticaltqshape == 1) verticalcurve = new KisTriangleWaveCurve(verticalamplitude, verticalwavelength, verticalshift); else verticalcurve = new KisSinusoidalWaveCurve(verticalamplitude, verticalwavelength, verticalshift); KisWaveCurve* horizontalcurve; - if(horizontalshape == 1) + if(horizontaltqshape == 1) horizontalcurve = new KisTriangleWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift); else horizontalcurve = new KisSinusoidalWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift); diff --git a/krita/plugins/filters/wavefilter/wavefilter.h b/krita/plugins/filters/wavefilter/wavefilter.h index 1eb49c11..d57dfcf3 100644 --- a/krita/plugins/filters/wavefilter/wavefilter.h +++ b/krita/plugins/filters/wavefilter/wavefilter.h @@ -29,7 +29,7 @@ class KisFilterConfigWidget; class KritaWaveFilter : public KParts::Plugin { public: - KritaWaveFilter(QObject *parent, const char *name, const QStringList &); + KritaWaveFilter(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaWaveFilter(); }; @@ -38,7 +38,7 @@ class KisFilterWave : public KisFilter public: KisFilterWave(); public: - virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const QRect&); + virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; static inline KisID id() { return KisID("wave", i18n("Wave")); }; virtual bool supportsPainting() { return true; } @@ -46,8 +46,8 @@ class KisFilterWave : public KisFilter virtual bool supportsIncrementalPainting() { return false; } virtual bool supportsAdjustmentLayers() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(QWidget* parent, KisPaintDeviceSP dev); - virtual KisFilterConfiguration* configuration(QWidget*); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfiguration* configuration(TQWidget*); }; #endif diff --git a/krita/plugins/filters/wavefilter/wdgwaveoptions.ui b/krita/plugins/filters/wavefilter/wdgwaveoptions.ui index e6bb0416..10fff389 100644 --- a/krita/plugins/filters/wavefilter/wdgwaveoptions.ui +++ b/krita/plugins/filters/wavefilter/wdgwaveoptions.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgWaveOptions</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgWaveOptions</cstring> </property> @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>60</width> <height>20</height> @@ -46,14 +46,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -64,7 +64,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -86,7 +86,7 @@ <number>1000000</number> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -108,7 +108,7 @@ <number>1000000</number> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -145,7 +145,7 @@ <cstring>cbHShape</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -155,7 +155,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>Vertical_wave</cstring> </property> @@ -166,7 +166,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -188,7 +188,7 @@ <number>1000000</number> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -210,7 +210,7 @@ <number>1000000</number> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2_2_2</cstring> </property> @@ -247,7 +247,7 @@ <cstring>cbVShape</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -261,7 +261,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc b/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc index e23fd3cf..c44a31c8 100644 --- a/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc +++ b/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc @@ -42,15 +42,15 @@ typedef KGenericFactory<DefaultPaintOpsPlugin> DefaultPaintOpsPluginFactory; K_EXPORT_COMPONENT_FACTORY( kritadefaultpaintops, DefaultPaintOpsPluginFactory( "kritacore" ) ) -DefaultPaintOpsPlugin::DefaultPaintOpsPlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +DefaultPaintOpsPlugin::DefaultPaintOpsPlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(DefaultPaintOpsPluginFactory::instance()); // This is not a gui plugin; only load it when the doc is created. - if ( parent->inherits("KisPaintOpRegistry") ) + if ( tqparent->inherits("KisPaintOpRegistry") ) { - KisPaintOpRegistry * r = dynamic_cast<KisPaintOpRegistry*>(parent); + KisPaintOpRegistry * r = dynamic_cast<KisPaintOpRegistry*>(tqparent); // Add hard-coded paint ops. Plugin paintops will add // themselves in the plugin initialization code. r->add ( new KisAirbrushOpFactory ); diff --git a/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h b/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h index 402ae4a2..d7afb9d0 100644 --- a/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h +++ b/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h @@ -27,8 +27,9 @@ class DefaultPaintOpsPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - DefaultPaintOpsPlugin(QObject *parent, const char *name, const QStringList &); + DefaultPaintOpsPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~DefaultPaintOpsPlugin(); }; diff --git a/krita/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/krita/plugins/paintops/defaultpaintops/kis_airbrushop.cc index 6f2e5cb1..db320bec 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_airbrushop.cc +++ b/krita/plugins/paintops/defaultpaintops/kis_airbrushop.cc @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qrect.h> +#include <tqrect.h> #include <kdebug.h> @@ -59,18 +59,18 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info // // Most graphics apps -- especially the simple ones like Kolourpaint // and the previous version of this routine in Krita took a brush -// shape -- often a simple ellipse -- and filled that shape with a +// tqshape -- often a simple ellipse -- and filled that tqshape with a // random 'spray' of single pixels. // // Other, more advanced graphics apps, like the Gimp or Photoshop, -// take the brush shape and paint just as with the brush paint op, +// take the brush tqshape and paint just as with the brush paint op, // only making the initial dab more transparent, and perhaps adding // extra transparence near the edges. Then, using a timer, when the // cursor stays in place, dab upon dab is positioned in the same // place, which makes the result less and less transparent. // // What I want to do here is create an airbrush that approaches a real -// one. It won't use brush shapes, instead going for the old-fashioned +// one. It won't use brush tqshapes, instead going for the old-fashioned // circle. Depending upon pressure, both the size of the dab and the // rate of paint deposition is determined. The edges of the dab are // more transparent than the center, with perhaps even some fully @@ -91,7 +91,7 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info KisPaintDeviceSP device = m_painter->device(); - // For now: use the current brush shape -- it beats calculating + // For now: use the current brush tqshape -- it beats calculating // ellipes and cones, and it shows the working of the timer. if (!device) return; @@ -103,9 +103,9 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info KisPoint hotSpot = brush->hotSpot(info); KisPoint pt = pos - hotSpot; - Q_INT32 x; + TQ_INT32 x; double xFraction; - Q_INT32 y; + TQ_INT32 y; double yFraction; splitCoordinate(pt.x(), &x, &xFraction); @@ -115,15 +115,15 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info dab = brush->image(device->colorSpace(), info, xFraction, yFraction); } else { - KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction); - dab = computeDab(mask); + KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction); + dab = computeDab(tqmask); } m_painter->setDab(dab); // Cache dab for future paints in the painter. m_painter->setPressure(info.pressure); // Cache pressure in the current painter. - QRect dabRect = QRect(0, 0, brush->maskWidth(info), brush->maskHeight(info)); - QRect dstRect = QRect(x, y, dabRect.width(), dabRect.height()); + TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info)); + TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height()); KisImage * image = device->image(); @@ -133,10 +133,10 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info if (dstRect.isNull() || dstRect.isEmpty() || !dstRect.isValid()) return; - Q_INT32 sx = dstRect.x() - x; - Q_INT32 sy = dstRect.y() - y; - Q_INT32 sw = dstRect.width(); - Q_INT32 sh = dstRect.height(); + TQ_INT32 sx = dstRect.x() - x; + TQ_INT32 sy = dstRect.y() - y; + TQ_INT32 sw = dstRect.width(); + TQ_INT32 sh = dstRect.height(); if (m_source->hasSelection()) { m_painter->bltSelection(dstRect.x(), dstRect.y(), m_painter->compositeOp(), dab.data(), diff --git a/krita/plugins/paintops/defaultpaintops/kis_airbrushop.h b/krita/plugins/paintops/defaultpaintops/kis_airbrushop.h index 7e751d3e..805664d7 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_airbrushop.h +++ b/krita/plugins/paintops/defaultpaintops/kis_airbrushop.h @@ -36,7 +36,7 @@ public: virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter); virtual KisID id() { return KisID("airbrush", i18n("Pixel Airbrush")); } - virtual QString pixmap() { return "airbrush.png"; } + virtual TQString pixmap() { return "airbrush.png"; } }; diff --git a/krita/plugins/paintops/defaultpaintops/kis_brushop.cc b/krita/plugins/paintops/defaultpaintops/kis_brushop.cc index 4a7485e5..360fa66e 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_brushop.cc +++ b/krita/plugins/paintops/defaultpaintops/kis_brushop.cc @@ -22,12 +22,12 @@ #include <string.h> -#include <qrect.h> -#include <qwidget.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qtoolbutton.h> +#include <tqrect.h> +#include <tqwidget.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqtoolbutton.h> #include <kdebug.h> @@ -55,22 +55,22 @@ KisPaintOp * KisBrushOpFactory::createOp(const KisPaintOpSettings *settings, Kis return op; } -KisBrushOpSettings::KisBrushOpSettings(QWidget *parent) - : super(parent) +KisBrushOpSettings::KisBrushOpSettings(TQWidget *tqparent) + : super(tqparent) { - m_optionsWidget = new QWidget(parent, "brush option widget"); - QHBoxLayout * l = new QHBoxLayout(m_optionsWidget); + m_optionsWidget = new TQWidget(tqparent, "brush option widget"); + TQHBoxLayout * l = new TQHBoxLayout(m_optionsWidget); l->setAutoAdd(true); - m_pressureVariation = new QLabel(i18n("Pressure variation: "), m_optionsWidget); - m_size = new QCheckBox(i18n("Size"), m_optionsWidget); + m_pressureVariation = new TQLabel(i18n("Pressure variation: "), m_optionsWidget); + m_size = new TQCheckBox(i18n("Size"), m_optionsWidget); m_size->setChecked(true); - m_opacity = new QCheckBox(i18n("Opacity"), m_optionsWidget); - m_darken = new QCheckBox(i18n("Darken"), m_optionsWidget); + m_opacity = new TQCheckBox(i18n("Opacity"), m_optionsWidget); + m_darken = new TQCheckBox(i18n("Darken"), m_optionsWidget); m_curveControl = new WdgBrushCurveControl(m_optionsWidget); - QToolButton* moreButton = new QToolButton(Qt::UpArrow, m_optionsWidget); - moreButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - moreButton->setMinimumSize(QSize(24,24)); // Bah, I had hoped the above line would make this unneeded - connect(moreButton, SIGNAL(clicked()), this, SLOT(slotCustomCurves())); + TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget); + moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded + connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves())); m_customSize = false; m_customOpacity = false; @@ -79,7 +79,7 @@ KisBrushOpSettings::KisBrushOpSettings(QWidget *parent) } void KisBrushOpSettings::slotCustomCurves() { - if (m_curveControl->exec() == QDialog::Accepted) { + if (m_curveControl->exec() == TQDialog::Accepted) { m_customSize = m_curveControl->sizeCheckbox->isChecked(); m_customOpacity = m_curveControl->opacityCheckbox->isChecked(); m_customDarken = m_curveControl->darkenCheckbox->isChecked(); @@ -125,13 +125,13 @@ bool KisBrushOpSettings::varyDarken() const return m_darken->isChecked(); } -KisPaintOpSettings* KisBrushOpFactory::settings(QWidget * parent, const KisInputDevice& inputDevice) +KisPaintOpSettings* KisBrushOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice) { if (inputDevice == KisInputDevice::mouse()) { // No options for mouse, only tablet devices return 0; } else { - return new KisBrushOpSettings(parent); + return new KisBrushOpSettings(tqparent); } } @@ -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 == mask - // retrieve mask + // if brush == tqmask + // retrieve tqmask // else if brush == image // retrieve image - // subsample (mask | image) for position -- pos should be double! - // apply filters to mask (colour | gradient | pattern | etc. - // composite filtered mask into temporary layer + // subsample (tqmask | image) for position -- pos should be double! + // apply filters to tqmask (colour | gradient | pattern | etc. + // composite filtered tqmask into temporary layer // composite temporary layer into target layer // @see: doc/brush.txt @@ -207,9 +207,9 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) // Split the coordinates into integer plus fractional parts. The integer // is where the dab will be positioned and the fractional part determines // the sub-pixel positioning. - Q_INT32 x; + TQ_INT32 x; double xFraction; - Q_INT32 y; + TQ_INT32 y; double yFraction; splitCoordinate(pt.x(), &x, &xFraction); @@ -217,24 +217,24 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) KisPaintDeviceSP dab = 0; - Q_UINT8 origOpacity = m_painter->opacity(); + TQ_UINT8 origOpacity = m_painter->opacity(); KisColor origColor = m_painter->paintColor(); if (m_pressureOpacity) { if (!m_customOpacity) - m_painter->setOpacity((Q_INT8)(origOpacity * info.pressure)); + m_painter->setOpacity((TQ_INT8)(origOpacity * info.pressure)); else - m_painter->setOpacity((Q_INT8)(origOpacity * scaleToCurve(info.pressure, m_opacityCurve))); + m_painter->setOpacity((TQ_INT8)(origOpacity * scaleToCurve(info.pressure, m_opacityCurve))); } if (m_pressureDarken) { KisColor darkened = origColor; // Darken docs aren't really clear about what exactly the amount param can have as value... - Q_UINT32 darkenAmount; + TQ_UINT32 darkenAmount; if (!m_customDarken) - darkenAmount = (Q_INT32)(255 - 75 * info.pressure); + darkenAmount = (TQ_INT32)(255 - 75 * info.pressure); else - darkenAmount = (Q_INT32)(255 - 75 * scaleToCurve(info.pressure, m_darkenCurve)); + darkenAmount = (TQ_INT32)(255 - 75 * scaleToCurve(info.pressure, m_darkenCurve)); darkened.colorSpace()->darken(origColor.data(), darkened.data(), darkenAmount, false, 0.0, 1); @@ -245,15 +245,15 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) dab = brush->image(device->colorSpace(), adjustedInfo, xFraction, yFraction); } else { - KisAlphaMaskSP mask = brush->mask(adjustedInfo, xFraction, yFraction); - dab = computeDab(mask); + KisAlphaMaskSP tqmask = brush->tqmask(adjustedInfo, xFraction, yFraction); + dab = computeDab(tqmask); } m_painter->setPressure(adjustedInfo.pressure); - QRect dabRect = QRect(0, 0, brush->maskWidth(adjustedInfo), - brush->maskHeight(adjustedInfo)); - QRect dstRect = QRect(x, y, dabRect.width(), dabRect.height()); + TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(adjustedInfo), + brush->tqmaskHeight(adjustedInfo)); + TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height()); KisImage * image = device->image(); @@ -263,10 +263,10 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) if (dstRect.isNull() || dstRect.isEmpty() || !dstRect.isValid()) return; - Q_INT32 sx = dstRect.x() - x; - Q_INT32 sy = dstRect.y() - y; - Q_INT32 sw = dstRect.width(); - Q_INT32 sh = dstRect.height(); + TQ_INT32 sx = dstRect.x() - x; + TQ_INT32 sy = dstRect.y() - y; + TQ_INT32 sw = dstRect.width(); + TQ_INT32 sh = dstRect.height(); if (m_source->hasSelection()) { m_painter->bltSelection(dstRect.x(), dstRect.y(), m_painter->compositeOp(), dab.data(), diff --git a/krita/plugins/paintops/defaultpaintops/kis_brushop.h b/krita/plugins/paintops/defaultpaintops/kis_brushop.h index ecaf3ad2..6475b3d7 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_brushop.h +++ b/krita/plugins/paintops/defaultpaintops/kis_brushop.h @@ -25,9 +25,9 @@ #include "kis_paintop.h" -class QWidget; -class QCheckBox; -class QLabel; +class TQWidget; +class TQCheckBox; +class TQLabel; class KisPoint; class KisPainter; class KCurve; @@ -41,15 +41,16 @@ public: virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter); virtual KisID id() { return KisID("paintbrush", i18n("Pixel Brush")); } - virtual QString pixmap() { return "paintbrush.png"; } - virtual KisPaintOpSettings *settings(QWidget * parent, const KisInputDevice& inputDevice); + virtual TQString pixmap() { return "paintbrush.png"; } + virtual KisPaintOpSettings *settings(TQWidget * tqparent, const KisInputDevice& inputDevice); }; -class KisBrushOpSettings : public QObject, public KisPaintOpSettings { +class KisBrushOpSettings : public TQObject, public KisPaintOpSettings { Q_OBJECT + TQ_OBJECT typedef KisPaintOpSettings super; public: - KisBrushOpSettings(QWidget *parent); + KisBrushOpSettings(TQWidget *tqparent); bool varySize() const; bool varyOpacity() const; @@ -62,16 +63,16 @@ public: const double* opacityCurve() const { return m_opacityCurve; } const double* darkenCurve() const { return m_darkenCurve; } - virtual QWidget *widget() const { return m_optionsWidget; } + virtual TQWidget *widget() const { return m_optionsWidget; } private slots: void slotCustomCurves(); private: void transferCurve(KCurve* curve, double* target); - QWidget *m_optionsWidget; - QLabel * m_pressureVariation; - QCheckBox * m_size; - QCheckBox * m_opacity; - QCheckBox * m_darken; + TQWidget *m_optionsWidget; + TQLabel * m_pressureVariation; + TQCheckBox * m_size; + TQCheckBox * m_opacity; + TQCheckBox * m_darken; WdgBrushCurveControl* m_curveControl; bool m_customSize; diff --git a/krita/plugins/paintops/defaultpaintops/kis_convolveop.cc b/krita/plugins/paintops/defaultpaintops/kis_convolveop.cc index ae55f54f..72bf9e66 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_convolveop.cc +++ b/krita/plugins/paintops/defaultpaintops/kis_convolveop.cc @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qrect.h> +#include <tqrect.h> #include <kdebug.h> diff --git a/krita/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui b/krita/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui index 7682c12f..f6021ecc 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui +++ b/krita/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgBrushCurveControl</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>WdgBrushCurveControl</cstring> </property> @@ -22,11 +22,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget8</cstring> </property> @@ -37,15 +37,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>sizeCheckbox</cstring> </property> @@ -70,7 +70,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget9</cstring> </property> @@ -81,15 +81,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>opacityCheckbox</cstring> </property> @@ -114,7 +114,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -125,15 +125,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>darkenCheckbox</cstring> </property> @@ -159,7 +159,7 @@ </grid> </widget> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -183,14 +183,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -207,7 +207,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -262,7 +262,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcurve.h</includehint> <includehint>kcurve.h</includehint> diff --git a/krita/plugins/paintops/defaultpaintops/kis_duplicateop.cc b/krita/plugins/paintops/defaultpaintops/kis_duplicateop.cc index 79d00b96..139ed51d 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_duplicateop.cc +++ b/krita/plugins/paintops/defaultpaintops/kis_duplicateop.cc @@ -22,7 +22,7 @@ #include "kis_duplicateop.h" -#include <qrect.h> +#include <tqrect.h> #include <kdebug.h> @@ -108,9 +108,9 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf // Split the coordinates into integer plus fractional parts. The integer // is where the dab will be positioned and the fractional part determines // the sub-pixel positioning. - Q_INT32 x; + TQ_INT32 x; double xFraction; - Q_INT32 y; + TQ_INT32 y; double yFraction; splitCoordinate(pt.x(), &x, &xFraction); @@ -125,19 +125,19 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf dab->convertTo(KisMetaRegistry::instance()->csRegistry()->getAlpha8()); } else { - KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction); - dab = computeDab(mask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); + KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction); + dab = computeDab(tqmask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); } m_painter->setPressure(info.pressure); KisPoint srcPointF = pt - m_painter->duplicateOffset(); - QPoint srcPoint = QPoint(x - static_cast<Q_INT32>(m_painter->duplicateOffset().x()), - y - static_cast<Q_INT32>(m_painter->duplicateOffset().y())); + TQPoint srcPoint = TQPoint(x - static_cast<TQ_INT32>(m_painter->duplicateOffset().x()), + y - static_cast<TQ_INT32>(m_painter->duplicateOffset().y())); - Q_INT32 sw = dab->extent().width(); - Q_INT32 sh = dab->extent().height(); + TQ_INT32 sw = dab->extent().width(); + TQ_INT32 sh = dab->extent().height(); if (srcPoint.x() < 0 ) srcPoint.setX(0); @@ -169,7 +169,7 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf } // First look for the grid corresponding to the start point KisSubPerspectiveGrid* subGridStart = *device->image()->perspectiveGrid()->begin();//device->image()->perspectiveGrid()->gridAt(KisPoint(srcPoint.x() +hotSpot.x(),srcPoint.y() +hotSpot.y())); - QRect r = QRect(0,0, device->image()->width(), device->image()->height()); + TQRect r = TQRect(0,0, device->image()->width(), device->image()->height()); #if 1 if(subGridStart) @@ -236,9 +236,9 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf if(heal) { - Q_UINT16 dataDevice[4]; - Q_UINT16 dataSrcDev[4]; - QMemArray<double> matrix ( 3 * sw * sh ); + TQ_UINT16 dataDevice[4]; + TQ_UINT16 dataSrcDev[4]; + TQMemArray<double> matrix ( 3 * sw * sh ); // First divide KisColorSpace* deviceCs = device->colorSpace(); KisHLineIteratorPixel deviceIt = device->createHLineIterator(x, y, sw, false ); @@ -248,12 +248,12 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf { for(int i= 0; !srcDevIt.isDone(); i++) { - deviceCs->toLabA16(deviceIt.rawData(), (Q_UINT8*)dataDevice, 1); - deviceCs->toLabA16(srcDevIt.rawData(), (Q_UINT8*)dataSrcDev, 1); + deviceCs->toLabA16(deviceIt.rawData(), (TQ_UINT8*)dataDevice, 1); + deviceCs->toLabA16(srcDevIt.rawData(), (TQ_UINT8*)dataSrcDev, 1); // Division for( int k = 0; k < 3; k++) { - matrixIt[k] = dataDevice[k] / (double)QMAX(dataSrcDev [k], 1); + matrixIt[k] = dataDevice[k] / (double)TQMAX(dataSrcDev [k], 1); } ++deviceIt; ++srcDevIt; @@ -266,7 +266,7 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf { int iter = 0; double err; - QMemArray<double> solution ( 3 * sw * sh ); + TQMemArray<double> solution ( 3 * sw * sh ); do { err = minimizeEnergy(&matrix[0], &solution[0],sw,sh); memcpy (&matrix[0], &solution[0], sw * sh * 3 * sizeof(double)); @@ -282,14 +282,14 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf { for(int i= 0; !srcDevIt.isDone(); i++) { - deviceCs->toLabA16(deviceIt.rawData(), (Q_UINT8*)dataDevice, 1); - deviceCs->toLabA16(srcDevIt.rawData(), (Q_UINT8*)dataSrcDev, 1); + deviceCs->toLabA16(deviceIt.rawData(), (TQ_UINT8*)dataDevice, 1); + deviceCs->toLabA16(srcDevIt.rawData(), (TQ_UINT8*)dataSrcDev, 1); // Multiplication for( int k = 0; k < 3; k++) { - dataSrcDev[k] = (int)CLAMP( matrixIt[k] * QMAX( dataSrcDev[k], 1), 0, 65535 ); + dataSrcDev[k] = (int)CLAMP( matrixIt[k] * TQMAX( dataSrcDev[k], 1), 0, 65535 ); } - deviceCs->fromLabA16((Q_UINT8*)dataSrcDev, srcDevIt.rawData(), 1); + deviceCs->fromLabA16((TQ_UINT8*)dataSrcDev, srcDevIt.rawData(), 1); ++deviceIt; ++srcDevIt; matrixIt +=3; @@ -312,8 +312,8 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf OPACITY_OPAQUE, 0, 0, sw, sh); copyPainter.end(); - QRect dabRect = QRect(0, 0, brush->maskWidth(info), brush->maskHeight(info)); - QRect dstRect = QRect(x, y, dabRect.width(), dabRect.height()); + TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info)); + TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height()); KisImage * image = device->image(); @@ -323,8 +323,8 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf if (dstRect.isNull() || dstRect.isEmpty() || !dstRect.isValid()) return; - Q_INT32 sx = dstRect.x() - x; - Q_INT32 sy = dstRect.y() - y; + TQ_INT32 sx = dstRect.x() - x; + TQ_INT32 sy = dstRect.y() - y; sw = dstRect.width(); sh = dstRect.height(); diff --git a/krita/plugins/paintops/defaultpaintops/kis_eraseop.cc b/krita/plugins/paintops/defaultpaintops/kis_eraseop.cc index 4fe46af2..cbf67a15 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_eraseop.cc +++ b/krita/plugins/paintops/defaultpaintops/kis_eraseop.cc @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qrect.h> +#include <tqrect.h> #include <kdebug.h> @@ -86,33 +86,33 @@ void KisEraseOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) KisPoint hotSpot = brush->hotSpot(info); KisPoint pt = pos - hotSpot; - Q_INT32 destX; + TQ_INT32 destX; double xFraction; - Q_INT32 destY; + TQ_INT32 destY; double yFraction; splitCoordinate(pt.x(), &destX, &xFraction); splitCoordinate(pt.y(), &destY, &yFraction); - KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction); + KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction); KisPaintDeviceSP dab = new KisPaintDevice(device->colorSpace(), "erase op dab"); Q_CHECK_PTR(dab); - Q_INT32 maskWidth = mask->width(); - Q_INT32 maskHeight = mask->height(); + TQ_INT32 tqmaskWidth = tqmask->width(); + TQ_INT32 tqmaskHeight = tqmask->height(); - QRect dstRect; + TQRect dstRect; - KisRectIteratorPixel it = dab->createRectIterator(0, 0, maskWidth, maskHeight, true); + KisRectIteratorPixel it = dab->createRectIterator(0, 0, tqmaskWidth, tqmaskHeight, true); KisColorSpace* cs = dab->colorSpace(); while (!it.isDone()) { - cs->setAlpha(it.rawData(), Q_UINT8_MAX - mask->alphaAt(it.x(), it.y()), 1); + cs->setAlpha(it.rawData(), TQ_UINT8_MAX - tqmask->alphaAt(it.x(), it.y()), 1); ++it; } - QRect dabRect = QRect(0, 0, maskWidth, maskHeight); - dstRect = QRect(destX, destY, dabRect.width(), dabRect.height()); + TQRect dabRect = TQRect(0, 0, tqmaskWidth, tqmaskHeight); + dstRect = TQRect(destX, destY, dabRect.width(), dabRect.height()); KisImage * image = device->image(); @@ -122,10 +122,10 @@ void KisEraseOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) if (dstRect.isNull() || dstRect.isEmpty() || !dstRect.isValid()) return; - Q_INT32 sx = dstRect.x() - destX; - Q_INT32 sy = dstRect.y() - destY; - Q_INT32 sw = dstRect.width(); - Q_INT32 sh = dstRect.height(); + TQ_INT32 sx = dstRect.x() - destX; + TQ_INT32 sy = dstRect.y() - destY; + TQ_INT32 sw = dstRect.width(); + TQ_INT32 sh = dstRect.height(); if (m_source->hasSelection()) { m_painter->bltSelection(dstRect.x(), dstRect.y(), COMPOSITE_ERASE, dab.data(), diff --git a/krita/plugins/paintops/defaultpaintops/kis_eraseop.h b/krita/plugins/paintops/defaultpaintops/kis_eraseop.h index c15d11b3..8c88a122 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_eraseop.h +++ b/krita/plugins/paintops/defaultpaintops/kis_eraseop.h @@ -36,7 +36,7 @@ public: virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter); virtual KisID id() { return KisID("eraser", i18n("Pixel Eraser")); } - virtual QString pixmap() { return "eraser.png"; } + virtual TQString pixmap() { return "eraser.png"; } }; diff --git a/krita/plugins/paintops/defaultpaintops/kis_penop.cc b/krita/plugins/paintops/defaultpaintops/kis_penop.cc index d93a75d4..0fcbca02 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_penop.cc +++ b/krita/plugins/paintops/defaultpaintops/kis_penop.cc @@ -21,7 +21,7 @@ */ -#include <qrect.h> +#include <tqrect.h> #include <kdebug.h> @@ -70,8 +70,8 @@ void KisPenOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) KisPoint hotSpot = brush->hotSpot(info); KisPoint pt = pos - hotSpot; - Q_INT32 x = pt.roundX(); - Q_INT32 y = pt.roundY(); + TQ_INT32 x = pt.roundX(); + TQ_INT32 y = pt.roundY(); KisPaintDeviceSP dab = 0; if (brush->brushType() == IMAGE || @@ -79,14 +79,14 @@ void KisPenOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) dab = brush->image(device->colorSpace(), info); } else { - // Compute mask without sub-pixel positioning - KisAlphaMaskSP mask = brush->mask(info); - dab = computeDab(mask); + // Compute tqmask without sub-pixel positioning + KisAlphaMaskSP tqmask = brush->tqmask(info); + dab = computeDab(tqmask); } m_painter->setPressure(info.pressure); - QRect dabRect = QRect(0, 0, brush->maskWidth(info), brush->maskHeight(info)); - QRect dstRect = QRect(x, y, dabRect.width(), dabRect.height()); + TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info)); + TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height()); KisImage * image = device->image(); @@ -104,7 +104,7 @@ void KisPenOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) KisRectIteratorPixel pixelIt = dab->createRectIterator(dabRect.x(), dabRect.y(), dabRect.width(), dabRect.height(), true); while (!pixelIt.isDone()) { - Q_UINT8 alpha = cs->getAlpha(pixelIt.rawData()); + TQ_UINT8 alpha = cs->getAlpha(pixelIt.rawData()); if (alpha < (4 * OPACITY_OPAQUE) / 10) { cs->setAlpha(pixelIt.rawData(), OPACITY_TRANSPARENT, 1); @@ -115,10 +115,10 @@ void KisPenOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) ++pixelIt; } - Q_INT32 sx = dstRect.x() - x; - Q_INT32 sy = dstRect.y() - y; - Q_INT32 sw = dstRect.width(); - Q_INT32 sh = dstRect.height(); + TQ_INT32 sx = dstRect.x() - x; + TQ_INT32 sy = dstRect.y() - y; + TQ_INT32 sw = dstRect.width(); + TQ_INT32 sh = dstRect.height(); if (m_source->hasSelection()) { m_painter->bltSelection(dstRect.x(), dstRect.y(), m_painter->compositeOp(), dab.data(), diff --git a/krita/plugins/paintops/defaultpaintops/kis_penop.h b/krita/plugins/paintops/defaultpaintops/kis_penop.h index f548bed5..ac03a501 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_penop.h +++ b/krita/plugins/paintops/defaultpaintops/kis_penop.h @@ -23,8 +23,8 @@ #ifndef KIS_PENOP_H_ #define KIS_PENOP_H_ -#include <qlabel.h> -#include <qwidget.h> +#include <tqlabel.h> +#include <tqwidget.h> #include "kis_paintop.h" class KisPoint; @@ -38,7 +38,7 @@ public: virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter); virtual KisID id(){ return KisID("pen", i18n("Pixel Pencil")); } - virtual QString pixmap() { return "pencil.png"; } + virtual TQString pixmap() { return "pencil.png"; } }; diff --git a/krita/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/krita/plugins/paintops/defaultpaintops/kis_smudgeop.cc index a339c062..2e50bebb 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_smudgeop.cc +++ b/krita/plugins/paintops/defaultpaintops/kis_smudgeop.cc @@ -20,14 +20,14 @@ #include <string.h> -#include <qrect.h> -#include <qwidget.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qtabwidget.h> -#include <qtoolbutton.h> -#include <qslider.h> +#include <tqrect.h> +#include <tqwidget.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqtabwidget.h> +#include <tqtoolbutton.h> +#include <tqslider.h> #include <kdebug.h> @@ -56,30 +56,30 @@ KisPaintOp * KisSmudgeOpFactory::createOp(const KisPaintOpSettings *settings, Ki return op; } -KisSmudgeOpSettings::KisSmudgeOpSettings(QWidget *parent, bool isTablet) - : super(parent) +KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *tqparent, bool isTablet) + : super(tqparent) { - m_optionsWidget = new QWidget(parent, "brush option widget"); - QHBoxLayout * l = new QHBoxLayout(m_optionsWidget); + m_optionsWidget = new TQWidget(tqparent, "brush option widget"); + TQHBoxLayout * l = new TQHBoxLayout(m_optionsWidget); l->setAutoAdd(true); - m_rateLabel = new QLabel(i18n("Rate: "), m_optionsWidget); - m_rateSlider = new QSlider(0,100,1, 50, Qt::Horizontal, m_optionsWidget); + m_rateLabel = new TQLabel(i18n("Rate: "), m_optionsWidget); + m_rateSlider = new TQSlider(0,100,1, 50, Qt::Horizontal, m_optionsWidget); if(isTablet) { - m_pressureVariation = new QLabel(i18n("Pressure variation: "), m_optionsWidget); - m_size = new QCheckBox(i18n("Size"), m_optionsWidget); + m_pressureVariation = new TQLabel(i18n("Pressure variation: "), m_optionsWidget); + m_size = new TQCheckBox(i18n("Size"), m_optionsWidget); m_size->setChecked(true); - m_opacity = new QCheckBox(i18n("Opacity"), m_optionsWidget); - m_rate = new QCheckBox(i18n("Rate"), m_optionsWidget); + m_opacity = new TQCheckBox(i18n("Opacity"), m_optionsWidget); + m_rate = new TQCheckBox(i18n("Rate"), m_optionsWidget); m_curveControl = new WdgBrushCurveControl(m_optionsWidget); // We abuse the darken curve here for rate m_curveControl->tabWidget->setTabLabel(m_curveControl->tabWidget->page(2), i18n("Rate")); m_curveControl->tabWidget->setTabToolTip(m_curveControl->tabWidget->page(2), i18n("Modifies the rate. Bottom is 0% of the rate top is 100% of the original rate.")); - QToolButton* moreButton = new QToolButton(Qt::UpArrow, m_optionsWidget); - moreButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - moreButton->setMinimumSize(QSize(24,24)); // Bah, I had hoped the above line would make this unneeded - connect(moreButton, SIGNAL(clicked()), this, SLOT(slotCustomCurves())); + TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget); + moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded + connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves())); } else { m_pressureVariation = 0; m_size = 0; @@ -95,7 +95,7 @@ KisSmudgeOpSettings::KisSmudgeOpSettings(QWidget *parent, bool isTablet) } void KisSmudgeOpSettings::slotCustomCurves() { - if (m_curveControl->exec() == QDialog::Accepted) { + if (m_curveControl->exec() == TQDialog::Accepted) { m_customRate = m_curveControl->darkenCheckbox->isChecked(); m_customSize = m_curveControl->sizeCheckbox->isChecked(); m_customOpacity = m_curveControl->opacityCheckbox->isChecked(); @@ -145,13 +145,13 @@ bool KisSmudgeOpSettings::varyOpacity() const return m_opacity ? m_opacity->isChecked() : false; } -KisPaintOpSettings* KisSmudgeOpFactory::settings(QWidget * parent, const KisInputDevice& inputDevice) +KisPaintOpSettings* KisSmudgeOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice) { if (inputDevice == KisInputDevice::mouse()) { // No options for mouse, only tablet devices - return new KisSmudgeOpSettings(parent, false); + return new KisSmudgeOpSettings(tqparent, false); } else { - return new KisSmudgeOpSettings(parent, true); + return new KisSmudgeOpSettings(tqparent, 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 == mask - // retrieve mask + // if brush == tqmask + // retrieve tqmask // else if brush == image // retrieve image - // subsample (mask | image) for position -- pos should be double! - // apply filters to mask (colour | gradient | pattern | etc. - // composite filtered mask into temporary layer + // subsample (tqmask | image) for position -- pos should be double! + // apply filters to tqmask (colour | gradient | pattern | etc. + // composite filtered tqmask into temporary layer // composite temporary layer into target layer // @see: doc/brush.txt @@ -232,9 +232,9 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) // Split the coordinates into integer plus fractional parts. The integer // is where the dab will be positioned and the fractional part determines // the sub-pixel positioning. - Q_INT32 x; + TQ_INT32 x; double xFraction; - Q_INT32 y; + TQ_INT32 y; double yFraction; splitCoordinate(pt.x(), &x, &xFraction); @@ -242,13 +242,13 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) KisPaintDeviceSP dab = 0; - Q_UINT8 origOpacity = m_painter->opacity(); + TQ_UINT8 origOpacity = m_painter->opacity(); if (m_pressureOpacity) { if (!m_customOpacity) - m_painter->setOpacity((Q_INT8)(origOpacity * info.pressure)); + m_painter->setOpacity((TQ_INT8)(origOpacity * info.pressure)); else - m_painter->setOpacity((Q_INT8)(origOpacity * scaleToCurve(info.pressure, m_opacityCurve))); + m_painter->setOpacity((TQ_INT8)(origOpacity * scaleToCurve(info.pressure, m_opacityCurve))); } if (brush->brushType() == IMAGE || brush->brushType() == PIPE_IMAGE) { @@ -256,16 +256,16 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) dab->convertTo(KisMetaRegistry::instance()->csRegistry()->getAlpha8()); } else { - KisAlphaMaskSP mask = brush->mask(adjustedInfo, xFraction, yFraction); - dab = computeDab(mask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); + KisAlphaMaskSP tqmask = brush->tqmask(adjustedInfo, xFraction, yFraction); + dab = computeDab(tqmask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); } m_painter->setPressure(adjustedInfo.pressure); - QRect dabRect = QRect(0, 0, brush->maskWidth(adjustedInfo), - brush->maskHeight(adjustedInfo)); - QRect dstRect = QRect(x, y, dabRect.width(), dabRect.height()); + TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(adjustedInfo), + brush->tqmaskHeight(adjustedInfo)); + TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height()); KisImage * image = device->image(); @@ -273,8 +273,8 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) dstRect &= image->bounds(); } - Q_INT32 sw = dab->extent().width(); - Q_INT32 sh = dab->extent().height(); + TQ_INT32 sw = dab->extent().width(); + TQ_INT32 sh = dab->extent().height(); KisPainter copyPainter(m_srcdev); int opacity = OPACITY_OPAQUE; @@ -283,9 +283,9 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) opacity = rate(); if (m_pressureRate) { if (m_customRate) { - opacity = CLAMP((Q_UINT8)(double(opacity) * scaleToCurve(info.pressure, m_rateCurve)), OPACITY_TRANSPARENT, OPACITY_OPAQUE); + opacity = CLAMP((TQ_UINT8)(double(opacity) * scaleToCurve(info.pressure, m_rateCurve)), OPACITY_TRANSPARENT, OPACITY_OPAQUE); } else { - opacity = CLAMP((Q_UINT8)(double(opacity) * info.pressure), OPACITY_TRANSPARENT, OPACITY_OPAQUE); + opacity = CLAMP((TQ_UINT8)(double(opacity) * info.pressure), OPACITY_TRANSPARENT, OPACITY_OPAQUE); } } opacity = OPACITY_OPAQUE - opacity; @@ -306,8 +306,8 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) if (dstRect.isNull() || dstRect.isEmpty() || !dstRect.isValid()) return; - Q_INT32 sx = dstRect.x() - x; - Q_INT32 sy = dstRect.y() - y; + TQ_INT32 sx = dstRect.x() - x; + TQ_INT32 sy = dstRect.y() - y; sw = dstRect.width(); sh = dstRect.height(); diff --git a/krita/plugins/paintops/defaultpaintops/kis_smudgeop.h b/krita/plugins/paintops/defaultpaintops/kis_smudgeop.h index 26a82e07..d9c8872d 100644 --- a/krita/plugins/paintops/defaultpaintops/kis_smudgeop.h +++ b/krita/plugins/paintops/defaultpaintops/kis_smudgeop.h @@ -20,12 +20,12 @@ #define KIS_SMUDGEOP_H_ #include "kis_paintop.h" -#include <qobject.h> +#include <tqobject.h> -class QWidget; -class QCheckBox; -class QLabel; -class QSlider; +class TQWidget; +class TQCheckBox; +class TQLabel; +class TQSlider; class KisPoint; class KisPainter; class KCurve; @@ -39,15 +39,16 @@ public: virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter); virtual KisID id() { return KisID("smudge", i18n("Smudge Brush")); } - virtual QString pixmap() { return "paintbrush.png"; } - virtual KisPaintOpSettings *settings(QWidget * parent, const KisInputDevice& inputDevice); + virtual TQString pixmap() { return "paintbrush.png"; } + virtual KisPaintOpSettings *settings(TQWidget * tqparent, const KisInputDevice& inputDevice); }; -class KisSmudgeOpSettings : public QObject, public KisPaintOpSettings { +class KisSmudgeOpSettings : public TQObject, public KisPaintOpSettings { Q_OBJECT + TQ_OBJECT typedef KisPaintOpSettings super; public: - KisSmudgeOpSettings(QWidget *parent, bool isTablet); + KisSmudgeOpSettings(TQWidget *tqparent, bool isTablet); int rate() const; bool varyRate() const; @@ -61,18 +62,18 @@ public: const double* sizeCurve() const { return m_sizeCurve; } const double* opacityCurve() const { return m_opacityCurve; } - virtual QWidget *widget() const { return m_optionsWidget; } + virtual TQWidget *widget() const { return m_optionsWidget; } private slots: void slotCustomCurves(); private: void transferCurve(KCurve* curve, double* target); - QWidget *m_optionsWidget; - QLabel* m_rateLabel; - QSlider* m_rateSlider; - QLabel * m_pressureVariation; - QCheckBox * m_rate; - QCheckBox * m_size; - QCheckBox * m_opacity; + TQWidget *m_optionsWidget; + TQLabel* m_rateLabel; + TQSlider* m_rateSlider; + TQLabel * m_pressureVariation; + TQCheckBox * m_rate; + TQCheckBox * m_size; + TQCheckBox * m_opacity; WdgBrushCurveControl* m_curveControl; bool m_customSize; diff --git a/krita/plugins/tools/defaulttools/default_tools.cc b/krita/plugins/tools/defaulttools/default_tools.cc index c4edcfb3..a281a52c 100644 --- a/krita/plugins/tools/defaulttools/default_tools.cc +++ b/krita/plugins/tools/defaulttools/default_tools.cc @@ -20,7 +20,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -56,14 +56,14 @@ typedef KGenericFactory<DefaultTools> DefaultToolsFactory; K_EXPORT_COMPONENT_FACTORY( kritadefaulttools, DefaultToolsFactory( "krita" ) ) -DefaultTools::DefaultTools(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +DefaultTools::DefaultTools(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(DefaultToolsFactory::instance()); - if ( parent->inherits("KisToolRegistry") ) + if ( tqparent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); r->add(new KisToolFillFactory()); r->add(new KisToolGradientFactory()); diff --git a/krita/plugins/tools/defaulttools/default_tools.h b/krita/plugins/tools/defaulttools/default_tools.h index 0088263d..b4c6d4de 100644 --- a/krita/plugins/tools/defaulttools/default_tools.h +++ b/krita/plugins/tools/defaulttools/default_tools.h @@ -34,8 +34,9 @@ class DefaultTools : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - DefaultTools(QObject *parent, const char *name, const QStringList &); + DefaultTools(TQObject *tqparent, const char *name, const TQStringList &); virtual ~DefaultTools(); }; diff --git a/krita/plugins/tools/defaulttools/kis_tool_brush.cc b/krita/plugins/tools/defaulttools/kis_tool_brush.cc index a65795d1..3a931bfb 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_brush.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_brush.cc @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qevent.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwidget.h> -#include <qtimer.h> -#include <qpushbutton.h> -#include <qpainter.h> -#include <qrect.h> -#include <qcheckbox.h> +#include <tqevent.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwidget.h> +#include <tqtimer.h> +#include <tqpushbutton.h> +#include <tqpainter.h> +#include <tqrect.h> +#include <tqcheckbox.h> #include <kdebug.h> #include <kaction.h> @@ -52,10 +52,10 @@ KisToolBrush::KisToolBrush() setName("tool_brush"); setCursor(KisCursor::load("tool_freehand_cursor.png", 5, 5)); m_rate = 100; // Conveniently hardcoded for now - m_timer = new QTimer(this); + m_timer = new TQTimer(this); Q_CHECK_PTR(m_timer); - connect(m_timer, SIGNAL(timeout()), this, SLOT(timeoutPaint())); + connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutPaint())); } @@ -114,8 +114,8 @@ void KisToolBrush::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("&Brush"), - "tool_freehand", Qt::Key_B, this, - SLOT(activate()), collection, + "tool_freehand", TQt::Key_B, this, + TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Draw freehand")); m_action->setExclusiveGroup("tools"); @@ -130,14 +130,14 @@ void KisToolBrush::move(KisMoveEvent *e) { paintOutline(e->pos()); } -void KisToolBrush::leave(QEvent */*e*/) { +void KisToolBrush::leave(TQEvent */*e*/) { m_subject->canvasController()->kiscanvas()->update(); // remove the outline } void KisToolBrush::slotSetPaintingMode( int mode ) { - if (mode == QButton::On) { + if (mode == TQButton::On) { // Direct painting m_paintIncremental = true; } @@ -147,14 +147,14 @@ void KisToolBrush::slotSetPaintingMode( int mode ) } -QWidget* KisToolBrush::createOptionWidget(QWidget* parent) +TQWidget* KisToolBrush::createOptionWidget(TQWidget* tqparent) { - QWidget *widget = super::createOptionWidget(parent); - m_chkDirect = new QCheckBox(i18n("Paint direct"), widget, "chkDirect"); + TQWidget *widget = super::createOptionWidget(tqparent); + m_chkDirect = new TQCheckBox(i18n("Paint direct"), widget, "chkDirect"); m_chkDirect->setChecked(true); - connect(m_chkDirect, SIGNAL(stateChanged(int)), this, SLOT(slotSetPaintingMode(int))); + connect(m_chkDirect, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotSetPaintingMode(int))); - m_optionLayout = new QGridLayout(widget, 3, 2, 0, 6); + m_optionLayout = new TQGridLayout(widget, 3, 2, 0, 6); Q_CHECK_PTR(m_optionLayout); super::addOptionWidgetLayout(m_optionLayout); diff --git a/krita/plugins/tools/defaulttools/kis_tool_brush.h b/krita/plugins/tools/defaulttools/kis_tool_brush.h index 0024213d..a23e8d12 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_brush.h +++ b/krita/plugins/tools/defaulttools/kis_tool_brush.h @@ -25,16 +25,17 @@ #include "kis_tool_factory.h" #include "koffice_export.h" -class QTimer; +class TQTimer; class KisPoint; -class QHBoxLayout; -class QPainter; -class QRect; -class QCheckBox; -class QGridLayout; +class TQHBoxLayout; +class TQPainter; +class TQRect; +class TQCheckBox; +class TQGridLayout; class KRITACORE_EXPORT KisToolBrush : public KisToolFreehand { Q_OBJECT + TQ_OBJECT typedef KisToolFreehand super; public: @@ -43,15 +44,15 @@ public: virtual void update(KisCanvasSubject *subject); virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } - virtual Q_UINT32 priority() { return 0; } - QWidget* createOptionWidget(QWidget* parent); + virtual TQ_UINT32 priority() { return 0; } + TQWidget* createOptionWidget(TQWidget* tqparent); protected: virtual void initPaint(KisEvent *e); virtual void endPaint(); virtual void move(KisMoveEvent *e); - virtual void leave(QEvent *e); + virtual void leave(TQEvent *e); private slots: @@ -60,10 +61,10 @@ private slots: private: - Q_INT32 m_rate; - QTimer * m_timer; - QGridLayout* m_optionLayout; - QCheckBox * m_chkDirect; + TQ_INT32 m_rate; + TQTimer * m_timer; + TQGridLayout* m_optionLayout; + TQCheckBox * m_chkDirect; }; class KisToolBrushFactory : public KisToolFactory { diff --git a/krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc index ae553952..77020342 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_colorpicker.cc @@ -18,16 +18,16 @@ */ #include <string.h> -#include <qpoint.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlistview.h> -#include <qspinbox.h> +#include <tqpoint.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlistview.h> +#include <tqspinbox.h> #include <kaction.h> #include <klocale.h> -#include <qcolor.h> +#include <tqcolor.h> #include <kmessagebox.h> #include "kis_layer.h" @@ -77,7 +77,7 @@ void KisToolColorPicker::update(KisCanvasSubject *subject) void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) { if (m_subject) { - if (e->button() != QMouseEvent::LeftButton && e->button() != QMouseEvent::RightButton) + if (e->button() != TQMouseEvent::LeftButton && e->button() != TQMouseEvent::RightButton) return; KisImageSP img; @@ -102,9 +102,9 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) } } - QPoint pos = QPoint(e->pos().floorX(), e->pos().floorY()); + TQPoint pos = TQPoint(e->pos().floorX(), e->pos().floorY()); - if (!img->bounds().contains(pos)) { + if (!img->bounds().tqcontains(pos)) { return; } @@ -121,9 +121,9 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) KisColorSpace* cs = dev->colorSpace(); int pixelSize = cs->pixelSize(); - Q_UINT8* data = new Q_UINT8[pixelSize]; - Q_UINT8** pixels = new Q_UINT8*[counts[m_radius]]; - Q_UINT8* weights = new Q_UINT8[counts[m_radius]]; + TQ_UINT8* data = new TQ_UINT8[pixelSize]; + TQ_UINT8** pixels = new TQ_UINT8*[counts[m_radius]]; + TQ_UINT8* weights = new TQ_UINT8[counts[m_radius]]; int i = 0; // dummy init @@ -133,7 +133,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) if (x*x + y*y < m_radius * m_radius) { iter = dev->createHLineIterator(pos.x() + x, pos.y() + y, 1, false); - pixels[i] = new Q_UINT8[pixelSize]; + pixels[i] = new TQ_UINT8[pixelSize]; memcpy(pixels[i], iter.rawData(), pixelSize); if (x == 0 && y == 0) { @@ -151,7 +151,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) } } // Weird, I can't do that directly :/ - const Q_UINT8** cpixels = const_cast<const Q_UINT8**>(pixels); + const TQ_UINT8** cpixels = const_cast<const TQ_UINT8**>(pixels); cs->mixColors(cpixels, weights, counts[m_radius], data); m_pickedColor = KisColor(data, cs); @@ -164,7 +164,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) displayPickedColor(); if (m_updateColor) { - if (e->button() == QMouseEvent::LeftButton) + if (e->button() == TQMouseEvent::LeftButton) m_subject->setFGColor(m_pickedColor); else m_subject->setBGColor(m_pickedColor); @@ -173,14 +173,14 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e) if (m_addPalette) { // Convert to RGB to add to palette, we ought to have our own format :( KisPaletteEntry ent; - ent.color = m_pickedColor.toQColor(); + ent.color = m_pickedColor.toTQColor(); // We don't ask for a name, too intrusive here KisPalette* palette = m_palettes.at(m_optionsWidget-> cmbPalette->currentItem()); palette->add(ent); if (!palette->save()) { - KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").arg(palette->filename()), i18n("Palette")); + KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").tqarg(palette->filename()), i18n("Palette")); } } } @@ -190,19 +190,19 @@ void KisToolColorPicker::displayPickedColor() { if (m_pickedColor.data() && m_optionsWidget) { - QValueVector<KisChannelInfo *> channels = m_pickedColor.colorSpace()->channels(); + TQValueVector<KisChannelInfo *> channels = m_pickedColor.colorSpace()->channels(); m_optionsWidget->listViewChannels->clear(); for (int i = channels.count() - 1; i >= 0 ; --i) { - QString channelValueText; + TQString channelValueText; if (m_normaliseValues) { - channelValueText = i18n("%1%").arg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i)); + channelValueText = i18n("%1%").tqarg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i)); } else { channelValueText = m_pickedColor.colorSpace()->channelValueText(m_pickedColor.data(), i); } - m_optionsWidget->listViewChannels->insertItem(new QListViewItem(m_optionsWidget->listViewChannels, + m_optionsWidget->listViewChannels->insertItem(new TQListViewItem(m_optionsWidget->listViewChannels, channels[i]->name(), channelValueText)); } @@ -214,16 +214,16 @@ void KisToolColorPicker::setup(KActionCollection *collection) m_action = static_cast<KRadioAction *>(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Color Picker"), "tool_colorpicker", Qt::Key_P, this, SLOT(activate()), collection, name()); + m_action = new KRadioAction(i18n("&Color Picker"), "tool_colorpicker", TQt::Key_P, this, TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Color picker")); m_action->setExclusiveGroup("tools"); m_ownAction = true; } } -QWidget* KisToolColorPicker::createOptionWidget(QWidget* parent) +TQWidget* KisToolColorPicker::createOptionWidget(TQWidget* tqparent) { - m_optionsWidget = new ColorPickerOptionsWidget(parent); + m_optionsWidget = new ColorPickerOptionsWidget(tqparent); m_optionsWidget->cbUpdateCurrentColour->setChecked(m_updateColor); @@ -235,12 +235,12 @@ QWidget* KisToolColorPicker::createOptionWidget(QWidget* parent) m_optionsWidget->listViewChannels->setSorting(-1); - connect(m_optionsWidget->cbUpdateCurrentColour, SIGNAL(toggled(bool)), SLOT(slotSetUpdateColor(bool))); - connect(m_optionsWidget->cbNormaliseValues, SIGNAL(toggled(bool)), SLOT(slotSetNormaliseValues(bool))); - connect(m_optionsWidget->cbPalette, SIGNAL(toggled(bool)), - SLOT(slotSetAddPalette(bool))); - connect(m_optionsWidget->radius, SIGNAL(valueChanged(int)), - SLOT(slotChangeRadius(int))); + connect(m_optionsWidget->cbUpdateCurrentColour, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetUpdateColor(bool))); + connect(m_optionsWidget->cbNormaliseValues, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetNormaliseValues(bool))); + connect(m_optionsWidget->cbPalette, TQT_SIGNAL(toggled(bool)), + TQT_SLOT(slotSetAddPalette(bool))); + connect(m_optionsWidget->radius, TQT_SIGNAL(valueChanged(int)), + TQT_SLOT(slotChangeRadius(int))); KisResourceServerBase* srv = KisResourceServerRegistry::instance()->get("PaletteServer"); @@ -248,7 +248,7 @@ QWidget* KisToolColorPicker::createOptionWidget(QWidget* parent) return m_optionsWidget; } - QValueList<KisResource*> palettes = srv->resources(); + TQValueList<KisResource*> palettes = srv->resources(); for(uint i = 0; i < palettes.count(); i++) { KisPalette* palette = dynamic_cast<KisPalette*>(*palettes.at(i)); @@ -258,12 +258,12 @@ QWidget* KisToolColorPicker::createOptionWidget(QWidget* parent) } } - connect(srv, SIGNAL(resourceAdded(KisResource*)), this, SLOT(slotAddPalette(KisResource*))); + connect(srv, TQT_SIGNAL(resourceAdded(KisResource*)), this, TQT_SLOT(slotAddPalette(KisResource*))); return m_optionsWidget; } -QWidget* KisToolColorPicker::optionWidget() +TQWidget* KisToolColorPicker::optionWidget() { return m_optionsWidget; } diff --git a/krita/plugins/tools/defaulttools/kis_tool_colorpicker.h b/krita/plugins/tools/defaulttools/kis_tool_colorpicker.h index 2834b8c6..ab59ef17 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_colorpicker.h +++ b/krita/plugins/tools/defaulttools/kis_tool_colorpicker.h @@ -22,7 +22,7 @@ #include "kis_tool_non_paint.h" #include "kis_tool_factory.h" -#include "qvaluevector.h" +#include "tqvaluevector.h" class ColorPickerOptionsWidget; class KisResource; @@ -31,6 +31,7 @@ class KisPalette; class KisToolColorPicker : public KisToolNonPaint { Q_OBJECT + TQ_OBJECT typedef KisToolNonPaint super; public: @@ -41,10 +42,10 @@ public: virtual void update(KisCanvasSubject *subject); virtual void setup(KActionCollection *collection); virtual void buttonPress(KisButtonPressEvent *e); - virtual QWidget* createOptionWidget(QWidget* parent); - virtual QWidget* optionWidget(); + virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* optionWidget(); virtual enumToolType toolType() { return TOOL_FILL; } - virtual Q_UINT32 priority() { return 3; } + virtual TQ_UINT32 priority() { return 3; } public slots: void slotSetUpdateColor(bool); @@ -64,7 +65,7 @@ private: ColorPickerOptionsWidget *m_optionsWidget; KisCanvasSubject *m_subject; - QValueVector<KisPalette*> m_palettes; + TQValueVector<KisPalette*> m_palettes; }; class KisToolColorPickerFactory : public KisToolFactory { diff --git a/krita/plugins/tools/defaulttools/kis_tool_duplicate.cc b/krita/plugins/tools/defaulttools/kis_tool_duplicate.cc index 71678e6f..bd03245d 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_duplicate.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_duplicate.cc @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qbitmap.h> -#include <qcheckbox.h> -#include <qpainter.h> -#include <qlabel.h> +#include <tqbitmap.h> +#include <tqcheckbox.h> +#include <tqpainter.h> +#include <tqlabel.h> #include <kaction.h> #include <kdebug.h> @@ -46,7 +46,7 @@ #include "kis_boundary_painter.h" KisToolDuplicate::KisToolDuplicate() - : super(i18n("Duplicate Brush")), m_isOffsetNotUptodate(true), m_position(QPoint(-1,-1)) + : super(i18n("Duplicate Brush")), m_isOffsetNotUptodate(true), m_position(TQPoint(-1,-1)) { setName("tool_duplicate"); m_subject = 0; @@ -59,7 +59,7 @@ KisToolDuplicate::~KisToolDuplicate() void KisToolDuplicate::activate() { - m_position = QPoint(-1,-1); + m_position = TQPoint(-1,-1); super::activate(); if( m_subject->currentImg()->perspectiveGrid()->countSubGrids() != 1 ) { @@ -76,7 +76,7 @@ void KisToolDuplicate::buttonPress(KisButtonPressEvent *e) m_position = e->pos(); m_isOffsetNotUptodate = true; } else { - if (m_position != QPoint(-1, -1)) { + if (m_position != TQPoint(-1, -1)) { super::buttonPress(e); } } @@ -89,8 +89,8 @@ void KisToolDuplicate::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("&Duplicate Brush"), - "tool_duplicate", Qt::Key_C, this, - SLOT(activate()), collection, + "tool_duplicate", TQt::Key_C, this, + TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Duplicate parts of the image. Shift-click to select the point to duplicate from to begin.")); m_action->setExclusiveGroup("tools"); @@ -100,7 +100,7 @@ void KisToolDuplicate::setup(KActionCollection *collection) void KisToolDuplicate::initPaint(KisEvent *e) { - if( m_position != QPoint(-1,-1)) + if( m_position != TQPoint(-1,-1)) { if(m_isOffsetNotUptodate) { @@ -124,10 +124,10 @@ void KisToolDuplicate::move(KisMoveEvent *e) { // Paint the outline where we will (or are) copying from - if( m_position == QPoint(-1,-1) ) + if( m_position == TQPoint(-1,-1) ) return; - QPoint srcPos; + TQPoint srcPos; if (m_mode == PAINT) { // if we are in perspective correction mode, update the offset when moving if(m_perspectiveCorrection->isChecked()) @@ -147,7 +147,7 @@ void KisToolDuplicate::move(KisMoveEvent *e) // First look for the grid corresponding to the start point KisSubPerspectiveGrid* subGridStart = *m_subject->currentImg()->perspectiveGrid()->begin();//device->image()->perspectiveGrid()->gridAt(KisPoint(srcPoint.x() +hotSpot.x(),srcPoint.y() +hotSpot.y())); - QRect r = QRect(0,0, m_subject->currentImg()->width(), m_subject->currentImg()->height()); + TQRect r = TQRect(0,0, m_subject->currentImg()->width(), m_subject->currentImg()->height()); if(subGridStart) { @@ -182,26 +182,26 @@ void KisToolDuplicate::move(KisMoveEvent *e) KisPoint duplicateStartPoisitionT = KisPerspectiveMath::matProd(endM, m_positionStartPainting - m_offset); KisPoint duplicateRealPosition = KisPerspectiveMath::matProd(startM, duplicateStartPoisitionT + (currentPositionT - positionStartPaintingT) ); KisPoint p = e->pos() - duplicateRealPosition; - srcPos = p.floorQPoint(); + srcPos = p.floorTQPoint(); } }else { - srcPos = painter()->duplicateOffset().floorQPoint(); + srcPos = painter()->duplicateOffset().floorTQPoint(); } } else { if(m_isOffsetNotUptodate) - srcPos = e->pos().floorQPoint() - m_position.floorQPoint(); + srcPos = e->pos().floorTQPoint() - m_position.floorTQPoint(); else - srcPos = m_offset.floorQPoint(); + srcPos = m_offset.floorTQPoint(); } - Q_INT32 x; - Q_INT32 y; + TQ_INT32 x; + TQ_INT32 y; // like KisPaintOp::splitCoordinate - x = (Q_INT32)((e->x() < 0) ? e->x() - 1 : e->x()); - y = (Q_INT32)((e->y() < 0) ? e->y() - 1 : e->y()); - srcPos = QPoint(x - srcPos.x(), y - srcPos.y()); + x = (TQ_INT32)((e->x() < 0) ? e->x() - 1 : e->x()); + y = (TQ_INT32)((e->y() < 0) ? e->y() - 1 : e->y()); + srcPos = TQPoint(x - srcPos.x(), y - srcPos.y()); paintOutline(srcPos); super::move(e); @@ -212,7 +212,7 @@ void KisToolDuplicate::paintAt(const KisPoint &pos, const double xtilt, const double ytilt) { - if( m_position != QPoint(-1,-1)) + if( m_position != TQPoint(-1,-1)) { if(m_isOffsetNotUptodate) { @@ -226,29 +226,29 @@ void KisToolDuplicate::paintAt(const KisPoint &pos, } } -QString KisToolDuplicate::quickHelp() const { +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."); } -QWidget* KisToolDuplicate::createOptionWidget(QWidget* parent) +TQWidget* KisToolDuplicate::createOptionWidget(TQWidget* tqparent) { - QWidget* widget = KisToolPaint::createOptionWidget(parent); - m_healing = new QCheckBox(widget); + TQWidget* widget = KisToolPaint::createOptionWidget(tqparent); + m_healing = new TQCheckBox(widget); m_healing->setChecked( false); - addOptionWidgetOption(m_healing, new QLabel(i18n("Healing"), widget )); + addOptionWidgetOption(m_healing, new TQLabel(i18n("Healing"), widget )); m_healingRadius = new KIntNumInput(widget); KisBrush *brush = m_subject->currentBrush(); int healingradius = 20; if( brush ) { - healingradius = 2 * QMAX(brush->width(),brush->height()); + healingradius = 2 * TQMAX(brush->width(),brush->height()); } m_healingRadius->setValue( healingradius ); - addOptionWidgetOption(m_healingRadius, new QLabel(i18n("Healing radius"), widget )); - m_perspectiveCorrection = new QCheckBox(widget); - addOptionWidgetOption(m_perspectiveCorrection, new QLabel(i18n("Correct the perspective"), widget )); + addOptionWidgetOption(m_healingRadius, new TQLabel(i18n("Healing radius"), widget )); + m_perspectiveCorrection = new TQCheckBox(widget); + addOptionWidgetOption(m_perspectiveCorrection, new TQLabel(i18n("Correct the perspective"), widget )); return widget; } diff --git a/krita/plugins/tools/defaulttools/kis_tool_duplicate.h b/krita/plugins/tools/defaulttools/kis_tool_duplicate.h index 758542b8..2201badd 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_duplicate.h +++ b/krita/plugins/tools/defaulttools/kis_tool_duplicate.h @@ -27,13 +27,14 @@ class KisEvent; class KisButtonPressEvent; -class QCheckBox; +class TQCheckBox; class KIntNumInput; class KisToolDuplicate : public KisToolFreehand { typedef KisToolFreehand super; Q_OBJECT + TQ_OBJECT public: KisToolDuplicate(); @@ -41,7 +42,7 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_FREEHAND; } - virtual Q_UINT32 priority() { return 0; } + virtual TQ_UINT32 priority() { return 0; } virtual void buttonPress(KisButtonPressEvent *e); virtual void move(KisMoveEvent *e); @@ -50,8 +51,8 @@ public: const double xTilt, const double yTilt); - virtual QString quickHelp() const; - virtual QWidget* createOptionWidget(QWidget* parent); + virtual TQString quickHelp() const; + virtual TQWidget* createOptionWidget(TQWidget* tqparent); protected slots: virtual void activate(); @@ -64,9 +65,9 @@ protected: bool m_isOffsetNotUptodate; // Tells if the offset is update KisPoint m_position; // Give the position of the last alt-click KisPoint m_positionStartPainting; - QCheckBox* m_healing; + TQCheckBox* m_healing; KIntNumInput* m_healingRadius; - QCheckBox* m_perspectiveCorrection; + TQCheckBox* m_perspectiveCorrection; }; diff --git a/krita/plugins/tools/defaulttools/kis_tool_ellipse.cc b/krita/plugins/tools/defaulttools/kis_tool_ellipse.cc index dd8867c6..bae8ae04 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_ellipse.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_ellipse.cc @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qpainter.h> +#include <tqpainter.h> #include <kaction.h> #include <kdebug.h> @@ -75,23 +75,23 @@ void KisToolEllipse::move(KisMoveEvent *event) // erase old lines on canvas draw(m_dragStart, m_dragEnd); // move (alt) or resize ellipse - if (event->state() & Qt::AltButton) { + if (event->state() & TQt::AltButton) { KisPoint trans = event->pos() - m_dragEnd; m_dragStart += trans; m_dragEnd += trans; } else { - KisPoint diag = event->pos() - (event->state() & Qt::ControlButton + KisPoint diag = event->pos() - (event->state() & TQt::ControlButton ? m_dragCenter : m_dragStart); // circle? - if (event->state() & Qt::ShiftButton) { - double size = QMAX(fabs(diag.x()), fabs(diag.y())); + if (event->state() & TQt::ShiftButton) { + double size = TQMAX(fabs(diag.x()), fabs(diag.y())); double w = diag.x() < 0 ? -size : size; double h = diag.y() < 0 ? -size : size; diag = KisPoint(w, h); } // resize around center point? - if (event->state() & Qt::ControlButton) { + if (event->state() & TQt::ControlButton) { m_dragStart = m_dragCenter - diag; m_dragEnd = m_dragCenter + diag; } else { @@ -158,8 +158,8 @@ void KisToolEllipse::draw(const KisPoint& start, const KisPoint& end ) KisCanvas *canvas = controller->kiscanvas(); KisCanvasPainter p (canvas); - p.setRasterOp (Qt::NotROP); - p.drawEllipse (QRect (controller->windowToView (start).floorQPoint(), controller->windowToView (end).floorQPoint())); + p.setRasterOp (TQt::NotROP); + p.drawEllipse (TQRect (controller->windowToView (start).floorTQPoint(), controller->windowToView (end).floorTQPoint())); p.end (); } @@ -168,13 +168,13 @@ void KisToolEllipse::setup(KActionCollection *collection) m_action = static_cast<KRadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(Qt::Key_Plus); - shortcut.append(KShortcut(Qt::Key_F7)); + KShortcut shortcut(TQt::Key_Plus); + shortcut.append(KShortcut(TQt::Key_F7)); m_action = new KRadioAction(i18n("&Ellipse"), "tool_ellipse", shortcut, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Draw an ellipse")); diff --git a/krita/plugins/tools/defaulttools/kis_tool_ellipse.h b/krita/plugins/tools/defaulttools/kis_tool_ellipse.h index a7bd595c..4f79fbd6 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_ellipse.h +++ b/krita/plugins/tools/defaulttools/kis_tool_ellipse.h @@ -33,6 +33,7 @@ class KisToolEllipse : public KisToolShape { typedef KisToolShape super; Q_OBJECT + TQ_OBJECT public: KisToolEllipse(); @@ -49,7 +50,7 @@ public: // virtual void setup(KActionCollection *collection); - virtual Q_UINT32 priority() { return 3; } + virtual TQ_UINT32 priority() { return 3; } virtual enumToolType toolType() { return TOOL_SHAPE; } virtual void buttonPress(KisButtonPressEvent *event); virtual void move(KisMoveEvent *event); diff --git a/krita/plugins/tools/defaulttools/kis_tool_fill.cc b/krita/plugins/tools/defaulttools/kis_tool_fill.cc index 3edd4f17..6e2ae99c 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_fill.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_fill.cc @@ -24,11 +24,11 @@ #include <kdebug.h> #include <klocale.h> #include <kcommand.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqcheckbox.h> -#include <qcolor.h> +#include <tqcolor.h> #include "knuminput.h" @@ -81,7 +81,7 @@ bool KisToolFill::flood(int startX, int startY) if (!device) return false; if (m_fillOnlySelection) { - QRect rc = device->selection()->selectedRect(); + TQRect rc = device->selection()->selectedRect(); KisPaintDeviceSP filled = new KisPaintDevice(device->colorSpace(), "filled"); KisFillPainter painter(filled); if (m_usePattern) @@ -145,41 +145,41 @@ void KisToolFill::buttonRelease(KisButtonReleaseEvent *e) { if (!m_subject) return; if (!m_currentImage || !m_currentImage->activeDevice()) return; - if (e->button() != QMouseEvent::LeftButton) return; + if (e->button() != TQMouseEvent::LeftButton) return; if(!m_wasPressed) return; m_wasPressed = false; int x, y; x = m_startPos.floorX(); y = m_startPos.floorY(); - if (!m_currentImage->bounds().contains(x, y)) { + if (!m_currentImage->bounds().tqcontains(x, y)) { return; } flood(x, y); notifyModified(); } -QWidget* KisToolFill::createOptionWidget(QWidget* parent) +TQWidget* KisToolFill::createOptionWidget(TQWidget* tqparent) { - QWidget *widget = super::createOptionWidget(parent); + TQWidget *widget = super::createOptionWidget(tqparent); - m_lbThreshold = new QLabel(i18n("Threshold: "), widget); + m_lbThreshold = new TQLabel(i18n("Threshold: "), widget); m_slThreshold = new KIntNumInput( widget, "int_widget"); m_slThreshold->setRange( 1, 100); m_slThreshold->setSteps( 3, 3); m_slThreshold->setValue(m_threshold); - connect(m_slThreshold, SIGNAL(valueChanged(int)), this, SLOT(slotSetThreshold(int))); + connect(m_slThreshold, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetThreshold(int))); - m_checkUsePattern = new QCheckBox(i18n("Use pattern"), widget); + m_checkUsePattern = new TQCheckBox(i18n("Use pattern"), widget); m_checkUsePattern->setChecked(m_usePattern); - connect(m_checkUsePattern, SIGNAL(toggled(bool)), this, SLOT(slotSetUsePattern(bool))); + connect(m_checkUsePattern, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetUsePattern(bool))); - m_checkSampleMerged = new QCheckBox(i18n("Limit to current layer"), widget); + m_checkSampleMerged = new TQCheckBox(i18n("Limit to current layer"), widget); m_checkSampleMerged->setChecked(m_unmerged); - connect(m_checkSampleMerged, SIGNAL(toggled(bool)), this, SLOT(slotSetSampleMerged(bool))); + connect(m_checkSampleMerged, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetSampleMerged(bool))); - m_checkFillSelection = new QCheckBox(i18n("Fill entire selection"), widget); + m_checkFillSelection = new TQCheckBox(i18n("Fill entire selection"), widget); m_checkFillSelection->setChecked(m_fillOnlySelection); - connect(m_checkFillSelection, SIGNAL(toggled(bool)), this, SLOT(slotSetFillSelection(bool))); + connect(m_checkFillSelection, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFillSelection(bool))); addOptionWidgetOption(m_slThreshold, m_lbThreshold); @@ -219,9 +219,9 @@ void KisToolFill::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("&Fill"), "tool_color_fill", - Qt::Key_F, + TQt::Key_F, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Contiguous fill")); diff --git a/krita/plugins/tools/defaulttools/kis_tool_fill.h b/krita/plugins/tools/defaulttools/kis_tool_fill.h index 2b121d9c..411d711e 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_fill.h +++ b/krita/plugins/tools/defaulttools/kis_tool_fill.h @@ -21,15 +21,15 @@ #ifndef __filltool_h__ #define __filltool_h__ -#include <qpoint.h> +#include <tqpoint.h> #include "kis_point.h" #include "kis_tool_paint.h" class KisPainter; -class QWidget; -class QLabel; -class QCheckBox; +class TQWidget; +class TQLabel; +class TQCheckBox; class KIntNumInput; class KActionCollection; @@ -37,6 +37,7 @@ class KisToolFill : public KisToolPaint { typedef KisToolPaint super; Q_OBJECT + TQ_OBJECT public: @@ -45,7 +46,7 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_FILL; } - virtual Q_UINT32 priority() { return 0; } + virtual TQ_UINT32 priority() { return 0; } virtual void update(KisCanvasSubject *subject); @@ -54,7 +55,7 @@ public: bool flood(int startX, int startY); - virtual QWidget* createOptionWidget(QWidget* parent); + virtual TQWidget* createOptionWidget(TQWidget* tqparent); public slots: virtual void slotSetThreshold(int); @@ -65,20 +66,20 @@ public slots: private: KisPoint m_startPos; int m_threshold; - Q_INT32 m_depth; + TQ_INT32 m_depth; KisLayerSP m_lay; - Q_UINT8* m_oldColor, *m_color; + TQ_UINT8* m_oldColor, *m_color; KisPainter *m_painter; KisCanvasSubject *m_subject; KisImageSP m_currentImage; bool *m_map, m_unmerged, m_usePattern, m_fillOnlySelection; KisSelectionSP m_selection; - QLabel *m_lbThreshold; + TQLabel *m_lbThreshold; KIntNumInput *m_slThreshold; - QCheckBox *m_checkUsePattern; - QCheckBox *m_checkSampleMerged; - QCheckBox *m_checkFillSelection; + TQCheckBox *m_checkUsePattern; + TQCheckBox *m_checkSampleMerged; + TQCheckBox *m_checkFillSelection; bool m_wasPressed; // use for preventing bug:133148 }; diff --git a/krita/plugins/tools/defaulttools/kis_tool_gradient.cc b/krita/plugins/tools/defaulttools/kis_tool_gradient.cc index 6c35de4e..20ea5aa1 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_gradient.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_gradient.cc @@ -21,10 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qpainter.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qcheckbox.h> +#include <tqpainter.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqcheckbox.h> #include <kdebug.h> #include <kaction.h> @@ -58,7 +58,7 @@ KisToolGradient::KisToolGradient() m_endPos = KisPoint(0, 0); m_reverse = false; - m_shape = KisGradientPainter::GradientShapeLinear; + m_tqshape = KisGradientPainter::GradientShapeLinear; m_repeat = KisGradientPainter::GradientRepeatNone; m_antiAliasThreshold = 0.2; } @@ -79,7 +79,7 @@ void KisToolGradient::paint(KisCanvasPainter& gc) paintLine(gc); } -void KisToolGradient::paint(KisCanvasPainter& gc, const QRect&) +void KisToolGradient::paint(KisCanvasPainter& gc, const TQRect&) { if (m_dragging) paintLine(gc); @@ -91,7 +91,7 @@ void KisToolGradient::buttonPress(KisButtonPressEvent *e) return; } - if (e->button() == QMouseEvent::LeftButton) { + if (e->button() == TQMouseEvent::LeftButton) { m_dragging = true; m_startPos = e->pos(); m_endPos = e->pos(); @@ -105,7 +105,7 @@ void KisToolGradient::move(KisMoveEvent *e) paintLine(); } - if ((e->state() & Qt::ShiftButton) == Qt::ShiftButton) { + if ((e->state() & TQt::ShiftButton) == TQt::ShiftButton) { m_endPos = straightLine(e->pos()); } else { @@ -118,7 +118,7 @@ void KisToolGradient::move(KisMoveEvent *e) void KisToolGradient::buttonRelease(KisButtonReleaseEvent *e) { - if (m_dragging && e->button() == QMouseEvent::LeftButton) { + if (m_dragging && e->button() == TQMouseEvent::LeftButton) { KisCanvasController *controller = m_subject->canvasController(); KisImageSP img = m_subject->currentImg(); @@ -131,7 +131,7 @@ void KisToolGradient::buttonRelease(KisButtonReleaseEvent *e) return; } - if ((e->state() & Qt::ShiftButton) == Qt::ShiftButton) { + if ((e->state() & TQt::ShiftButton) == TQt::ShiftButton) { m_endPos = straightLine(e->pos()); } else { @@ -157,7 +157,7 @@ void KisToolGradient::buttonRelease(KisButtonReleaseEvent *e) progress->setSubject(&painter, true, true); } - bool painted = painter.paintGradient(m_startPos, m_endPos, m_shape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height()); + bool painted = painter.paintGradient(m_startPos, m_endPos, m_tqshape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height()); if (painted) { // does whole thing at moment @@ -215,30 +215,30 @@ void KisToolGradient::paintLine(KisCanvasPainter& gc) KisPoint end = controller->windowToView(m_endPos); RasterOp op = gc.rasterOp(); - QPen old = gc.pen(); - QPen pen(Qt::SolidLine); + TQPen old = gc.pen(); + TQPen pen(TQt::SolidLine); - gc.setRasterOp(Qt::NotROP); + gc.setRasterOp(TQt::NotROP); gc.setPen(pen); - gc.drawLine(start.floorQPoint(), end.floorQPoint()); + gc.drawLine(start.floorTQPoint(), end.floorTQPoint()); gc.setRasterOp(op); gc.setPen(old); } } -QWidget* KisToolGradient::createOptionWidget(QWidget* parent) +TQWidget* KisToolGradient::createOptionWidget(TQWidget* tqparent) { - QWidget *widget = super::createOptionWidget(parent); + TQWidget *widget = super::createOptionWidget(tqparent); Q_CHECK_PTR(widget); - m_lbShape = new QLabel(i18n("Shape:"), widget); - m_lbRepeat = new QLabel(i18n("Repeat:"), widget); + m_lbShape = new TQLabel(i18n("Shape:"), widget); + m_lbRepeat = new TQLabel(i18n("Repeat:"), widget); - m_ckReverse = new QCheckBox(i18n("Reverse"), widget, "reverse_check"); - connect(m_ckReverse, SIGNAL(toggled(bool)), this, SLOT(slotSetReverse(bool))); + m_ckReverse = new TQCheckBox(i18n("Reverse"), widget, "reverse_check"); + connect(m_ckReverse, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetReverse(bool))); - m_cmbShape = new QComboBox(false, widget, "shape_combo"); - connect(m_cmbShape, SIGNAL(activated(int)), this, SLOT(slotSetShape(int))); + m_cmbShape = new TQComboBox(false, widget, "tqshape_combo"); + connect(m_cmbShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetShape(int))); m_cmbShape->insertItem(i18n("Linear")); m_cmbShape->insertItem(i18n("Bi-Linear")); m_cmbShape->insertItem(i18n("Radial")); @@ -246,8 +246,8 @@ QWidget* KisToolGradient::createOptionWidget(QWidget* parent) m_cmbShape->insertItem(i18n("Conical")); m_cmbShape->insertItem(i18n("Conical Symmetric")); - m_cmbRepeat = new QComboBox(false, widget, "repeat_combo"); - connect(m_cmbRepeat, SIGNAL(activated(int)), this, SLOT(slotSetRepeat(int))); + m_cmbRepeat = new TQComboBox(false, widget, "repeat_combo"); + connect(m_cmbRepeat, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetRepeat(int))); m_cmbRepeat->insertItem(i18n("None")); m_cmbRepeat->insertItem(i18n("Forwards")); m_cmbRepeat->insertItem(i18n("Alternating")); @@ -258,21 +258,21 @@ QWidget* KisToolGradient::createOptionWidget(QWidget* parent) addOptionWidgetOption(m_ckReverse); - m_lbAntiAliasThreshold = new QLabel(i18n("Anti-alias threshold:"), widget); + m_lbAntiAliasThreshold = new TQLabel(i18n("Anti-alias threshold:"), widget); m_slAntiAliasThreshold = new KDoubleNumInput(widget, "threshold_slider"); m_slAntiAliasThreshold->setRange( 0, 1); m_slAntiAliasThreshold->setValue(m_antiAliasThreshold); - connect(m_slAntiAliasThreshold, SIGNAL(valueChanged(double)), this, SLOT(slotSetAntiAliasThreshold(double))); + connect(m_slAntiAliasThreshold, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotSetAntiAliasThreshold(double))); addOptionWidgetOption(m_slAntiAliasThreshold, m_lbAntiAliasThreshold); return widget; } -void KisToolGradient::slotSetShape(int shape) +void KisToolGradient::slotSetShape(int tqshape) { - m_shape = static_cast<KisGradientPainter::enumGradientShape>(shape); + m_tqshape = static_cast<KisGradientPainter::enumGradientShape>(tqshape); } void KisToolGradient::slotSetRepeat(int repeat) @@ -296,8 +296,8 @@ void KisToolGradient::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("&Gradient"), - "tool_gradient", Qt::Key_G, this, - SLOT(activate()), collection, + "tool_gradient", TQt::Key_G, this, + TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Draw a gradient")); m_action->setExclusiveGroup("tools"); diff --git a/krita/plugins/tools/defaulttools/kis_tool_gradient.h b/krita/plugins/tools/defaulttools/kis_tool_gradient.h index c80529e3..59d78ad3 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_gradient.h +++ b/krita/plugins/tools/defaulttools/kis_tool_gradient.h @@ -37,16 +37,17 @@ class KDoubleNumInput; class KisCmbComposite; class KisPainter; -class QLabel; -class QPoint; -class QWidget; -class QCheckBox; +class TQLabel; +class TQPoint; +class TQWidget; +class TQCheckBox; class KisToolGradient : public KisToolPaint { Q_OBJECT + TQ_OBJECT typedef KisToolPaint super; public: @@ -55,7 +56,7 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_FILL; } - virtual Q_UINT32 priority() { return 1; } + virtual TQ_UINT32 priority() { return 1; } virtual void update(KisCanvasSubject *subject); @@ -64,9 +65,9 @@ public: virtual void buttonRelease(KisButtonReleaseEvent *event); virtual void paint(KisCanvasPainter& gc); - virtual void paint(KisCanvasPainter& gc, const QRect& rc); + virtual void paint(KisCanvasPainter& gc, const TQRect& rc); - QWidget* createOptionWidget(QWidget* parent); + TQWidget* createOptionWidget(TQWidget* tqparent); public slots: void slotSetShape(int); @@ -87,18 +88,18 @@ private: KisCanvasSubject *m_subject; - KisGradientPainter::enumGradientShape m_shape; + KisGradientPainter::enumGradientShape m_tqshape; KisGradientPainter::enumGradientRepeat m_repeat; bool m_reverse; double m_antiAliasThreshold; - QLabel *m_lbShape; - QLabel *m_lbRepeat; - QCheckBox *m_ckReverse; - QComboBox *m_cmbShape; - QComboBox *m_cmbRepeat; - QLabel *m_lbAntiAliasThreshold; + TQLabel *m_lbShape; + TQLabel *m_lbRepeat; + TQCheckBox *m_ckReverse; + TQComboBox *m_cmbShape; + TQComboBox *m_cmbRepeat; + TQLabel *m_lbAntiAliasThreshold; KDoubleNumInput *m_slAntiAliasThreshold; }; diff --git a/krita/plugins/tools/defaulttools/kis_tool_line.cc b/krita/plugins/tools/defaulttools/kis_tool_line.cc index cbdf5448..a335f918 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_line.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_line.cc @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qpainter.h> -#include <qlayout.h> -#include <qwidget.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqwidget.h> #include <kdebug.h> #include <kaction.h> @@ -72,10 +72,10 @@ void KisToolLine::update(KisCanvasSubject *subject) void KisToolLine::paint(KisCanvasPainter& gc) { if (m_dragging) - paintLine(gc, QRect()); + paintLine(gc, TQRect()); } -void KisToolLine::paint(KisCanvasPainter& gc, const QRect& rc) +void KisToolLine::paint(KisCanvasPainter& gc, const TQRect& rc) { if (m_dragging) paintLine(gc, rc); @@ -87,7 +87,7 @@ void KisToolLine::buttonPress(KisButtonPressEvent *e) if (!m_subject->currentBrush()) return; - if (e->button() == QMouseEvent::LeftButton) { + if (e->button() == TQMouseEvent::LeftButton) { m_dragging = true; //KisCanvasController *controller = m_subject->canvasController(); m_startPos = e->pos(); //controller->windowToView(e->pos()); @@ -102,11 +102,11 @@ void KisToolLine::move(KisMoveEvent *e) paintLine(); //KisCanvasController *controller = m_subject->canvasController(); - if (e->state() & Qt::AltButton) { + if (e->state() & TQt::AltButton) { KisPoint trans = e->pos() - m_endPos; m_startPos += trans; m_endPos += trans; - } else if (e->state() & Qt::ShiftButton) + } else if (e->state() & TQt::ShiftButton) m_endPos = straightLine(e->pos()); else m_endPos = e->pos();//controller->windowToView(e->pos()); @@ -116,7 +116,7 @@ void KisToolLine::move(KisMoveEvent *e) void KisToolLine::buttonRelease(KisButtonReleaseEvent *e) { - if (m_dragging && e->button() == QMouseEvent::LeftButton) { + if (m_dragging && e->button() == TQMouseEvent::LeftButton) { m_dragging = false; KisCanvasController *controller = m_subject->canvasController(); KisImageSP img = m_subject->currentImg(); @@ -127,7 +127,7 @@ void KisToolLine::buttonRelease(KisButtonReleaseEvent *e) return; } - if ((e->state() & Qt::ShiftButton) == Qt::ShiftButton) { + if ((e->state() & TQt::ShiftButton) == TQt::ShiftButton) { m_endPos = straightLine(e->pos()); } else { @@ -196,19 +196,19 @@ void KisToolLine::paintLine() KisCanvasController *controller = m_subject->canvasController(); KisCanvas *canvas = controller->kiscanvas(); KisCanvasPainter gc(canvas); - QRect rc; + TQRect rc; paintLine(gc, rc); } } -void KisToolLine::paintLine(KisCanvasPainter& gc, const QRect&) +void KisToolLine::paintLine(KisCanvasPainter& gc, const TQRect&) { if (m_subject) { KisCanvasController *controller = m_subject->canvasController(); RasterOp op = gc.rasterOp(); - QPen old = gc.pen(); - QPen pen(Qt::SolidLine); + TQPen old = gc.pen(); + TQPen pen(TQt::SolidLine); KisPoint start; KisPoint end; @@ -223,9 +223,9 @@ void KisToolLine::paintLine(KisCanvasPainter& gc, const QRect&) // end.setY((end.y() - start.y())); // start *= m_subject->zoomFactor(); // end *= m_subject->zoomFactor(); - gc.setRasterOp(Qt::NotROP); + gc.setRasterOp(TQt::NotROP); gc.setPen(pen); - gc.drawLine(start.floorQPoint(), end.floorQPoint()); + gc.drawLine(start.floorTQPoint(), end.floorTQPoint()); gc.setRasterOp(op); gc.setPen(old); } @@ -237,8 +237,8 @@ void KisToolLine::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("&Line"), - "tool_line", Qt::Key_L, this, - SLOT(activate()), collection, + "tool_line", TQt::Key_L, this, + TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Draw a line")); m_action->setExclusiveGroup("tools"); @@ -246,7 +246,7 @@ void KisToolLine::setup(KActionCollection *collection) } } -QString KisToolLine::quickHelp() const { +TQString KisToolLine::quickHelp() const { return i18n("Alt+Drag will move the origin of the currently displayed line around, Shift+Drag will force you to draw straight lines"); } diff --git a/krita/plugins/tools/defaulttools/kis_tool_line.h b/krita/plugins/tools/defaulttools/kis_tool_line.h index 8a84a819..4ce0ff38 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_line.h +++ b/krita/plugins/tools/defaulttools/kis_tool_line.h @@ -32,13 +32,14 @@ class KisBrush; class KisPainter; -class QPoint; -class QWidget; +class TQPoint; +class TQWidget; class KisToolLine : public KisToolPaint { Q_OBJECT + TQ_OBJECT typedef KisToolPaint super; public: @@ -47,7 +48,7 @@ class KisToolLine : public KisToolPaint { virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } - virtual Q_UINT32 priority() { return 1; } + virtual TQ_UINT32 priority() { return 1; } virtual void update(KisCanvasSubject *subject); virtual void buttonPress(KisButtonPressEvent *event); @@ -55,13 +56,13 @@ class KisToolLine : public KisToolPaint { virtual void buttonRelease(KisButtonReleaseEvent *event); virtual void paint(KisCanvasPainter& gc); - virtual void paint(KisCanvasPainter& gc, const QRect& rc); + virtual void paint(KisCanvasPainter& gc, const TQRect& rc); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; private: void paintLine(); - void paintLine(KisCanvasPainter& gc, const QRect& rc); + void paintLine(KisCanvasPainter& gc, const TQRect& rc); KisPoint straightLine(KisPoint point); diff --git a/krita/plugins/tools/defaulttools/kis_tool_move.cc b/krita/plugins/tools/defaulttools/kis_tool_move.cc index 810bda37..643c29c8 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_move.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_move.cc @@ -20,10 +20,10 @@ */ #include <stdlib.h> -#include <qpoint.h> +#include <tqpoint.h> #include <kaction.h> #include <klocale.h> -#include <qcolor.h> +#include <tqcolor.h> #include "kis_canvas_subject.h" #include "kis_cursor.h" #include "kis_image.h" @@ -45,8 +45,8 @@ KisToolMove::KisToolMove() setName("tool_move"); setCursor(KisCursor::moveCursor()); - m_repeatTimer = new QTimer(this); - connect( m_repeatTimer, SIGNAL( timeout() ), this, SLOT( slotMove() ) ); + m_repeatTimer = new TQTimer(this); + connect( m_repeatTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotMove() ) ); } KisToolMove::~KisToolMove() @@ -62,8 +62,8 @@ void KisToolMove::update(KisCanvasSubject *subject) void KisToolMove::buttonPress(KisButtonPressEvent *e) { - if (m_subject && e->button() == QMouseEvent::LeftButton) { - QPoint pos = e->pos().floorQPoint(); + if (m_subject && e->button() == TQMouseEvent::LeftButton) { + TQPoint pos = e->pos().floorTQPoint(); KisImageSP img = m_subject->currentImg(); KisLayerSP dev; @@ -76,9 +76,9 @@ void KisToolMove::buttonPress(KisButtonPressEvent *e) void KisToolMove::move(KisMoveEvent *e) { - if (m_subject && e->state() == QMouseEvent::LeftButton) { - QPoint pos = e->pos().floorQPoint(); - if((e->state() & Qt::AltButton) || (e->state() & Qt::ControlButton)) { + if (m_subject && e->state() == TQMouseEvent::LeftButton) { + TQPoint pos = e->pos().floorTQPoint(); + if((e->state() & TQt::AltButton) || (e->state() & TQt::ControlButton)) { if(fabs(pos.x() - m_dragStart.x()) > fabs(pos.y() - m_dragStart.y())) pos.setY(m_dragStart.y()); else @@ -90,8 +90,8 @@ void KisToolMove::move(KisMoveEvent *e) void KisToolMove::buttonRelease(KisButtonReleaseEvent *e) { - if (m_subject && e->button() == QMouseEvent::LeftButton) { - m_strategy.endDrag(e->pos().floorQPoint()); + if (m_subject && e->button() == TQMouseEvent::LeftButton) { + m_strategy.endDrag(e->pos().floorTQPoint()); } } @@ -102,9 +102,9 @@ void KisToolMove::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("&Move"), "tool_move", - Qt::SHIFT+Qt::Key_V, + TQt::SHIFT+TQt::Key_V, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Move")); @@ -114,7 +114,7 @@ void KisToolMove::setup(KActionCollection *collection) } -void KisToolMove::keyPress( QKeyEvent *e ) +void KisToolMove::keyPress( TQKeyEvent *e ) { m_keyEvent = e; @@ -126,7 +126,7 @@ void KisToolMove::keyPress( QKeyEvent *e ) if (!img || !(dev = img->activeLayer())) return; - m_dragStart = QPoint( 0, 0 ); + m_dragStart = TQPoint( 0, 0 ); m_strategy.startDrag( m_dragStart ); m_steps = 1; m_repeatTimer->start(200); @@ -134,23 +134,23 @@ void KisToolMove::keyPress( QKeyEvent *e ) } } -void KisToolMove::keyRelease(QKeyEvent *) +void KisToolMove::keyRelease(TQKeyEvent *) { m_repeatTimer->stop(); if ( m_subject && m_keyEvent) { - if ( m_keyEvent->key() == Qt::Key_Left ) { - m_strategy.endDrag(QPoint( -m_steps, 0 )); + if ( m_keyEvent->key() == TQt::Key_Left ) { + m_strategy.endDrag(TQPoint( -m_steps, 0 )); } - else if ( m_keyEvent->key() == Qt::Key_Right ) { - m_strategy.endDrag(QPoint(m_steps, 0) ); + else if ( m_keyEvent->key() == TQt::Key_Right ) { + m_strategy.endDrag(TQPoint(m_steps, 0) ); } - else if ( m_keyEvent->key() == Qt::Key_Up ) { - m_strategy.endDrag(QPoint(0, -m_steps) ); + else if ( m_keyEvent->key() == TQt::Key_Up ) { + m_strategy.endDrag(TQPoint(0, -m_steps) ); } - else if ( m_keyEvent->key() == Qt::Key_Down ) { - m_strategy.endDrag(QPoint(0, m_steps) ); + else if ( m_keyEvent->key() == TQt::Key_Down ) { + m_strategy.endDrag(TQPoint(0, m_steps) ); } } m_steps = 0; @@ -162,17 +162,17 @@ void KisToolMove::slotMove() { if (m_subject && m_keyEvent) { - if ( m_keyEvent->key() == Qt::Key_Left ) { - m_strategy.drag(QPoint(-m_steps, 0) ); + if ( m_keyEvent->key() == TQt::Key_Left ) { + m_strategy.drag(TQPoint(-m_steps, 0) ); } - else if ( m_keyEvent->key() == Qt::Key_Right ) { - m_strategy.drag(QPoint(m_steps, 0) ); + else if ( m_keyEvent->key() == TQt::Key_Right ) { + m_strategy.drag(TQPoint(m_steps, 0) ); } - else if ( m_keyEvent->key() == Qt::Key_Up ) { - m_strategy.drag(QPoint(0, -m_steps) ); + else if ( m_keyEvent->key() == TQt::Key_Up ) { + m_strategy.drag(TQPoint(0, -m_steps) ); } - else if ( m_keyEvent->key() == Qt::Key_Down ) { - m_strategy.drag(QPoint(0, m_steps) ); + else if ( m_keyEvent->key() == TQt::Key_Down ) { + m_strategy.drag(TQPoint(0, m_steps) ); } ++m_steps; diff --git a/krita/plugins/tools/defaulttools/kis_tool_move.h b/krita/plugins/tools/defaulttools/kis_tool_move.h index 128a9661..274cc3c7 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_move.h +++ b/krita/plugins/tools/defaulttools/kis_tool_move.h @@ -21,18 +21,19 @@ #ifndef KIS_TOOL_MOVE_H_ #define KIS_TOOL_MOVE_H_ -#include <qtimer.h> +#include <tqtimer.h> #include "kis_strategy_move.h" #include "kis_tool_non_paint.h" #include "kis_tool_factory.h" -class QTimer; +class TQTimer; class KisToolMove : public KisToolNonPaint { typedef KisToolNonPaint super; Q_OBJECT + TQ_OBJECT public: KisToolMove(); @@ -44,13 +45,13 @@ public: public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_TRANSFORM; } - virtual Q_UINT32 priority() { return 2; } + virtual TQ_UINT32 priority() { return 2; } virtual void buttonPress(KisButtonPressEvent *e); virtual void move(KisMoveEvent *e); virtual void buttonRelease(KisButtonReleaseEvent *e); - virtual void keyPress(QKeyEvent *e); - virtual void keyRelease(QKeyEvent *e); + virtual void keyPress(TQKeyEvent *e); + virtual void keyRelease(TQKeyEvent *e); private slots: @@ -60,9 +61,9 @@ private: KisCanvasSubject *m_subject; KisStrategyMove m_strategy; - QPoint m_dragStart; - QTimer * m_repeatTimer; - QKeyEvent * m_keyEvent; + TQPoint m_dragStart; + TQTimer * m_repeatTimer; + TQKeyEvent * m_keyEvent; int m_steps; }; diff --git a/krita/plugins/tools/defaulttools/kis_tool_pan.cc b/krita/plugins/tools/defaulttools/kis_tool_pan.cc index 56da211d..f7a92dcb 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_pan.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_pan.cc @@ -85,7 +85,7 @@ void KisToolPan::setup(KActionCollection *collection) m_action = static_cast<KRadioAction *>(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Pan"), "tool_pan", Qt::SHIFT+Qt::Key_H, this, SLOT(activate()), collection, name()); + m_action = new KRadioAction(i18n("&Pan"), "tool_pan", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Pan")); m_action->setExclusiveGroup("tools"); m_ownAction = true; diff --git a/krita/plugins/tools/defaulttools/kis_tool_pan.h b/krita/plugins/tools/defaulttools/kis_tool_pan.h index d0f37669..36ed9dcc 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_pan.h +++ b/krita/plugins/tools/defaulttools/kis_tool_pan.h @@ -32,6 +32,7 @@ class KRITATOOL_EXPORT KisToolPan : public KisToolNonPaint typedef KisToolNonPaint super; Q_OBJECT + TQ_OBJECT public: KisToolPan(); @@ -41,7 +42,7 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_VIEW; } - virtual Q_UINT32 priority() { return 1; } + virtual TQ_UINT32 priority() { return 1; } virtual void buttonPress(KisButtonPressEvent *e); virtual void move(KisMoveEvent *e); @@ -52,11 +53,11 @@ public: private: KisCanvasSubject *m_subject; KisPoint m_dragPos; - Q_INT32 m_origScrollX; - Q_INT32 m_origScrollY; + TQ_INT32 m_origScrollX; + TQ_INT32 m_origScrollY; bool m_dragging; - QCursor m_openHandCursor; - QCursor m_closedHandCursor; + TQCursor m_openHandCursor; + TQCursor m_closedHandCursor; }; class KisToolPanFactory : public KisToolFactory { diff --git a/krita/plugins/tools/defaulttools/kis_tool_rectangle.cc b/krita/plugins/tools/defaulttools/kis_tool_rectangle.cc index 13b81c7f..741b5051 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_rectangle.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_rectangle.cc @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qpainter.h> +#include <tqpainter.h> #include <kaction.h> #include <kdebug.h> @@ -76,23 +76,23 @@ void KisToolRectangle::move(KisMoveEvent *event) // erase old lines on canvas draw(m_dragStart, m_dragEnd); // move (alt) or resize rectangle - if (event->state() & Qt::AltButton) { + if (event->state() & TQt::AltButton) { KisPoint trans = event->pos() - m_dragEnd; m_dragStart += trans; m_dragEnd += trans; } else { - KisPoint diag = event->pos() - (event->state() & Qt::ControlButton + KisPoint diag = event->pos() - (event->state() & TQt::ControlButton ? m_dragCenter : m_dragStart); // square? - if (event->state() & Qt::ShiftButton) { - double size = QMAX(fabs(diag.x()), fabs(diag.y())); + if (event->state() & TQt::ShiftButton) { + double size = TQMAX(fabs(diag.x()), fabs(diag.y())); double w = diag.x() < 0 ? -size : size; double h = diag.y() < 0 ? -size : size; diag = KisPoint(w, h); } // resize around center point? - if (event->state() & Qt::ControlButton) { + if (event->state() & TQt::ControlButton) { m_dragStart = m_dragCenter - diag; m_dragEnd = m_dragCenter + diag; } else { @@ -161,8 +161,8 @@ void KisToolRectangle::draw(const KisPoint& start, const KisPoint& end ) KisCanvas *canvas = controller->kiscanvas(); KisCanvasPainter p (canvas); - p.setRasterOp (Qt::NotROP); - p.drawRect (QRect (controller->windowToView (start).floorQPoint(), controller->windowToView (end).floorQPoint())); + p.setRasterOp (TQt::NotROP); + p.drawRect (TQRect (controller->windowToView (start).floorTQPoint(), controller->windowToView (end).floorTQPoint())); p.end (); } @@ -173,9 +173,9 @@ void KisToolRectangle::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("&Rectangle"), "tool_rectangle", - Qt::Key_F6, + TQt::Key_F6, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Draw a rectangle")); diff --git a/krita/plugins/tools/defaulttools/kis_tool_rectangle.h b/krita/plugins/tools/defaulttools/kis_tool_rectangle.h index d9f1bf21..cc6c0853 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_rectangle.h +++ b/krita/plugins/tools/defaulttools/kis_tool_rectangle.h @@ -24,20 +24,21 @@ #ifndef __KIS_TOOL_RECTANGLE_H__ #define __KIS_TOOL_RECTANGLE_H__ -#include <qrect.h> +#include <tqrect.h> #include "kis_tool_shape.h" #include "kis_types.h" #include "kis_tool_factory.h" #include "kis_point.h" -class QPainter; +class TQPainter; class KisPainter; class KisToolRectangle : public KisToolShape { typedef KisToolShape super; Q_OBJECT + TQ_OBJECT public: KisToolRectangle(); @@ -55,7 +56,7 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } - virtual Q_UINT32 priority() { return 2; } + virtual TQ_UINT32 priority() { return 2; } virtual void buttonPress(KisButtonPressEvent *event); virtual void move(KisMoveEvent *event); virtual void buttonRelease(KisButtonReleaseEvent *event); @@ -69,7 +70,7 @@ protected: KisPoint m_dragCenter; KisPoint m_dragStart; KisPoint m_dragEnd; - QRect m_final_lines; + TQRect m_final_lines; bool m_dragging; KisImageSP m_currentImage; diff --git a/krita/plugins/tools/defaulttools/kis_tool_text.cc b/krita/plugins/tools/defaulttools/kis_tool_text.cc index b75f1b1b..853ff322 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_text.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_text.cc @@ -16,17 +16,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qfont.h> -#include <qrect.h> -#include <qimage.h> -#include <qlayout.h> -#include <qwidget.h> -#include <qstring.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qpushbutton.h> -#include <qfontmetrics.h> -#include <qhbox.h> +#include <tqfont.h> +#include <tqrect.h> +#include <tqimage.h> +#include <tqlayout.h> +#include <tqwidget.h> +#include <tqstring.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqpushbutton.h> +#include <tqfontmetrics.h> +#include <tqhbox.h> #include <kaction.h> #include <kinputdialog.h> @@ -34,7 +34,7 @@ #include <kfontdialog.h> #include <ksqueezedtextlabel.h> -#include <qcolor.h> +#include <tqcolor.h> #include "kis_point.h" #include "kis_image.h" @@ -72,7 +72,7 @@ void KisToolText::update(KisCanvasSubject *subject) void KisToolText::buttonPress(KisButtonPressEvent *e) { - if (m_subject && e->button() == QMouseEvent::LeftButton) { + if (m_subject && e->button() == TQMouseEvent::LeftButton) { m_wasPressed = true; } } @@ -81,15 +81,15 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) { if ( m_windowIsBeingShown ) return; - if (m_subject && e->button() == QMouseEvent::LeftButton) { + if (m_subject && e->button() == TQMouseEvent::LeftButton) { if(!m_wasPressed) return; m_wasPressed = false; KisImageSP img = m_subject->currentImg(); m_windowIsBeingShown = true; bool ok; - QString text = KInputDialog::getText(i18n("Font Tool"), i18n("Enter text:"), - QString::null, &ok); + TQString text = KInputDialog::getText(i18n("Font Tool"), i18n("Enter text:"), + TQString(), &ok); if (!ok) { m_windowIsBeingShown = false; return; @@ -100,37 +100,37 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) undoAdapter->beginMacro(i18n("Text")); } - QFontMetrics metrics(m_font); - QRect boundingRect = metrics.boundingRect(text).normalize(); + TQFontMetrics metrics(m_font); + TQRect boundingRect = metrics.boundingRect(text).normalize(); int xB = - boundingRect.x(); int yB = - boundingRect.y(); if (boundingRect.x() < 0 || boundingRect.y() < 0) boundingRect.moveBy(- boundingRect.x(), - boundingRect.y()); - QPixmap pixels(boundingRect.width(), boundingRect.height()); + TQPixmap pixels(boundingRect.width(), boundingRect.height()); { - QPainter paint(&pixels); - paint.fillRect(boundingRect, Qt::white); + TQPainter paint(&pixels); + paint.fillRect(boundingRect, TQt::white); paint.setFont(m_font); - paint.setBrush(QBrush(Qt::black)); + paint.setBrush(TQBrush(TQt::black)); paint.drawText(xB, yB, text); } - QImage image = pixels.convertToImage(); + TQImage image = pixels.convertToImage(); - Q_INT32 height = boundingRect.height(); - Q_INT32 width = boundingRect.width(); + TQ_INT32 height = boundingRect.height(); + TQ_INT32 width = boundingRect.width(); KisPaintLayer *layer = new KisPaintLayer(img, '"' + text + '"', OPACITY_OPAQUE); - KisGroupLayerSP parent = img->rootLayer(); + KisGroupLayerSP tqparent = img->rootLayer(); if (img->activeLayer()) - parent = img->activeLayer()->parent(); - img->addLayer(layer, parent, img->activeLayer()); + tqparent = img->activeLayer()->tqparent(); + img->addLayer(layer, tqparent, img->activeLayer()); for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { - QRgb pixel = image.pixel(x, y); + TQRgb pixel = image.pixel(x, y); // use the 'blackness' as alpha :) - Q_UINT8 alpha = 255 - qRed(pixel) * OPACITY_OPAQUE / 255; - QColor c = m_subject->fgColor().toQColor(); + TQ_UINT8 alpha = 255 - tqRed(pixel) * OPACITY_OPAQUE / 255; + TQColor c = m_subject->fgColor().toTQColor(); layer->paintDevice()->setPixel(x, y, c, alpha); } } @@ -139,8 +139,8 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) layer->setCompositeOp(m_compositeOp); layer->setVisible(false); - Q_INT32 x = QMAX(0, static_cast<int>(e->x() - width/2)); - Q_INT32 y = QMAX(0, static_cast<int>(e->y() - height/2)); + TQ_INT32 x = TQMAX(0, static_cast<int>(e->x() - width/2)); + TQ_INT32 y = TQMAX(0, static_cast<int>(e->y() - height/2)); layer->setX(x); layer->setY(y); layer->setVisible(true); @@ -155,22 +155,22 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) } void KisToolText::setFont() { - KFontDialog::getFont( m_font, false/*, QWidget* parent! */ ); - m_lbFontName->setText(QString(m_font.family() + ", %1").arg(m_font.pointSize())); + KFontDialog::getFont( m_font, false/*, TQWidget* tqparent! */ ); + m_lbFontName->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize())); } -QWidget* KisToolText::createOptionWidget(QWidget* parent) +TQWidget* KisToolText::createOptionWidget(TQWidget* tqparent) { - QWidget *widget = super::createOptionWidget(parent); + TQWidget *widget = super::createOptionWidget(tqparent); - m_lbFont = new QLabel(i18n("Font: "), widget); + m_lbFont = new TQLabel(i18n("Font: "), widget); - QHBox *fontBox = new QHBox(widget); - m_lbFontName = new KSqueezedTextLabel(QString(m_font.family() + ", %1") - .arg(m_font.pointSize()), fontBox); - m_btnMoreFonts = new QPushButton("...", fontBox); + TQHBox *fontBox = new TQHBox(widget); + m_lbFontName = new KSqueezedTextLabel(TQString(m_font.family() + ", %1") + .tqarg(m_font.pointSize()), fontBox); + m_btnMoreFonts = new TQPushButton("...", fontBox); - connect(m_btnMoreFonts, SIGNAL(released()), this, SLOT(setFont())); + connect(m_btnMoreFonts, TQT_SIGNAL(released()), this, TQT_SLOT(setFont())); addOptionWidgetOption(fontBox, m_lbFont); @@ -184,9 +184,9 @@ void KisToolText::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("T&ext"), "tool_text", - Qt::SHIFT+Qt::Key_T, + TQt::SHIFT+TQt::Key_T, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); m_action->setExclusiveGroup("tools"); diff --git a/krita/plugins/tools/defaulttools/kis_tool_text.h b/krita/plugins/tools/defaulttools/kis_tool_text.h index b7bc857c..b2aa7e18 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_text.h +++ b/krita/plugins/tools/defaulttools/kis_tool_text.h @@ -23,10 +23,10 @@ #include "kis_tool_factory.h" -class QFont; -class QLabel; -class QWidget; -class QPushButton; +class TQFont; +class TQLabel; +class TQWidget; +class TQPushButton; class KSqueezedTextLabel; @@ -34,6 +34,7 @@ class KSqueezedTextLabel; class KisToolText : public KisToolPaint { typedef KisToolPaint super; Q_OBJECT + TQ_OBJECT public: KisToolText(); @@ -42,20 +43,20 @@ public: virtual void update(KisCanvasSubject *subject); virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_FILL; } - virtual Q_UINT32 priority() { return 2; } + virtual TQ_UINT32 priority() { return 2; } virtual void buttonPress(KisButtonPressEvent*); virtual void buttonRelease(KisButtonReleaseEvent *e); - virtual QWidget* createOptionWidget(QWidget* parent); + virtual TQWidget* createOptionWidget(TQWidget* tqparent); public slots: virtual void setFont(); private: KisCanvasSubject *m_subject; - QFont m_font; - QLabel *m_lbFont; + TQFont m_font; + TQLabel *m_lbFont; KSqueezedTextLabel *m_lbFontName; - QPushButton *m_btnMoreFonts; + TQPushButton *m_btnMoreFonts; bool m_wasPressed; // use for preventing bug:136151 bool m_windowIsBeingShown; }; diff --git a/krita/plugins/tools/defaulttools/kis_tool_zoom.cc b/krita/plugins/tools/defaulttools/kis_tool_zoom.cc index a5567f83..f866e5e2 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_zoom.cc +++ b/krita/plugins/tools/defaulttools/kis_tool_zoom.cc @@ -41,12 +41,12 @@ KisToolZoom::KisToolZoom() setName("tool_zoom"); m_subject = 0; m_dragging = false; - m_startPos = QPoint(0, 0); - m_endPos = QPoint(0, 0); + m_startPos = TQPoint(0, 0); + m_endPos = TQPoint(0, 0); m_plusCursor = KisCursor::load("tool_zoom_plus_cursor.png", 8, 8); m_minusCursor = KisCursor::load("tool_zoom_minus_cursor.png", 8, 8); setCursor(m_plusCursor); - connect(&m_timer, SIGNAL(timeout()), SLOT(slotTimer())); + connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimer())); } KisToolZoom::~KisToolZoom() @@ -62,10 +62,10 @@ void KisToolZoom::update(KisCanvasSubject *subject) void KisToolZoom::paint(KisCanvasPainter& gc) { if (m_dragging) - paintOutline(gc, QRect()); + paintOutline(gc, TQRect()); } -void KisToolZoom::paint(KisCanvasPainter& gc, const QRect& rc) +void KisToolZoom::paint(KisCanvasPainter& gc, const TQRect& rc) { if (m_dragging) paintOutline(gc, rc); @@ -75,8 +75,8 @@ void KisToolZoom::buttonPress(KisButtonPressEvent *e) { if (m_subject && m_subject->currentImg() && !m_dragging) { if (e->button() == Qt::LeftButton) { - m_startPos = e->pos().floorQPoint(); - m_endPos = e->pos().floorQPoint(); + m_startPos = e->pos().floorTQPoint(); + m_endPos = e->pos().floorTQPoint(); m_dragging = true; } } @@ -88,7 +88,7 @@ void KisToolZoom::move(KisMoveEvent *e) if (m_startPos != m_endPos) paintOutline(); - m_endPos = e->pos().floorQPoint(); + m_endPos = e->pos().floorTQPoint(); paintOutline(); } } @@ -98,19 +98,19 @@ void KisToolZoom::buttonRelease(KisButtonReleaseEvent *e) if (m_subject && m_dragging && e->button() == Qt::LeftButton) { KisCanvasController *controller = m_subject->canvasController(); - m_endPos = e->pos().floorQPoint(); + m_endPos = e->pos().floorTQPoint(); m_dragging = false; - QPoint delta = m_endPos - m_startPos; + TQPoint delta = m_endPos - m_startPos; if (sqrt(delta.x() * delta.x() + delta.y() * delta.y()) < 10) { - if (e->state() & Qt::ControlButton) { + if (e->state() & TQt::ControlButton) { controller->zoomOut(m_endPos.x(), m_endPos.y()); } else { controller->zoomIn(m_endPos.x(), m_endPos.y()); } } else { - controller->zoomTo(QRect(m_startPos, m_endPos)); + controller->zoomTo(TQRect(m_startPos, m_endPos)); } } } @@ -129,13 +129,13 @@ void KisToolZoom::deactivate() void KisToolZoom::slotTimer() { #if KDE_IS_VERSION(3,4,0) - int state = kapp->keyboardMouseState() & (Qt::ShiftButton|Qt::ControlButton|Qt::AltButton); + int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton); #else int state = kapp->keyboardModifiers() & (KApplication::ShiftModifier |KApplication::ControlModifier|KApplication::Modifier1); #endif - if (state & Qt::ControlButton) { + if (state & TQt::ControlButton) { m_subject->canvasController()->setCanvasCursor(m_minusCursor); } else { m_subject->canvasController()->setCanvasCursor(m_plusCursor); @@ -148,29 +148,29 @@ void KisToolZoom::paintOutline() KisCanvasController *controller = m_subject->canvasController(); KisCanvas *canvas = controller->kiscanvas(); KisCanvasPainter gc(canvas); - QRect rc; + TQRect rc; paintOutline(gc, rc); } } -void KisToolZoom::paintOutline(KisCanvasPainter& gc, const QRect&) +void KisToolZoom::paintOutline(KisCanvasPainter& gc, const TQRect&) { if (m_subject) { KisCanvasController *controller = m_subject->canvasController(); RasterOp op = gc.rasterOp(); - QPen old = gc.pen(); - QPen pen(Qt::DotLine); - QPoint start; - QPoint end; + TQPen old = gc.pen(); + TQPen pen(TQt::DotLine); + TQPoint start; + TQPoint end; Q_ASSERT(controller); start = controller->windowToView(m_startPos); end = controller->windowToView(m_endPos); - gc.setRasterOp(Qt::NotROP); + gc.setRasterOp(TQt::NotROP); gc.setPen(pen); - gc.drawRect(QRect(start, end)); + gc.drawRect(TQRect(start, end)); gc.setRasterOp(op); gc.setPen(old); } @@ -181,7 +181,7 @@ void KisToolZoom::setup(KActionCollection *collection) m_action = static_cast<KRadioAction *>(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Zoom"), "tool_zoom", Qt::Key_Z, this, SLOT(activate()), collection, name()); + m_action = new KRadioAction(i18n("&Zoom"), "tool_zoom", TQt::Key_Z, this, TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Zoom")); m_action->setExclusiveGroup("tools"); m_ownAction = true; diff --git a/krita/plugins/tools/defaulttools/kis_tool_zoom.h b/krita/plugins/tools/defaulttools/kis_tool_zoom.h index 235c3a74..3faa5bf1 100644 --- a/krita/plugins/tools/defaulttools/kis_tool_zoom.h +++ b/krita/plugins/tools/defaulttools/kis_tool_zoom.h @@ -21,7 +21,7 @@ #ifndef KIS_ZOOM_TOOL_H_ #define KIS_ZOOM_TOOL_H_ -#include <qtimer.h> +#include <tqtimer.h> #include "kis_tool_non_paint.h" @@ -33,6 +33,7 @@ class KisToolZoom : public KisToolNonPaint { typedef KisToolNonPaint super; Q_OBJECT + TQ_OBJECT public: KisToolZoom(); @@ -44,18 +45,18 @@ public: public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_VIEW; } - virtual Q_UINT32 priority() { return 2; } + virtual TQ_UINT32 priority() { return 2; } virtual void buttonPress(KisButtonPressEvent *e); virtual void move(KisMoveEvent *e); virtual void buttonRelease(KisButtonReleaseEvent *e); virtual void paint(KisCanvasPainter& gc); - virtual void paint(KisCanvasPainter& gc, const QRect& rc); + virtual void paint(KisCanvasPainter& gc, const TQRect& rc); private: void paintOutline(); - void paintOutline(KisCanvasPainter& gc, const QRect& rc); + void paintOutline(KisCanvasPainter& gc, const TQRect& rc); public slots: @@ -69,12 +70,12 @@ private slots: private: KisCanvasSubject *m_subject; - QPoint m_startPos; - QPoint m_endPos; + TQPoint m_startPos; + TQPoint m_endPos; bool m_dragging; - QCursor m_plusCursor; - QCursor m_minusCursor; - QTimer m_timer; + TQCursor m_plusCursor; + TQCursor m_minusCursor; + TQTimer m_timer; }; diff --git a/krita/plugins/tools/defaulttools/wdgcolorpicker.ui b/krita/plugins/tools/defaulttools/wdgcolorpicker.ui index 4a26c53f..a2b9d7d3 100644 --- a/krita/plugins/tools/defaulttools/wdgcolorpicker.ui +++ b/krita/plugins/tools/defaulttools/wdgcolorpicker.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ColorPickerOptionsWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ColorPickerOptionsWidget</cstring> </property> @@ -25,7 +25,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Sample All Visible Layers</string> @@ -47,20 +47,20 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>200</width> <height>32767</height> </size> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbUpdateCurrentColour</cstring> </property> @@ -68,15 +68,15 @@ <string>Update current color</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbPalette</cstring> </property> @@ -84,14 +84,14 @@ <string>Add to palette:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>cmbPalette</cstring> </property> </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbNormaliseValues</cstring> </property> @@ -99,15 +99,15 @@ <string>Show colors as percentages</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -115,7 +115,7 @@ <string>Sample radius:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>radius</cstring> </property> @@ -128,7 +128,7 @@ </widget> </hbox> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Channel</string> @@ -163,5 +163,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/tools/selectiontools/kis_tool_move_selection.cc b/krita/plugins/tools/selectiontools/kis_tool_move_selection.cc index 25ceb924..42c95093 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_move_selection.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_move_selection.cc @@ -19,11 +19,11 @@ #include "kis_tool_move_selection.h" #include <stdlib.h> -#include <qpoint.h> +#include <tqpoint.h> #include <kaction.h> #include <kcommand.h> #include <klocale.h> -#include <qcolor.h> +#include <tqcolor.h> #include "kis_canvas_subject.h" #include "kis_cursor.h" #include "kis_image.h" @@ -41,22 +41,22 @@ class KisSelectionOffsetCommand : public KNamedCommand { typedef KNamedCommand super; public: - KisSelectionOffsetCommand(KisSelectionSP layer, const QPoint& oldpos, const QPoint& newpos); + KisSelectionOffsetCommand(KisSelectionSP layer, const TQPoint& oldpos, const TQPoint& newpos); virtual ~KisSelectionOffsetCommand(); virtual void execute(); virtual void unexecute(); private: - void moveTo(const QPoint& pos); + void moveTo(const TQPoint& pos); private: KisSelectionSP m_layer; - QPoint m_oldPos; - QPoint m_newPos; + TQPoint m_oldPos; + TQPoint m_newPos; }; - KisSelectionOffsetCommand::KisSelectionOffsetCommand(KisSelectionSP layer, const QPoint& oldpos, const QPoint& newpos) : + KisSelectionOffsetCommand::KisSelectionOffsetCommand(KisSelectionSP layer, const TQPoint& oldpos, const TQPoint& newpos) : super(i18n("Move Layer")) { m_layer = layer; @@ -79,7 +79,7 @@ private: moveTo(m_oldPos); } - void KisSelectionOffsetCommand::moveTo(const QPoint& pos) + void KisSelectionOffsetCommand::moveTo(const TQPoint& pos) { if (m_layer->undoAdapter()) { m_layer->undoAdapter()->setUndo(false); @@ -88,7 +88,7 @@ private: m_layer->setX(pos.x()); m_layer->setY(pos.y()); - m_layer->parentPaintDevice()->setDirty(); + m_layer->tqparentPaintDevice()->setDirty(); if (m_layer->undoAdapter()) { m_layer->undoAdapter()->setUndo(true); @@ -118,8 +118,8 @@ void KisToolMoveSelection::update(KisCanvasSubject *subject) void KisToolMoveSelection::buttonPress(KisButtonPressEvent *e) { m_dragging = false; - if (m_subject && e->button() == QMouseEvent::LeftButton) { - QPoint pos = e->pos().floorQPoint(); + if (m_subject && e->button() == TQMouseEvent::LeftButton) { + TQPoint pos = e->pos().floorTQPoint(); KisImageSP img = m_subject->currentImg(); KisPaintLayerSP lay; @@ -145,8 +145,8 @@ void KisToolMoveSelection::buttonPress(KisButtonPressEvent *e) void KisToolMoveSelection::move(KisMoveEvent *e) { if (m_subject && m_dragging) { - QPoint pos = e->pos().floorQPoint(); - if((e->state() & Qt::AltButton) || (e->state() & Qt::ControlButton)) { + TQPoint pos = e->pos().floorTQPoint(); + if((e->state() & TQt::AltButton) || (e->state() & TQt::ControlButton)) { if(fabs(pos.x() - m_dragStart.x()) > fabs(pos.y() - m_dragStart.y())) pos.setY(m_dragStart.y()); else @@ -158,7 +158,7 @@ void KisToolMoveSelection::move(KisMoveEvent *e) if(!lay) return; KisSelectionSP sel = lay->paintDevice()->selection(); - QRect rc; + TQRect rc; pos -= m_dragStart; // convert to delta rc = sel->selectedRect(); @@ -166,8 +166,8 @@ void KisToolMoveSelection::move(KisMoveEvent *e) sel->setY(sel->getY() + pos.y()); rc = rc.unite(sel->selectedRect()); - m_layerPosition = QPoint(sel->getX(), sel->getY()); - m_dragStart = e->pos().floorQPoint(); + m_layerPosition = TQPoint(sel->getX(), sel->getY()); + m_dragStart = e->pos().floorTQPoint(); lay->paintDevice()->setDirty(rc); } @@ -176,7 +176,7 @@ void KisToolMoveSelection::move(KisMoveEvent *e) void KisToolMoveSelection::buttonRelease(KisButtonReleaseEvent *e) { - if (m_subject && e->button() == QMouseEvent::LeftButton && m_dragging) { + if (m_subject && e->button() == TQMouseEvent::LeftButton && m_dragging) { m_dragging = false; KisImageSP img = m_subject->currentImg(); if(!img) return; @@ -209,9 +209,9 @@ void KisToolMoveSelection::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("&Move selection"), "tool_move", - Qt::SHIFT+Qt::Key_V, + TQt::SHIFT+TQt::Key_V, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); m_action->setToolTip(i18n("Move the selection")); diff --git a/krita/plugins/tools/selectiontools/kis_tool_move_selection.h b/krita/plugins/tools/selectiontools/kis_tool_move_selection.h index b7eb47ec..60d73a9b 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_move_selection.h +++ b/krita/plugins/tools/selectiontools/kis_tool_move_selection.h @@ -27,6 +27,7 @@ class KisToolMoveSelection : public KisToolNonPaint { typedef KisToolNonPaint super; Q_OBJECT + TQ_OBJECT public: KisToolMoveSelection(); @@ -38,7 +39,7 @@ public: public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_SELECT; } - virtual Q_UINT32 priority() { return 10; } + virtual TQ_UINT32 priority() { return 10; } virtual void buttonPress(KisButtonPressEvent *e); virtual void move(KisMoveEvent *e); @@ -46,9 +47,9 @@ public: private: KisCanvasSubject *m_subject; - QPoint m_dragStart; - QPoint m_layerStart; - QPoint m_layerPosition; + TQPoint m_dragStart; + TQPoint m_layerStart; + TQPoint m_layerPosition; bool m_dragging; }; diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc b/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc index 9257d15a..c5737b2d 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_brush.cc @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qevent.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwidget.h> -#include <qrect.h> +#include <tqevent.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwidget.h> +#include <tqrect.h> #include <kdebug.h> #include <kaction.h> @@ -93,14 +93,14 @@ void KisToolSelectBrush::initPaint(KisEvent* /*e*/) m_target = selection; m_painter = new KisPainter(selection.data()); Q_CHECK_PTR(m_painter); - m_painter->setPaintColor(KisColor(Qt::black, selection->colorSpace())); + m_painter->setPaintColor(KisColor(TQt::black, selection->colorSpace())); m_painter->setBrush(m_subject->currentBrush()); m_painter->setOpacity(OPACITY_OPAQUE);//m_subject->fgColor().colorSpace()->intensity8(m_subject->fgColor().data())); m_painter->setCompositeOp(COMPOSITE_OVER); 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 mask created from the brush, + // Set the cursor -- ideally. this should be a tqmask 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 @@ -134,7 +134,7 @@ void KisToolSelectBrush::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("&Selection Brush"), "tool_brush_selection", "Ctrl+Shift+B", this, - SLOT(activate()), collection, + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); m_action->setToolTip(i18n("Paint a selection")); @@ -143,24 +143,24 @@ void KisToolSelectBrush::setup(KActionCollection *collection) } } -QWidget* KisToolSelectBrush::createOptionWidget(QWidget* parent) +TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* tqparent) { - Q_UNUSED(parent); + Q_UNUSED(tqparent); // Commented out due to the fact that this doesn't actually work if you change the action #if 0 - m_optWidget = new KisSelectionOptions(parent, m_subject); + m_optWidget = new KisSelectionOptions(tqparent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Brush")); - QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout()); - l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; #endif return 0; } -QWidget* KisToolSelectBrush::optionWidget() +TQWidget* KisToolSelectBrush::optionWidget() { return m_optWidget; } diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_brush.h b/krita/plugins/tools/selectiontools/kis_tool_select_brush.h index cc49cd5e..a85ac55f 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_brush.h +++ b/krita/plugins/tools/selectiontools/kis_tool_select_brush.h @@ -25,18 +25,19 @@ #include <kis_tool_freehand.h> #include <kis_tool_factory.h> -class QWidget; +class TQWidget; class KisPoint; class KisSelectedTransaction; class KisSelectionOptions; /** * The selection brush creates a selection by painting with the current - * brush shape. Not sure what kind of an icon could represent this... + * brush tqshape. Not sure what kind of an icon could represent this... * Depends a bit on how we're going to visualize selections. */ class KisToolSelectBrush : public KisToolFreehand { Q_OBJECT + TQ_OBJECT typedef KisToolFreehand super; public: @@ -44,10 +45,10 @@ public: virtual ~KisToolSelectBrush(); virtual void setup(KActionCollection *collection); - virtual Q_UINT32 priority() { return 1; } + virtual TQ_UINT32 priority() { return 1; } virtual enumToolType toolType() { return TOOL_SELECT; } - virtual QWidget* createOptionWidget(QWidget* parent); - virtual QWidget* optionWidget(); + virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* optionWidget(); public slots: virtual void activate(); diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/krita/plugins/tools/selectiontools/kis_tool_select_contiguous.cc index 01acbbcb..1344c39f 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_contiguous.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_contiguous.cc @@ -20,11 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qpainter.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qapplication.h> -#include <qcheckbox.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqapplication.h> +#include <tqcheckbox.h> #include <kaction.h> #include <kdebug.h> @@ -84,9 +84,9 @@ void KisToolSelectContiguous::buttonPress(KisButtonPressEvent * e) KisImageSP img; KisPaintDeviceSP dev; - QPoint pos; + TQPoint pos; - if (e->button() != QMouseEvent::LeftButton && e->button() != QMouseEvent::RightButton) + if (e->button() != TQMouseEvent::LeftButton && e->button() != TQMouseEvent::RightButton) return; if (!(img = m_subject->currentImg())) @@ -97,9 +97,9 @@ void KisToolSelectContiguous::buttonPress(KisButtonPressEvent * e) if (!dev || !img->activeLayer()->visible()) return; - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); - pos = QPoint(e->pos().floorX(), e->pos().floorY()); + pos = TQPoint(e->pos().floorX(), e->pos().floorY()); KisFillPainter fillpainter(dev); fillpainter.setFillThreshold(m_fuzziness); @@ -132,7 +132,7 @@ void KisToolSelectContiguous::buttonPress(KisButtonPressEvent * e) if (img->undo()) img->undoAdapter()->addCommand(t); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } } @@ -146,7 +146,7 @@ void KisToolSelectContiguous::setup(KActionCollection *collection) "tool_contiguous_selection" , 0, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); @@ -183,21 +183,21 @@ void KisToolSelectContiguous::slotSetAction(int action) } -QWidget* KisToolSelectContiguous::createOptionWidget(QWidget* parent) +TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* tqparent) { - m_optWidget = new KisSelectionOptions(parent, m_subject); + m_optWidget = new KisSelectionOptions(tqparent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Contiguous Area Selection")); - QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout()); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); l->setSpacing( 6 ); - connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); + connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - QHBoxLayout * hbox = new QHBoxLayout(l); + TQHBoxLayout * hbox = new TQHBoxLayout(l); Q_CHECK_PTR(hbox); - QLabel * lbl = new QLabel(i18n("Fuzziness: "), m_optWidget); + TQLabel * lbl = new TQLabel(i18n("Fuzziness: "), m_optWidget); hbox->addWidget(lbl); KIntNumInput * input = new KIntNumInput(m_optWidget, "fuzziness"); @@ -206,29 +206,29 @@ QWidget* KisToolSelectContiguous::createOptionWidget(QWidget* parent) input->setRange(0, 200, 10, true); input->setValue(20); hbox->addWidget(input); - connect(input, SIGNAL(valueChanged(int)), this, SLOT(slotSetFuzziness(int))); + connect(input, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetFuzziness(int))); - QCheckBox* samplemerged = new QCheckBox(i18n("Sample merged"), m_optWidget); + TQCheckBox* samplemerged = new TQCheckBox(i18n("Sample merged"), m_optWidget); l->addWidget( samplemerged ); samplemerged->setChecked(m_sampleMerged); - connect(samplemerged, SIGNAL(stateChanged(int)), - this, SLOT(slotSetSampleMerged(int))); + connect(samplemerged, TQT_SIGNAL(stateChanged(int)), + this, TQT_SLOT(slotSetSampleMerged(int))); - l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); + l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; } -QWidget* KisToolSelectContiguous::optionWidget() +TQWidget* KisToolSelectContiguous::optionWidget() { return m_optWidget; } void KisToolSelectContiguous::slotSetSampleMerged(int state) { - if (state == QButton::NoChange) + if (state == TQButton::NoChange) return; - m_sampleMerged = (state == QButton::On); + m_sampleMerged = (state == TQButton::On); } #include "kis_tool_select_contiguous.moc" diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_contiguous.h b/krita/plugins/tools/selectiontools/kis_tool_select_contiguous.h index cc91b3ef..c60b0673 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_contiguous.h +++ b/krita/plugins/tools/selectiontools/kis_tool_select_contiguous.h @@ -28,9 +28,9 @@ #include <kis_selection.h> class KisCanvasSubject; -class QWidget; -class QVBoxLayout; -class QCheckBox; +class TQWidget; +class TQVBoxLayout; +class TQCheckBox; class KisSelectionOptions; /** @@ -41,6 +41,7 @@ class KisToolSelectContiguous : public KisToolNonPaint { typedef KisToolNonPaint super; Q_OBJECT + TQ_OBJECT public: KisToolSelectContiguous(); @@ -50,11 +51,11 @@ public: virtual void update(KisCanvasSubject *subject); virtual void setup(KActionCollection *collection); - virtual Q_UINT32 priority() { return 7; } + virtual TQ_UINT32 priority() { return 7; } virtual enumToolType toolType() { return TOOL_SELECT; }; - virtual QWidget* createOptionWidget(QWidget* parent); - virtual QWidget* optionWidget(); + virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* optionWidget(); virtual void buttonPress(KisButtonPressEvent *event); diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/krita/plugins/tools/selectiontools/kis_tool_select_elliptical.cc index 226277b2..a97518ce 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_elliptical.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_elliptical.cc @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qapplication.h> -#include <qpainter.h> -#include <qpen.h> -#include <qlayout.h> +#include <tqapplication.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqlayout.h> #include <kdebug.h> #include <kaction.h> @@ -84,10 +84,10 @@ void KisToolSelectElliptical::update(KisCanvasSubject *subject) void KisToolSelectElliptical::paint(KisCanvasPainter& gc) { if (m_selecting) - paintOutline(gc, QRect()); + paintOutline(gc, TQRect()); } -void KisToolSelectElliptical::paint(KisCanvasPainter& gc, const QRect& rc) +void KisToolSelectElliptical::paint(KisCanvasPainter& gc, const TQRect& rc) { if (m_selecting) paintOutline(gc, rc); @@ -131,23 +131,23 @@ void KisToolSelectElliptical::move(KisMoveEvent *e) if (m_subject && m_selecting) { paintOutline(); // move (alt) or resize ellipse - if (e->state() & Qt::AltButton) { + if (e->state() & TQt::AltButton) { KisPoint trans = e->pos() - m_endPos; m_startPos += trans; m_endPos += trans; } else { - KisPoint diag = e->pos() - (e->state() & Qt::ControlButton + KisPoint diag = e->pos() - (e->state() & TQt::ControlButton ? m_centerPos : m_startPos); // circle? - if (e->state() & Qt::ShiftButton) { - double size = QMAX(fabs(diag.x()), fabs(diag.y())); + if (e->state() & TQt::ShiftButton) { + double size = TQMAX(fabs(diag.x()), fabs(diag.y())); double w = diag.x() < 0 ? -size : size; double h = diag.y() < 0 ? -size : size; diag = KisPoint(w, h); } // resize around center point? - if (e->state() & Qt::ControlButton) { + if (e->state() & TQt::ControlButton) { m_startPos = m_centerPos - diag; m_endPos = m_centerPos + diag; } else { @@ -169,7 +169,7 @@ void KisToolSelectElliptical::buttonRelease(KisButtonReleaseEvent *e) if (m_startPos == m_endPos) { clearSelection(); } else { - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); KisImageSP img = m_subject->currentImg(); if (!img) @@ -199,16 +199,16 @@ void KisToolSelectElliptical::buttonRelease(KisButtonReleaseEvent *e) if(m_selectAction==SELECTION_SUBTRACT) dev->selection()->invert(); } - QRect rc( m_startPos.floorQPoint(), m_endPos.floorQPoint()); + TQRect rc( m_startPos.floorTQPoint(), m_endPos.floorTQPoint()); rc = rc.normalize(); KisSelectionSP tmpSel = new KisSelection(dev); - KisAutobrushCircleShape shape(rc.width(),rc.height(), 1, 1); - Q_UINT8 value; + KisAutobrushCircleShape tqshape(rc.width(),rc.height(), 1, 1); + TQ_UINT8 value; for (int y = 0; y <= rc.height(); y++) for (int x = 0; x <= rc.width(); x++) { - value = MAX_SELECTED - shape.valueAt(x,y); + value = MAX_SELECTED - tqshape.valueAt(x,y); tmpSel->setSelected( x+rc.x(), y+rc.y(), value); } switch(m_selectAction) @@ -232,7 +232,7 @@ void KisToolSelectElliptical::buttonRelease(KisButtonReleaseEvent *e) if (img->undo()) img->undoAdapter()->addCommand(t); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } } m_selecting = false; @@ -245,29 +245,29 @@ void KisToolSelectElliptical::paintOutline() KisCanvasController *controller = m_subject->canvasController(); KisCanvas *canvas = controller->kiscanvas(); KisCanvasPainter gc(canvas); - QRect rc; + TQRect rc; paintOutline(gc, rc); } } -void KisToolSelectElliptical::paintOutline(KisCanvasPainter& gc, const QRect&) +void KisToolSelectElliptical::paintOutline(KisCanvasPainter& gc, const TQRect&) { if (m_subject) { KisCanvasController *controller = m_subject->canvasController(); RasterOp op = gc.rasterOp(); - QPen old = gc.pen(); - QPen pen(Qt::DotLine); - QPoint start; - QPoint end; + TQPen old = gc.pen(); + TQPen pen(TQt::DotLine); + TQPoint start; + TQPoint end; Q_ASSERT(controller); - start = controller->windowToView(m_startPos).floorQPoint(); - end = controller->windowToView(m_endPos).floorQPoint(); + start = controller->windowToView(m_startPos).floorTQPoint(); + end = controller->windowToView(m_endPos).floorTQPoint(); - gc.setRasterOp(Qt::NotROP); + gc.setRasterOp(TQt::NotROP); gc.setPen(pen); - gc.drawEllipse(QRect(start, end)); + gc.drawEllipse(TQRect(start, end)); gc.setRasterOp(op); gc.setPen(old); } @@ -285,9 +285,9 @@ void KisToolSelectElliptical::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("&Elliptical Selection"), "tool_elliptical_selection" , - Qt::Key_J, + TQt::Key_J, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); @@ -297,21 +297,21 @@ void KisToolSelectElliptical::setup(KActionCollection *collection) } } -QWidget* KisToolSelectElliptical::createOptionWidget(QWidget* parent) +TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* tqparent) { - m_optWidget = new KisSelectionOptions(parent, m_subject); + m_optWidget = new KisSelectionOptions(tqparent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Elliptical Selection")); - connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); + connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout()); - l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; } -QWidget* KisToolSelectElliptical::optionWidget() +TQWidget* KisToolSelectElliptical::optionWidget() { return m_optWidget; } diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_elliptical.h b/krita/plugins/tools/selectiontools/kis_tool_select_elliptical.h index e3b46737..dbccda59 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_elliptical.h +++ b/krita/plugins/tools/selectiontools/kis_tool_select_elliptical.h @@ -23,7 +23,7 @@ #ifndef __KIS_TOOL_SELECT_ELLIPTICAL_H__ #define __KIS_TOOL_SELECT_ELLIPTICAL_H__ -#include <qpoint.h> +#include <tqpoint.h> #include "kis_point.h" #include "kis_selection.h" @@ -36,6 +36,7 @@ class KisToolSelectElliptical : public KisToolNonPaint { typedef KisToolNonPaint super; Q_OBJECT + TQ_OBJECT public: KisToolSelectElliptical(); @@ -44,13 +45,13 @@ public: virtual void update(KisCanvasSubject *subject); virtual void setup(KActionCollection *collection); - virtual Q_UINT32 priority() { return 4; } - virtual QWidget * createOptionWidget(QWidget* parent); - virtual QWidget* optionWidget(); + virtual TQ_UINT32 priority() { return 4; } + virtual TQWidget * createOptionWidget(TQWidget* tqparent); + virtual TQWidget* optionWidget(); virtual enumToolType toolType() { return TOOL_SELECT; } virtual void paint(KisCanvasPainter& gc); - virtual void paint(KisCanvasPainter& gc, const QRect& rc); + virtual void paint(KisCanvasPainter& gc, const TQRect& rc); virtual void buttonPress(KisButtonPressEvent *e); virtual void move(KisMoveEvent *e); virtual void buttonRelease(KisButtonReleaseEvent *e); @@ -63,7 +64,7 @@ public slots: private: void clearSelection(); void paintOutline(); - void paintOutline(KisCanvasPainter& gc, const QRect& rc); + void paintOutline(KisCanvasPainter& gc, const TQRect& rc); private: KisCanvasSubject *m_subject; diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/krita/plugins/tools/selectiontools/kis_tool_select_eraser.cc index 6880c61b..08c30fc0 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_eraser.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_eraser.cc @@ -18,10 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qevent.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qwidget.h> +#include <tqevent.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqwidget.h> #include <kdebug.h> #include <kaction.h> @@ -93,14 +93,14 @@ void KisToolSelectEraser::initPaint(KisEvent */*e*/) m_painter = new KisPainter(selection.data()); Q_CHECK_PTR(m_painter); m_painter->beginTransaction(i18n("Selection Eraser")); - m_painter->setPaintColor(KisColor(Qt::white, selection->colorSpace())); + m_painter->setPaintColor(KisColor(TQt::white, selection->colorSpace())); m_painter->setBrush(m_subject->currentBrush()); m_painter->setOpacity(OPACITY_OPAQUE); m_painter->setCompositeOp(COMPOSITE_ERASE); 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 mask created from the brush, + // Set the cursor -- ideally. this should be a tqmask 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 @@ -121,7 +121,7 @@ void KisToolSelectEraser::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("Selection &Eraser"), "tool_eraser_selection", "Ctrl+Shift+E", this, - SLOT(activate()), collection, + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); m_action->setToolTip(i18n("Erase parts of a selection")); @@ -130,24 +130,24 @@ void KisToolSelectEraser::setup(KActionCollection *collection) } } -QWidget* KisToolSelectEraser::createOptionWidget(QWidget* parent) +TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* tqparent) { - Q_UNUSED(parent); + Q_UNUSED(tqparent); // Commented out due to the fact that this doesn't actually work if you change the action #if 0 - m_optWidget = new KisSelectionOptions(parent, m_subject); + m_optWidget = new KisSelectionOptions(tqparent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Eraser")); - QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout()); - l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; #endif return 0; } -QWidget* KisToolSelectEraser::optionWidget() +TQWidget* KisToolSelectEraser::optionWidget() { return m_optWidget; } diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_eraser.h b/krita/plugins/tools/selectiontools/kis_tool_select_eraser.h index 092122c8..79352df1 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_eraser.h +++ b/krita/plugins/tools/selectiontools/kis_tool_select_eraser.h @@ -30,11 +30,12 @@ class KisSelectionOptions; /** * The selection eraser makes a selection smaller by painting with the - * current eraser shape. Not sure what kind of an icon could represent + * current eraser tqshape. Not sure what kind of an icon could represent * this... Depends a bit on how we're going to visualize selections. */ class KisToolSelectEraser : public KisToolFreehand { Q_OBJECT + TQ_OBJECT typedef KisToolFreehand super; public: @@ -42,10 +43,10 @@ public: virtual ~KisToolSelectEraser(); virtual void setup(KActionCollection *collection); - virtual Q_UINT32 priority() { return 2; } + virtual TQ_UINT32 priority() { return 2; } virtual enumToolType toolType() { return TOOL_SELECT; } - virtual QWidget* createOptionWidget(QWidget* parent); - virtual QWidget* optionWidget(); + virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* optionWidget(); public slots: virtual void activate(); diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_outline.cc b/krita/plugins/tools/selectiontools/kis_tool_select_outline.cc index fe76c989..11c59824 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_outline.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_outline.cc @@ -19,11 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qapplication.h> -#include <qpainter.h> -#include <qregion.h> -#include <qwidget.h> -#include <qlayout.h> +#include <tqapplication.h> +#include <tqpainter.h> +#include <tqregion.h> +#include <tqwidget.h> +#include <tqlayout.h> #include <kaction.h> #include <kdebug.h> @@ -115,7 +115,7 @@ void KisToolSelectOutline::buttonRelease(KisButtonReleaseEvent *event) KisImageSP img = m_subject->currentImg(); if (img && img->activeDevice()) { - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); KisPaintDeviceSP dev = img->activeDevice(); bool hasSelection = dev->hasSelection(); KisSelectedTransaction *t = 0; @@ -128,7 +128,7 @@ void KisToolSelectOutline::buttonRelease(KisButtonReleaseEvent *event) KisPainter painter(selection.data()); - painter.setPaintColor(KisColor(Qt::black, selection->colorSpace())); + painter.setPaintColor(KisColor(TQt::black, selection->colorSpace())); painter.setFillStyle(KisPainter::FillStyleForegroundColor); painter.setStrokeStyle(KisPainter::StrokeStyleNone); painter.setBrush(m_subject->currentBrush()); @@ -151,7 +151,7 @@ void KisToolSelectOutline::buttonRelease(KisButtonReleaseEvent *event) if(hasSelection) { - QRect dirty(painter.dirtyRect()); + TQRect dirty(painter.dirtyRect()); dev->setDirty(dirty); dev->emitSelectionChanged(dirty); } else { @@ -162,7 +162,7 @@ void KisToolSelectOutline::buttonRelease(KisButtonReleaseEvent *event) if (img->undo()) img->undoAdapter()->addCommand(t); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } m_points.clear(); @@ -174,7 +174,7 @@ void KisToolSelectOutline::paint(KisCanvasPainter& gc) draw(gc); } -void KisToolSelectOutline::paint(KisCanvasPainter& gc, const QRect&) +void KisToolSelectOutline::paint(KisCanvasPainter& gc, const TQRect&) { draw(gc); } @@ -196,18 +196,18 @@ void KisToolSelectOutline::draw(KisCanvasPainter& gc) return; if (m_dragging && !m_points.empty()) { - QPen pen(Qt::white, 0, Qt::DotLine); + TQPen pen(TQt::white, 0, TQt::DotLine); gc.setPen(pen); - gc.setRasterOp(Qt::XorROP); + gc.setRasterOp(TQt::XorROP); KisCanvasController *controller = m_subject->canvasController(); KisPoint start, end; - QPoint startPos; - QPoint endPos; + TQPoint startPos; + TQPoint endPos; - startPos = controller->windowToView(m_dragStart.floorQPoint()); - endPos = controller->windowToView(m_dragEnd.floorQPoint()); + startPos = controller->windowToView(m_dragStart.floorTQPoint()); + endPos = controller->windowToView(m_dragEnd.floorTQPoint()); gc.drawLine(startPos, endPos); } } @@ -219,14 +219,14 @@ void KisToolSelectOutline::deactivate() KisCanvas *canvas = controller->kiscanvas(); KisCanvasPainter gc(canvas); - QPen pen(Qt::white, 0, Qt::DotLine); + TQPen pen(TQt::white, 0, TQt::DotLine); gc.setPen(pen); - gc.setRasterOp(Qt::XorROP); + gc.setRasterOp(TQt::XorROP); KisPoint start, end; - QPoint startPos; - QPoint endPos; + TQPoint startPos; + TQPoint endPos; for (KisPointVector::iterator it = m_points.begin(); it != m_points.end(); ++it) { @@ -236,8 +236,8 @@ void KisToolSelectOutline::deactivate() } else { end = (*it); - startPos = controller->windowToView(start.floorQPoint()); - endPos = controller->windowToView(end.floorQPoint()); + startPos = controller->windowToView(start.floorTQPoint()); + endPos = controller->windowToView(end.floorTQPoint()); gc.drawLine(startPos, endPos); @@ -256,7 +256,7 @@ void KisToolSelectOutline::setup(KActionCollection *collection) "tool_outline_selection", 0, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); @@ -267,21 +267,21 @@ void KisToolSelectOutline::setup(KActionCollection *collection) } -QWidget* KisToolSelectOutline::createOptionWidget(QWidget* parent) +TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* tqparent) { - m_optWidget = new KisSelectionOptions(parent, m_subject); + m_optWidget = new KisSelectionOptions(tqparent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Outline Selection")); - connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); + connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout()); - l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; } -QWidget* KisToolSelectOutline::optionWidget() +TQWidget* KisToolSelectOutline::optionWidget() { return m_optWidget; } diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_outline.h b/krita/plugins/tools/selectiontools/kis_tool_select_outline.h index eda10504..bc43ff88 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_outline.h +++ b/krita/plugins/tools/selectiontools/kis_tool_select_outline.h @@ -23,8 +23,8 @@ #ifndef __selecttoolfreehand_h__ #define __selecttoolfreehand_h__ -#include <qpoint.h> -#include <qpointarray.h> +#include <tqpoint.h> +#include <tqpointarray.h> #include "kis_point.h" #include "kis_tool_non_paint.h" @@ -37,6 +37,7 @@ class KisToolSelectOutline : public KisToolNonPaint { typedef KisToolNonPaint super; Q_OBJECT + TQ_OBJECT public: KisToolSelectOutline(); virtual ~KisToolSelectOutline(); @@ -44,15 +45,15 @@ public: virtual void update (KisCanvasSubject *subject); virtual void setup(KActionCollection *collection); - virtual Q_UINT32 priority() { return 6; } + virtual TQ_UINT32 priority() { return 6; } virtual enumToolType toolType() { return TOOL_SELECT; } virtual void buttonPress(KisButtonPressEvent *event); virtual void move(KisMoveEvent *event); virtual void buttonRelease(KisButtonReleaseEvent *event); - QWidget* createOptionWidget(QWidget* parent); - virtual QWidget* optionWidget(); + TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* optionWidget(); public slots: virtual void slotSetAction(int); @@ -61,7 +62,7 @@ public slots: protected: virtual void paint(KisCanvasPainter& gc); - virtual void paint(KisCanvasPainter& gc, const QRect& rc); + virtual void paint(KisCanvasPainter& gc, const TQRect& rc); void draw(KisCanvasPainter& gc); void draw(); @@ -72,7 +73,7 @@ protected: bool m_dragging; private: - typedef QValueVector<KisPoint> KisPointVector; + typedef TQValueVector<KisPoint> KisPointVector; KisCanvasSubject *m_subject; KisPointVector m_points; KisSelectionOptions * m_optWidget; diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/krita/plugins/tools/selectiontools/kis_tool_select_polygonal.cc index dc7cec97..dc8ceeca 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_polygonal.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_polygonal.cc @@ -19,11 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qapplication.h> -#include <qpainter.h> -#include <qregion.h> -#include <qwidget.h> -#include <qlayout.h> +#include <tqapplication.h> +#include <tqpainter.h> +#include <tqregion.h> +#include <tqwidget.h> +#include <tqlayout.h> #include <kaction.h> #include <kdebug.h> @@ -124,7 +124,7 @@ void KisToolSelectPolygonal::finish() KisImageSP img = m_subject->currentImg(); if (img && img->activeDevice()) { - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); KisPaintDeviceSP dev = img->activeDevice(); bool hasSelection = dev->hasSelection(); @@ -138,7 +138,7 @@ void KisToolSelectPolygonal::finish() } KisPainter painter(selection.data()); - painter.setPaintColor(KisColor(Qt::black, selection->colorSpace())); + painter.setPaintColor(KisColor(TQt::black, selection->colorSpace())); painter.setFillStyle(KisPainter::FillStyleForegroundColor); painter.setStrokeStyle(KisPainter::StrokeStyleNone); painter.setBrush(m_subject->currentBrush()); @@ -161,7 +161,7 @@ void KisToolSelectPolygonal::finish() painter.paintPolygon(m_points); if(hasSelection) { - QRect rect(painter.dirtyRect()); + TQRect rect(painter.dirtyRect()); dev->setDirty(rect); dev->emitSelectionChanged(rect); } else { @@ -171,7 +171,7 @@ void KisToolSelectPolygonal::finish() if (img->undo()) img->undoAdapter()->addCommand(t); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } m_points.clear(); @@ -210,7 +210,7 @@ void KisToolSelectPolygonal::paint(KisCanvasPainter& gc) draw(gc); } -void KisToolSelectPolygonal::paint(KisCanvasPainter& gc, const QRect&) +void KisToolSelectPolygonal::paint(KisCanvasPainter& gc, const TQRect&) { draw(gc); } @@ -231,19 +231,19 @@ void KisToolSelectPolygonal::draw(KisCanvasPainter& gc) if (!m_subject) return; - QPen pen(Qt::white, 0, Qt::DotLine); + TQPen pen(TQt::white, 0, TQt::DotLine); gc.setPen(pen); - gc.setRasterOp(Qt::XorROP); + gc.setRasterOp(TQt::XorROP); KisCanvasController *controller = m_subject->canvasController(); KisPoint start, end; - QPoint startPos; - QPoint endPos; + TQPoint startPos; + TQPoint endPos; if (m_dragging) { - startPos = controller->windowToView(m_dragStart.floorQPoint()); - endPos = controller->windowToView(m_dragEnd.floorQPoint()); + startPos = controller->windowToView(m_dragStart.floorTQPoint()); + endPos = controller->windowToView(m_dragEnd.floorTQPoint()); gc.drawLine(startPos, endPos); } else { for (KisPointVector::iterator it = m_points.begin(); it != m_points.end(); ++it) { @@ -254,8 +254,8 @@ void KisToolSelectPolygonal::draw(KisCanvasPainter& gc) } else { end = (*it); - startPos = controller->windowToView(start.floorQPoint()); - endPos = controller->windowToView(end.floorQPoint()); + startPos = controller->windowToView(start.floorTQPoint()); + endPos = controller->windowToView(end.floorTQPoint()); gc.drawLine(startPos, endPos); @@ -275,7 +275,7 @@ void KisToolSelectPolygonal::setup(KActionCollection *collection) "tool_polygonal_selection" , 0, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); @@ -286,21 +286,21 @@ void KisToolSelectPolygonal::setup(KActionCollection *collection) } -QWidget* KisToolSelectPolygonal::createOptionWidget(QWidget* parent) +TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* tqparent) { - m_optWidget = new KisSelectionOptions(parent, m_subject); + m_optWidget = new KisSelectionOptions(tqparent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Polygonal Selection")); - connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); + connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout()); - l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; } -QWidget* KisToolSelectPolygonal::optionWidget() +TQWidget* KisToolSelectPolygonal::optionWidget() { return m_optWidget; } diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_polygonal.h b/krita/plugins/tools/selectiontools/kis_tool_select_polygonal.h index 05764c61..f233bd51 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_polygonal.h +++ b/krita/plugins/tools/selectiontools/kis_tool_select_polygonal.h @@ -34,6 +34,7 @@ class KisToolSelectPolygonal : public KisToolNonPaint { typedef KisToolNonPaint super; Q_OBJECT + TQ_OBJECT public: KisToolSelectPolygonal(); virtual ~KisToolSelectPolygonal(); @@ -49,7 +50,7 @@ public: // virtual void setup(KActionCollection *collection); - virtual Q_UINT32 priority() { return 5; } + virtual TQ_UINT32 priority() { return 5; } virtual enumToolType toolType() { return TOOL_SELECT; } virtual void buttonPress(KisButtonPressEvent *event); virtual void move(KisMoveEvent *event); @@ -57,8 +58,8 @@ public: virtual void doubleClick(KisDoubleClickEvent * event); void finish(); - QWidget* createOptionWidget(QWidget* parent); - virtual QWidget* optionWidget(); + TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* optionWidget(); public slots: virtual void slotSetAction(int); @@ -67,7 +68,7 @@ public slots: protected: virtual void paint(KisCanvasPainter& gc); - virtual void paint(KisCanvasPainter& gc, const QRect& rc); + virtual void paint(KisCanvasPainter& gc, const TQRect& rc); void draw(KisCanvasPainter& gc); void draw(); @@ -77,7 +78,7 @@ protected: bool m_dragging; private: - typedef QValueVector<KisPoint> KisPointVector; + typedef TQValueVector<KisPoint> KisPointVector; KisCanvasSubject *m_subject; KisPointVector m_points; KisSelectionOptions * m_optWidget; diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/krita/plugins/tools/selectiontools/kis_tool_select_rectangular.cc index 61a4c292..0f29844a 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_rectangular.cc +++ b/krita/plugins/tools/selectiontools/kis_tool_select_rectangular.cc @@ -21,10 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qapplication.h> -#include <qpainter.h> -#include <qpen.h> -#include <qlayout.h> +#include <tqapplication.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqlayout.h> #include <kdebug.h> #include <kaction.h> @@ -85,10 +85,10 @@ void KisToolSelectRectangular::update(KisCanvasSubject *subject) void KisToolSelectRectangular::paint(KisCanvasPainter& gc) { if (m_selecting) - paintOutline(gc, QRect()); + paintOutline(gc, TQRect()); } -void KisToolSelectRectangular::paint(KisCanvasPainter& gc, const QRect& rc) +void KisToolSelectRectangular::paint(KisCanvasPainter& gc, const TQRect& rc) { if (m_selecting) paintOutline(gc, rc); @@ -127,23 +127,23 @@ void KisToolSelectRectangular::move(KisMoveEvent *e) if (m_subject && m_selecting) { paintOutline(); // move (alt) or resize rectangle - if (e->state() & Qt::AltButton) { + if (e->state() & TQt::AltButton) { KisPoint trans = e->pos() - m_endPos; m_startPos += trans; m_endPos += trans; } else { - KisPoint diag = e->pos() - (e->state() & Qt::ControlButton + KisPoint diag = e->pos() - (e->state() & TQt::ControlButton ? m_centerPos : m_startPos); // square? - if (e->state() & Qt::ShiftButton) { - double size = QMAX(fabs(diag.x()), fabs(diag.y())); + if (e->state() & TQt::ShiftButton) { + double size = TQMAX(fabs(diag.x()), fabs(diag.y())); double w = diag.x() < 0 ? -size : size; double h = diag.y() < 0 ? -size : size; diag = KisPoint(w, h); } // resize around center point? - if (e->state() & Qt::ControlButton) { + if (e->state() & TQt::ControlButton) { m_startPos = m_centerPos - diag; m_endPos = m_centerPos + diag; } else { @@ -183,18 +183,18 @@ void KisToolSelectRectangular::buttonRelease(KisButtonReleaseEvent *e) m_endPos.setX(img->width()); if (img && img->activeDevice()) { - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); KisPaintDeviceSP dev = img->activeDevice(); bool hasSelection = dev->hasSelection(); KisSelectedTransaction *t = 0; if (img->undo()) t = new KisSelectedTransaction(i18n("Rectangular Selection"), dev); KisSelectionSP selection = dev->selection(); - QRect rc(m_startPos.floorQPoint(), m_endPos.floorQPoint()); + TQRect rc(m_startPos.floorTQPoint(), m_endPos.floorTQPoint()); rc = rc.normalize(); // We don't want the border of the 'rectangle' to be included in our selection - rc.setSize(rc.size() - QSize(1,1)); + rc.setSize(rc.size() - TQSize(1,1)); if(! hasSelection) { @@ -232,7 +232,7 @@ void KisToolSelectRectangular::buttonRelease(KisButtonReleaseEvent *e) KisCanvasController *controller = m_subject -> canvasController(); controller -> kiscanvas() -> update(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } } @@ -246,29 +246,29 @@ void KisToolSelectRectangular::paintOutline() KisCanvasController *controller = m_subject->canvasController(); KisCanvas *canvas = controller->kiscanvas(); KisCanvasPainter gc(canvas); - QRect rc; + TQRect rc; paintOutline(gc, rc); } } -void KisToolSelectRectangular::paintOutline(KisCanvasPainter& gc, const QRect&) +void KisToolSelectRectangular::paintOutline(KisCanvasPainter& gc, const TQRect&) { if (m_subject) { KisCanvasController *controller = m_subject->canvasController(); RasterOp op = gc.rasterOp(); - QPen old = gc.pen(); - QPen pen(Qt::DotLine); - QPoint start; - QPoint end; + TQPen old = gc.pen(); + TQPen pen(TQt::DotLine); + TQPoint start; + TQPoint end; Q_ASSERT(controller); - start = controller->windowToView(m_startPos.floorQPoint()); - end = controller->windowToView(m_endPos.floorQPoint()); + start = controller->windowToView(m_startPos.floorTQPoint()); + end = controller->windowToView(m_endPos.floorTQPoint()); - gc.setRasterOp(Qt::NotROP); + gc.setRasterOp(TQt::NotROP); gc.setPen(pen); - gc.drawRect(QRect(start, end)); + gc.drawRect(TQRect(start, end)); gc.setRasterOp(op); gc.setPen(old); } @@ -286,9 +286,9 @@ void KisToolSelectRectangular::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("&Rectangular Selection"), "tool_rect_selection", - Qt::Key_R, + TQt::Key_R, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); @@ -298,21 +298,21 @@ void KisToolSelectRectangular::setup(KActionCollection *collection) } } -QWidget* KisToolSelectRectangular::createOptionWidget(QWidget* parent) +TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* tqparent) { - m_optWidget = new KisSelectionOptions(parent, m_subject); + m_optWidget = new KisSelectionOptions(tqparent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Rectangular Selection")); - connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); + connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout()); - l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; } -QWidget* KisToolSelectRectangular::optionWidget() +TQWidget* KisToolSelectRectangular::optionWidget() { return m_optWidget; } diff --git a/krita/plugins/tools/selectiontools/kis_tool_select_rectangular.h b/krita/plugins/tools/selectiontools/kis_tool_select_rectangular.h index 2724a2ca..7c3fb529 100644 --- a/krita/plugins/tools/selectiontools/kis_tool_select_rectangular.h +++ b/krita/plugins/tools/selectiontools/kis_tool_select_rectangular.h @@ -33,6 +33,7 @@ class KisToolSelectRectangular : public KisToolNonPaint { typedef KisToolNonPaint super; Q_OBJECT + TQ_OBJECT public: KisToolSelectRectangular(); @@ -41,13 +42,13 @@ public: virtual void update(KisCanvasSubject *subject); virtual void setup(KActionCollection *collection); - virtual Q_UINT32 priority() { return 3; } + virtual TQ_UINT32 priority() { return 3; } virtual enumToolType toolType() { return TOOL_SELECT; } - virtual QWidget * createOptionWidget(QWidget* parent); - virtual QWidget* optionWidget(); + virtual TQWidget * createOptionWidget(TQWidget* tqparent); + virtual TQWidget* optionWidget(); virtual void paint(KisCanvasPainter& gc); - virtual void paint(KisCanvasPainter& gc, const QRect& rc); + virtual void paint(KisCanvasPainter& gc, const TQRect& rc); virtual void buttonPress(KisButtonPressEvent *e); virtual void move(KisMoveEvent *e); virtual void buttonRelease(KisButtonReleaseEvent *e); @@ -60,7 +61,7 @@ public slots: private: void clearSelection(); void paintOutline(); - void paintOutline(KisCanvasPainter& gc, const QRect& rc); + void paintOutline(KisCanvasPainter& gc, const TQRect& rc); private: KisCanvasSubject *m_subject; diff --git a/krita/plugins/tools/selectiontools/selection_tools.cc b/krita/plugins/tools/selectiontools/selection_tools.cc index 1297aa31..cff97ea5 100644 --- a/krita/plugins/tools/selectiontools/selection_tools.cc +++ b/krita/plugins/tools/selectiontools/selection_tools.cc @@ -20,7 +20,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -51,14 +51,14 @@ typedef KGenericFactory<SelectionTools> SelectionToolsFactory; K_EXPORT_COMPONENT_FACTORY( kritaselectiontools, SelectionToolsFactory( "krita" ) ) -SelectionTools::SelectionTools(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +SelectionTools::SelectionTools(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(SelectionToolsFactory::instance()); - if ( parent->inherits("KisToolRegistry") ) + if ( tqparent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); r->add(new KisToolSelectOutlineFactory()); r->add(new KisToolSelectPolygonalFactory()); r->add(new KisToolSelectRectangularFactory()); diff --git a/krita/plugins/tools/selectiontools/selection_tools.h b/krita/plugins/tools/selectiontools/selection_tools.h index ad023762..ff888aa9 100644 --- a/krita/plugins/tools/selectiontools/selection_tools.h +++ b/krita/plugins/tools/selectiontools/selection_tools.h @@ -34,8 +34,9 @@ class SelectionTools : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - SelectionTools(QObject *parent, const char *name, const QStringList &); + SelectionTools(TQObject *tqparent, const char *name, const TQStringList &); virtual ~SelectionTools(); }; diff --git a/krita/plugins/tools/tool_crop/kis_tool_crop.cc b/krita/plugins/tools/tool_crop/kis_tool_crop.cc index fd83e204..763e19b1 100644 --- a/krita/plugins/tools/tool_crop/kis_tool_crop.cc +++ b/krita/plugins/tools/tool_crop/kis_tool_crop.cc @@ -21,13 +21,13 @@ */ -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qobject.h> -#include <qpainter.h> -#include <qpen.h> -#include <qpushbutton.h> -#include <qrect.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqobject.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqpushbutton.h> +#include <tqrect.h> #include <kdebug.h> #include <kaction.h> @@ -67,7 +67,7 @@ KisToolCrop::KisToolCrop() setCursor(m_cropCursor); m_subject = 0; m_selecting = false; - m_rectCrop = QRect(0, 0, 0, 0); + m_rectCrop = TQRect(0, 0, 0, 0); m_handleSize = 13; m_haveCropSelection = false; m_optWidget = 0; @@ -113,10 +113,10 @@ void KisToolCrop::deactivate() void KisToolCrop::paint(KisCanvasPainter& gc) { - paintOutlineWithHandles(gc, QRect()); + paintOutlineWithHandles(gc, TQRect()); } -void KisToolCrop::paint(KisCanvasPainter& gc, const QRect& rc) +void KisToolCrop::paint(KisCanvasPainter& gc, const TQRect& rc) { paintOutlineWithHandles(gc, rc); } @@ -133,7 +133,7 @@ void KisToolCrop::clearRect() controller->kiscanvas()->update(); - m_rectCrop = QRect(0,0,0,0); + m_rectCrop = TQRect(0,0,0,0); updateWidgetValues(); m_selecting = false; @@ -147,8 +147,8 @@ void KisToolCrop::buttonPress(KisButtonPressEvent *e) if (img && img->activeDevice() && e->button() == LeftButton) { - QPoint pos = e->pos().floorQPoint(); - QRect b = img->bounds(); + TQPoint pos = e->pos().floorTQPoint(); + TQRect b = img->bounds(); if (pos.x() < b.x()) pos.setX(b.x()); @@ -164,7 +164,7 @@ void KisToolCrop::buttonPress(KisButtonPressEvent *e) if( !m_haveCropSelection ) //if the selection is not set { - m_rectCrop = QRect( pos.x(), pos.y(), 0, 0); + m_rectCrop = TQRect( pos.x(), pos.y(), 0, 0); paintOutlineWithHandles(); } else @@ -189,28 +189,28 @@ void KisToolCrop::move(KisMoveEvent *e) { paintOutlineWithHandles(); - m_rectCrop.setBottomRight( e->pos().floorQPoint()); + m_rectCrop.setBottomRight( e->pos().floorTQPoint()); KisImageSP image = m_subject->currentImg(); - m_rectCrop.setRight( QMIN(m_rectCrop.right(), image->width())); - m_rectCrop.setBottom( QMIN(m_rectCrop.bottom(), image->width())); + m_rectCrop.setRight( TQMIN(m_rectCrop.right(), image->width())); + m_rectCrop.setBottom( TQMIN(m_rectCrop.bottom(), image->width())); m_rectCrop = m_rectCrop.normalize(); paintOutlineWithHandles(); } else //if the crop selection is set { - m_dragStop = e->pos().floorQPoint(); + m_dragStop = e->pos().floorTQPoint(); if (m_mouseOnHandleType != None && m_dragStart != m_dragStop ) { - Q_INT32 imageWidth = m_subject->currentImg()->width(); - Q_INT32 imageHeight = m_subject->currentImg()->height(); + TQ_INT32 imageWidth = m_subject->currentImg()->width(); + TQ_INT32 imageHeight = m_subject->currentImg()->height(); paintOutlineWithHandles(); - QPoint pos = e->pos().floorQPoint(); + TQPoint pos = e->pos().floorTQPoint(); if( m_mouseOnHandleType == Inside ) { m_rectCrop.moveBy( ( m_dragStop.x() - m_dragStart.x() ), ( m_dragStop.y() - m_dragStart.y() ) ); @@ -232,35 +232,35 @@ void KisToolCrop::move(KisMoveEvent *e) } } else if(m_optWidget->boolRatio->isChecked()) { - QPoint drag = m_dragStop - m_dragStart; + TQPoint drag = m_dragStop - m_dragStart; if( ! m_optWidget->boolWidth->isChecked() && !m_optWidget->boolHeight->isChecked() ) { switch (m_mouseOnHandleType) { case (UpperLeft): { - Q_INT32 dep = (drag.x() + drag.y()) / 2; + TQ_INT32 dep = (drag.x() + drag.y()) / 2; m_rectCrop.setTop( m_rectCrop.top() + dep ); m_rectCrop.setLeft( (int) ( m_rectCrop.right() - m_optWidget->doubleRatio->value() * m_rectCrop.height() ) ); } break; case (LowerRight): { - Q_INT32 dep = (drag.x() + drag.y()) / 2; + TQ_INT32 dep = (drag.x() + drag.y()) / 2; m_rectCrop.setBottom( m_rectCrop.bottom() + dep ); m_rectCrop.setWidth( (int) ( m_optWidget->doubleRatio->value() * m_rectCrop.height() ) ); break; } case (UpperRight): { - Q_INT32 dep = (drag.x() - drag.y()) / 2; + TQ_INT32 dep = (drag.x() - drag.y()) / 2; m_rectCrop.setTop( m_rectCrop.top() - dep ); m_rectCrop.setWidth( (int) ( m_optWidget->doubleRatio->value() * m_rectCrop.height() ) ); break; } case (LowerLeft): { - Q_INT32 dep = (drag.x() - drag.y()) / 2; + TQ_INT32 dep = (drag.x() - drag.y()) / 2; m_rectCrop.setBottom( m_rectCrop.bottom() - dep ); m_rectCrop.setLeft( (int) ( m_rectCrop.right() - m_optWidget->doubleRatio->value() * m_rectCrop.height() ) ); break; @@ -359,8 +359,8 @@ void KisToolCrop::move(KisMoveEvent *e) } m_rectCrop = m_rectCrop.normalize(); - m_rectCrop = m_rectCrop.intersect( QRect(0,0, imageWidth + 1, imageHeight + 1 ) ); - m_dragStart = e->pos().floorQPoint(); + m_rectCrop = m_rectCrop.intersect( TQRect(0,0, imageWidth + 1, imageHeight + 1 ) ); + m_dragStart = e->pos().floorTQPoint(); paintOutlineWithHandles(); } } @@ -371,7 +371,7 @@ void KisToolCrop::move(KisMoveEvent *e) if ( m_haveCropSelection ) //if the crop selection is set { KisCanvasController *controller = m_subject->canvasController(); - Q_INT32 type = mouseOnHandle(controller->windowToView(e->pos().floorQPoint())); + TQ_INT32 type = mouseOnHandle(controller->windowToView(e->pos().floorTQPoint())); //set resize cursor if we are on one of the handles setMoveResizeCursor(type); } @@ -381,7 +381,7 @@ void KisToolCrop::move(KisMoveEvent *e) void KisToolCrop::updateWidgetValues(bool updateratio) { - QRect r = realRectCrop(); + TQRect r = realRectCrop(); setOptionWidgetX(r.x()); setOptionWidgetY(r.y()); setOptionWidgetWidth(r.width() ); @@ -414,12 +414,12 @@ void KisToolCrop::validateSelection(bool updateratio) KisImageSP image = m_subject->currentImg(); if (image) { - Q_INT32 imageWidth = image->width(); - Q_INT32 imageHeight = image->height(); - m_rectCrop.setLeft(QMAX(0, m_rectCrop.left())); - m_rectCrop.setTop(QMAX(0, m_rectCrop.top())); - m_rectCrop.setRight(QMIN(imageWidth, m_rectCrop.right())); - m_rectCrop.setBottom(QMIN(imageHeight, m_rectCrop.bottom())); + TQ_INT32 imageWidth = image->width(); + TQ_INT32 imageHeight = image->height(); + m_rectCrop.setLeft(TQMAX(0, m_rectCrop.left())); + m_rectCrop.setTop(TQMAX(0, m_rectCrop.top())); + m_rectCrop.setRight(TQMIN(imageWidth, m_rectCrop.right())); + m_rectCrop.setBottom(TQMIN(imageHeight, m_rectCrop.bottom())); updateWidgetValues(updateratio); } @@ -432,36 +432,36 @@ void KisToolCrop::paintOutlineWithHandles() KisCanvasController *controller = m_subject->canvasController(); KisCanvas *canvas = controller->kiscanvas(); KisCanvasPainter gc(canvas); - QRect rc; + TQRect rc; paintOutlineWithHandles(gc, rc); } } -void KisToolCrop::paintOutlineWithHandles(KisCanvasPainter& gc, const QRect&) +void KisToolCrop::paintOutlineWithHandles(KisCanvasPainter& gc, const TQRect&) { if (m_subject && (m_selecting || m_haveCropSelection)) { KisCanvasController *controller = m_subject->canvasController(); RasterOp op = gc.rasterOp(); - QPen old = gc.pen(); - QPen pen(Qt::SolidLine); + TQPen old = gc.pen(); + TQPen pen(TQt::SolidLine); pen.setWidth(1); - QPoint start; - QPoint end; + TQPoint start; + TQPoint end; Q_ASSERT(controller); start = controller->windowToView(m_rectCrop.topLeft()); end = controller->windowToView(m_rectCrop.bottomRight()); - gc.setRasterOp(Qt::NotROP); + gc.setRasterOp(TQt::NotROP); gc.setPen(pen); //draw handles - m_handlesRegion = handles(QRect(start, end)); + m_handlesRegion = handles(TQRect(start, end)); - Q_INT32 startx; - Q_INT32 starty; - Q_INT32 endx; - Q_INT32 endy; + TQ_INT32 startx; + TQ_INT32 starty; + TQ_INT32 endx; + TQ_INT32 endy; if(start.x()<=end.x()) { startx=start.x(); @@ -500,10 +500,10 @@ void KisToolCrop::paintOutlineWithHandles(KisCanvasPainter& gc, const QRect&) gc.drawLine(startx,endy + m_handleSize / 2 + 1, startx, controller->kiscanvas()->height()); gc.drawLine(endx,0,endx,starty - m_handleSize / 2); gc.drawLine(endx + m_handleSize / 2 + 1,starty, controller->kiscanvas()->width(), starty); - QMemArray <QRect> rects = m_handlesRegion.rects (); - for (QMemArray <QRect>::ConstIterator it = rects.begin (); it != rects.end (); ++it) + TQMemArray <TQRect> rects = m_handlesRegion.rects (); + for (TQMemArray <TQRect>::ConstIterator it = rects.begin (); it != rects.end (); ++it) { - gc.fillRect (*it, Qt::black); + gc.fillRect (*it, TQt::black); } @@ -523,12 +523,12 @@ void KisToolCrop::crop() { if (!img) return; - QRect rc = realRectCrop().normalize(); + TQRect rc = realRectCrop().normalize(); // The visitor adds the undo steps to the macro if (m_optWidget->cmbType->currentItem() == 0) { - QRect dirty = img->bounds(); + TQRect dirty = img->bounds(); // The layer(s) under the current layer will take care of adding // undo information to the Crop macro. @@ -548,7 +548,7 @@ void KisToolCrop::crop() { img->resize(rc, true); } - m_rectCrop = QRect(0,0,0,0); + m_rectCrop = TQRect(0,0,0,0); updateWidgetValues(); } @@ -660,7 +660,7 @@ void KisToolCrop::setRatio(double ) } } -void KisToolCrop::setOptionWidgetX(Q_INT32 x) +void KisToolCrop::setOptionWidgetX(TQ_INT32 x) { // Disable signals otherwise we get the valueChanged signal, which we don't want // to go through the logic for setting values that way. @@ -669,21 +669,21 @@ void KisToolCrop::setOptionWidgetX(Q_INT32 x) m_optWidget->intX->blockSignals(false); } -void KisToolCrop::setOptionWidgetY(Q_INT32 y) +void KisToolCrop::setOptionWidgetY(TQ_INT32 y) { m_optWidget->intY->blockSignals(true); m_optWidget->intY->setValue(y); m_optWidget->intY->blockSignals(false); } -void KisToolCrop::setOptionWidgetWidth(Q_INT32 x) +void KisToolCrop::setOptionWidgetWidth(TQ_INT32 x) { m_optWidget->intWidth->blockSignals(true); m_optWidget->intWidth->setValue(x); m_optWidget->intWidth->blockSignals(false); } -void KisToolCrop::setOptionWidgetHeight(Q_INT32 y) +void KisToolCrop::setOptionWidgetHeight(TQ_INT32 y) { m_optWidget->intHeight->blockSignals(true); m_optWidget->intHeight->setValue(y); @@ -698,23 +698,23 @@ void KisToolCrop::setOptionWidgetRatio(double ratio) } -QWidget* KisToolCrop::createOptionWidget(QWidget* parent) +TQWidget* KisToolCrop::createOptionWidget(TQWidget* tqparent) { - m_optWidget = new WdgToolCrop(parent); + m_optWidget = new WdgToolCrop(tqparent); Q_CHECK_PTR(m_optWidget); - connect(m_optWidget->bnCrop, SIGNAL(clicked()), this, SLOT(crop())); + connect(m_optWidget->bnCrop, TQT_SIGNAL(clicked()), this, TQT_SLOT(crop())); - connect(m_optWidget->intX, SIGNAL(valueChanged(int)), this, SLOT(setCropX(int))); - connect(m_optWidget->intY, SIGNAL(valueChanged(int)), this, SLOT(setCropY(int))); - connect(m_optWidget->intWidth, SIGNAL(valueChanged(int)), this, SLOT(setCropWidth(int))); - connect(m_optWidget->intHeight, SIGNAL(valueChanged(int)), this, SLOT(setCropHeight(int))); - connect(m_optWidget->doubleRatio, SIGNAL(valueChanged(double)), this, SLOT(setRatio( double ))); + connect(m_optWidget->intX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setCropX(int))); + connect(m_optWidget->intY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setCropY(int))); + connect(m_optWidget->intWidth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setCropWidth(int))); + connect(m_optWidget->intHeight, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setCropHeight(int))); + connect(m_optWidget->doubleRatio, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(setRatio( double ))); return m_optWidget; } -QWidget* KisToolCrop::optionWidget() +TQWidget* KisToolCrop::optionWidget() { return m_optWidget; } @@ -728,7 +728,7 @@ void KisToolCrop::setup(KActionCollection *collection) "tool_crop", 0, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); @@ -740,31 +740,31 @@ void KisToolCrop::setup(KActionCollection *collection) } } -QRect toQRect(double x, double y, int w, int h) +TQRect toTQRect(double x, double y, int w, int h) { - return QRect(int(x), int(y), w, h); + return TQRect(int(x), int(y), w, h); } -QRegion KisToolCrop::handles(QRect rect) +TQRegion KisToolCrop::handles(TQRect rect) { - QRegion handlesRegion; + TQRegion handlesRegion; //add handle at the lower right corner - handlesRegion += toQRect( QABS( rect.width() ) - m_handleSize / 2.0, QABS( rect.height() ) - m_handleSize / 2.0, m_handleSize, m_handleSize ); + handlesRegion += toTQRect( TQABS( rect.width() ) - m_handleSize / 2.0, TQABS( rect.height() ) - m_handleSize / 2.0, m_handleSize, m_handleSize ); //add handle at the upper right corner - handlesRegion += toQRect( QABS( rect.width() ) - m_handleSize / 2.0 , 0 - m_handleSize / 2.0, m_handleSize, m_handleSize ); + handlesRegion += toTQRect( TQABS( rect.width() ) - m_handleSize / 2.0 , 0 - m_handleSize / 2.0, m_handleSize, m_handleSize ); //add rectangle at the lower left corner - handlesRegion += toQRect( 0 - m_handleSize / 2.0 , QABS( rect.height() ) - m_handleSize / 2.0, m_handleSize, m_handleSize ); + handlesRegion += toTQRect( 0 - m_handleSize / 2.0 , TQABS( rect.height() ) - m_handleSize / 2.0, m_handleSize, m_handleSize ); //add rectangle at the upper left corner - handlesRegion += toQRect( 0 - m_handleSize / 2.0, 0 - m_handleSize / 2.0, m_handleSize, m_handleSize ); + handlesRegion += toTQRect( 0 - m_handleSize / 2.0, 0 - m_handleSize / 2.0, m_handleSize, m_handleSize ); //add handle at the lower edge of the rectangle - handlesRegion += toQRect( ( QABS( rect.width() ) - m_handleSize ) / 2.0 , QABS( rect.height() ) - m_handleSize / 2.0, m_handleSize, m_handleSize ); + handlesRegion += toTQRect( ( TQABS( rect.width() ) - m_handleSize ) / 2.0 , TQABS( rect.height() ) - m_handleSize / 2.0, m_handleSize, m_handleSize ); //add handle at the right edge of the rectangle - handlesRegion += toQRect( QABS( rect.width() ) - m_handleSize / 2.0 , ( QABS( rect.height() ) - m_handleSize ) / 2.0, m_handleSize, m_handleSize ); + handlesRegion += toTQRect( TQABS( rect.width() ) - m_handleSize / 2.0 , ( TQABS( rect.height() ) - m_handleSize ) / 2.0, m_handleSize, m_handleSize ); //add handle at the upper edge of the rectangle - handlesRegion += toQRect( ( QABS( rect.width() ) - m_handleSize ) / 2.0 , 0 - m_handleSize / 2.0, m_handleSize, m_handleSize ); + handlesRegion += toTQRect( ( TQABS( rect.width() ) - m_handleSize ) / 2.0 , 0 - m_handleSize / 2.0, m_handleSize, m_handleSize ); //add handle at the left edge of the rectangle - handlesRegion += toQRect( 0 - m_handleSize / 2.0, ( QABS( rect.height() ) - m_handleSize ) / 2.0, m_handleSize, m_handleSize ); + handlesRegion += toTQRect( 0 - m_handleSize / 2.0, ( TQABS( rect.height() ) - m_handleSize ) / 2.0, m_handleSize, m_handleSize ); //move the handles to the correct position if( rect.width() >= 0 && rect.height() >= 0) @@ -773,30 +773,30 @@ QRegion KisToolCrop::handles(QRect rect) } else if( rect.width() < 0 && rect.height() >= 0) { - handlesRegion.translate ( rect.x() - QABS( rect.width() ), rect.y() ); + handlesRegion.translate ( rect.x() - TQABS( rect.width() ), rect.y() ); } else if( rect.width() >= 0 && rect.height() < 0) { - handlesRegion.translate ( rect.x(), rect.y() - QABS( rect.height() ) ); + handlesRegion.translate ( rect.x(), rect.y() - TQABS( rect.height() ) ); } else if( rect.width() < 0 && rect.height() < 0) { - handlesRegion.translate ( rect.x() - QABS( rect.width() ), rect.y() - QABS( rect.height() ) ); + handlesRegion.translate ( rect.x() - TQABS( rect.width() ), rect.y() - TQABS( rect.height() ) ); } return handlesRegion; } -Q_INT32 KisToolCrop::mouseOnHandle(QPoint currentViewPoint) +TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint) { KisCanvasController *controller = m_subject->canvasController(); Q_ASSERT(controller); - QPoint start = controller->windowToView(m_rectCrop.topLeft()); - QPoint end = controller->windowToView(m_rectCrop.bottomRight()); + TQPoint start = controller->windowToView(m_rectCrop.topLeft()); + TQPoint end = controller->windowToView(m_rectCrop.bottomRight()); - Q_INT32 startx; - Q_INT32 starty; - Q_INT32 endx; - Q_INT32 endy; + TQ_INT32 startx; + TQ_INT32 starty; + TQ_INT32 endx; + TQ_INT32 endy; if(start.x()<=end.x()) { startx=start.x(); @@ -818,7 +818,7 @@ Q_INT32 KisToolCrop::mouseOnHandle(QPoint currentViewPoint) endy=start.y(); } - if ( toQRect ( startx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) + if ( toTQRect ( startx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) { if( !m_selecting ) { @@ -827,7 +827,7 @@ Q_INT32 KisToolCrop::mouseOnHandle(QPoint currentViewPoint) } return UpperLeft; } - else if ( toQRect ( startx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) + else if ( toTQRect ( startx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) { if( !m_selecting ) { @@ -836,7 +836,7 @@ Q_INT32 KisToolCrop::mouseOnHandle(QPoint currentViewPoint) } return LowerLeft; } - else if ( toQRect ( endx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) + else if ( toTQRect ( endx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) { if( !m_selecting ) { @@ -845,7 +845,7 @@ Q_INT32 KisToolCrop::mouseOnHandle(QPoint currentViewPoint) } return UpperRight; } - else if ( toQRect ( endx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) + else if ( toTQRect ( endx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) { if( !m_selecting ) { @@ -854,7 +854,7 @@ Q_INT32 KisToolCrop::mouseOnHandle(QPoint currentViewPoint) } return LowerRight; } - else if ( toQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) + else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) { if( !m_selecting ) { @@ -862,7 +862,7 @@ Q_INT32 KisToolCrop::mouseOnHandle(QPoint currentViewPoint) } return Upper; } - else if ( toQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, endy - m_handleSize / 2, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) + else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, endy - m_handleSize / 2, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) { if( !m_selecting ) { @@ -870,7 +870,7 @@ Q_INT32 KisToolCrop::mouseOnHandle(QPoint currentViewPoint) } return Lower; } - else if ( toQRect ( startx - m_handleSize / 2.0, starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) + else if ( toTQRect ( startx - m_handleSize / 2.0, starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) { if( !m_selecting ) { @@ -878,7 +878,7 @@ Q_INT32 KisToolCrop::mouseOnHandle(QPoint currentViewPoint) } return Left; } - else if ( toQRect ( endx - m_handleSize / 2.0 , starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) ) + else if ( toTQRect ( endx - m_handleSize / 2.0 , starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) ) { if( !m_selecting ) { @@ -886,14 +886,14 @@ Q_INT32 KisToolCrop::mouseOnHandle(QPoint currentViewPoint) } return Right; } - else if ( toQRect ( startx , starty, endx - startx , endy - starty ).contains( currentViewPoint ) ) + else if ( toTQRect ( startx , starty, endx - startx , endy - starty ).tqcontains( currentViewPoint ) ) { return Inside; } else return None; } -void KisToolCrop::setMoveResizeCursor (Q_INT32 handle) +void KisToolCrop::setMoveResizeCursor (TQ_INT32 handle) { switch (handle) { diff --git a/krita/plugins/tools/tool_crop/kis_tool_crop.h b/krita/plugins/tools/tool_crop/kis_tool_crop.h index 538e4158..5be2daa2 100644 --- a/krita/plugins/tools/tool_crop/kis_tool_crop.h +++ b/krita/plugins/tools/tool_crop/kis_tool_crop.h @@ -21,26 +21,27 @@ #ifndef KIS_TOOL_CROP_H_ #define KIS_TOOL_CROP_H_ -#include <qpoint.h> -#include <qregion.h> +#include <tqpoint.h> +#include <tqregion.h> #include <kis_tool_non_paint.h> #include <kis_tool_factory.h> -class QRect; -class QCursor; +class TQRect; +class TQCursor; class WdgToolCrop; /** * Crop tool * * TODO: - crop from selection -- i.e, set crop outline to the exact bounds of the selection. - * - (when moving to Qt 4: replace rectangle with darker, dimmer overlay layer + * - (when moving to TQt 4: replace rectangle with darker, dimmer overlay layer * like we have for selections right now) */ class KisToolCrop : public KisToolNonPaint { typedef KisToolNonPaint super; Q_OBJECT + TQ_OBJECT public: @@ -49,14 +50,14 @@ public: virtual void update(KisCanvasSubject *subject); - virtual QWidget* createOptionWidget(QWidget* parent); - virtual QWidget* optionWidget(); + virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* optionWidget(); virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_TRANSFORM; } - virtual Q_UINT32 priority() { return 1; } + virtual TQ_UINT32 priority() { return 1; } virtual void paint(KisCanvasPainter& gc); - virtual void paint(KisCanvasPainter& gc, const QRect& rc); + virtual void paint(KisCanvasPainter& gc, const TQRect& rc); virtual void buttonPress(KisButtonPressEvent *e); virtual void move(KisMoveEvent *e); virtual void buttonRelease(KisButtonReleaseEvent *e); @@ -70,16 +71,16 @@ public slots: private: void clearRect(); - QRegion handles(QRect rect); + TQRegion handles(TQRect rect); void paintOutlineWithHandles(); - void paintOutlineWithHandles(KisCanvasPainter& gc, const QRect& rc); - Q_INT32 mouseOnHandle (const QPoint currentViewPoint); - void setMoveResizeCursor (Q_INT32 handle); + void paintOutlineWithHandles(KisCanvasPainter& gc, const TQRect& rc); + TQ_INT32 mouseOnHandle (const TQPoint currentViewPoint); + void setMoveResizeCursor (TQ_INT32 handle); void validateSelection(bool updateratio = true); - void setOptionWidgetX(Q_INT32 x); - void setOptionWidgetY(Q_INT32 y); - void setOptionWidgetWidth(Q_INT32 x); - void setOptionWidgetHeight(Q_INT32 y); + void setOptionWidgetX(TQ_INT32 x); + void setOptionWidgetY(TQ_INT32 y); + void setOptionWidgetWidth(TQ_INT32 x); + void setOptionWidgetHeight(TQ_INT32 y); void setOptionWidgetRatio(double ratio); private slots: @@ -91,26 +92,26 @@ private slots: void setCropHeight(int y); void setRatio(double ratio); - inline QRect realRectCrop() { QRect r = m_rectCrop; r.setSize(r.size() - QSize(1,1)); return r; } + inline TQRect realRectCrop() { TQRect r = m_rectCrop; r.setSize(r.size() - TQSize(1,1)); return r; } private: void updateWidgetValues(bool updateratio = true); KisCanvasSubject *m_subject; - QRect m_rectCrop; // Is the coordinate of the outline rect and not of the region to crop (to get the region to crop you need to remove 1 to width and height -// QPoint m_startPos; -// QPoint m_endPos; + TQRect m_rectCrop; // Is the coordinate of the outline rect and not of the region to crop (to get the region to crop you need to remove 1 to width and height +// TQPoint m_startPos; +// TQPoint m_endPos; bool m_selecting; - QPoint m_dragStart; - QPoint m_dragStop; + TQPoint m_dragStart; + TQPoint m_dragStop; WdgToolCrop* m_optWidget; - Q_INT32 m_handleSize; - QRegion m_handlesRegion; + TQ_INT32 m_handleSize; + TQRegion m_handlesRegion; bool m_haveCropSelection; - Q_INT32 m_dx, m_dy; - Q_INT32 m_mouseOnHandleType; - QCursor m_cropCursor; + TQ_INT32 m_dx, m_dy; + TQ_INT32 m_mouseOnHandleType; + TQCursor m_cropCursor; enum handleType { diff --git a/krita/plugins/tools/tool_crop/tool_crop.cc b/krita/plugins/tools/tool_crop/tool_crop.cc index 542af31b..7090b713 100644 --- a/krita/plugins/tools/tool_crop/tool_crop.cc +++ b/krita/plugins/tools/tool_crop/tool_crop.cc @@ -20,7 +20,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolCrop> ToolCropFactory; K_EXPORT_COMPONENT_FACTORY( kritatoolcrop, ToolCropFactory( "krita" ) ) -ToolCrop::ToolCrop(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ToolCrop::ToolCrop(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(ToolCropFactory::instance()); - if ( parent->inherits("KisToolRegistry") ) + if ( tqparent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); r->add(new KisToolCropFactory()); } diff --git a/krita/plugins/tools/tool_crop/tool_crop.h b/krita/plugins/tools/tool_crop/tool_crop.h index 1ebe9064..df5d7c28 100644 --- a/krita/plugins/tools/tool_crop/tool_crop.h +++ b/krita/plugins/tools/tool_crop/tool_crop.h @@ -29,8 +29,9 @@ class KisView; class ToolCrop : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ToolCrop(QObject *parent, const char *name, const QStringList &); + ToolCrop(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ToolCrop(); private: diff --git a/krita/plugins/tools/tool_crop/wdg_tool_crop.ui b/krita/plugins/tools/tool_crop/wdg_tool_crop.ui index 8099af7c..4f857cf9 100644 --- a/krita/plugins/tools/tool_crop/wdg_tool_crop.ui +++ b/krita/plugins/tools/tool_crop/wdg_tool_crop.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgToolCrop</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgToolCrop</cstring> </property> @@ -25,9 +25,9 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -39,7 +39,7 @@ <property name="spacing"> <number>3</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -66,7 +66,7 @@ <number>1000000000</number> </property> </widget> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>boolWidth</cstring> </property> @@ -93,7 +93,7 @@ <number>1000000000</number> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>boolHeight</cstring> </property> @@ -104,7 +104,7 @@ <string>Will keep the height of the crop constant</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -123,7 +123,7 @@ <number>2</number> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>boolRatio</cstring> </property> @@ -136,9 +136,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -147,7 +147,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Layer</string> @@ -165,7 +165,7 @@ <number>1</number> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>bnCrop</cstring> </property> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -204,7 +204,7 @@ <tabstop>cmbType</tabstop> <tabstop>bnCrop</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/tools/tool_curves/kis_curve_framework.cc b/krita/plugins/tools/tool_curves/kis_curve_framework.cc index 2ccb87a4..416d3bfd 100644 --- a/krita/plugins/tools/tool_curves/kis_curve_framework.cc +++ b/krita/plugins/tools/tool_curves/kis_curve_framework.cc @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qvaluelist.h> -#include <qrect.h> +#include <tqvaluelist.h> +#include <tqrect.h> #include "kis_point.h" #include "kis_curve_framework.h" @@ -79,12 +79,12 @@ KisCurve KisCurve::selectedPivots(bool selected) KisCurve KisCurve::subCurve(const KisPoint& tend) { - return subCurve(find(tend).previousPivot(),find(tend)); + return subCurve(tqfind(tend).previousPivot(),tqfind(tend)); } KisCurve KisCurve::subCurve(const CurvePoint& tend) { - return subCurve(find(tend).previousPivot(),find(tend)); + return subCurve(tqfind(tend).previousPivot(),tqfind(tend)); } KisCurve KisCurve::subCurve(iterator tend) @@ -94,12 +94,12 @@ KisCurve KisCurve::subCurve(iterator tend) KisCurve KisCurve::subCurve(const KisPoint& tstart, const KisPoint& tend) { - return subCurve(find(tstart),find(tend)); + return subCurve(tqfind(tstart),tqfind(tend)); } KisCurve KisCurve::subCurve(const CurvePoint& tstart, const CurvePoint& tend) { - return subCurve(find(tstart),find(tend)); + return subCurve(tqfind(tstart),tqfind(tend)); } KisCurve KisCurve::subCurve(iterator tstart, iterator tend) @@ -137,7 +137,7 @@ KisCurve::iterator KisCurve::deleteCurve (const KisPoint& pos1, const KisPoint& KisCurve::iterator KisCurve::deleteCurve (const CurvePoint& pos1, const CurvePoint& pos2) { - return deleteCurve (find(pos1),find(pos2)); + return deleteCurve (tqfind(pos1),tqfind(pos2)); } KisCurve::iterator KisCurve::deleteCurve (KisCurve::iterator pos1, KisCurve::iterator pos2) @@ -154,12 +154,12 @@ KisCurve::iterator KisCurve::deleteCurve (KisCurve::iterator pos1, KisCurve::ite KisCurve::iterator KisCurve::selectPivot(const KisPoint& pt, bool isSelected) { - return selectPivot(find(CurvePoint(pt,true)),isSelected); + return selectPivot(tqfind(CurvePoint(pt,true)),isSelected); } KisCurve::iterator KisCurve::selectPivot(const CurvePoint& pt, bool isSelected) { - return selectPivot(find(pt),isSelected); + return selectPivot(tqfind(pt),isSelected); } KisCurve::iterator KisCurve::selectPivot(KisCurve::iterator it, bool isSelected) @@ -171,7 +171,7 @@ KisCurve::iterator KisCurve::selectPivot(KisCurve::iterator it, bool isSelected) } KisCurve selected = pivots(); for (iterator i = selected.begin(); i != selected.end(); i++) - (*find((*i))).setSelected(sel); + (*tqfind((*i))).setSelected(sel); (*it).setSelected(isSelected); return it; @@ -184,7 +184,7 @@ KisCurve::iterator KisCurve::movePivot(const KisPoint& oldPt, const KisPoint& ne KisCurve::iterator KisCurve::movePivot(const CurvePoint& oldPt, const KisPoint& newPt) { - return movePivot(find(oldPt), newPt); + return movePivot(tqfind(oldPt), newPt); } KisCurve::iterator KisCurve::movePivot(KisCurve::iterator it, const KisPoint& newPt) @@ -213,7 +213,7 @@ void KisCurve::deletePivot (const KisPoint& pt) void KisCurve::deletePivot (const CurvePoint& pt) { - deletePivot(find(pt)); + deletePivot(tqfind(pt)); } void KisCurve::deletePivot (KisCurve::iterator it) diff --git a/krita/plugins/tools/tool_curves/kis_curve_framework.h b/krita/plugins/tools/tool_curves/kis_curve_framework.h index 23e326c8..c27369aa 100644 --- a/krita/plugins/tools/tool_curves/kis_curve_framework.h +++ b/krita/plugins/tools/tool_curves/kis_curve_framework.h @@ -78,8 +78,8 @@ public: void setHint(int h) {m_hint = h;} }; -typedef QValueList<CurvePoint> PointList; -typedef QValueList<CurvePoint>::iterator BaseIterator; +typedef TQValueList<CurvePoint> PointList; +typedef TQValueList<CurvePoint>::iterator BaseIterator; class CurveIterator; @@ -130,10 +130,10 @@ public: iterator begin() const; iterator lastIterator() const; iterator end() const; - iterator find(const CurvePoint& pt); - iterator find(const KisPoint& pt); - iterator find(iterator it, const CurvePoint& pt); - iterator find(iterator it, const KisPoint& pt); + iterator tqfind(const CurvePoint& pt); + iterator tqfind(const KisPoint& pt); + iterator tqfind(iterator it, const CurvePoint& pt); + iterator tqfind(iterator it, const KisPoint& pt); KisCurve pivots(); KisCurve selectedPivots(bool = true); @@ -312,34 +312,34 @@ inline KisCurve::iterator KisCurve::end() const return iterator(*this,m_curve.end()); } -inline KisCurve::iterator KisCurve::find (const CurvePoint& pt) +inline KisCurve::iterator KisCurve::tqfind (const CurvePoint& pt) { - return iterator(*this,m_curve.find(pt)); + return iterator(*this,m_curve.tqfind(pt)); } -inline KisCurve::iterator KisCurve::find (const KisPoint& pt) +inline KisCurve::iterator KisCurve::tqfind (const KisPoint& pt) { - return iterator(*this,m_curve.find(CurvePoint(pt))); + return iterator(*this,m_curve.tqfind(CurvePoint(pt))); } -inline KisCurve::iterator KisCurve::find (KisCurve::iterator it, const CurvePoint& pt) +inline KisCurve::iterator KisCurve::tqfind (KisCurve::iterator it, const CurvePoint& pt) { - return iterator(*this,m_curve.find(it.position(),pt)); + return iterator(*this,m_curve.tqfind(it.position(),pt)); } -inline KisCurve::iterator KisCurve::find (iterator it, const KisPoint& pt) +inline KisCurve::iterator KisCurve::tqfind (iterator it, const KisPoint& pt) { - return iterator(*this,m_curve.find(it.position(),CurvePoint(pt))); + return iterator(*this,m_curve.tqfind(it.position(),CurvePoint(pt))); } inline void KisCurve::calculateCurve(const KisPoint& start, const KisPoint& end, KisCurve::iterator it) { - calculateCurve(find(CurvePoint(start)),find(CurvePoint(end)),it); + calculateCurve(tqfind(CurvePoint(start)),tqfind(CurvePoint(end)),it); } inline void KisCurve::calculateCurve(const CurvePoint& start, const CurvePoint& end, KisCurve::iterator it) { - calculateCurve(find(start),find(end),it); + calculateCurve(tqfind(start),tqfind(end),it); } inline void KisCurve::calculateCurve(KisCurve::iterator, KisCurve::iterator, KisCurve::iterator) diff --git a/krita/plugins/tools/tool_curves/kis_tool_bezier.cc b/krita/plugins/tools/tool_curves/kis_tool_bezier.cc index b6d16f78..cd9e7cf4 100644 --- a/krita/plugins/tools/tool_curves/kis_tool_bezier.cc +++ b/krita/plugins/tools/tool_curves/kis_tool_bezier.cc @@ -20,9 +20,9 @@ #include <math.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qrect.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqrect.h> #include <kaction.h> #include <kdebug.h> @@ -260,7 +260,7 @@ void KisCurveBezier::deletePivot (KisCurve::iterator it) } } -KisToolBezier::KisToolBezier(const QString& UIName) +KisToolBezier::KisToolBezier(const TQString& UIName) : super(UIName) { m_derivated = new KisCurveBezier; @@ -276,20 +276,20 @@ KisToolBezier::~KisToolBezier() } -KisCurve::iterator KisToolBezier::handleUnderMouse(const QPoint& pos) +KisCurve::iterator KisToolBezier::handleUnderMouse(const TQPoint& pos) { - QPoint qpos; + TQPoint qpos; KisCurve pivs = m_curve->pivots(), inHandle; KisCurve::iterator it; int hint; for (it = pivs.begin(); it != pivs.end(); it++) { - qpos = m_subject->canvasController()->windowToView((*it).point().toQPoint()); + qpos = m_subject->canvasController()->windowToView((*it).point().toTQPoint()); hint = (*it).hint(); if (hint != BEZIERENDHINT && !m_derivated->groupSelected(it)) continue; if (hint == BEZIERENDHINT && (m_actionOptions & SHIFTOPTION)) continue; - if (pivotRect(qpos).contains(pos)) { + if (pivotRect(qpos).tqcontains(pos)) { inHandle.pushPoint((*it)); if (hint == BEZIERENDHINT && !(m_actionOptions & SHIFTOPTION)) break; @@ -300,7 +300,7 @@ KisCurve::iterator KisToolBezier::handleUnderMouse(const QPoint& pos) if (inHandle.isEmpty()) return m_curve->end(); - return m_curve->find(inHandle.last()); + return m_curve->tqfind(inHandle.last()); } KisCurve::iterator KisToolBezier::drawPoint (KisCanvasPainter& gc, KisCurve::iterator point) @@ -321,11 +321,11 @@ KisCurve::iterator KisToolBezier::drawPoint (KisCanvasPainter& gc, KisCurve::ite if (control2 != m_curve->end()) { point = control2; - QPointArray vec(4); - vec[0] = controller->windowToView((*origin).point().toQPoint()); - vec[1] = controller->windowToView((*control1).point().toQPoint()); - vec[2] = controller->windowToView((*control2).point().toQPoint()); - vec[3] = controller->windowToView((*destination).point().toQPoint()); + TQPointArray vec(4); + vec[0] = controller->windowToView((*origin).point().toTQPoint()); + vec[1] = controller->windowToView((*control1).point().toTQPoint()); + vec[2] = controller->windowToView((*control2).point().toTQPoint()); + vec[3] = controller->windowToView((*destination).point().toTQPoint()); gc.drawCubicBezier(vec); } @@ -341,14 +341,14 @@ void KisToolBezier::drawPivotHandle (KisCanvasPainter& gc, KisCurve::iterator po KisCanvasController *controller = m_subject->canvasController(); - QPoint endpPos = controller->windowToView((*point).point().toQPoint()); + TQPoint endpPos = controller->windowToView((*point).point().toTQPoint()); if (!m_derivated->groupSelected(point)) { gc.setPen(m_pivotPen); gc.drawRoundRect(pivotRect(endpPos),m_pivotRounding,m_pivotRounding); } else { - QPoint nextControlPos = controller->windowToView((*point.next()).point().toQPoint()); - QPoint prevControlPos = controller->windowToView((*point.previousPivot()).point().toQPoint()); + TQPoint nextControlPos = controller->windowToView((*point.next()).point().toTQPoint()); + TQPoint prevControlPos = controller->windowToView((*point.previousPivot()).point().toTQPoint()); gc.setPen(m_selectedPivotPen); gc.drawRoundRect(selectedPivotRect(endpPos),m_selectedPivotRounding,m_selectedPivotRounding); diff --git a/krita/plugins/tools/tool_curves/kis_tool_bezier.h b/krita/plugins/tools/tool_curves/kis_tool_bezier.h index ec4ce7bb..09f5b77d 100644 --- a/krita/plugins/tools/tool_curves/kis_tool_bezier.h +++ b/krita/plugins/tools/tool_curves/kis_tool_bezier.h @@ -77,14 +77,15 @@ class KisToolBezier : public KisToolCurve { typedef KisToolCurve super; Q_OBJECT + TQ_OBJECT public: - KisToolBezier(const QString&); + KisToolBezier(const TQString&); virtual ~KisToolBezier(); protected: - virtual KisCurve::iterator handleUnderMouse(const QPoint& pos); + virtual KisCurve::iterator handleUnderMouse(const TQPoint& pos); virtual void drawPivotHandle(KisCanvasPainter& gc, KisCurve::iterator point); virtual KisCurve::iterator drawPoint(KisCanvasPainter& gc, KisCurve::iterator point); diff --git a/krita/plugins/tools/tool_curves/kis_tool_bezier_paint.cc b/krita/plugins/tools/tool_curves/kis_tool_bezier_paint.cc index 94ee2b79..a29d0ca0 100644 --- a/krita/plugins/tools/tool_curves/kis_tool_bezier_paint.cc +++ b/krita/plugins/tools/tool_curves/kis_tool_bezier_paint.cc @@ -19,13 +19,13 @@ */ -#include <qpainter.h> -#include <qlayout.h> -#include <qrect.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqrect.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> #include <kaction.h> #include <kdebug.h> @@ -95,13 +95,13 @@ void KisToolBezierPaint::setup(KActionCollection *collection) m_action = static_cast<KRadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(Qt::Key_Plus); - shortcut.append(KShortcut(Qt::Key_F9)); + KShortcut shortcut(TQt::Key_Plus); + shortcut.append(KShortcut(TQt::Key_F9)); m_action = new KRadioAction(i18n("&Bezier"), "tool_bezier_paint", shortcut, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); diff --git a/krita/plugins/tools/tool_curves/kis_tool_bezier_paint.h b/krita/plugins/tools/tool_curves/kis_tool_bezier_paint.h index 052f23e6..fb358aea 100644 --- a/krita/plugins/tools/tool_curves/kis_tool_bezier_paint.h +++ b/krita/plugins/tools/tool_curves/kis_tool_bezier_paint.h @@ -29,6 +29,7 @@ class KisToolBezierPaint : public KisToolBezier { typedef KisToolBezier super; Q_OBJECT + TQ_OBJECT public: KisToolBezierPaint(); @@ -36,7 +37,7 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } - virtual Q_UINT32 priority() { return 7; } + virtual TQ_UINT32 priority() { return 7; } protected: @@ -56,7 +57,7 @@ public: t->setup(ac); return t; } - virtual KisID id() { return KisID("beziershape", i18n("Bezier Painting Tool")); } + virtual KisID id() { return KisID("beziertqshape", i18n("Bezier Painting Tool")); } }; #endif //__KIS_TOOL_CURVE_PAINT_H_ diff --git a/krita/plugins/tools/tool_curves/kis_tool_bezier_select.cc b/krita/plugins/tools/tool_curves/kis_tool_bezier_select.cc index 94ebde37..c4649f24 100644 --- a/krita/plugins/tools/tool_curves/kis_tool_bezier_select.cc +++ b/krita/plugins/tools/tool_curves/kis_tool_bezier_select.cc @@ -19,13 +19,13 @@ */ -#include <qpainter.h> -#include <qlayout.h> -#include <qrect.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qwhatsthis.h> -#include <qcheckbox.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqrect.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqwhatsthis.h> +#include <tqcheckbox.h> #include <kaction.h> #include <kdebug.h> @@ -67,9 +67,9 @@ KisToolBezierSelect::~KisToolBezierSelect() } -QValueVector<KisPoint> KisToolBezierSelect::convertCurve() +TQValueVector<KisPoint> KisToolBezierSelect::convertCurve() { - QValueVector<KisPoint> points; + TQValueVector<KisPoint> points; for (KisCurve::iterator i = m_curve->begin(); i != m_curve->end(); i++) { if (((*i).hint() != BEZIERPREVCONTROLHINT) && ((*i).hint() != BEZIERNEXTCONTROLHINT)) @@ -84,13 +84,13 @@ void KisToolBezierSelect::setup(KActionCollection *collection) m_action = static_cast<KRadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(Qt::Key_Plus); - shortcut.append(KShortcut(Qt::Key_F9)); + KShortcut shortcut(TQt::Key_Plus); + shortcut.append(KShortcut(TQt::Key_F9)); m_action = new KRadioAction(i18n("&Bezier"), "tool_bezier_select", shortcut, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); diff --git a/krita/plugins/tools/tool_curves/kis_tool_bezier_select.h b/krita/plugins/tools/tool_curves/kis_tool_bezier_select.h index ac596eeb..9b7cd975 100644 --- a/krita/plugins/tools/tool_curves/kis_tool_bezier_select.h +++ b/krita/plugins/tools/tool_curves/kis_tool_bezier_select.h @@ -29,6 +29,7 @@ class KisToolBezierSelect : public KisToolBezier { typedef KisToolBezier super; Q_OBJECT + TQ_OBJECT public: KisToolBezierSelect(); @@ -36,11 +37,11 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_SELECT; } - virtual Q_UINT32 priority() { return 10; } + virtual TQ_UINT32 priority() { return 10; } protected: - virtual QValueVector<KisPoint> convertCurve(); + virtual TQValueVector<KisPoint> convertCurve(); }; diff --git a/krita/plugins/tools/tool_curves/kis_tool_curve.cc b/krita/plugins/tools/tool_curves/kis_tool_curve.cc index 526311e3..3ca41af6 100644 --- a/krita/plugins/tools/tool_curves/kis_tool_curve.cc +++ b/krita/plugins/tools/tool_curves/kis_tool_curve.cc @@ -21,10 +21,10 @@ #include <math.h> #include <limits.h> -#include <qapplication.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qrect.h> +#include <tqapplication.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqrect.h> #include <kaction.h> #include <kdebug.h> @@ -53,17 +53,17 @@ #include "kis_curve_framework.h" #include "kis_tool_curve.h" -QRect KisToolCurve::pivotRect (const QPoint& pos) +TQRect KisToolCurve::pivotRect (const TQPoint& pos) { - return QRect (pos-QPoint(4,4),pos+QPoint(4,4)); + return TQRect (pos-TQPoint(4,4),pos+TQPoint(4,4)); } -QRect KisToolCurve::selectedPivotRect (const QPoint& pos) +TQRect KisToolCurve::selectedPivotRect (const TQPoint& pos) { - return QRect (pos-QPoint(5,5),pos+QPoint(5,5)); + return TQRect (pos-TQPoint(5,5),pos+TQPoint(5,5)); } -KisToolCurve::KisToolCurve(const QString& UIName) +KisToolCurve::KisToolCurve(const TQString& UIName) : super(UIName) { m_UIName = UIName; @@ -75,9 +75,9 @@ KisToolCurve::KisToolCurve(const QString& UIName) m_dragging = false; m_draggingCursor = false; m_drawPivots = true; - m_drawingPen = QPen(Qt::white, 0, Qt::SolidLine); - m_pivotPen = QPen(Qt::gray, 0, Qt::SolidLine); - m_selectedPivotPen = QPen(Qt::yellow, 0, Qt::SolidLine); + m_drawingPen = TQPen(TQt::white, 0, TQt::SolidLine); + m_pivotPen = TQPen(TQt::gray, 0, TQt::SolidLine); + m_selectedPivotPen = TQPen(TQt::yellow, 0, TQt::SolidLine); m_pivotRounding = m_selectedPivotRounding = 55; m_actionOptions = NOOPTIONS; @@ -118,13 +118,13 @@ void KisToolCurve::buttonPress(KisButtonPressEvent *event) if (event->button() == Qt::LeftButton) { m_dragging = true; m_currentPoint = event->pos(); - PointPair temp = pointUnderMouse (m_subject->canvasController()->windowToView(event->pos().toQPoint())); + PointPair temp = pointUnderMouse (m_subject->canvasController()->windowToView(event->pos().toTQPoint())); if (temp.first == m_curve->end() && !(m_actionOptions)) { draw(true, true); m_curve->selectAll(false); draw(true, true); draw(m_curve->end()); - m_previous = m_curve->find(m_curve->last()); + m_previous = m_curve->tqfind(m_curve->last()); m_current = m_curve->pushPivot(event->pos()); if (m_curve->pivots().count() > 1) m_curve->calculateCurve(m_previous,m_current,m_current); @@ -143,28 +143,28 @@ void KisToolCurve::buttonPress(KisButtonPressEvent *event) } } -void KisToolCurve::keyPress(QKeyEvent *event) +void KisToolCurve::keyPress(TQKeyEvent *event) { - if (event->key() == Qt::Key_Return) { + if (event->key() == TQt::Key_Return) { m_dragging = false; commitCurve(); } else - if (event->key() == Qt::Key_Escape) { + if (event->key() == TQt::Key_Escape) { m_dragging = false; draw(false); m_curve->clear(); } else - if (event->key() == Qt::Key_Delete) { + if (event->key() == TQt::Key_Delete) { draw(false); m_dragging = false; m_curve->deleteSelected(); - m_current = m_curve->find(m_curve->last()); + m_current = m_curve->tqfind(m_curve->last()); m_previous = m_curve->selectPivot(m_current); draw(false); } } -void KisToolCurve::keyRelease(QKeyEvent *) +void KisToolCurve::keyRelease(TQKeyEvent *) { } @@ -183,7 +183,7 @@ void KisToolCurve::doubleClick(KisDoubleClickEvent *) void KisToolCurve::move(KisMoveEvent *event) { updateOptions(event->state()); - PointPair temp = pointUnderMouse(m_subject->canvasController()->windowToView(event->pos().toQPoint())); + PointPair temp = pointUnderMouse(m_subject->canvasController()->windowToView(event->pos().toTQPoint())); if (temp.first == m_curve->end() && !m_dragging) { if (m_draggingCursor) { setCursor(KisCursor::load(m_cursor, 6, 6)); @@ -220,10 +220,10 @@ double pointToSegmentDistance(const KisPoint& p, const KisPoint& l0, const KisPo return distance; } -PointPair KisToolCurve::pointUnderMouse(const QPoint& pos) +PointPair KisToolCurve::pointUnderMouse(const TQPoint& pos) { KisCurve::iterator it, next; - QPoint pos1, pos2; + TQPoint pos1, pos2; it = handleUnderMouse(pos); if (it != m_curve->end()) return PointPair(it,true); @@ -234,8 +234,8 @@ PointPair KisToolCurve::pointUnderMouse(const QPoint& pos) return PointPair(m_curve->end(),false); if ((*it).hint() > LINEHINT || (*next).hint() > LINEHINT) continue; - pos1 = m_subject->canvasController()->windowToView((*it).point().toQPoint()); - pos2 = m_subject->canvasController()->windowToView((*next).point().toQPoint()); + pos1 = m_subject->canvasController()->windowToView((*it).point().toTQPoint()); + pos2 = m_subject->canvasController()->windowToView((*next).point().toTQPoint()); if (pos1 == pos2) continue; if (pointToSegmentDistance(pos,pos1,pos2) <= MAXDISTANCE) @@ -245,17 +245,17 @@ PointPair KisToolCurve::pointUnderMouse(const QPoint& pos) return PointPair(it,false); } -KisCurve::iterator KisToolCurve::handleUnderMouse(const QPoint& pos) +KisCurve::iterator KisToolCurve::handleUnderMouse(const TQPoint& pos) { KisCurve pivs = m_curve->pivots(), inHandle; KisCurve::iterator it; for (it = pivs.begin(); it != pivs.end(); it++) { - if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toQPoint())).contains(pos)) + if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toTQPoint())).tqcontains(pos)) inHandle.pushPoint((*it)); } if (inHandle.isEmpty()) return m_curve->end(); - return m_curve->find(inHandle.last()); + return m_curve->tqfind(inHandle.last()); } KisCurve::iterator KisToolCurve::selectByMouse(KisCurve::iterator it) @@ -278,13 +278,13 @@ int KisToolCurve::updateOptions(int key) { int options = 0x0000; - if (key & Qt::ControlButton) + if (key & TQt::ControlButton) options |= CONTROLOPTION; - if (key & Qt::ShiftButton) + if (key & TQt::ShiftButton) options |= SHIFTOPTION; - if (key & Qt::AltButton) + if (key & TQt::AltButton) options |= ALTOPTION; if (options != m_actionOptions) { @@ -317,7 +317,7 @@ void KisToolCurve::draw(KisCurve::iterator inf, bool pivotonly, bool minimal) return; gc->setPen(m_drawingPen); - gc->setRasterOp(Qt::XorROP); + gc->setRasterOp(TQt::XorROP); KisCurve::iterator it, finish; @@ -344,8 +344,8 @@ void KisToolCurve::draw(KisCurve::iterator inf, bool pivotonly, bool minimal) return; } for (KisCurve::iterator i = sel.begin(); i != sel.end(); i++) { - it = m_curve->find(*i).previousPivot(); - finish = m_curve->find(*i).nextPivot(); + it = m_curve->tqfind(*i).previousPivot(); + finish = m_curve->tqfind(*i).nextPivot(); if ((*finish).isSelected()) finish = finish.previousPivot(); while (it != finish) { @@ -374,8 +374,8 @@ KisCurve::iterator KisToolCurve::drawPoint(KisCanvasPainter& gc, KisCurve::itera { KisCanvasController *controller = m_subject->canvasController(); - QPoint pos1, pos2; - pos1 = controller->windowToView((*point).point().toQPoint()); + TQPoint pos1, pos2; + pos1 = controller->windowToView((*point).point().toTQPoint()); switch ((*point).hint()) { case POINTHINT: @@ -385,7 +385,7 @@ KisCurve::iterator KisToolCurve::drawPoint(KisCanvasPainter& gc, KisCurve::itera case LINEHINT: gc.drawPoint(pos1); if (++point != m_curve->end() && (*point).hint() <= LINEHINT) { - pos2 = controller->windowToView((*point).point().toQPoint()); + pos2 = controller->windowToView((*point).point().toTQPoint()); gc.drawLine(pos1,pos2); } break; @@ -401,7 +401,7 @@ void KisToolCurve::drawPivotHandle(KisCanvasPainter& gc, KisCurve::iterator poin KisCanvasController *controller = m_subject->canvasController(); if (m_drawPivots) { - QPoint pos = controller->windowToView((*point).point().toQPoint()); + TQPoint pos = controller->windowToView((*point).point().toTQPoint()); if ((*point).isSelected()) { gc.setPen(m_selectedPivotPen); gc.drawRoundRect(selectedPivotRect(pos),m_selectedPivotRounding,m_selectedPivotRounding); @@ -418,7 +418,7 @@ void KisToolCurve::paint(KisCanvasPainter&) draw(false); } -void KisToolCurve::paint(KisCanvasPainter&, const QRect&) +void KisToolCurve::paint(KisCanvasPainter&, const TQRect&) { draw(false); } @@ -487,9 +487,9 @@ KisCurve::iterator KisToolCurve::paintPoint (KisPainter& painter, KisCurve::iter return point; } -QValueVector<KisPoint> KisToolCurve::convertCurve() +TQValueVector<KisPoint> KisToolCurve::convertCurve() { - QValueVector<KisPoint> points; + TQValueVector<KisPoint> points; for (KisCurve::iterator i = m_curve->begin(); i != m_curve->end(); i++) if ((*i).hint() != NOHINTS) @@ -500,7 +500,7 @@ QValueVector<KisPoint> KisToolCurve::convertCurve() void KisToolCurve::selectCurve() { - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); KisPaintDeviceSP dev = m_currentImage->activeDevice(); bool hasSelection = dev->hasSelection(); KisSelectedTransaction *t = 0; @@ -513,7 +513,7 @@ void KisToolCurve::selectCurve() KisPainter painter(selection.data()); - painter.setPaintColor(KisColor(Qt::black, selection->colorSpace())); + painter.setPaintColor(KisColor(TQt::black, selection->colorSpace())); painter.setFillStyle(KisPainter::FillStyleForegroundColor); painter.setStrokeStyle(KisPainter::StrokeStyleNone); painter.setBrush(m_subject->currentBrush()); @@ -536,7 +536,7 @@ void KisToolCurve::selectCurve() if(hasSelection) { - QRect dirty(painter.dirtyRect()); + TQRect dirty(painter.dirtyRect()); dev->setDirty(dirty); dev->emitSelectionChanged(dirty); } else { @@ -547,17 +547,17 @@ void KisToolCurve::selectCurve() if (m_currentImage->undo()) m_currentImage->undoAdapter()->addCommand(t); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); draw(false); } -QWidget* KisToolCurve::createOptionWidget(QWidget* parent) +TQWidget* KisToolCurve::createOptionWidget(TQWidget* tqparent) { if (toolType() == TOOL_SHAPE || toolType() == TOOL_FREEHAND) - return super::createOptionWidget(parent); + return super::createOptionWidget(tqparent); else if (toolType() == TOOL_SELECT) - return createSelectionOptionWidget(parent); + return createSelectionOptionWidget(tqparent); else kdDebug(0) << "NO SUPPORT FOR THIS TOOL TYPE" << endl; return 0; @@ -568,21 +568,21 @@ void KisToolCurve::slotSetAction(int action) { m_selectAction =(enumSelectionMode)action; } -QWidget* KisToolCurve::createSelectionOptionWidget(QWidget* parent) +TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* tqparent) { - m_optWidget = new KisSelectionOptions(parent, m_subject); + m_optWidget = new KisSelectionOptions(tqparent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(m_UIName); - connect (m_optWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); + connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout()); - l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; } -QWidget* KisToolCurve::optionWidget() +TQWidget* KisToolCurve::optionWidget() { if (toolType() == TOOL_SELECT) return m_optWidget; diff --git a/krita/plugins/tools/tool_curves/kis_tool_curve.h b/krita/plugins/tools/tool_curves/kis_tool_curve.h index 17a0c418..d6552d47 100644 --- a/krita/plugins/tools/tool_curves/kis_tool_curve.h +++ b/krita/plugins/tools/tool_curves/kis_tool_curve.h @@ -21,8 +21,8 @@ #ifndef KIS_TOOL_CURVE_H_ #define KIS_TOOL_CURVE_H_ -#include <qpen.h> -#include <qcursor.h> +#include <tqpen.h> +#include <tqcursor.h> #include "kis_selection.h" #include "kis_tool_paint.h" @@ -31,11 +31,11 @@ #include "kis_curve_framework.h" -class QRect; +class TQRect; class KisPainter; class KisSelectionOptions; -typedef QPair<KisCurve::iterator,bool> PointPair; +typedef TQPair<KisCurve::iterator,bool> PointPair; const double MAXDISTANCE = 2.5; double pointToSegmentDistance(const KisPoint& p, const KisPoint& l0, const KisPoint& l1); @@ -44,20 +44,21 @@ class KisToolCurve : public KisToolPaint { typedef KisToolPaint super; Q_OBJECT + TQ_OBJECT public: - KisToolCurve(const QString& UIName); + KisToolCurve(const TQString& UIName); virtual ~KisToolCurve(); virtual void update (KisCanvasSubject *subject); - virtual QWidget* createOptionWidget(QWidget* parent); + virtual TQWidget* createOptionWidget(TQWidget* tqparent); virtual void buttonPress(KisButtonPressEvent *event); virtual void move(KisMoveEvent *event); virtual void buttonRelease(KisButtonReleaseEvent *event); virtual void doubleClick(KisDoubleClickEvent *event); - virtual void keyPress(QKeyEvent *event); - virtual void keyRelease(QKeyEvent *event); + virtual void keyPress(TQKeyEvent *event); + virtual void keyRelease(TQKeyEvent *event); public slots: @@ -66,7 +67,7 @@ public slots: protected: virtual void paint(KisCanvasPainter&); - virtual void paint(KisCanvasPainter&, const QRect&); + virtual void paint(KisCanvasPainter&, const TQRect&); /* ********************** * * KisToolCurve interface * @@ -77,8 +78,8 @@ protected: */ virtual int updateOptions(int); - virtual PointPair pointUnderMouse(const QPoint& pos); - virtual KisCurve::iterator handleUnderMouse(const QPoint& pos); + virtual PointPair pointUnderMouse(const TQPoint& pos); + virtual KisCurve::iterator handleUnderMouse(const TQPoint& pos); /* * Select the needed points; called after pointUnderMouse @@ -108,7 +109,7 @@ protected: /* * Called by selectCurve(), this convert m_curve to a vector of KisPoint in order to be used by paintPolygon() */ - virtual QValueVector<KisPoint> convertCurve(); + virtual TQValueVector<KisPoint> convertCurve(); /* * Called by paintCurve(), it behaves essentially like drawPoint(), but this uses a KisPainter @@ -133,12 +134,12 @@ protected: /* * Return the rect around a given point, assuming that that point is an unselected pivot */ - QRect pivotRect (const QPoint&); + TQRect pivotRect (const TQPoint&); /* * Same as above for selected pivots */ - QRect selectedPivotRect (const QPoint&); + TQRect selectedPivotRect (const TQPoint&); protected: @@ -151,9 +152,9 @@ protected: bool m_dragging; bool m_drawPivots; - QPen m_drawingPen; - QPen m_pivotPen; - QPen m_selectedPivotPen; + TQPen m_drawingPen; + TQPen m_pivotPen; + TQPen m_selectedPivotPen; int m_pivotRounding; int m_selectedPivotRounding; @@ -161,12 +162,12 @@ protected: bool m_supportMinimalDraw; bool m_draggingCursor; - QString m_transactionMessage; - QString m_cursor; + TQString m_transactionMessage; + TQString m_cursor; private: - QString m_UIName; + TQString m_UIName; /* ********************************** * @@ -178,12 +179,12 @@ public: /* * This initializes our Option Widget (called by createOptionWidget()) */ - virtual QWidget* createSelectionOptionWidget(QWidget* parent); + virtual TQWidget* createSelectionOptionWidget(TQWidget* tqparent); /* * This return our internal KisSelectionOptions if toolType() returns TOOL_SELECT */ - virtual QWidget* optionWidget(); + virtual TQWidget* optionWidget(); public slots: diff --git a/krita/plugins/tools/tool_curves/kis_tool_example.cc b/krita/plugins/tools/tool_curves/kis_tool_example.cc index 9fcc5d01..9458d966 100644 --- a/krita/plugins/tools/tool_curves/kis_tool_example.cc +++ b/krita/plugins/tools/tool_curves/kis_tool_example.cc @@ -19,9 +19,9 @@ */ -#include <qpainter.h> -#include <qlayout.h> -#include <qrect.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqrect.h> #include <kaction.h> #include <kdebug.h> @@ -88,13 +88,13 @@ void KisToolExample::setup(KActionCollection *collection) m_action = static_cast<KRadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(Qt::Key_Plus); - shortcut.append(KShortcut(Qt::Key_F9)); + KShortcut shortcut(TQt::Key_Plus); + shortcut.append(KShortcut(TQt::Key_F9)); m_action = new KRadioAction(i18n("&Example"), "tool_example", shortcut, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); diff --git a/krita/plugins/tools/tool_curves/kis_tool_example.h b/krita/plugins/tools/tool_curves/kis_tool_example.h index af1d3574..ec1e8f8e 100644 --- a/krita/plugins/tools/tool_curves/kis_tool_example.h +++ b/krita/plugins/tools/tool_curves/kis_tool_example.h @@ -37,6 +37,7 @@ class KisToolExample : public KisToolCurve { typedef KisToolCurve super; Q_OBJECT + TQ_OBJECT public: KisToolExample(); @@ -59,7 +60,7 @@ public: t->setup(ac); return t; } - virtual KisID id() { return KisID("exampleshape", i18n("Example Tool")); } + virtual KisID id() { return KisID("exampletqshape", i18n("Example Tool")); } }; diff --git a/krita/plugins/tools/tool_curves/kis_tool_moutline.cc b/krita/plugins/tools/tool_curves/kis_tool_moutline.cc index 75ab0205..1f0c4ac2 100644 --- a/krita/plugins/tools/tool_curves/kis_tool_moutline.cc +++ b/krita/plugins/tools/tool_curves/kis_tool_moutline.cc @@ -21,12 +21,12 @@ #include <math.h> #include <set> -#include <qpainter.h> -#include <qlayout.h> -#include <qrect.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qslider.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqrect.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqslider.h> #include <kaction.h> #include <kdebug.h> @@ -77,18 +77,18 @@ const int PAGESTEP = 5; class Node { - QPoint m_pos; + TQPoint m_pos; int m_gCost; int m_hCost; int m_tCost; bool m_malus; - QPoint m_parent; + TQPoint m_parent; public: Node() { - m_pos = m_parent = QPoint(-1,-1); + m_pos = m_parent = TQPoint(-1,-1); m_gCost = m_hCost = m_tCost = 0; m_malus = false; } @@ -100,14 +100,14 @@ public: m_hCost = node.hCost(); m_tCost = node.tCost(); m_malus = node.malus(); - m_parent = node.parent(); + m_parent = node.tqparent(); } - Node(const QPoint& parent, const QPoint& pos, int g, int h, bool malus) + Node(const TQPoint& tqparent, const TQPoint& pos, int g, int h, bool malus) : m_pos(pos), m_hCost(h), m_malus(malus) { setGCost(g); - m_parent = parent; + m_parent = tqparent; } ~Node () { @@ -117,10 +117,10 @@ public: int hCost () const {return m_hCost;} int tCost () const {return m_tCost;} bool malus () const {return m_malus;} - QPoint pos () const {return m_pos;} + TQPoint pos () const {return m_pos;} int col () const {return m_pos.x();} int row () const {return m_pos.y();} - QPoint parent () const {return m_parent;} + TQPoint tqparent () const {return m_parent;} void setGCost (int g) { @@ -132,7 +132,7 @@ public: m_hCost = h; m_tCost = m_gCost+m_hCost; } - void setPos (const QPoint& pos) + void setPos (const TQPoint& pos) { m_pos = pos; } @@ -142,7 +142,7 @@ public: } void clear () { - m_pos = QPoint(-1,-1); + m_pos = TQPoint(-1,-1); } bool operator== (const Node& n2) const @@ -153,11 +153,11 @@ public: { return m_pos != n2.pos(); } - bool operator== (const QPoint& n2) const + bool operator== (const TQPoint& n2) const { return m_pos == n2; } - bool operator!= (const QPoint& n2) const + bool operator!= (const TQPoint& n2) const { return m_pos != n2; } @@ -170,10 +170,10 @@ public: return m_tCost > n2.tCost(); } - QValueList<Node> getNeighbor(const GrayMatrix& src, const Node& end) + TQValueList<Node> getNeighbor(const GrayMatrix& src, const Node& end) { - QPoint tmpdist; - QValueList<Node> temp; + TQPoint tmpdist; + TQValueList<Node> temp; int dcol, drow; int g, h; bool malus; @@ -183,7 +183,7 @@ public: for (int i = 0; i < 8; i++) { dcol = m_pos.x() + x[i]; drow = m_pos.y() + y[i]; - tmpdist = QPoint(dcol,drow) - end.pos(); + tmpdist = TQPoint(dcol,drow) - end.pos(); // I use src[0] here because all cols have same number of rows if (dcol == (int)src.count() || dcol < 0 || drow == (int)src[0].count() || drow < 0) @@ -197,17 +197,17 @@ public: else g = m_gCost + ORTHOGONAL_COST; h = ORTHOGONAL_COST * (abs(tmpdist.x()) + abs(tmpdist.y())); - temp.append(Node(m_pos,QPoint(dcol,drow),g,h,malus)); + temp.append(Node(m_pos,TQPoint(dcol,drow),g,h,malus)); } return temp; } }; -KisKernelSP createKernel( Q_INT32 i0, Q_INT32 i1, Q_INT32 i2, - Q_INT32 i3, Q_INT32 i4, Q_INT32 i5, - Q_INT32 i6, Q_INT32 i7, Q_INT32 i8, - Q_INT32 factor, Q_INT32 offset ) +KisKernelSP createKernel( TQ_INT32 i0, TQ_INT32 i1, TQ_INT32 i2, + TQ_INT32 i3, TQ_INT32 i4, TQ_INT32 i5, + TQ_INT32 i6, TQ_INT32 i7, TQ_INT32 i8, + TQ_INT32 factor, TQ_INT32 offset ) { KisKernelSP kernel = new KisKernel(); kernel->width = 3; @@ -216,7 +216,7 @@ KisKernelSP createKernel( Q_INT32 i0, Q_INT32 i1, Q_INT32 i2, kernel->factor = factor; kernel->offset = offset; - kernel->data = new Q_INT32[9]; + kernel->data = new TQ_INT32[9]; kernel->data[0] = i0; kernel->data[1] = i1; kernel->data[2] = i2; @@ -230,8 +230,8 @@ KisKernelSP createKernel( Q_INT32 i0, Q_INT32 i1, Q_INT32 i2, return kernel; } -KisCurveMagnetic::KisCurveMagnetic (KisToolMagnetic *parent) - : m_parent(parent) +KisCurveMagnetic::KisCurveMagnetic (KisToolMagnetic *tqparent) + : m_parent(tqparent) { m_standardkeepselected = false; } @@ -263,11 +263,11 @@ void KisCurveMagnetic::calculateCurve (KisCurve::iterator p1, KisCurve::iterator return; if (m_parent->editingMode()) return; - QPoint start = (*p1).point().roundQPoint(); - QPoint end = (*p2).point().roundQPoint(); - QRect rc = QRect(start,end).normalize(); - rc.setTopLeft(rc.topLeft()+QPoint(-8,-8)); // Enlarge the view, so problems with gaussian blur can be removed - rc.setBottomRight(rc.bottomRight()+QPoint(8,8)); // and we are able to find paths that go beyond the rect. + TQPoint start = (*p1).point().roundTQPoint(); + TQPoint end = (*p2).point().roundTQPoint(); + TQRect rc = TQRect(start,end).normalize(); + rc.setTopLeft(rc.topLeft()+TQPoint(-8,-8)); // Enlarge the view, so problems with gaussian blur can be removed + rc.setBottomRight(rc.bottomRight()+TQPoint(8,8)); // and we are able to find paths that go beyond the rect. KisPaintDeviceSP src = m_parent->m_currentImage->activeDevice(); GrayMatrix dst = GrayMatrix(rc.width(),GrayCol(rc.height())); @@ -280,7 +280,7 @@ void KisCurveMagnetic::calculateCurve (KisCurve::iterator p1, KisCurve::iterator NodeMatrix openMatrix = NodeMatrix(rc.width(),NodeCol(rc.height())); NodeMatrix closedMatrix = NodeMatrix(rc.width(),NodeCol(rc.height())); - QPoint tl(rc.topLeft().x(),rc.topLeft().y()); + TQPoint tl(rc.topLeft().x(),rc.topLeft().y()); start -= tl; // Relative to the matrix end -= tl; // Relative to the matrix @@ -294,28 +294,28 @@ void KisCurveMagnetic::calculateCurve (KisCurve::iterator p1, KisCurve::iterator openSet.erase(openSet.begin()); openMatrix[current.col()][current.row()].clear(); - QValueList<Node> successors = current.getNeighbor(dst,endNode); - for (QValueList<Node>::iterator i = successors.begin(); i != successors.end(); i++) { + TQValueList<Node> successors = current.getNeighbor(dst,endNode); + for (TQValueList<Node>::iterator i = successors.begin(); i != successors.end(); i++) { int col = (*i).col(); int row = (*i).row(); if ((*i) == endNode) { - while (current.parent() != QPoint(-1,-1)) { + while (current.tqparent() != TQPoint(-1,-1)) { it = addPoint(it,tl+current.pos(),false,false,LINEHINT); - current = closedMatrix[current.parent().x()][current.parent().y()]; + current = closedMatrix[current.tqparent().x()][current.tqparent().y()]; } return; } Node *openNode = &openMatrix[col][row]; - if (*openNode != QPoint(-1,-1)) { + if (*openNode != TQPoint(-1,-1)) { if (*i > *openNode) continue; else { - openSet.erase(qFind(openSet.begin(),openSet.end(),*openNode)); + openSet.erase(tqFind(openSet.begin(),openSet.end(),*openNode)); openNode->clear(); // Clear the Node } } Node *closedNode = &closedMatrix[col][row]; - if (*closedNode != QPoint(-1,-1)) { + if (*closedNode != TQPoint(-1,-1)) { if ((*i) > (*closedNode)) continue; else { @@ -352,13 +352,13 @@ void KisCurveMagnetic::findEdge (int col, int row, const GrayMatrix& src, Node& x = (int)(col + mindist.x()); y = (int)(row + mindist.y()); - node.setPos(QPoint(x,y)); + node.setPos(TQPoint(x,y)); } -void KisCurveMagnetic::reduceMatrix (QRect& rc, GrayMatrix& m, int top, int right, int bottom, int left) +void KisCurveMagnetic::reduceMatrix (TQRect& rc, GrayMatrix& m, int top, int right, int bottom, int left) { - QPoint topleft(top, left); - QPoint bottomright(bottom, right); + TQPoint topleft(top, left); + TQPoint bottomright(bottom, right); rc.setTopLeft(rc.topLeft()+topleft); rc.setBottomRight(rc.bottomRight()-bottomright); @@ -377,7 +377,7 @@ void KisCurveMagnetic::reduceMatrix (QRect& rc, GrayMatrix& m, int top, int righ } } -void KisCurveMagnetic::detectEdges (const QRect & rect, KisPaintDeviceSP src, GrayMatrix& dst) +void KisCurveMagnetic::detectEdges (const TQRect & rect, KisPaintDeviceSP src, GrayMatrix& dst) { GrayMatrix graysrc(rect.width(),GrayCol(rect.height())); GrayMatrix xdeltas(rect.width(),GrayCol(rect.height())); @@ -392,7 +392,7 @@ void KisCurveMagnetic::detectEdges (const QRect & rect, KisPaintDeviceSP src, Gr nonMaxSupp(magnitude, xdeltas, ydeltas, dst); } -void KisCurveMagnetic::gaussianBlur (const QRect& rect, KisPaintDeviceSP src, KisPaintDeviceSP dst) +void KisCurveMagnetic::gaussianBlur (const TQRect& rect, KisPaintDeviceSP src, KisPaintDeviceSP dst) { int grectx = rect.x(); int grecty = rect.y(); @@ -410,20 +410,20 @@ void KisCurveMagnetic::gaussianBlur (const QRect& rect, KisPaintDeviceSP src, Ki painter.applyMatrix(kernel, grectx, grecty, grectw, grecth, BORDER_AVOID); } -void KisCurveMagnetic::toGrayScale (const QRect& rect, KisPaintDeviceSP src, GrayMatrix& dst) +void KisCurveMagnetic::toGrayScale (const TQRect& rect, KisPaintDeviceSP src, GrayMatrix& dst) { int grectx = rect.x(); int grecty = rect.y(); int grectw = rect.width(); int grecth = rect.height(); - QColor c; + TQColor c; KisColorSpace *cs = src->colorSpace(); for (int row = 0; row < grecth; row++) { KisHLineIteratorPixel srcIt = src->createHLineIterator(grectx, grecty+row, grectw, false); for (int col = 0; col < grectw; col++) { - cs->toQColor(srcIt.rawData(),&c); - dst[col][row] = qGray(c.rgb()); + cs->toTQColor(srcIt.rawData(),&c); + dst[col][row] = tqGray(c.rgb()); ++srcIt; } } @@ -432,7 +432,7 @@ void KisCurveMagnetic::toGrayScale (const QRect& rect, KisPaintDeviceSP src, Gra void KisCurveMagnetic::getDeltas (const GrayMatrix& src, GrayMatrix& xdelta, GrayMatrix& ydelta) { uint start = 1, xend = src[0].count()-1, yend = src.count()-1; - Q_INT16 deri; + TQ_INT16 deri; for (uint col = 0; col < src.count(); col++) { for (uint row = 0; row < src[col].count(); row++) { if (row >= start && row < xend) { @@ -453,7 +453,7 @@ void KisCurveMagnetic::getMagnitude (const GrayMatrix& xdelta, const GrayMatrix& { for (uint col = 0; col < xdelta.count(); col++) { for (uint row = 0; row < xdelta[col].count(); row++) - gradient[col][row] = (Q_INT16)(ROUND(RMS(xdelta[col][row],ydelta[col][row]))); + gradient[col][row] = (TQ_INT16)(ROUND(RMS(xdelta[col][row],ydelta[col][row]))); } } @@ -471,12 +471,12 @@ void KisCurveMagnetic::nonMaxSupp (const GrayMatrix& magnitude, const GrayMatrix // For this reason: first direction is relative to Gy only and third direction to Gx only double theta; // theta = invtan (|Gy| / |Gx|) This give the direction relative to a quadrant - Q_INT16 mag; // Current magnitude - Q_INT16 lmag; // Magnitude at the left (So this pixel is "more internal" than the current - Q_INT16 rmag; // Magnitude at the right (So this pixel is "more external") + TQ_INT16 mag; // Current magnitude + TQ_INT16 lmag; // Magnitude at the left (So this pixel is "more internal" than the current + TQ_INT16 rmag; // Magnitude at the right (So this pixel is "more external") double xdel; // Current xdelta double ydel; // Current ydelta - Q_INT16 result; + TQ_INT16 result; for (uint col = 0; col < magnitude.count(); col++) { for (uint row = 0; row < magnitude[col].count(); row++) { @@ -590,9 +590,9 @@ void KisToolMagnetic::deactivate () m_drawPivots = true; } -void KisToolMagnetic::keyPress(QKeyEvent *event) +void KisToolMagnetic::keyPress(TQKeyEvent *event) { - if (event->key() == Qt::Key_Control) { + if (event->key() == TQt::Key_Control) { draw(false); if (m_editingMode) { m_editingMode = false; @@ -604,7 +604,7 @@ void KisToolMagnetic::keyPress(QKeyEvent *event) m_mode->setText(i18n("Manual Mode")); } draw(false); - } else if (event->key() == Qt::Key_Delete && m_curve->count()) { + } else if (event->key() == TQt::Key_Delete && m_curve->count()) { draw(false); m_dragging = false; if (m_curve->pivots().count() == 2) @@ -648,7 +648,7 @@ void KisToolMagnetic::buttonPress(KisButtonPressEvent *event) m_currentPoint = event->pos(); PointPair temp(m_curve->end(),false); if (m_editingMode) - temp = pointUnderMouse (m_subject->canvasController()->windowToView(event->pos().toQPoint())); + temp = pointUnderMouse (m_subject->canvasController()->windowToView(event->pos().toTQPoint())); if (temp.first == m_curve->end() && !(m_actionOptions)) { if (m_editingMode) { draw(true, true); @@ -691,10 +691,10 @@ void KisToolMagnetic::buttonPress(KisButtonPressEvent *event) void KisToolMagnetic::move(KisMoveEvent *event) { updateOptions(event->state()); - if (m_currentPoint == event->pos().floorQPoint()) + if (m_currentPoint == event->pos().floorTQPoint()) return; if (m_editingMode) { - PointPair temp = pointUnderMouse(m_subject->canvasController()->windowToView(event->pos().toQPoint())); + PointPair temp = pointUnderMouse(m_subject->canvasController()->windowToView(event->pos().toTQPoint())); if (temp.first == m_curve->end() && !m_dragging) { if (m_editingCursor || m_draggingCursor) { setCursor(KisCursor::load("tool_moutline_cursor.png", 6, 6)); @@ -736,7 +736,7 @@ void KisToolMagnetic::move(KisMoveEvent *event) else draw(m_current); m_curve->movePivot(m_current,event->pos()); - m_currentPoint = event->pos().floorQPoint(); + m_currentPoint = event->pos().floorTQPoint(); draw(m_current); } @@ -759,22 +759,22 @@ void KisToolMagnetic::slotSetDistance (int dist) m_distance = dist; } -QWidget* KisToolMagnetic::createOptionWidget(QWidget* parent) +TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* tqparent) { - m_optWidget = super::createOptionWidget(parent); - QVBoxLayout * l = dynamic_cast<QVBoxLayout*>(m_optWidget->layout()); - QGridLayout *box = new QGridLayout(l, 2, 2, 3); + m_optWidget = super::createOptionWidget(tqparent); + TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); + TQGridLayout *box = new TQGridLayout(l, 2, 2, 3); box->setColStretch(0, 1); box->setColStretch(1, 1); Q_CHECK_PTR(box); - m_mode = new QLabel(i18n("Automatic mode"), m_optWidget); - m_lbDistance = new QLabel(i18n("Distance: "), m_optWidget); - QPushButton *finish = new QPushButton(i18n("To Selection"), m_optWidget); - m_slDistance = new QSlider(MINDIST, MAXDIST, PAGESTEP, m_distance, Qt::Horizontal, m_optWidget); + m_mode = new TQLabel(i18n("Automatic mode"), m_optWidget); + m_lbDistance = new TQLabel(i18n("Distance: "), m_optWidget); + TQPushButton *finish = new TQPushButton(i18n("To Selection"), m_optWidget); + m_slDistance = new TQSlider(MINDIST, MAXDIST, PAGESTEP, m_distance, Qt::Horizontal, m_optWidget); - connect(m_slDistance, SIGNAL(valueChanged(int)), this, SLOT(slotSetDistance(int))); - connect(finish, SIGNAL(clicked()), this, SLOT(slotCommitCurve())); + connect(m_slDistance, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetDistance(int))); + connect(finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCommitCurve())); box->addWidget(m_lbDistance, 0, 0); box->addWidget(m_slDistance, 0, 1); @@ -789,13 +789,13 @@ void KisToolMagnetic::setup(KActionCollection *collection) m_action = static_cast<KRadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(Qt::Key_Plus); - shortcut.append(KShortcut(Qt::Key_F9)); + KShortcut shortcut(TQt::Key_Plus); + shortcut.append(KShortcut(TQt::Key_F9)); m_action = new KRadioAction(i18n("Magnetic Outline"), "tool_moutline", shortcut, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); diff --git a/krita/plugins/tools/tool_curves/kis_tool_moutline.h b/krita/plugins/tools/tool_curves/kis_tool_moutline.h index 43a140be..e5ff62a1 100644 --- a/krita/plugins/tools/tool_curves/kis_tool_moutline.h +++ b/krita/plugins/tools/tool_curves/kis_tool_moutline.h @@ -25,15 +25,15 @@ #include "kis_curve_framework.h" #include "kis_tool_curve.h" -class QSlider; +class TQSlider; class KisToolMagnetic; class KisVector2D; class Node; -typedef QValueVector<Node> NodeCol; -typedef QValueVector<NodeCol> NodeMatrix; -typedef QValueVector<Q_INT16> GrayCol; -typedef QValueVector<GrayCol> GrayMatrix; +typedef TQValueVector<Node> NodeCol; +typedef TQValueVector<NodeCol> NodeMatrix; +typedef TQValueVector<TQ_INT16> GrayCol; +typedef TQValueVector<GrayCol> GrayMatrix; class KisCurveMagnetic : public KisCurve { @@ -41,19 +41,19 @@ class KisCurveMagnetic : public KisCurve { KisToolMagnetic *m_parent; - void reduceMatrix (QRect&, GrayMatrix&, int, int, int, int); + void reduceMatrix (TQRect&, GrayMatrix&, int, int, int, int); void findEdge (int, int, const GrayMatrix&, Node&); - void detectEdges (const QRect&, KisPaintDeviceSP, GrayMatrix&); + void detectEdges (const TQRect&, KisPaintDeviceSP, GrayMatrix&); - void gaussianBlur (const QRect&, KisPaintDeviceSP, KisPaintDeviceSP); - void toGrayScale (const QRect&, KisPaintDeviceSP, GrayMatrix&); + void gaussianBlur (const TQRect&, KisPaintDeviceSP, KisPaintDeviceSP); + void toGrayScale (const TQRect&, KisPaintDeviceSP, GrayMatrix&); void getDeltas (const GrayMatrix&, GrayMatrix&, GrayMatrix&); void getMagnitude (const GrayMatrix&, const GrayMatrix&, GrayMatrix&); void nonMaxSupp (const GrayMatrix&, const GrayMatrix&, const GrayMatrix&, GrayMatrix&); public: - KisCurveMagnetic (KisToolMagnetic *parent); + KisCurveMagnetic (KisToolMagnetic *tqparent); ~KisCurveMagnetic (); virtual KisCurve::iterator addPivot (iterator, const KisPoint&); @@ -66,6 +66,7 @@ class KisToolMagnetic : public KisToolCurve { typedef KisToolCurve super; Q_OBJECT + TQ_OBJECT friend class KisCurveMagnetic; @@ -77,9 +78,9 @@ public: virtual void update (KisCanvasSubject*); virtual void setup (KActionCollection*); virtual enumToolType toolType() { return TOOL_SELECT; } - virtual Q_UINT32 priority() { return 9; } + virtual TQ_UINT32 priority() { return 9; } - virtual void keyPress(QKeyEvent*); + virtual void keyPress(TQKeyEvent*); virtual void buttonPress(KisButtonPressEvent*); virtual void buttonRelease(KisButtonReleaseEvent*); virtual void move(KisMoveEvent*); @@ -87,7 +88,7 @@ public: virtual KisCurve::iterator selectByMouse(KisCurve::iterator it); bool editingMode() {return m_editingMode;} - virtual QWidget* createOptionWidget(QWidget* parent); + virtual TQWidget* createOptionWidget(TQWidget* tqparent); public slots: @@ -100,10 +101,10 @@ public slots: private: KisCurveMagnetic *m_derived; - QWidget* m_optWidget; - QLabel* m_mode; - QLabel* m_lbDistance; - QSlider* m_slDistance; + TQWidget* m_optWidget; + TQLabel* m_mode; + TQLabel* m_lbDistance; + TQSlider* m_slDistance; bool m_editingMode; bool m_editingCursor; bool m_draggingCursor; diff --git a/krita/plugins/tools/tool_curves/tool_curves.cc b/krita/plugins/tools/tool_curves/tool_curves.cc index bb4b2736..c25ed941 100644 --- a/krita/plugins/tools/tool_curves/tool_curves.cc +++ b/krita/plugins/tools/tool_curves/tool_curves.cc @@ -21,7 +21,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -45,14 +45,14 @@ typedef KGenericFactory<ToolCurves> ToolCurvesFactory; K_EXPORT_COMPONENT_FACTORY( kritatoolcurves, ToolCurvesFactory( "krita" ) ) -ToolCurves::ToolCurves(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ToolCurves::ToolCurves(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(ToolCurvesFactory::instance()); - if ( parent->inherits("KisToolRegistry") ) + if ( tqparent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( parent ); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( tqparent ); r->add(new KisToolBezierPaintFactory()); r->add(new KisToolBezierSelectFactory()); r->add(new KisToolMagneticFactory()); diff --git a/krita/plugins/tools/tool_curves/tool_curves.h b/krita/plugins/tools/tool_curves/tool_curves.h index 7a097d46..db6d5a7f 100644 --- a/krita/plugins/tools/tool_curves/tool_curves.h +++ b/krita/plugins/tools/tool_curves/tool_curves.h @@ -26,8 +26,9 @@ class ToolCurves : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ToolCurves(QObject *parent, const char *name, const QStringList &); + ToolCurves(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ToolCurves(); }; diff --git a/krita/plugins/tools/tool_curves/wdg_tool_example.ui b/krita/plugins/tools/tool_curves/wdg_tool_example.ui index 3841185f..eac06e2b 100644 --- a/krita/plugins/tools/tool_curves/wdg_tool_example.ui +++ b/krita/plugins/tools/tool_curves/wdg_tool_example.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgToolExample</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgToolExample</cstring> </property> @@ -22,15 +22,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -57,15 +57,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -120,7 +120,7 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/tools/tool_filter/kis_filterop.cc b/krita/plugins/tools/tool_filter/kis_filterop.cc index a2ca604a..1f2200b3 100644 --- a/krita/plugins/tools/tool_filter/kis_filterop.cc +++ b/krita/plugins/tools/tool_filter/kis_filterop.cc @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qrect.h> +#include <tqrect.h> #include <kdebug.h> @@ -74,22 +74,22 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) // Split the coordinates into integer plus fractional parts. The integer // is where the dab will be positioned and the fractional part determines // the sub-pixel positioning. - Q_INT32 x; + TQ_INT32 x; double xFraction; - Q_INT32 y; + TQ_INT32 y; double yFraction; splitCoordinate(pt.x(), &x, &xFraction); splitCoordinate(pt.y(), &y, &yFraction); - // Filters always work with a mask, never with an image; that + // Filters always work with a tqmask, never with an image; that // wouldn't be useful at all. - KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction); + KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction); m_painter->setPressure(info.pressure); - Q_INT32 maskWidth = mask->width(); - Q_INT32 maskHeight = mask->height(); + TQ_INT32 tqmaskWidth = tqmask->width(); + TQ_INT32 tqmaskHeight = tqmask->height(); // Create a temporary paint device KisPaintDeviceSP tmpDev = new KisPaintDevice(colorSpace, "filterop tmpdev"); @@ -98,21 +98,21 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) // Copy the layer data onto the new paint device KisPainter p( tmpDev ); - p.bitBlt( 0, 0, COMPOSITE_COPY, m_source, OPACITY_OPAQUE, x, y, maskWidth, maskHeight ); + p.bitBlt( 0, 0, COMPOSITE_COPY, m_source, OPACITY_OPAQUE, x, y, tqmaskWidth, tqmaskHeight ); // Filter the paint device filter->disableProgress(); - filter->process( tmpDev, tmpDev, m_filterConfiguration, QRect( 0, 0, maskWidth, maskHeight )); + filter->process( tmpDev, tmpDev, m_filterConfiguration, TQRect( 0, 0, tqmaskWidth, tqmaskHeight )); filter->enableProgress(); - // Apply the mask on the paint device (filter before mask because edge pixels may be important) - for (int y = 0; y < maskHeight; y++) + // Apply the tqmask on the paint device (filter before tqmask because edge pixels may be important) + for (int y = 0; y < tqmaskHeight; y++) { - KisHLineIterator hiter = tmpDev->createHLineIterator(0, y, maskWidth, false); + KisHLineIterator hiter = tmpDev->createHLineIterator(0, y, tqmaskWidth, false); int x=0; while(! hiter.isDone()) { - Q_UINT8 alpha = mask->alphaAt( x++, y ); + TQ_UINT8 alpha = tqmask->alphaAt( x++, y ); colorSpace->setAlpha(hiter.rawData(), alpha, 1); ++hiter; @@ -120,8 +120,8 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) } // Blit the paint device onto the layer - QRect dabRect = QRect(0, 0, maskWidth, maskHeight); - QRect dstRect = QRect(x, y, dabRect.width(), dabRect.height()); + TQRect dabRect = TQRect(0, 0, tqmaskWidth, tqmaskHeight); + TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height()); KisImage * image = m_painter->device()->image(); @@ -131,10 +131,10 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) if (dstRect.isNull() || dstRect.isEmpty() || !dstRect.isValid()) return; - Q_INT32 sx = dstRect.x() - x; - Q_INT32 sy = dstRect.y() - y; - Q_INT32 sw = dstRect.width(); - Q_INT32 sh = dstRect.height(); + TQ_INT32 sx = dstRect.x() - x; + TQ_INT32 sy = dstRect.y() - y; + TQ_INT32 sw = dstRect.width(); + TQ_INT32 sh = dstRect.height(); if (m_source->hasSelection()) { m_painter->bltSelection(dstRect.x(), dstRect.y(), m_painter->compositeOp(), tmpDev.data(), diff --git a/krita/plugins/tools/tool_filter/kis_tool_filter.cc b/krita/plugins/tools/tool_filter/kis_tool_filter.cc index 1cc1240f..bb303862 100644 --- a/krita/plugins/tools/tool_filter/kis_tool_filter.cc +++ b/krita/plugins/tools/tool_filter/kis_tool_filter.cc @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qbitmap.h> -#include <qpainter.h> -#include <qcombobox.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqbitmap.h> +#include <tqpainter.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <kaction.h> #include <kdebug.h> @@ -67,7 +67,7 @@ void KisToolFilter::setup(KActionCollection *collection) if (m_action == 0) { m_action = new KRadioAction(i18n("&Filter Brush"), "tool_filter", 0, this, - SLOT(activate()), collection, + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); m_action->setToolTip(i18n("Paint with filters")); @@ -96,14 +96,14 @@ void KisToolFilter::initPaint(KisEvent *e) dynamic_cast<KisFilterOp *>(op)->setFilterConfiguration( m_filter->configuration( m_filterConfigurationWidget) ); } -QWidget* KisToolFilter::createOptionWidget(QWidget* parent) +TQWidget* KisToolFilter::createOptionWidget(TQWidget* tqparent) { - QWidget *widget = super::createOptionWidget(parent); + TQWidget *widget = super::createOptionWidget(tqparent); m_cbFilter = new KisCmbIDList(widget); Q_CHECK_PTR(m_cbFilter); - QLabel* lbFilter = new QLabel(i18n("Filter:"), widget); + TQLabel* lbFilter = new TQLabel(i18n("Filter:"), widget); Q_CHECK_PTR(lbFilter); // Check which filters support painting @@ -120,11 +120,11 @@ QWidget* KisToolFilter::createOptionWidget(QWidget* parent) addOptionWidgetOption(m_cbFilter, lbFilter); - m_optionLayout = new QGridLayout(widget, 1, 1, 0, 6); + m_optionLayout = new TQGridLayout(widget, 1, 1, 0, 6); Q_CHECK_PTR(m_optionLayout); super::addOptionWidgetLayout(m_optionLayout); - connect(m_cbFilter, SIGNAL(activated ( const KisID& )), this, SLOT( changeFilter( const KisID& ) ) ); + connect(m_cbFilter, TQT_SIGNAL(activated ( const KisID& )), this, TQT_SLOT( changeFilter( const KisID& ) ) ); changeFilter( m_cbFilter->currentItem () ); return widget; diff --git a/krita/plugins/tools/tool_filter/kis_tool_filter.h b/krita/plugins/tools/tool_filter/kis_tool_filter.h index 631c1355..d8335f74 100644 --- a/krita/plugins/tools/tool_filter/kis_tool_filter.h +++ b/krita/plugins/tools/tool_filter/kis_tool_filter.h @@ -24,8 +24,8 @@ #include "kis_tool_freehand.h" #include "kis_tool_factory.h" -class QComboBox; -class QGridLayout; +class TQComboBox; +class TQGridLayout; class KisEvent; class KisFilterConfigurationWidget; class KisButtonPressEvent; @@ -36,6 +36,7 @@ class KisCmbIDList; class KisToolFilter : public KisToolFreehand { Q_OBJECT + TQ_OBJECT typedef KisToolFreehand super; public: @@ -44,8 +45,8 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_FREEHAND; } - virtual Q_UINT32 priority() { return 1; } - virtual QWidget* createOptionWidget(QWidget* parent); + virtual TQ_UINT32 priority() { return 1; } + virtual TQWidget* createOptionWidget(TQWidget* tqparent); public slots: void changeFilter( const KisID & filter); @@ -55,8 +56,8 @@ protected: private: KisFilterSP m_filter; - QWidget* m_filterConfigurationWidget; - QGridLayout* m_optionLayout; + TQWidget* m_filterConfigurationWidget; + TQGridLayout* m_optionLayout; KisCmbIDList * m_cbFilter; }; diff --git a/krita/plugins/tools/tool_filter/tool_filter.cc b/krita/plugins/tools/tool_filter/tool_filter.cc index 2102dfdb..f03ffbca 100644 --- a/krita/plugins/tools/tool_filter/tool_filter.cc +++ b/krita/plugins/tools/tool_filter/tool_filter.cc @@ -20,7 +20,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -44,14 +44,14 @@ typedef KGenericFactory<ToolFilter> ToolFilterFactory; K_EXPORT_COMPONENT_FACTORY( kritatoolfilter, ToolFilterFactory( "krita" ) ) -ToolFilter::ToolFilter(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ToolFilter::ToolFilter(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(ToolFilterFactory::instance()); - if ( parent->inherits("KisToolRegistry") ) + if ( tqparent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); r->add( new KisToolFilterFactory()); // XXX: Put this in a separate plugin? diff --git a/krita/plugins/tools/tool_filter/tool_filter.h b/krita/plugins/tools/tool_filter/tool_filter.h index 2eee589a..7bf33dca 100644 --- a/krita/plugins/tools/tool_filter/tool_filter.h +++ b/krita/plugins/tools/tool_filter/tool_filter.h @@ -29,8 +29,9 @@ class KisView; class ToolFilter : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ToolFilter(QObject *parent, const char *name, const QStringList &); + ToolFilter(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ToolFilter(); private: diff --git a/krita/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/krita/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc index 944807eb..04524e48 100644 --- a/krita/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc +++ b/krita/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc @@ -19,11 +19,11 @@ */ #include <kis_tool_perspectivegrid.h> -#include <qapplication.h> -#include <qpainter.h> -#include <qregion.h> -#include <qwidget.h> -#include <qlayout.h> +#include <tqapplication.h> +#include <tqpainter.h> +#include <tqregion.h> +#include <tqwidget.h> +#include <tqlayout.h> #include <kaction.h> #include <kdebug.h> @@ -95,9 +95,9 @@ void KisToolPerspectiveGrid::update (KisCanvasSubject *subject) super::update(m_subject); } -bool KisToolPerspectiveGrid::mouseNear(const QPoint& mousep, const QPoint point) +bool KisToolPerspectiveGrid::mouseNear(const TQPoint& mousep, const TQPoint point) { - return (QRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).contains(mousep) ); + return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).tqcontains(mousep) ); } void KisToolPerspectiveGrid::buttonPress(KisButtonPressEvent *event) @@ -128,40 +128,40 @@ void KisToolPerspectiveGrid::buttonPress(KisButtonPressEvent *event) return; KisCanvasController *controller = m_subject->canvasController(); Q_ASSERT(controller); - QPoint mousep = controller->windowToView( event->pos().roundQPoint() ); + TQPoint mousep = controller->windowToView( event->pos().roundTQPoint() ); - for( QValueList<KisSubPerspectiveGrid*>::const_iterator it = pGrid->begin(); it != pGrid->end(); ++it) + for( TQValueList<KisSubPerspectiveGrid*>::const_iterator it = pGrid->begin(); it != pGrid->end(); ++it) { KisSubPerspectiveGrid* grid = *it; - if( mouseNear( mousep, controller->windowToView(grid->topLeft()->roundQPoint() ) ) ) + if( mouseNear( mousep, controller->windowToView(grid->topLeft()->roundTQPoint() ) ) ) { kdDebug() << " PRESS TOPLEFT HANDLE " << endl; m_mode = MODE_DRAGING_NODE; m_selectedNode1 = grid->topLeft(); break; } - else if( mouseNear( mousep, controller->windowToView(grid->topRight()->roundQPoint() ) ) ) + else if( mouseNear( mousep, controller->windowToView(grid->topRight()->roundTQPoint() ) ) ) { kdDebug() << " PRESS TOPRIGHT HANDLE " << endl; m_mode = MODE_DRAGING_NODE; m_selectedNode1 = grid->topRight(); break; } - else if( mouseNear( mousep, controller->windowToView(grid->bottomLeft()->roundQPoint() ) ) ) + else if( mouseNear( mousep, controller->windowToView(grid->bottomLeft()->roundTQPoint() ) ) ) { kdDebug() << " PRESS BOTTOMLEFT HANDLE " << endl; m_mode = MODE_DRAGING_NODE; m_selectedNode1 = grid->bottomLeft(); break; } - else if( mouseNear( mousep, controller->windowToView(grid->bottomRight()->roundQPoint() ) ) ) + else if( mouseNear( mousep, controller->windowToView(grid->bottomRight()->roundTQPoint() ) ) ) { kdDebug() << " PRESS BOTTOMRIGHT HANDLE " << endl; m_mode = MODE_DRAGING_NODE; m_selectedNode1 = grid->bottomRight(); break; } - else if( !grid->leftGrid() && mouseNear( mousep, controller->windowToView( ((*grid->topLeft() + *grid->bottomLeft() )*0.5) ).roundQPoint() ) ) + else if( !grid->leftGrid() && mouseNear( mousep, controller->windowToView( ((*grid->topLeft() + *grid->bottomLeft() )*0.5) ).roundTQPoint() ) ) { kdDebug() << " PRESS LEFT HANDLE " << endl; m_mode = MODE_DRAGING_TRANSLATING_TWONODES; @@ -176,7 +176,7 @@ void KisToolPerspectiveGrid::buttonPress(KisButtonPressEvent *event) drawGrid(); break; } - else if( !grid->rightGrid() && mouseNear( mousep, controller->windowToView( ((*grid->topRight() + *grid->bottomRight() )*0.5) ).roundQPoint() ) ) + else if( !grid->rightGrid() && mouseNear( mousep, controller->windowToView( ((*grid->topRight() + *grid->bottomRight() )*0.5) ).roundTQPoint() ) ) { kdDebug() << " PRESS RIGHT HANDLE " << endl; m_mode = MODE_DRAGING_TRANSLATING_TWONODES; @@ -191,7 +191,7 @@ void KisToolPerspectiveGrid::buttonPress(KisButtonPressEvent *event) drawGrid(); break; } - else if( !grid->topGrid() && mouseNear( mousep, controller->windowToView( ((*grid->topLeft() + *grid->topRight() )*0.5) ).roundQPoint() ) ) + else if( !grid->topGrid() && mouseNear( mousep, controller->windowToView( ((*grid->topLeft() + *grid->topRight() )*0.5) ).roundTQPoint() ) ) { kdDebug() << " PRESS TOP HANDLE " << endl; m_mode = MODE_DRAGING_TRANSLATING_TWONODES; @@ -206,7 +206,7 @@ void KisToolPerspectiveGrid::buttonPress(KisButtonPressEvent *event) drawGrid(); break; } - else if( !grid->bottomGrid() && mouseNear( mousep, controller->windowToView( ((*grid->bottomLeft() + *grid->bottomRight() )*0.5) ).roundQPoint() ) ) + else if( !grid->bottomGrid() && mouseNear( mousep, controller->windowToView( ((*grid->bottomLeft() + *grid->bottomRight() )*0.5) ).roundTQPoint() ) ) { kdDebug() << " PRESS BOTTOM HANDLE " << endl; m_mode = MODE_DRAGING_TRANSLATING_TWONODES; @@ -297,7 +297,7 @@ void KisToolPerspectiveGrid::paint(KisCanvasPainter& gc) } } -void KisToolPerspectiveGrid::paint(KisCanvasPainter& gc, const QRect&) +void KisToolPerspectiveGrid::paint(KisCanvasPainter& gc, const TQRect&) { if( m_mode == MODE_CREATION ) { @@ -324,19 +324,19 @@ void KisToolPerspectiveGrid::drawGridCreation(KisCanvasPainter& gc) if (!m_subject) return; - QPen pen(Qt::white); + TQPen pen(TQt::white); gc.setPen(pen); - gc.setRasterOp(Qt::XorROP); + gc.setRasterOp(TQt::XorROP); KisCanvasController *controller = m_subject->canvasController(); KisPoint start, end; - QPoint startPos; - QPoint endPos; + TQPoint startPos; + TQPoint endPos; if (m_dragging) { - startPos = controller->windowToView(m_dragStart.floorQPoint()); - endPos = controller->windowToView(m_dragEnd.floorQPoint()); + startPos = controller->windowToView(m_dragStart.floorTQPoint()); + endPos = controller->windowToView(m_dragEnd.floorTQPoint()); gc.drawLine(startPos, endPos); } else { for (KisPointVector::iterator it = m_points.begin(); it != m_points.end(); ++it) { @@ -347,8 +347,8 @@ void KisToolPerspectiveGrid::drawGridCreation(KisCanvasPainter& gc) } else { end = (*it); - startPos = controller->windowToView(start.floorQPoint()); - endPos = controller->windowToView(end.floorQPoint()); + startPos = controller->windowToView(start.floorTQPoint()); + endPos = controller->windowToView(end.floorTQPoint()); gc.drawLine(startPos, endPos); @@ -358,7 +358,7 @@ void KisToolPerspectiveGrid::drawGridCreation(KisCanvasPainter& gc) } } -void KisToolPerspectiveGrid::drawSmallRectangle(KisCanvasPainter& gc, QPoint p) +void KisToolPerspectiveGrid::drawSmallRectangle(KisCanvasPainter& gc, TQPoint p) { gc.drawRect( p.x() - m_handleHalfSize - 1, p.y() - m_handleHalfSize - 1, m_handleSize, m_handleSize); } @@ -371,15 +371,15 @@ void KisToolPerspectiveGrid::drawGrid(KisCanvasPainter& gc) KisCanvasController *controller = m_subject->canvasController(); - QPen pen(Qt::white); - QPoint startPos; - QPoint endPos; + TQPen pen(TQt::white); + TQPoint startPos; + TQPoint endPos; gc.setPen(pen); - gc.setRasterOp(Qt::XorROP); + gc.setRasterOp(TQt::XorROP); KisPerspectiveGrid* pGrid = m_subject->currentImg()->perspectiveGrid(); - for( QValueList<KisSubPerspectiveGrid*>::const_iterator it = pGrid->begin(); it != pGrid->end(); ++it) + for( TQValueList<KisSubPerspectiveGrid*>::const_iterator it = pGrid->begin(); it != pGrid->end(); ++it) { KisSubPerspectiveGrid* grid = *it; int index = grid->index(); @@ -388,8 +388,8 @@ void KisToolPerspectiveGrid::drawGrid(KisCanvasPainter& gc) bool drawTop = !(grid->topGrid() && (index > grid->topGrid()->index() ) ); bool drawBottom = !(grid->bottomGrid() && (index > grid->bottomGrid()->index() ) ); if(drawTop) { - startPos = controller->windowToView(grid->topLeft()->roundQPoint()); - endPos = controller->windowToView(grid->topRight()->roundQPoint()); + startPos = controller->windowToView(grid->topLeft()->roundTQPoint()); + endPos = controller->windowToView(grid->topRight()->roundTQPoint()); gc.drawLine( startPos, endPos ); if( !grid->topGrid() ) { @@ -403,8 +403,8 @@ void KisToolPerspectiveGrid::drawGrid(KisCanvasPainter& gc) } } if(drawRight) { - startPos = controller->windowToView(grid->topRight()->roundQPoint()); - endPos = controller->windowToView(grid->bottomRight()->roundQPoint()); + startPos = controller->windowToView(grid->topRight()->roundTQPoint()); + endPos = controller->windowToView(grid->bottomRight()->roundTQPoint()); gc.drawLine( startPos, endPos ); if( !grid->rightGrid() ) { @@ -412,8 +412,8 @@ void KisToolPerspectiveGrid::drawGrid(KisCanvasPainter& gc) } } if(drawBottom) { - startPos = controller->windowToView(grid->bottomRight()->roundQPoint()); - endPos = controller->windowToView(grid->bottomLeft()->roundQPoint()); + startPos = controller->windowToView(grid->bottomRight()->roundTQPoint()); + endPos = controller->windowToView(grid->bottomLeft()->roundTQPoint()); gc.drawLine( startPos, endPos ); if( !grid->bottomGrid() ) { @@ -427,8 +427,8 @@ void KisToolPerspectiveGrid::drawGrid(KisCanvasPainter& gc) } } if(drawLeft) { - startPos = controller->windowToView(grid->bottomLeft()->roundQPoint()); - endPos = controller->windowToView(grid->topLeft()->roundQPoint()); + startPos = controller->windowToView(grid->bottomLeft()->roundTQPoint()); + endPos = controller->windowToView(grid->topLeft()->roundTQPoint()); gc.drawLine( startPos, endPos ); if( !grid->leftGrid() ) { @@ -438,14 +438,14 @@ void KisToolPerspectiveGrid::drawGrid(KisCanvasPainter& gc) KisPoint tbVpf = grid->topBottomVanishingPoint(); if( fabs(tbVpf.x()) < 30000000. && fabs(tbVpf.y()) < 30000000.) { - QPoint tbVp = controller->windowToView(tbVpf.roundQPoint()); + TQPoint tbVp = controller->windowToView(tbVpf.roundTQPoint()); gc.drawLine( tbVp.x() - m_handleHalfSize, tbVp.y() - m_handleHalfSize, tbVp.x() + m_handleHalfSize, tbVp.y() + m_handleHalfSize); gc.drawLine( tbVp.x() - m_handleHalfSize, tbVp.y() + m_handleHalfSize, tbVp.x() + m_handleHalfSize, tbVp.y() - m_handleHalfSize); } KisPoint lrVpf = grid->leftRightVanishingPoint(); if( fabs(lrVpf.x()) < 30000000. && fabs(lrVpf.y()) < 30000000.) { // Don't display it, if it is too far, or you get funny results - QPoint lrVp = controller->windowToView(lrVpf.roundQPoint()); + TQPoint lrVp = controller->windowToView(lrVpf.roundTQPoint()); gc.drawLine( lrVp.x() - m_handleHalfSize, lrVp.y() - m_handleHalfSize, lrVp.x() + m_handleHalfSize, lrVp.y() + m_handleHalfSize); gc.drawLine( lrVp.x() - m_handleHalfSize, lrVp.y() + m_handleHalfSize, lrVp.x() + m_handleHalfSize, lrVp.y() - m_handleHalfSize); } @@ -474,7 +474,7 @@ void KisToolPerspectiveGrid::setup(KActionCollection *collection) "tool_perspectivegrid" , 0, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); @@ -485,12 +485,12 @@ void KisToolPerspectiveGrid::setup(KActionCollection *collection) } -// QWidget* KisToolPerspectiveGrid::createOptionWidget(QWidget* parent) +// TQWidget* KisToolPerspectiveGrid::createOptionWidget(TQWidget* tqparent) // { // return 0; // } // -// QWidget* KisToolPerspectiveGrid::optionWidget() +// TQWidget* KisToolPerspectiveGrid::optionWidget() // { // return 0; // } diff --git a/krita/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h b/krita/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h index b6318c7d..2b5467d4 100644 --- a/krita/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h +++ b/krita/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h @@ -28,6 +28,7 @@ class KisToolPerspectiveGrid : public KisToolNonPaint { Q_OBJECT + TQ_OBJECT enum PerspectiveGridEditionMode { MODE_CREATION, // This is the mode when there is not yet a perspective grid MODE_EDITING, // This is the mode when the grid has been created, and we are waiting for the user to click on a control box @@ -49,14 +50,14 @@ public: // virtual void setup(KActionCollection *collection); - virtual Q_UINT32 priority() { return 3; } + virtual TQ_UINT32 priority() { return 3; } virtual enumToolType toolType() { return TOOL_VIEW; } virtual void buttonPress(KisButtonPressEvent *event); virtual void move(KisMoveEvent *event); virtual void buttonRelease(KisButtonReleaseEvent *event); -// QWidget* createOptionWidget(QWidget* parent); -// virtual QWidget* optionWidget(); +// TQWidget* createOptionWidget(TQWidget* tqparent); +// virtual TQWidget* optionWidget(); public slots: virtual void activate(); @@ -64,15 +65,15 @@ public slots: protected: virtual void paint(KisCanvasPainter& gc); - virtual void paint(KisCanvasPainter& gc, const QRect& rc); + virtual void paint(KisCanvasPainter& gc, const TQRect& rc); void drawGridCreation(KisCanvasPainter& gc); void drawGridCreation(); void drawGrid(KisCanvasPainter& gc); void drawGrid(); private: - void drawSmallRectangle(KisCanvasPainter& gc, QPoint p); - bool mouseNear(const QPoint& mousep, const QPoint point); + void drawSmallRectangle(KisCanvasPainter& gc, TQPoint p); + bool mouseNear(const TQPoint& mousep, const TQPoint point); protected: KisPoint m_dragStart; @@ -80,11 +81,11 @@ protected: bool m_dragging; private: - typedef QValueVector<KisPoint> KisPointVector; + typedef TQValueVector<KisPoint> KisPointVector; KisCanvasSubject *m_subject; KisPointVector m_points; PerspectiveGridEditionMode m_mode; - Q_INT32 m_handleSize, m_handleHalfSize; + TQ_INT32 m_handleSize, m_handleHalfSize; KisPerspectiveGridNodeSP m_selectedNode1, m_selectedNode2; }; diff --git a/krita/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc b/krita/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc index 157a7457..54a39f0f 100644 --- a/krita/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc +++ b/krita/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc @@ -20,7 +20,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolPerspectiveGrid> ToolPerspectiveGridFactory; K_EXPORT_COMPONENT_FACTORY( kritatoolperspectivegrid, ToolPerspectiveGridFactory( "krita" ) ) -ToolPerspectiveGrid::ToolPerspectiveGrid(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ToolPerspectiveGrid::ToolPerspectiveGrid(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(ToolPerspectiveGridFactory::instance()); - if ( parent->inherits("KisToolRegistry") ) + if ( tqparent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); r->add(new KisToolPerspectiveGridFactory()); } diff --git a/krita/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h b/krita/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h index e98cbf09..aed4a60c 100644 --- a/krita/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h +++ b/krita/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h @@ -29,8 +29,9 @@ class KisView; class ToolPerspectiveGrid : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ToolPerspectiveGrid(QObject *parent, const char *name, const QStringList &); + ToolPerspectiveGrid(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ToolPerspectiveGrid(); private: diff --git a/krita/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/krita/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc index f334c429..b662c940 100644 --- a/krita/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc +++ b/krita/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc @@ -24,13 +24,13 @@ #include "kis_tool_perspectivetransform.h" -#include <qpainter.h> -#include <qpen.h> -#include <qpushbutton.h> -#include <qobject.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qapplication.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqpushbutton.h> +#include <tqobject.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqapplication.h> #include <kdebug.h> #include <kaction.h> @@ -65,19 +65,19 @@ namespace { typedef KisSelectedTransaction super; public: - PerspectiveTransformCmd(KisToolPerspectiveTransform *tool, KisPaintDeviceSP device, KisPaintDeviceSP origDevice, KisPoint topleft, KisPoint topright, KisPoint bottomleft, KisPoint bottomright, KisSelectionSP origSel, QRect initialRect); + PerspectiveTransformCmd(KisToolPerspectiveTransform *tool, KisPaintDeviceSP device, KisPaintDeviceSP origDevice, KisPoint topleft, KisPoint topright, KisPoint bottomleft, KisPoint bottomright, KisSelectionSP origSel, TQRect initialRect); virtual ~PerspectiveTransformCmd(); public: virtual void execute(); virtual void unexecute(); void transformArgs(KisPoint &topleft, KisPoint &topright, KisPoint &bottomleft, KisPoint& bottomright) const; - KisSelectionSP origSelection(QRect& initialRect) const; + KisSelectionSP origSelection(TQRect& initialRect) const; KisPaintDeviceSP theDevice(); KisPaintDeviceSP origDevice(); private: - QRect m_initialRect; + TQRect m_initialRect; KisPoint m_topleft, m_topright, m_bottomleft, m_bottomright; KisToolPerspectiveTransform *m_tool; KisSelectionSP m_origSelection; @@ -85,7 +85,7 @@ namespace { KisPaintDeviceSP m_origDevice; }; - PerspectiveTransformCmd::PerspectiveTransformCmd(KisToolPerspectiveTransform *tool, KisPaintDeviceSP device, KisPaintDeviceSP origDevice, KisPoint topleft, KisPoint topright, KisPoint bottomleft, KisPoint bottomright, KisSelectionSP origSel, QRect initialRect) : + PerspectiveTransformCmd::PerspectiveTransformCmd(KisToolPerspectiveTransform *tool, KisPaintDeviceSP device, KisPaintDeviceSP origDevice, KisPoint topleft, KisPoint topright, KisPoint bottomleft, KisPoint bottomright, KisSelectionSP origSel, TQRect initialRect) : super(i18n("Perspective Transform"), device), m_initialRect(initialRect) , m_topleft(topleft), m_topright(topright), m_bottomleft(bottomleft), m_bottomright(bottomright) , m_tool(tool), m_origSelection(origSel), m_device(device), m_origDevice(origDevice) @@ -104,7 +104,7 @@ namespace { bottomright = m_bottomright; } - KisSelectionSP PerspectiveTransformCmd::origSelection(QRect& initialRect) const + KisSelectionSP PerspectiveTransformCmd::origSelection(TQRect& initialRect) const { initialRect = m_initialRect; return m_origSelection; @@ -157,7 +157,7 @@ void KisToolPerspectiveTransform::deactivate() paintOutline(); - disconnect(m_subject->currentImg().data(), SIGNAL(sigLayerActivated(KisLayerSP)), this, SLOT(slotLayerActivated(KisLayerSP))); + disconnect(m_subject->currentImg().data(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP))); } void KisToolPerspectiveTransform::activate() @@ -196,12 +196,12 @@ void KisToolPerspectiveTransform::activate() initHandles(); } } - connect(m_subject->currentImg(), SIGNAL(sigLayerActivated(KisLayerSP)), this, SLOT(slotLayerActivated(KisLayerSP))); + connect(m_subject->currentImg(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP))); } void KisToolPerspectiveTransform::initHandles() { -// Q_INT32 x,y,w,h; +// TQ_INT32 x,y,w,h; KisImageSP img = m_subject->currentImg(); KisPaintDeviceSP dev = img->activeDevice(); @@ -230,17 +230,17 @@ void KisToolPerspectiveTransform::initHandles() void KisToolPerspectiveTransform::paint(KisCanvasPainter& gc) { - paintOutline(gc, QRect()); + paintOutline(gc, TQRect()); } -void KisToolPerspectiveTransform::paint(KisCanvasPainter& gc, const QRect& rc) +void KisToolPerspectiveTransform::paint(KisCanvasPainter& gc, const TQRect& rc) { paintOutline(gc, rc); } -bool KisToolPerspectiveTransform::mouseNear(const QPoint& mousep, const QPoint point) +bool KisToolPerspectiveTransform::mouseNear(const TQPoint& mousep, const TQPoint point) { - return (QRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).contains(mousep) ); + return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).tqcontains(mousep) ); } void KisToolPerspectiveTransform::buttonPress(KisButtonPressEvent *event) @@ -272,43 +272,43 @@ void KisToolPerspectiveTransform::buttonPress(KisButtonPressEvent *event) m_actualyMoveWhileSelected = false; m_dragEnd = event->pos(); KisCanvasController *controller = m_subject->canvasController(); - QPoint mousep = controller->windowToView( event->pos().roundQPoint() ); - if( mouseNear( mousep, controller->windowToView(m_topleft.roundQPoint() ) ) ) + TQPoint mousep = controller->windowToView( event->pos().roundTQPoint() ); + if( mouseNear( mousep, controller->windowToView(m_topleft.roundTQPoint() ) ) ) { kdDebug() << " PRESS TOPLEFT HANDLE " << endl; m_currentSelectedPoint = &m_topleft; } - else if( mouseNear( mousep, controller->windowToView(m_topright.roundQPoint() ) ) ) + else if( mouseNear( mousep, controller->windowToView(m_topright.roundTQPoint() ) ) ) { kdDebug() << " PRESS TOPRIGHT HANDLE " << endl; m_currentSelectedPoint = &m_topright; } - else if( mouseNear( mousep, controller->windowToView(m_bottomleft.roundQPoint() ) ) ) + else if( mouseNear( mousep, controller->windowToView(m_bottomleft.roundTQPoint() ) ) ) { kdDebug() << " PRESS BOTTOMLEFT HANDLE " << endl; m_currentSelectedPoint = &m_bottomleft; } - else if( mouseNear( mousep, controller->windowToView(m_bottomright.roundQPoint() ) ) ) + else if( mouseNear( mousep, controller->windowToView(m_bottomright.roundTQPoint() ) ) ) { kdDebug() << " PRESS BOTTOMRIGHT HANDLE " << endl; m_currentSelectedPoint = &m_bottomright; - } else if( mouseNear( mousep, controller->windowToView(KisPoint((m_topleft+m_topright)*0.5).roundQPoint() ) ) ) + } else if( mouseNear( mousep, controller->windowToView(KisPoint((m_topleft+m_topright)*0.5).roundTQPoint() ) ) ) { kdDebug() << " PRESS TOP HANDLE " << endl; m_handleSelected = TOPHANDLE; - }else if( mouseNear( mousep, controller->windowToView(KisPoint((m_topleft+m_bottomleft)*0.5).roundQPoint() ) ) ) + }else if( mouseNear( mousep, controller->windowToView(KisPoint((m_topleft+m_bottomleft)*0.5).roundTQPoint() ) ) ) { kdDebug() << " PRESS LEFT HANDLE " << endl; m_handleSelected = LEFTHANDLE; - }else if( mouseNear( mousep, controller->windowToView(KisPoint((m_bottomleft+m_bottomright)*0.5).roundQPoint() ) ) ) + }else if( mouseNear( mousep, controller->windowToView(KisPoint((m_bottomleft+m_bottomright)*0.5).roundTQPoint() ) ) ) { kdDebug() << " PRESS BOTTOM HANDLE " << endl; m_handleSelected = BOTTOMHANDLE; - }else if( mouseNear( mousep, controller->windowToView(KisPoint((m_bottomright+m_topright)*0.5).roundQPoint() ) ) ) + }else if( mouseNear( mousep, controller->windowToView(KisPoint((m_bottomright+m_topright)*0.5).roundTQPoint() ) ) ) { kdDebug() << " PRESS RIGHT HANDLE " << endl; m_handleSelected = RIGHTHANDLE; - }else if( mouseNear( mousep, controller->windowToView(KisPoint((m_topleft+m_bottomleft + m_bottomright+m_topright)*0.25).roundQPoint() ) ) ) + }else if( mouseNear( mousep, controller->windowToView(KisPoint((m_topleft+m_bottomleft + m_bottomright+m_topright)*0.25).roundTQPoint() ) ) ) { kdDebug() << " PRESS MIDDLE HANDLE " << endl; m_handleSelected = MIDDLEHANDLE; @@ -368,7 +368,7 @@ void KisToolPerspectiveTransform::move(KisMoveEvent *event) KisPoint topRight = KisPerspectiveMath::matProd(matrixFrom, m_initialRect.topRight() ); KisPoint bottomLeft = KisPerspectiveMath::matProd(matrixFrom, m_initialRect.bottomLeft() ); KisPoint bottomRight = KisPerspectiveMath::matProd(matrixFrom, m_initialRect.bottomRight() ); - QRect dstRect = m_initialRect; + TQRect dstRect = m_initialRect; switch(m_handleSelected) { case TOPHANDLE: @@ -458,9 +458,9 @@ void KisToolPerspectiveTransform::buttonRelease(KisButtonReleaseEvent * event) m_bottomright = KisPerspectiveMath::matProd(matrix, m_initialRect.bottomRight()); m_interractionMode = EDITRECTINTERRACTION; paintOutline(); - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); transform(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } else { paintOutline(); } @@ -475,9 +475,9 @@ void KisToolPerspectiveTransform::buttonRelease(KisButtonReleaseEvent * event) if(m_actualyMoveWhileSelected) { paintOutline(); - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); transform(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } } if(m_handleSelected != NOHANDLE) @@ -486,9 +486,9 @@ void KisToolPerspectiveTransform::buttonRelease(KisButtonReleaseEvent * event) if(m_actualyMoveWhileSelected) { // paintOutline(); - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); transform(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } } } @@ -503,19 +503,19 @@ void KisToolPerspectiveTransform::paintOutline() KisCanvasController *controller = m_subject->canvasController(); KisCanvas *canvas = controller->kiscanvas(); KisCanvasPainter gc(canvas); - QRect rc; + TQRect rc; paintOutline(gc, rc); } } -void KisToolPerspectiveTransform::paintOutline(KisCanvasPainter& gc, const QRect&) +void KisToolPerspectiveTransform::paintOutline(KisCanvasPainter& gc, const TQRect&) { if (m_subject) { KisCanvasController *controller = m_subject->canvasController(); RasterOp op = gc.rasterOp(); - QPen old = gc.pen(); - QPen pen(Qt::SolidLine); + TQPen old = gc.pen(); + TQPen pen(TQt::SolidLine); pen.setWidth(1); Q_ASSERT(controller); @@ -525,8 +525,8 @@ void KisToolPerspectiveTransform::paintOutline(KisCanvasPainter& gc, const QRect { kdDebug() << "DRAWRECTINTERRACTION paintOutline " << m_points.size() << endl; KisPoint start, end; - QPoint startPos; - QPoint endPos; + TQPoint startPos; + TQPoint endPos; for (KisPointVector::iterator it = m_points.begin(); it != m_points.end(); ++it) { if (it == m_points.begin()) @@ -535,8 +535,8 @@ void KisToolPerspectiveTransform::paintOutline(KisCanvasPainter& gc, const QRect } else { end = (*it); - startPos = controller->windowToView(start.floorQPoint()); - endPos = controller->windowToView(end.floorQPoint()); + startPos = controller->windowToView(start.floorTQPoint()); + endPos = controller->windowToView(end.floorTQPoint()); gc.drawLine(startPos, endPos); @@ -547,12 +547,12 @@ void KisToolPerspectiveTransform::paintOutline(KisCanvasPainter& gc, const QRect break; case EDITRECTINTERRACTION: { - QPoint topleft = controller->windowToView(m_topleft ).roundQPoint(); - QPoint topright = controller->windowToView(m_topright).roundQPoint(); - QPoint bottomleft = controller->windowToView(m_bottomleft).roundQPoint(); - QPoint bottomright = controller->windowToView(m_bottomright).roundQPoint(); + TQPoint topleft = controller->windowToView(m_topleft ).roundTQPoint(); + TQPoint topright = controller->windowToView(m_topright).roundTQPoint(); + TQPoint bottomleft = controller->windowToView(m_bottomleft).roundTQPoint(); + TQPoint bottomright = controller->windowToView(m_bottomright).roundTQPoint(); - gc.setRasterOp(Qt::NotROP); + gc.setRasterOp(TQt::NotROP); gc.setPen(pen); gc.drawRect(topleft.x()-4, topleft.y()-4, 8, 8); gc.drawLine(topleft.x(), topleft.y(), (topleft.x()+topright.x())/2, (topleft.y()+topright.y())/2); @@ -593,7 +593,7 @@ void KisToolPerspectiveTransform::transform() m_topleft, m_topright, m_bottomleft, m_bottomright, m_origSelection, m_initialRect); // Copy the original state back. - QRect rc = m_origDevice->extent(); + TQRect rc = m_origDevice->extent(); rc = rc.normalize(); img->activeDevice()->clear(); KisPainter gc(img->activeDevice()); @@ -603,7 +603,7 @@ void KisToolPerspectiveTransform::transform() // Also restore the original selection. if(m_origSelection) { - QRect rc = m_origSelection->selectedRect(); + TQRect rc = m_origSelection->selectedRect(); rc = rc.normalize(); img->activeDevice()->selection()->clear(); KisPainter sgc(img->activeDevice()->selection().data()); @@ -681,27 +681,27 @@ void KisToolPerspectiveTransform::slotLayerActivated(KisLayerSP) } -QWidget* KisToolPerspectiveTransform::createOptionWidget(QWidget* /*parent*/) +TQWidget* KisToolPerspectiveTransform::createOptionWidget(TQWidget* /*tqparent*/) { #if 0 - m_optWidget = new WdgToolPerspectiveTransform(parent); + m_optWidget = new WdgToolPerspectiveTransform(tqparent); Q_CHECK_PTR(m_optWidget); m_optWidget->cmbFilter->clear(); m_optWidget->cmbFilter->setIDList(KisFilterStrategyRegistry::instance()->listKeys()); m_optWidget->cmbFilter->setCurrentText("Mitchell"); - connect(m_optWidget->cmbFilter, SIGNAL(activated(const KisID &)), - this, SLOT(slotSetFilter(const KisID &))); + connect(m_optWidget->cmbFilter, TQT_SIGNAL(activated(const KisID &)), + this, TQT_SLOT(slotSetFilter(const KisID &))); KisID filterID = m_optWidget->cmbFilter->currentItem(); m_filter = KisFilterStrategyRegistry::instance()->get(filterID); /* - connect(m_optWidget->intStartX, SIGNAL(valueChanged(int)), this, SLOT(setStartX(int))); - connect(m_optWidget->intStartY, SIGNAL(valueChanged(int)), this, SLOT(setStartY(int))); - connect(m_optWidget->intEndX, SIGNAL(valueChanged(int)), this, SLOT(setEndX(int))); - connect(m_optWidget->intEndY, SIGNAL(valueChanged(int)), this, SLOT(setEndY(int))); + connect(m_optWidget->intStartX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartX(int))); + connect(m_optWidget->intStartY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartY(int))); + connect(m_optWidget->intEndX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndX(int))); + connect(m_optWidget->intEndY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndY(int))); */ m_optWidget->intStartX->hide(); m_optWidget->intStartY->hide(); @@ -715,7 +715,7 @@ QWidget* KisToolPerspectiveTransform::createOptionWidget(QWidget* /*parent*/) return 0; } -QWidget* KisToolPerspectiveTransform::optionWidget() +TQWidget* KisToolPerspectiveTransform::optionWidget() { return 0; } @@ -729,7 +729,7 @@ void KisToolPerspectiveTransform::setup(KActionCollection *collection) "tool_perspectivetransform", 0, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); diff --git a/krita/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h b/krita/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h index e2600cfc..94b808c2 100644 --- a/krita/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h +++ b/krita/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h @@ -24,7 +24,7 @@ #ifndef KIS_TOOL_PERSPECTIVETRANSFORM_H_ #define KIS_TOOL_PERSPECTIVETRANSFORM_H_ -#include <qpoint.h> +#include <tqpoint.h> #include <kis_layer.h> #include <kis_point.h> @@ -46,20 +46,21 @@ class KisToolPerspectiveTransform : public KisToolNonPaint, KisCommandHistoryLis typedef KisToolNonPaint super; Q_OBJECT + TQ_OBJECT enum InterractionMode { DRAWRECTINTERRACTION, EDITRECTINTERRACTION }; enum HandleSelected { NOHANDLE, TOPHANDLE, BOTTOMHANDLE, RIGHTHANDLE, LEFTHANDLE, MIDDLEHANDLE }; public: KisToolPerspectiveTransform(); virtual ~KisToolPerspectiveTransform(); - virtual QWidget* createOptionWidget(QWidget* parent); - virtual QWidget* optionWidget(); + virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* optionWidget(); virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_TRANSFORM; } - virtual Q_UINT32 priority() { return 4; } + virtual TQ_UINT32 priority() { return 4; } virtual void paint(KisCanvasPainter& gc); - virtual void paint(KisCanvasPainter& gc, const QRect& rc); + virtual void paint(KisCanvasPainter& gc, const TQRect& rc); virtual void buttonPress(KisButtonPressEvent *e); virtual void move(KisMoveEvent *e); virtual void buttonRelease(KisButtonReleaseEvent *e); @@ -75,8 +76,8 @@ public: private: - bool mouseNear(const QPoint& mousep, const QPoint point); - void paintOutline(KisCanvasPainter& gc, const QRect& rc); + bool mouseNear(const TQPoint& mousep, const TQPoint point); + void paintOutline(KisCanvasPainter& gc, const TQRect& rc); void transform(); void initHandles(); @@ -89,7 +90,7 @@ protected slots: private: bool m_dragging; InterractionMode m_interractionMode; - QRect m_initialRect; + TQRect m_initialRect; KisPoint m_dragStart, m_dragEnd; KisPoint m_topleft, m_topright, m_bottomleft, m_bottomright; KisPoint* m_currentSelectedPoint; @@ -102,7 +103,7 @@ private: int m_handleHalfSize, m_handleSize; // The following variables are used in during the draw rect interraction mode - typedef QValueVector<KisPoint> KisPointVector; + typedef TQValueVector<KisPoint> KisPointVector; KisPointVector m_points; // The following variables are used when moving a middle handle HandleSelected m_handleSelected; diff --git a/krita/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc b/krita/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc index 3fdbe3bb..9102bb0c 100644 --- a/krita/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc +++ b/krita/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc @@ -20,7 +20,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -42,15 +42,15 @@ typedef KGenericFactory<ToolPerspectiveTransform> ToolPerspectiveTransformFactor K_EXPORT_COMPONENT_FACTORY( kritatoolperspectivetransform, ToolPerspectiveTransformFactory( "krita" ) ) -ToolPerspectiveTransform::ToolPerspectiveTransform(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ToolPerspectiveTransform::ToolPerspectiveTransform(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(ToolPerspectiveTransformFactory::instance()); - if ( parent->inherits("KisToolRegistry") ) + if ( tqparent->inherits("KisToolRegistry") ) { kdDebug() << " add perspective transform tool to the registry" << endl; - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); r->add(new KisToolPerspectiveTransformFactory()); } diff --git a/krita/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h b/krita/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h index 6cc6370f..1cbeadee 100644 --- a/krita/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h +++ b/krita/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h @@ -29,8 +29,9 @@ class KisView; class ToolPerspectiveTransform : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ToolPerspectiveTransform(QObject *parent, const char *name, const QStringList &); + ToolPerspectiveTransform(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ToolPerspectiveTransform(); private: diff --git a/krita/plugins/tools/tool_polygon/kis_tool_polygon.cc b/krita/plugins/tools/tool_polygon/kis_tool_polygon.cc index 9589e19f..35ffd5ed 100644 --- a/krita/plugins/tools/tool_polygon/kis_tool_polygon.cc +++ b/krita/plugins/tools/tool_polygon/kis_tool_polygon.cc @@ -21,8 +21,8 @@ #include <math.h> -#include <qpainter.h> -#include <qspinbox.h> +#include <tqpainter.h> +#include <tqspinbox.h> #include <kaction.h> #include <kdebug.h> @@ -159,7 +159,7 @@ void KisToolPolygon::paint(KisCanvasPainter& gc) draw(gc); } -void KisToolPolygon::paint(KisCanvasPainter& gc, const QRect&) +void KisToolPolygon::paint(KisCanvasPainter& gc, const TQRect&) { draw(gc); } @@ -180,19 +180,19 @@ void KisToolPolygon::draw(KisCanvasPainter& gc) if (!m_subject || !m_currentImage) return; - QPen pen(Qt::white, 0, Qt::SolidLine); + TQPen pen(TQt::white, 0, TQt::SolidLine); gc.setPen(pen); - gc.setRasterOp(Qt::XorROP); + gc.setRasterOp(TQt::XorROP); KisCanvasController *controller = m_subject->canvasController(); KisPoint start, end; - QPoint startPos; - QPoint endPos; + TQPoint startPos; + TQPoint endPos; if (m_dragging) { - startPos = controller->windowToView(m_dragStart.floorQPoint()); - endPos = controller->windowToView(m_dragEnd.floorQPoint()); + startPos = controller->windowToView(m_dragStart.floorTQPoint()); + endPos = controller->windowToView(m_dragEnd.floorTQPoint()); gc.drawLine(startPos, endPos); } else { for (KisPointVector::iterator it = m_points.begin(); it != m_points.end(); ++it) { @@ -203,8 +203,8 @@ void KisToolPolygon::draw(KisCanvasPainter& gc) } else { end = (*it); - startPos = controller->windowToView(start.floorQPoint()); - endPos = controller->windowToView(end.floorQPoint()); + startPos = controller->windowToView(start.floorTQPoint()); + endPos = controller->windowToView(end.floorTQPoint()); gc.drawLine(startPos, endPos); @@ -221,13 +221,13 @@ void KisToolPolygon::setup(KActionCollection *collection) m_action = static_cast<KRadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(Qt::Key_Plus); - shortcut.append(KShortcut(Qt::Key_F9)); + KShortcut shortcut(TQt::Key_Plus); + shortcut.append(KShortcut(TQt::Key_F9)); m_action = new KRadioAction(i18n("&Polygon"), "tool_polygon", shortcut, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); @@ -238,9 +238,9 @@ void KisToolPolygon::setup(KActionCollection *collection) } } -void KisToolPolygon::keyPress(QKeyEvent *e) +void KisToolPolygon::keyPress(TQKeyEvent *e) { - if (e->key()==Qt::Key_Escape) { + if (e->key()==TQt::Key_Escape) { // erase old lines on canvas draw(); m_dragging = false; diff --git a/krita/plugins/tools/tool_polygon/kis_tool_polygon.h b/krita/plugins/tools/tool_polygon/kis_tool_polygon.h index 7ca24914..f68cae64 100644 --- a/krita/plugins/tools/tool_polygon/kis_tool_polygon.h +++ b/krita/plugins/tools/tool_polygon/kis_tool_polygon.h @@ -21,7 +21,7 @@ #ifndef KIS_TOOL_POLYGON_H_ #define KIS_TOOL_POLYGON_H_ -#include <qvaluevector.h> +#include <tqvaluevector.h> #include "kis_tool_shape.h" @@ -35,6 +35,7 @@ class KisToolPolygon : public KisToolShape { typedef KisToolShape super; Q_OBJECT + TQ_OBJECT public: KisToolPolygon(); @@ -52,22 +53,22 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } - virtual Q_UINT32 priority() { return 4; } + virtual TQ_UINT32 priority() { return 4; } virtual void buttonPress(KisButtonPressEvent *event); virtual void move(KisMoveEvent *event); virtual void buttonRelease(KisButtonReleaseEvent *event); - virtual QString quickHelp() const { + virtual TQString quickHelp() const { return i18n("Shift-click will end the polygon."); } virtual void doubleClick(KisDoubleClickEvent * event); protected: virtual void paint(KisCanvasPainter& gc); - virtual void paint(KisCanvasPainter& gc, const QRect& rc); + virtual void paint(KisCanvasPainter& gc, const TQRect& rc); void draw(KisCanvasPainter& gc); void draw(); void finish(); - virtual void keyPress(QKeyEvent *e); + virtual void keyPress(TQKeyEvent *e); protected: KisPoint m_dragStart; KisPoint m_dragEnd; @@ -75,7 +76,7 @@ protected: bool m_dragging; KisImageSP m_currentImage; private: - typedef QValueVector<KisPoint> KisPointVector; + typedef TQValueVector<KisPoint> KisPointVector; KisPointVector m_points; }; diff --git a/krita/plugins/tools/tool_polygon/tool_polygon.cc b/krita/plugins/tools/tool_polygon/tool_polygon.cc index a1fec49c..81abbb95 100644 --- a/krita/plugins/tools/tool_polygon/tool_polygon.cc +++ b/krita/plugins/tools/tool_polygon/tool_polygon.cc @@ -20,7 +20,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolPolygon> ToolPolygonFactory; K_EXPORT_COMPONENT_FACTORY( kritatoolpolygon, ToolPolygonFactory( "krita" ) ) -ToolPolygon::ToolPolygon(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ToolPolygon::ToolPolygon(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(ToolPolygonFactory::instance()); - if ( parent->inherits("KisToolRegistry") ) + if ( tqparent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( parent ); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( tqparent ); r->add(new KisToolPolygonFactory()); } diff --git a/krita/plugins/tools/tool_polygon/tool_polygon.h b/krita/plugins/tools/tool_polygon/tool_polygon.h index 6249d935..ec816736 100644 --- a/krita/plugins/tools/tool_polygon/tool_polygon.h +++ b/krita/plugins/tools/tool_polygon/tool_polygon.h @@ -27,10 +27,11 @@ class ToolPolygon : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ToolPolygon(QObject *parent, const char *name, const QStringList &); + ToolPolygon(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ToolPolygon(); }; diff --git a/krita/plugins/tools/tool_polyline/kis_tool_polyline.cc b/krita/plugins/tools/tool_polyline/kis_tool_polyline.cc index 2f7a8e59..baeb946d 100644 --- a/krita/plugins/tools/tool_polyline/kis_tool_polyline.cc +++ b/krita/plugins/tools/tool_polyline/kis_tool_polyline.cc @@ -21,8 +21,8 @@ #include <math.h> -#include <qpainter.h> -#include <qspinbox.h> +#include <tqpainter.h> +#include <tqspinbox.h> #include <kaction.h> #include <kdebug.h> @@ -68,7 +68,7 @@ void KisToolPolyline::update (KisCanvasSubject *subject) void KisToolPolyline::buttonPress(KisButtonPressEvent *event) { if (m_currentImage) { - if (event->button() == LeftButton && event->state() != Qt::ShiftButton ) { + if (event->button() == LeftButton && event->state() != TQt::ShiftButton ) { m_dragging = true; @@ -82,7 +82,7 @@ void KisToolPolyline::buttonPress(KisButtonPressEvent *event) m_dragEnd = event->pos(); draw(); } - } else if (event->button() == LeftButton && event->state() == Qt::ShiftButton ) { + } else if (event->button() == LeftButton && event->state() == TQt::ShiftButton ) { finish(); } } @@ -176,7 +176,7 @@ void KisToolPolyline::paint(KisCanvasPainter& gc) draw(gc); } -void KisToolPolyline::paint(KisCanvasPainter& gc, const QRect&) +void KisToolPolyline::paint(KisCanvasPainter& gc, const TQRect&) { draw(gc); } @@ -197,19 +197,19 @@ void KisToolPolyline::draw(KisCanvasPainter& gc) if (!m_subject || !m_currentImage) return; - QPen pen(Qt::white, 0, Qt::SolidLine); + TQPen pen(TQt::white, 0, TQt::SolidLine); gc.setPen(pen); - gc.setRasterOp(Qt::XorROP); + gc.setRasterOp(TQt::XorROP); KisCanvasController *controller = m_subject->canvasController(); KisPoint start, end; - QPoint startPos; - QPoint endPos; + TQPoint startPos; + TQPoint endPos; if (m_dragging) { - startPos = controller->windowToView(m_dragStart.floorQPoint()); - endPos = controller->windowToView(m_dragEnd.floorQPoint()); + startPos = controller->windowToView(m_dragStart.floorTQPoint()); + endPos = controller->windowToView(m_dragEnd.floorTQPoint()); gc.drawLine(startPos, endPos); } else { for (KisPointVector::iterator it = m_points.begin(); it != m_points.end(); ++it) { @@ -220,8 +220,8 @@ void KisToolPolyline::draw(KisCanvasPainter& gc) } else { end = (*it); - startPos = controller->windowToView(start.floorQPoint()); - endPos = controller->windowToView(end.floorQPoint()); + startPos = controller->windowToView(start.floorTQPoint()); + endPos = controller->windowToView(end.floorTQPoint()); gc.drawLine(startPos, endPos); @@ -236,13 +236,13 @@ void KisToolPolyline::setup(KActionCollection *collection) m_action = static_cast<KRadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(Qt::Key_Plus); - shortcut.append(KShortcut(Qt::Key_F9)); + KShortcut shortcut(TQt::Key_Plus); + shortcut.append(KShortcut(TQt::Key_F9)); m_action = new KRadioAction(i18n("&Polyline"), "polyline", shortcut, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); @@ -253,14 +253,14 @@ void KisToolPolyline::setup(KActionCollection *collection) } } -QString KisToolPolyline::quickHelp() const +TQString KisToolPolyline::quickHelp() const { return i18n("Press shift-mouseclick to end the polyline."); } -void KisToolPolyline::keyPress(QKeyEvent *e) +void KisToolPolyline::keyPress(TQKeyEvent *e) { - if (e->key()==Qt::Key_Escape) { + if (e->key()==TQt::Key_Escape) { // erase old lines on canvas draw(); m_dragging = false; diff --git a/krita/plugins/tools/tool_polyline/kis_tool_polyline.h b/krita/plugins/tools/tool_polyline/kis_tool_polyline.h index 5dfff695..b234c53b 100644 --- a/krita/plugins/tools/tool_polyline/kis_tool_polyline.h +++ b/krita/plugins/tools/tool_polyline/kis_tool_polyline.h @@ -21,8 +21,8 @@ #ifndef KIS_TOOL_POLYLINE_H_ #define KIS_TOOL_POLYLINE_H_ -#include <qvaluevector.h> -#include <qstring.h> +#include <tqvaluevector.h> +#include <tqstring.h> #include "kis_tool_paint.h" #include "kis_point.h" @@ -38,6 +38,7 @@ class KisToolPolyline : public KisToolPaint { typedef KisToolPaint super; Q_OBJECT + TQ_OBJECT public: KisToolPolyline(); @@ -55,15 +56,15 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } - virtual Q_UINT32 priority() { return 5; } + virtual TQ_UINT32 priority() { return 5; } virtual void buttonPress(KisButtonPressEvent *event); virtual void doubleClick(KisDoubleClickEvent *e); virtual void move(KisMoveEvent *event); virtual void buttonRelease(KisButtonReleaseEvent *event); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; void finish(); - virtual void keyPress(QKeyEvent *e); + virtual void keyPress(TQKeyEvent *e); public slots: @@ -71,7 +72,7 @@ public slots: protected: virtual void paint(KisCanvasPainter& gc); - virtual void paint(KisCanvasPainter& gc, const QRect& rc); + virtual void paint(KisCanvasPainter& gc, const TQRect& rc); void draw(KisCanvasPainter& gc); void draw(); @@ -82,7 +83,7 @@ protected: bool m_dragging; KisImageSP m_currentImage; private: - typedef QValueVector<KisPoint> KisPointVector; + typedef TQValueVector<KisPoint> KisPointVector; KisPointVector m_points; }; diff --git a/krita/plugins/tools/tool_polyline/tool_polyline.cc b/krita/plugins/tools/tool_polyline/tool_polyline.cc index ae1fdda5..830a2d22 100644 --- a/krita/plugins/tools/tool_polyline/tool_polyline.cc +++ b/krita/plugins/tools/tool_polyline/tool_polyline.cc @@ -20,7 +20,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -43,14 +43,14 @@ typedef KGenericFactory<ToolPolyline> ToolPolylineFactory; K_EXPORT_COMPONENT_FACTORY( kritatoolpolyline, ToolPolylineFactory( "krita" ) ) -ToolPolyline::ToolPolyline(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ToolPolyline::ToolPolyline(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(ToolPolylineFactory::instance()); - if ( parent->inherits("KisToolRegistry") ) + if ( tqparent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); r->add(new KisToolPolylineFactory()); } diff --git a/krita/plugins/tools/tool_polyline/tool_polyline.h b/krita/plugins/tools/tool_polyline/tool_polyline.h index 14987487..9f483363 100644 --- a/krita/plugins/tools/tool_polyline/tool_polyline.h +++ b/krita/plugins/tools/tool_polyline/tool_polyline.h @@ -29,8 +29,9 @@ class KisView; class ToolPolyline : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ToolPolyline(QObject *parent, const char *name, const QStringList &); + ToolPolyline(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ToolPolyline(); private: diff --git a/krita/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/krita/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc index cdb38cb3..bfac2a5d 100644 --- a/krita/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc +++ b/krita/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qpoint.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qtimer.h> +#include <tqpoint.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqtimer.h> #include <kapplication.h> #include <kaction.h> @@ -47,10 +47,10 @@ #include "kis_tool_selectsimilar.h" -void selectByColor(KisPaintDeviceSP dev, KisSelectionSP selection, const Q_UINT8 * c, int fuzziness, enumSelectionMode mode) +void selectByColor(KisPaintDeviceSP dev, KisSelectionSP selection, const TQ_UINT8 * c, int fuzziness, enumSelectionMode mode) { // XXX: Multithread this! - Q_INT32 x, y, w, h; + TQ_INT32 x, y, w, h; dev->exactBounds(x, y, w, h); @@ -63,7 +63,7 @@ void selectByColor(KisPaintDeviceSP dev, KisSelectionSP selection, const Q_UINT8 //if (dev->colorSpace()->hasAlpha()) // opacity = dev->colorSpace()->getAlpha(hiter.rawData()); - Q_UINT8 match = cs->difference(c, hiter.rawData()); + TQ_UINT8 match = cs->difference(c, hiter.rawData()); if (mode == SELECTION_ADD) { if (match <= fuzziness) { @@ -96,8 +96,8 @@ KisToolSelectSimilar::KisToolSelectSimilar() m_selectionOptionsWidget = 0; m_fuzziness = 20; m_currentSelectAction = m_defaultSelectAction = SELECTION_ADD; - m_timer = new QTimer(this); - connect(m_timer, SIGNAL(timeout()), SLOT(slotTimer()) ); + m_timer = new TQTimer(this); + connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimer()) ); } KisToolSelectSimilar::~KisToolSelectSimilar() @@ -124,13 +124,13 @@ void KisToolSelectSimilar::buttonPress(KisButtonPressEvent *e) { if (m_subject) { - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); KisImageSP img; KisPaintDeviceSP dev; - QPoint pos; - Q_UINT8 opacity = OPACITY_OPAQUE; + TQPoint pos; + TQ_UINT8 opacity = OPACITY_OPAQUE; - if (e->button() != QMouseEvent::LeftButton && e->button() != QMouseEvent::RightButton) + if (e->button() != TQMouseEvent::LeftButton && e->button() != TQMouseEvent::RightButton) return; if (!(img = m_subject->currentImg())) @@ -141,7 +141,7 @@ void KisToolSelectSimilar::buttonPress(KisButtonPressEvent *e) if (!dev || !img->activeLayer()->visible()) return; - pos = QPoint(e->pos().floorX(), e->pos().floorY()); + pos = TQPoint(e->pos().floorX(), e->pos().floorY()); KisSelectedTransaction *t = 0; if (img->undo()) t = new KisSelectedTransaction(i18n("Similar Selection"),dev); @@ -159,23 +159,23 @@ void KisToolSelectSimilar::buttonPress(KisButtonPressEvent *e) img->undoAdapter()->addCommand(t); m_subject->canvasController()->updateCanvas(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } } void KisToolSelectSimilar::slotTimer() { #if KDE_IS_VERSION(3,4,0) - int state = kapp->keyboardMouseState() & (Qt::ShiftButton|Qt::ControlButton|Qt::AltButton); + int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton); #else int state = kapp->keyboardModifiers() & (KApplication::ShiftModifier |KApplication::ControlModifier|KApplication::Modifier1); #endif enumSelectionMode action; - if (state == Qt::ShiftButton) + if (state == TQt::ShiftButton) action = SELECTION_ADD; - else if (state == Qt::ControlButton) + else if (state == TQt::ControlButton) action = SELECTION_SUBTRACT; else action = m_defaultSelectAction; @@ -202,7 +202,7 @@ void KisToolSelectSimilar::setup(KActionCollection *collection) m_action = static_cast<KRadioAction *>(collection->action(name())); if (m_action == 0) { - m_action = new KRadioAction(i18n("&Similar Selection"), "tool_similar_selection", "Ctrl+E", this, SLOT(activate()), collection, name()); + m_action = new KRadioAction(i18n("&Similar Selection"), "tool_similar_selection", "Ctrl+E", this, TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); m_action->setToolTip(i18n("Select similar colors")); m_action->setExclusiveGroup("tools"); @@ -226,26 +226,26 @@ void KisToolSelectSimilar::slotSetAction(int action) m_defaultSelectAction = (enumSelectionMode)action; } -QWidget* KisToolSelectSimilar::createOptionWidget(QWidget* parent) +TQWidget* KisToolSelectSimilar::createOptionWidget(TQWidget* tqparent) { - m_optWidget = new QWidget(parent); + m_optWidget = new TQWidget(tqparent); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Similar Selection")); - QVBoxLayout * l = new QVBoxLayout(m_optWidget, 0, 6); + TQVBoxLayout * l = new TQVBoxLayout(m_optWidget, 0, 6); Q_CHECK_PTR(l); m_selectionOptionsWidget = new KisSelectionOptions(m_optWidget, m_subject); Q_CHECK_PTR(m_selectionOptionsWidget); l->addWidget(m_selectionOptionsWidget); - connect (m_selectionOptionsWidget, SIGNAL(actionChanged(int)), this, SLOT(slotSetAction(int))); + connect (m_selectionOptionsWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int))); - QHBoxLayout * hbox = new QHBoxLayout(l); + TQHBoxLayout * hbox = new TQHBoxLayout(l); Q_CHECK_PTR(hbox); - QLabel * lbl = new QLabel(i18n("Fuzziness: "), m_optWidget); + TQLabel * lbl = new TQLabel(i18n("Fuzziness: "), m_optWidget); Q_CHECK_PTR(lbl); hbox->addWidget(lbl); @@ -256,14 +256,14 @@ QWidget* KisToolSelectSimilar::createOptionWidget(QWidget* parent) input->setRange(0, 200, 10, true); input->setValue(20); hbox->addWidget(input); - connect(input, SIGNAL(valueChanged(int)), this, SLOT(slotSetFuzziness(int))); + connect(input, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetFuzziness(int))); - l->addItem(new QSpacerItem(1, 1, QSizePolicy::Fixed, QSizePolicy::Expanding)); + l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); return m_optWidget; } -QWidget* KisToolSelectSimilar::optionWidget() +TQWidget* KisToolSelectSimilar::optionWidget() { return m_optWidget; } diff --git a/krita/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h b/krita/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h index 10a57dd3..d98659d0 100644 --- a/krita/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h +++ b/krita/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h @@ -23,9 +23,9 @@ #include <kis_selection.h> class KisCanvasSubject; -class QWidget; -class QVBoxLayout; -class QCheckBox; +class TQWidget; +class TQVBoxLayout; +class TQCheckBox; class KisIntSpinbox; /** @@ -40,6 +40,7 @@ class KisSelectionOptions; class KisToolSelectSimilar : public KisToolNonPaint { Q_OBJECT + TQ_OBJECT typedef KisToolNonPaint super; public: @@ -48,7 +49,7 @@ public: virtual void update(KisCanvasSubject *subject); virtual void setup(KActionCollection *collection); - virtual Q_UINT32 priority() { return 8; } + virtual TQ_UINT32 priority() { return 8; } virtual enumToolType toolType() { return TOOL_SELECT; } public slots: @@ -60,22 +61,22 @@ public slots: virtual void slotSetAction(int); private: - virtual QWidget* createOptionWidget(QWidget* parent); - virtual QWidget* optionWidget(); + virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* optionWidget(); virtual void buttonPress(KisButtonPressEvent *e); void setPickerCursor(enumSelectionMode); KisCanvasSubject *m_subject; - QWidget *m_optWidget; + TQWidget *m_optWidget; KisSelectionOptions *m_selectionOptionsWidget; int m_fuzziness; enumSelectionMode m_defaultSelectAction; enumSelectionMode m_currentSelectAction; - QTimer *m_timer; - QCursor m_addCursor; - QCursor m_subtractCursor; + TQTimer *m_timer; + TQCursor m_addCursor; + TQCursor m_subtractCursor; private slots: void slotTimer(); diff --git a/krita/plugins/tools/tool_selectsimilar/selectsimilar.cc b/krita/plugins/tools/tool_selectsimilar/selectsimilar.cc index fc6b0c41..2b1cb867 100644 --- a/krita/plugins/tools/tool_selectsimilar/selectsimilar.cc +++ b/krita/plugins/tools/tool_selectsimilar/selectsimilar.cc @@ -21,8 +21,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -41,14 +41,14 @@ typedef KGenericFactory<SelectSimilar> SelectSimilarFactory; K_EXPORT_COMPONENT_FACTORY( kritatoolselectsimilar, SelectSimilarFactory( "krita" ) ) -SelectSimilar::SelectSimilar(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +SelectSimilar::SelectSimilar(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(SelectSimilarFactory::instance()); - if ( parent->inherits("KisToolRegistry") ) + if ( tqparent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); r->add(new KisToolSelectSimilarFactory()); } } diff --git a/krita/plugins/tools/tool_selectsimilar/selectsimilar.h b/krita/plugins/tools/tool_selectsimilar/selectsimilar.h index ca181bcc..c3287a4c 100644 --- a/krita/plugins/tools/tool_selectsimilar/selectsimilar.h +++ b/krita/plugins/tools/tool_selectsimilar/selectsimilar.h @@ -24,8 +24,9 @@ class SelectSimilar : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - SelectSimilar(QObject *parent, const char *name, const QStringList &); + SelectSimilar(TQObject *tqparent, const char *name, const TQStringList &); virtual ~SelectSimilar(); diff --git a/krita/plugins/tools/tool_star/kis_tool_star.cc b/krita/plugins/tools/tool_star/kis_tool_star.cc index 22e890ac..3ba619de 100644 --- a/krita/plugins/tools/tool_star/kis_tool_star.cc +++ b/krita/plugins/tools/tool_star/kis_tool_star.cc @@ -21,9 +21,9 @@ #include <math.h> -#include <qpainter.h> -#include <qspinbox.h> -#include <qlayout.h> +#include <tqpainter.h> +#include <tqspinbox.h> +#include <tqlayout.h> #include <kaction.h> #include <kdebug.h> @@ -88,7 +88,7 @@ void KisToolStar::move(KisMoveEvent *event) // erase old lines on canvas draw(m_dragStart, m_dragEnd); // move (alt) or resize star - if (event->state() & Qt::AltButton) { + if (event->state() & TQt::AltButton) { KisPoint trans = event->pos() - m_dragEnd; m_dragStart += trans; m_dragEnd += trans; @@ -154,21 +154,21 @@ void KisToolStar::draw(const KisPoint& start, const KisPoint& end ) KisCanvasController *controller = m_subject->canvasController(); KisCanvas *canvas = controller->kiscanvas(); KisCanvasPainter p (canvas); - QPen pen(Qt::SolidLine); + TQPen pen(TQt::SolidLine); KisPoint startPos; KisPoint endPos; startPos = controller->windowToView(start); endPos = controller->windowToView(end); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); vKisPoint points = starCoordinates(m_vertices, startPos.x(), startPos.y(), endPos.x(), endPos.y()); for (uint i = 0; i < points.count() - 1; i++) { - p.drawLine(points[i].floorQPoint(), points[i + 1].floorQPoint()); + p.drawLine(points[i].floorTQPoint(), points[i + 1].floorTQPoint()); } - p.drawLine(points[points.count() - 1].floorQPoint(), points[0].floorQPoint()); + p.drawLine(points[points.count() - 1].floorTQPoint(), points[0].floorTQPoint()); p.end (); } @@ -178,13 +178,13 @@ void KisToolStar::setup(KActionCollection *collection) m_action = static_cast<KRadioAction *>(collection->action(name())); if (m_action == 0) { - KShortcut shortcut(Qt::Key_Plus); - shortcut.append(KShortcut(Qt::Key_F9)); + KShortcut shortcut(TQt::Key_Plus); + shortcut.append(KShortcut(TQt::Key_F9)); m_action = new KRadioAction(i18n("&Star"), "tool_star", shortcut, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); @@ -198,7 +198,7 @@ void KisToolStar::setup(KActionCollection *collection) vKisPoint KisToolStar::starCoordinates(int N, double mx, double my, double x, double y) { double R=0, r=0; - Q_INT32 n=0; + TQ_INT32 n=0; double angle; vKisPoint starCoordinatesArray(2*N); @@ -225,16 +225,16 @@ vKisPoint KisToolStar::starCoordinates(int N, double mx, double my, double x, do return starCoordinatesArray; } -QWidget* KisToolStar::createOptionWidget(QWidget* parent) +TQWidget* KisToolStar::createOptionWidget(TQWidget* tqparent) { - QWidget *widget = super::createOptionWidget(parent); + TQWidget *widget = super::createOptionWidget(tqparent); m_optWidget = new WdgToolStar(widget); Q_CHECK_PTR(m_optWidget); m_optWidget->ratioSpinBox->setValue(m_innerOuterRatio); - QGridLayout *optionLayout = new QGridLayout(widget, 1, 1); + TQGridLayout *optionLayout = new TQGridLayout(widget, 1, 1); super::addOptionWidgetLayout(optionLayout); optionLayout->addWidget(m_optWidget, 0, 0); diff --git a/krita/plugins/tools/tool_star/kis_tool_star.h b/krita/plugins/tools/tool_star/kis_tool_star.h index e922aa6c..2637ffd5 100644 --- a/krita/plugins/tools/tool_star/kis_tool_star.h +++ b/krita/plugins/tools/tool_star/kis_tool_star.h @@ -34,6 +34,7 @@ class KisToolStar : public KisToolShape { typedef KisToolShape super; Q_OBJECT + TQ_OBJECT public: KisToolStar(); @@ -45,7 +46,7 @@ public: virtual void update (KisCanvasSubject *subject); - virtual QWidget* createOptionWidget(QWidget* parent); + virtual TQWidget* createOptionWidget(TQWidget* tqparent); // // KisToolPaint interface @@ -53,28 +54,28 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } - virtual Q_UINT32 priority() { return 6; } + virtual TQ_UINT32 priority() { return 6; } virtual void buttonPress(KisButtonPressEvent *event); virtual void move(KisMoveEvent *event); virtual void buttonRelease(KisButtonReleaseEvent *event); protected: virtual void draw(const KisPoint& start, const KisPoint& stop); - //virtual void draw(KisPainter *gc, const QRect& rc); + //virtual void draw(KisPainter *gc, const TQRect& rc); protected: int m_lineThickness; KisPoint m_dragStart; KisPoint m_dragEnd; - QRect m_final_lines; + TQRect m_final_lines; bool m_dragging; KisImageSP m_currentImage; private: vKisPoint starCoordinates(int N, double mx, double my, double x, double y); - Q_INT32 m_innerOuterRatio; - Q_INT32 m_vertices; + TQ_INT32 m_innerOuterRatio; + TQ_INT32 m_vertices; WdgToolStar* m_optWidget; }; @@ -93,7 +94,7 @@ public: t->setup(ac); return t; } - virtual KisID id() { return KisID("starshape", i18n("Star Tool")); } + virtual KisID id() { return KisID("startqshape", i18n("Star Tool")); } }; diff --git a/krita/plugins/tools/tool_star/tool_star.cc b/krita/plugins/tools/tool_star/tool_star.cc index b264cbde..52c4187c 100644 --- a/krita/plugins/tools/tool_star/tool_star.cc +++ b/krita/plugins/tools/tool_star/tool_star.cc @@ -20,7 +20,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolStar> ToolStarFactory; K_EXPORT_COMPONENT_FACTORY( kritatoolstar, ToolStarFactory( "krita" ) ) -ToolStar::ToolStar(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ToolStar::ToolStar(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(ToolStarFactory::instance()); - if ( parent->inherits("KisToolRegistry") ) + if ( tqparent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( parent ); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( tqparent ); r->add(new KisToolStarFactory()); } diff --git a/krita/plugins/tools/tool_star/tool_star.h b/krita/plugins/tools/tool_star/tool_star.h index 28a44f5c..36172dd6 100644 --- a/krita/plugins/tools/tool_star/tool_star.h +++ b/krita/plugins/tools/tool_star/tool_star.h @@ -29,8 +29,9 @@ class KisView; class ToolStar : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ToolStar(QObject *parent, const char *name, const QStringList &); + ToolStar(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ToolStar(); private: diff --git a/krita/plugins/tools/tool_star/wdg_tool_star.ui b/krita/plugins/tools/tool_star/wdg_tool_star.ui index db7c0e4b..b342a927 100644 --- a/krita/plugins/tools/tool_star/wdg_tool_star.ui +++ b/krita/plugins/tools/tool_star/wdg_tool_star.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgToolStar</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgToolStar</cstring> </property> @@ -22,15 +22,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -57,15 +57,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -120,7 +120,7 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/tools/tool_transform/kis_tool_transform.cc b/krita/plugins/tools/tool_transform/kis_tool_transform.cc index 05cdfd44..593ad450 100644 --- a/krita/plugins/tools/tool_transform/kis_tool_transform.cc +++ b/krita/plugins/tools/tool_transform/kis_tool_transform.cc @@ -20,13 +20,13 @@ */ -#include <qpainter.h> -#include <qpen.h> -#include <qpushbutton.h> -#include <qobject.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qapplication.h> +#include <tqpainter.h> +#include <tqpen.h> +#include <tqpushbutton.h> +#include <tqobject.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqapplication.h> #include <kdebug.h> #include <kaction.h> @@ -62,14 +62,14 @@ namespace { typedef KisSelectedTransaction super; public: - TransformCmd(KisToolTransform *tool, KisPaintDeviceSP device, KisPaintDeviceSP origDevice, double scaleX, double scaleY, double tX, double tY, double a, KisSelectionSP origSel, QPoint startPos, QPoint endPos); + TransformCmd(KisToolTransform *tool, KisPaintDeviceSP device, KisPaintDeviceSP origDevice, double scaleX, double scaleY, double tX, double tY, double a, KisSelectionSP origSel, TQPoint startPos, TQPoint endPos); virtual ~TransformCmd(); public: virtual void execute(); virtual void unexecute(); void transformArgs(double &sx, double &sy, double &tx, double &ty, double &a); - KisSelectionSP origSelection(QPoint &startPos, QPoint &endPos); + KisSelectionSP origSelection(TQPoint &startPos, TQPoint &endPos); KisPaintDeviceSP theDevice(); KisPaintDeviceSP origDevice(); @@ -81,13 +81,13 @@ namespace { double m_a; KisToolTransform *m_tool; KisSelectionSP m_origSelection; - QPoint m_startPos; - QPoint m_endPos; + TQPoint m_startPos; + TQPoint m_endPos; KisPaintDeviceSP m_device; KisPaintDeviceSP m_origDevice; }; - TransformCmd::TransformCmd(KisToolTransform *tool, KisPaintDeviceSP device, KisPaintDeviceSP origDevice, double scaleX, double scaleY, double tX, double tY, double a, KisSelectionSP origSel, QPoint startPos, QPoint endPos) : + TransformCmd::TransformCmd(KisToolTransform *tool, KisPaintDeviceSP device, KisPaintDeviceSP origDevice, double scaleX, double scaleY, double tX, double tY, double a, KisSelectionSP origSel, TQPoint startPos, TQPoint endPos) : super(i18n("Transform"), device) , m_scaleX(scaleX) , m_scaleY(scaleY) @@ -116,7 +116,7 @@ namespace { a = m_a; } - KisSelectionSP TransformCmd::origSelection(QPoint &startPos, QPoint &endPos) + KisSelectionSP TransformCmd::origSelection(TQPoint &startPos, TQPoint &endPos) { startPos = m_startPos; endPos = m_endPos; @@ -152,8 +152,8 @@ KisToolTransform::KisToolTransform() setCursor(KisCursor::selectCursor()); m_subject = 0; m_selecting = false; - m_startPos = QPoint(0, 0); - m_endPos = QPoint(0, 0); + m_startPos = TQPoint(0, 0); + m_endPos = TQPoint(0, 0); m_optWidget = 0; m_sizeCursors[0] = KisCursor::sizeVerCursor(); m_sizeCursors[1] = KisCursor::sizeBDiagCursor(); @@ -181,7 +181,7 @@ void KisToolTransform::deactivate() paintOutline(); - disconnect(m_subject->currentImg().data(), SIGNAL(sigLayerActivated(KisLayerSP)), this, SLOT(slotLayerActivated(KisLayerSP))); + disconnect(m_subject->currentImg().data(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP))); } void KisToolTransform::activate() @@ -222,12 +222,12 @@ void KisToolTransform::activate() initHandles(); } } - connect(m_subject->currentImg(), SIGNAL(sigLayerActivated(KisLayerSP)), this, SLOT(slotLayerActivated(KisLayerSP))); + connect(m_subject->currentImg(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP))); } void KisToolTransform::initHandles() { - Q_INT32 x,y,w,h; + TQ_INT32 x,y,w,h; KisImageSP img = m_subject->currentImg(); KisPaintDeviceSP dev = img->activeDevice(); @@ -241,15 +241,15 @@ void KisToolTransform::initHandles() { KisSelectionSP sel = dev->selection(); m_origSelection = new KisSelection(*sel.data()); - QRect r = sel->selectedExactRect(); + TQRect r = sel->selectedExactRect(); r.rect(&x, &y, &w, &h); } else { dev->exactBounds(x,y,w,h); m_origSelection = 0; } - m_startPos = QPoint(x, y); - m_endPos = QPoint(x+w-1, y+h-1); + m_startPos = TQPoint(x, y); + m_endPos = TQPoint(x+w-1, y+h-1); m_org_cenX = (m_startPos.x() + m_endPos.x()) / 2.0; m_org_cenY = (m_startPos.y() + m_endPos.y()) / 2.0; @@ -264,10 +264,10 @@ void KisToolTransform::initHandles() void KisToolTransform::paint(KisCanvasPainter& gc) { - paintOutline(gc, QRect()); + paintOutline(gc, TQRect()); } -void KisToolTransform::paint(KisCanvasPainter& gc, const QRect& rc) +void KisToolTransform::paint(KisCanvasPainter& gc, const TQRect& rc) { paintOutline(gc, rc); } @@ -275,7 +275,7 @@ void KisToolTransform::paint(KisCanvasPainter& gc, const QRect& rc) void KisToolTransform::buttonPress(KisButtonPressEvent *e) { - if (m_subject && e->button() == QMouseEvent::LeftButton) { + if (m_subject && e->button() == TQMouseEvent::LeftButton) { m_wasPressed = true; } @@ -286,42 +286,42 @@ void KisToolTransform::buttonPress(KisButtonPressEvent *e) switch(m_function) { case ROTATE: - m_clickoffset = e->pos().floorQPoint() - - QPoint(static_cast<int>(m_translateX),static_cast<int>(m_translateY)); + m_clickoffset = e->pos().floorTQPoint() + - TQPoint(static_cast<int>(m_translateX),static_cast<int>(m_translateY)); m_clickangle = -m_a - atan2(m_clickoffset.x(),m_clickoffset.y()); - m_clickoffset = QPoint(0, 0); + m_clickoffset = TQPoint(0, 0); break; case MOVE: - m_clickoffset = e->pos().floorQPoint() - - QPoint(static_cast<int>(m_translateX),static_cast<int>(m_translateY)); + m_clickoffset = e->pos().floorTQPoint() + - TQPoint(static_cast<int>(m_translateX),static_cast<int>(m_translateY)); break; case TOPSCALE: - m_clickoffset = e->pos().floorQPoint() - - QPoint((m_topleft + m_topright)/2); + m_clickoffset = e->pos().floorTQPoint() + - TQPoint((m_topleft + m_topright)/2); break; case TOPRIGHTSCALE: - m_clickoffset = e->pos().floorQPoint() - m_topright; + m_clickoffset = e->pos().floorTQPoint() - m_topright; break; case RIGHTSCALE: - m_clickoffset = e->pos().floorQPoint() - - QPoint((m_topright + m_bottomright)/2); + m_clickoffset = e->pos().floorTQPoint() + - TQPoint((m_topright + m_bottomright)/2); break; case BOTTOMRIGHTSCALE: - m_clickoffset = e->pos().floorQPoint() - m_bottomright; + m_clickoffset = e->pos().floorTQPoint() - m_bottomright; break; case BOTTOMSCALE: - m_clickoffset = e->pos().floorQPoint() - - QPoint((m_bottomleft + m_bottomright)/2); + m_clickoffset = e->pos().floorTQPoint() + - TQPoint((m_bottomleft + m_bottomright)/2); break; case BOTTOMLEFTSCALE: - m_clickoffset = e->pos().floorQPoint() - m_bottomleft; + m_clickoffset = e->pos().floorTQPoint() - m_bottomleft; break; case LEFTSCALE: - m_clickoffset = e->pos().floorQPoint() - - QPoint((m_topleft + m_bottomleft)/2); + m_clickoffset = e->pos().floorTQPoint() + - TQPoint((m_topleft + m_bottomleft)/2); break; case TOPLEFTSCALE: - m_clickoffset = e->pos().floorQPoint() - m_topleft; + m_clickoffset = e->pos().floorTQPoint() - m_topleft; break; } m_selecting = true; @@ -330,11 +330,11 @@ void KisToolTransform::buttonPress(KisButtonPressEvent *e) } } -int KisToolTransform::det(QPoint v,QPoint w) +int KisToolTransform::det(TQPoint v,TQPoint w) { return v.x()*w.y()-v.y()*w.x(); } -int KisToolTransform::distsq(QPoint v,QPoint w) +int KisToolTransform::distsq(TQPoint v,TQPoint w) { v -= w; return v.x()*v.x() + v.y()*v.y(); @@ -391,12 +391,12 @@ void KisToolTransform::move(KisMoveEvent *e) KisCanvasController *controller = m_subject->canvasController(); Q_ASSERT(controller); - QPoint topleft = m_topleft; - QPoint topright = m_topright; - QPoint bottomleft = m_bottomleft; - QPoint bottomright = m_bottomright; + TQPoint topleft = m_topleft; + TQPoint topright = m_topright; + TQPoint bottomleft = m_bottomleft; + TQPoint bottomright = m_bottomright; - QPoint mousePos = e->pos().floorQPoint(); + TQPoint mousePos = e->pos().floorTQPoint(); if (m_subject && m_selecting) { paintOutline(); @@ -428,7 +428,7 @@ void KisToolTransform::move(KisMoveEvent *e) m_scaleY = (newY - dy) / (m_startPos.y() - m_org_cenY); // enforce same acpect if shift button is pressed - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { if(m_scaleX>0) // handle the mirrored cases m_scaleX = fabs(m_scaleY); @@ -446,7 +446,7 @@ void KisToolTransform::move(KisMoveEvent *e) m_scaleY = (newY - dy) / (m_startPos.y() - m_org_cenY); // enforce same aspect if shift button is pressed - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { if(m_scaleX < m_scaleY) { @@ -473,7 +473,7 @@ void KisToolTransform::move(KisMoveEvent *e) m_scaleX = (newX - dx) / (m_endPos.x() - m_org_cenX); // enforce same acpect if shift button is pressed - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { if(m_scaleY>0) // handle the mirrored cases m_scaleY = fabs(m_scaleX); @@ -491,7 +491,7 @@ void KisToolTransform::move(KisMoveEvent *e) m_scaleY = (newY - dy) / (m_endPos.y() - m_org_cenY); // enforce same acpect if shift button is pressed - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { if(m_scaleX < m_scaleY) { @@ -518,7 +518,7 @@ void KisToolTransform::move(KisMoveEvent *e) m_scaleY = (newY - dy) / (m_endPos.y() - m_org_cenY); // enforce same acpect if shift button is pressed - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { if(m_scaleX>0) // handle the mirrored cases m_scaleX = fabs(m_scaleY); @@ -536,7 +536,7 @@ void KisToolTransform::move(KisMoveEvent *e) m_scaleY = (newY - dy) / (m_endPos.y() - m_org_cenY); // enforce same acpect if shift button is pressed - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { if(m_scaleX < m_scaleY) { @@ -563,7 +563,7 @@ void KisToolTransform::move(KisMoveEvent *e) m_scaleX = (newX - dx) / (m_startPos.x() - m_org_cenX); // enforce same acpect if shift button is pressed - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { if(m_scaleY>0) // handle the mirrored cases m_scaleY = fabs(m_scaleX); @@ -581,7 +581,7 @@ void KisToolTransform::move(KisMoveEvent *e) m_scaleY = (newY - dy) / (m_startPos.y() - m_org_cenY); // enforce same acpect if shift button is pressed - if(e->state() & Qt::ShiftButton) + if(e->state() & TQt::ShiftButton) { if(m_scaleX < m_scaleY) { @@ -646,7 +646,7 @@ void KisToolTransform::move(KisMoveEvent *e) void KisToolTransform::buttonRelease(KisButtonReleaseEvent *e) { - if (m_subject && e->button() == QMouseEvent::LeftButton) { + if (m_subject && e->button() == TQMouseEvent::LeftButton) { if(!m_wasPressed) return; m_wasPressed = false; @@ -660,9 +660,9 @@ void KisToolTransform::buttonRelease(KisButtonReleaseEvent *e) if(m_actualyMoveWhileSelected) { paintOutline(); - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); transform(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } } } @@ -673,7 +673,7 @@ void KisToolTransform::paintOutline() KisCanvasController *controller = m_subject->canvasController(); KisCanvas *canvas = controller->kiscanvas(); KisCanvasPainter gc(canvas); - QRect rc; + TQRect rc; paintOutline(gc, rc); } @@ -688,38 +688,38 @@ void KisToolTransform::recalcOutline() x = (m_startPos.x() - m_org_cenX) * m_scaleX; y = (m_startPos.y() - m_org_cenY) * m_scaleY; - m_topleft = QPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5)); + m_topleft = TQPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5)); x = (m_endPos.x() - m_org_cenX) * m_scaleX; y = (m_startPos.y() - m_org_cenY) * m_scaleY; - m_topright = QPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5)); + m_topright = TQPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5)); x = (m_startPos.x() - m_org_cenX) * m_scaleX; y = (m_endPos.y() - m_org_cenY) * m_scaleY; - m_bottomleft = QPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5)); + m_bottomleft = TQPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5)); x = (m_endPos.x() - m_org_cenX) * m_scaleX; y = (m_endPos.y() - m_org_cenY) * m_scaleY; - m_bottomright = QPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5)); + m_bottomright = TQPoint(int(rotX(x,y) + m_translateX+0.5), int(rotY(x,y) + m_translateY+0.5)); } -void KisToolTransform::paintOutline(KisCanvasPainter& gc, const QRect&) +void KisToolTransform::paintOutline(KisCanvasPainter& gc, const TQRect&) { if (m_subject) { KisCanvasController *controller = m_subject->canvasController(); RasterOp op = gc.rasterOp(); - QPen old = gc.pen(); - QPen pen(Qt::SolidLine); + TQPen old = gc.pen(); + TQPen pen(TQt::SolidLine); pen.setWidth(1); Q_ASSERT(controller); recalcOutline(); - QPoint topleft = controller->windowToView(m_topleft); - QPoint topright = controller->windowToView(m_topright); - QPoint bottomleft = controller->windowToView(m_bottomleft); - QPoint bottomright = controller->windowToView(m_bottomright); + TQPoint topleft = controller->windowToView(m_topleft); + TQPoint topright = controller->windowToView(m_topright); + TQPoint bottomleft = controller->windowToView(m_bottomleft); + TQPoint bottomright = controller->windowToView(m_bottomright); - gc.setRasterOp(Qt::NotROP); + gc.setRasterOp(TQt::NotROP); gc.setPen(pen); gc.drawRect(topleft.x()-4, topleft.y()-4, 8, 8); gc.drawLine(topleft.x(), topleft.y(), (topleft.x()+topright.x())/2, (topleft.y()+topright.y())/2); @@ -759,7 +759,7 @@ void KisToolTransform::transform() m_scaleX, m_scaleY, m_translateX, m_translateY, m_a, m_origSelection, m_startPos, m_endPos); // Copy the original state back. - QRect rc = m_origDevice->extent(); + TQRect rc = m_origDevice->extent(); rc = rc.normalize(); img->activeDevice()->clear(); KisPainter gc(img->activeDevice()); @@ -769,8 +769,8 @@ void KisToolTransform::transform() // Also restore the original selection. if(m_origSelection) { - //QRect rc = m_origSelection->extent(); - QRect rc = m_origSelection->selectedRect(); + //TQRect rc = m_origSelection->extent(); + TQRect rc = m_origSelection->selectedRect(); rc = rc.normalize(); img->activeDevice()->selection()->clear(); KisPainter sgc(img->activeDevice()->selection().data()); @@ -856,27 +856,27 @@ void KisToolTransform::slotLayerActivated(KisLayerSP) } -QWidget* KisToolTransform::createOptionWidget(QWidget* parent) +TQWidget* KisToolTransform::createOptionWidget(TQWidget* tqparent) { - m_optWidget = new WdgToolTransform(parent); + m_optWidget = new WdgToolTransform(tqparent); Q_CHECK_PTR(m_optWidget); m_optWidget->cmbFilter->clear(); m_optWidget->cmbFilter->setIDList(KisFilterStrategyRegistry::instance()->listKeys()); m_optWidget->cmbFilter->setCurrentText("Mitchell"); - connect(m_optWidget->cmbFilter, SIGNAL(activated(const KisID &)), - this, SLOT(slotSetFilter(const KisID &))); + connect(m_optWidget->cmbFilter, TQT_SIGNAL(activated(const KisID &)), + this, TQT_SLOT(slotSetFilter(const KisID &))); KisID filterID = m_optWidget->cmbFilter->currentItem(); m_filter = KisFilterStrategyRegistry::instance()->get(filterID); /* - connect(m_optWidget->intStartX, SIGNAL(valueChanged(int)), this, SLOT(setStartX(int))); - connect(m_optWidget->intStartY, SIGNAL(valueChanged(int)), this, SLOT(setStartY(int))); - connect(m_optWidget->intEndX, SIGNAL(valueChanged(int)), this, SLOT(setEndX(int))); - connect(m_optWidget->intEndY, SIGNAL(valueChanged(int)), this, SLOT(setEndY(int))); + connect(m_optWidget->intStartX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartX(int))); + connect(m_optWidget->intStartY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartY(int))); + connect(m_optWidget->intEndX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndX(int))); + connect(m_optWidget->intEndY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndY(int))); */ m_optWidget->intStartX->hide(); m_optWidget->intStartY->hide(); @@ -889,7 +889,7 @@ QWidget* KisToolTransform::createOptionWidget(QWidget* parent) return m_optWidget; } -QWidget* KisToolTransform::optionWidget() +TQWidget* KisToolTransform::optionWidget() { return m_optWidget; } @@ -903,7 +903,7 @@ void KisToolTransform::setup(KActionCollection *collection) "tool_transform", 0, this, - SLOT(activate()), + TQT_SLOT(activate()), collection, name()); Q_CHECK_PTR(m_action); diff --git a/krita/plugins/tools/tool_transform/kis_tool_transform.h b/krita/plugins/tools/tool_transform/kis_tool_transform.h index 9ae4f4da..3d5ff8b3 100644 --- a/krita/plugins/tools/tool_transform/kis_tool_transform.h +++ b/krita/plugins/tools/tool_transform/kis_tool_transform.h @@ -22,7 +22,7 @@ #ifndef KIS_TOOL_TRANSFORM_H_ #define KIS_TOOL_TRANSFORM_H_ -#include <qpoint.h> +#include <tqpoint.h> #include <kis_tool_non_paint.h> #include <kis_tool_factory.h> @@ -42,19 +42,20 @@ class KisToolTransform : public KisToolNonPaint, KisCommandHistoryListener { typedef KisToolNonPaint super; Q_OBJECT + TQ_OBJECT public: KisToolTransform(); virtual ~KisToolTransform(); - virtual QWidget* createOptionWidget(QWidget* parent); - virtual QWidget* optionWidget(); + virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* optionWidget(); virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_TRANSFORM; } - virtual Q_UINT32 priority() { return 3; } + virtual TQ_UINT32 priority() { return 3; } virtual void paint(KisCanvasPainter& gc); - virtual void paint(KisCanvasPainter& gc, const QRect& rc); + virtual void paint(KisCanvasPainter& gc, const TQRect& rc); virtual void buttonPress(KisButtonPressEvent *e); virtual void move(KisMoveEvent *e); virtual void buttonRelease(KisButtonReleaseEvent *e); @@ -75,15 +76,15 @@ public: private: - void paintOutline(KisCanvasPainter& gc, const QRect& rc); + void paintOutline(KisCanvasPainter& gc, const TQRect& rc); void transform(); void recalcOutline(); double rotX(double x, double y) { return m_cosa*x - m_sina*y;}; double rotY(double x, double y) { return m_sina*x + m_cosa*y;}; double invrotX(double x, double y) { return m_cosa*x + m_sina*y;}; double invrotY(double x, double y) { return -m_sina*x + m_cosa*y;}; - int det(QPoint v,QPoint w); - int distsq(QPoint v,QPoint w); + int det(TQPoint v,TQPoint w); + int distsq(TQPoint v,TQPoint w); void setFunctionalCursor(); void initHandles(); @@ -102,21 +103,21 @@ protected slots: private: enum function {ROTATE,MOVE,TOPLEFTSCALE,TOPSCALE,TOPRIGHTSCALE,RIGHTSCALE, BOTTOMRIGHTSCALE, BOTTOMSCALE,BOTTOMLEFTSCALE, LEFTSCALE}; - QCursor m_sizeCursors[8]; + TQCursor m_sizeCursors[8]; function m_function; - QPoint m_startPos; - QPoint m_endPos; + TQPoint m_startPos; + TQPoint m_endPos; bool m_selecting; bool m_actualyMoveWhileSelected; - QPoint m_topleft; - QPoint m_topright; - QPoint m_bottomleft; - QPoint m_bottomright; + TQPoint m_topleft; + TQPoint m_topright; + TQPoint m_bottomleft; + TQPoint m_bottomright; double m_scaleX; double m_scaleY; double m_translateX; double m_translateY; - QPoint m_clickoffset; + TQPoint m_clickoffset; double m_org_cenX; double m_org_cenY; double m_cosa; diff --git a/krita/plugins/tools/tool_transform/tool_transform.cc b/krita/plugins/tools/tool_transform/tool_transform.cc index e8c77aa7..b91ab784 100644 --- a/krita/plugins/tools/tool_transform/tool_transform.cc +++ b/krita/plugins/tools/tool_transform/tool_transform.cc @@ -20,7 +20,7 @@ #include <stdlib.h> #include <vector> -#include <qpoint.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolTransform> ToolTransformFactory; K_EXPORT_COMPONENT_FACTORY( kritatooltransform, ToolTransformFactory( "krita" ) ) -ToolTransform::ToolTransform(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ToolTransform::ToolTransform(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(ToolTransformFactory::instance()); - if ( parent->inherits("KisToolRegistry") ) + if ( tqparent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); KisToolTransformFactory * f = new KisToolTransformFactory(); Q_CHECK_PTR(f); r->add(f); diff --git a/krita/plugins/tools/tool_transform/tool_transform.h b/krita/plugins/tools/tool_transform/tool_transform.h index 42eba788..04bfbaa9 100644 --- a/krita/plugins/tools/tool_transform/tool_transform.h +++ b/krita/plugins/tools/tool_transform/tool_transform.h @@ -29,8 +29,9 @@ class KisView; class ToolTransform : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ToolTransform(QObject *parent, const char *name, const QStringList &); + ToolTransform(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ToolTransform(); private: diff --git a/krita/plugins/tools/tool_transform/wdg_tool_transform.ui b/krita/plugins/tools/tool_transform/wdg_tool_transform.ui index b9307451..2f41e1b3 100644 --- a/krita/plugins/tools/tool_transform/wdg_tool_transform.ui +++ b/krita/plugins/tools/tool_transform/wdg_tool_transform.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgToolTransform</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgToolTransform</cstring> </property> @@ -25,31 +25,31 @@ <property name="spacing"> <number>3</number> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -70,15 +70,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -101,23 +101,23 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -138,15 +138,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -171,14 +171,14 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> <property name="text"> <string>Filter:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -235,7 +235,7 @@ <tabstop>intEndX</tabstop> <tabstop>intEndY</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>kis_cmb_idlist.h</includehint> diff --git a/krita/plugins/viewplugins/colorrange/colorrange.cc b/krita/plugins/viewplugins/colorrange/colorrange.cc index 9c52e027..cc9bf95c 100644 --- a/krita/plugins/viewplugins/colorrange/colorrange.cc +++ b/krita/plugins/viewplugins/colorrange/colorrange.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -50,15 +50,15 @@ typedef KGenericFactory<ColorRange> ColorRangeFactory; K_EXPORT_COMPONENT_FACTORY( kritacolorrange, ColorRangeFactory( "krita" ) ) -ColorRange::ColorRange(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ColorRange::ColorRange(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if (parent->inherits("KisView")) { + if (tqparent->inherits("KisView")) { setInstance(ColorRangeFactory::instance()); setXMLFile(locate("data","kritaplugins/colorrange.rc"), true); - m_view = dynamic_cast<KisView*>(parent); - m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Color Range..."), 0, 0, this, SLOT(slotActivated()), actionCollection(), "colorrange") ); + m_view = dynamic_cast<KisView*>(tqparent); + m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Color Range..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "colorrange") ); } } diff --git a/krita/plugins/viewplugins/colorrange/colorrange.h b/krita/plugins/viewplugins/colorrange/colorrange.h index 1cc10cef..322f5bc4 100644 --- a/krita/plugins/viewplugins/colorrange/colorrange.h +++ b/krita/plugins/viewplugins/colorrange/colorrange.h @@ -28,8 +28,9 @@ class KisView; class ColorRange : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ColorRange(QObject *parent, const char *name, const QStringList &); + ColorRange(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ColorRange(); private slots: diff --git a/krita/plugins/viewplugins/colorrange/dlg_colorrange.cc b/krita/plugins/viewplugins/colorrange/dlg_colorrange.cc index 1cd115c1..acec9b17 100644 --- a/krita/plugins/viewplugins/colorrange/dlg_colorrange.cc +++ b/krita/plugins/viewplugins/colorrange/dlg_colorrange.cc @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qapplication.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qslider.h> -#include <qcombobox.h> -#include <qpixmap.h> -#include <qimage.h> -#include <qlabel.h> -#include <qcolor.h> -#include <qradiobutton.h> +#include <tqapplication.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqslider.h> +#include <tqcombobox.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqcolor.h> +#include <tqradiobutton.h> #include <knuminput.h> #include <klocale.h> @@ -103,7 +103,7 @@ namespace { } -Q_UINT32 matchColors(const QColor & c, enumAction action) +TQ_UINT32 matchColors(const TQColor & c, enumAction action) { int r = c.red(); int g = c.green(); @@ -174,8 +174,8 @@ Q_UINT32 matchColors(const QColor & c, enumAction action) -DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, QWidget * parent, const char * name) - : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok) +DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget * tqparent, const char * name) + : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok) { m_dev = dev; m_view = view; @@ -187,7 +187,7 @@ DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, QWidget * p setCaption(i18n("Color Range")); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); if (m_dev->image()->undo()) m_transaction = new KisSelectedTransaction(i18n("Select by Color Range"), m_dev); @@ -201,29 +201,29 @@ DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, QWidget * p m_mode = SELECTION_ADD; m_currentAction = REDS; - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); - connect(this, SIGNAL(cancelClicked()), - this, SLOT(cancelClicked())); + connect(this, TQT_SIGNAL(cancelClicked()), + this, TQT_SLOT(cancelClicked())); - connect(m_page->chkInvert, SIGNAL(clicked()), - this, SLOT(slotInvertClicked())); + connect(m_page->chkInvert, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotInvertClicked())); - connect(m_page->cmbSelect, SIGNAL(activated(int)), - this, SLOT(slotSelectionTypeChanged(int))); + connect(m_page->cmbSelect, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotSelectionTypeChanged(int))); - connect (m_page->radioAdd, SIGNAL(toggled(bool)), - this, SLOT(slotAdd(bool))); + connect (m_page->radioAdd, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotAdd(bool))); - connect (m_page->radioSubtract, SIGNAL(toggled(bool)), - this, SLOT(slotSubtract(bool))); + connect (m_page->radioSubtract, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotSubtract(bool))); - connect (m_page->bnSelect, SIGNAL(clicked()), - this, SLOT(slotSelectClicked())); + connect (m_page->bnSelect, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotSelectClicked())); - connect (m_page->bnDeselect, SIGNAL(clicked()), - this, SLOT(slotDeselectClicked())); + connect (m_page->bnDeselect, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotDeselectClicked())); } @@ -237,9 +237,9 @@ void DlgColorRange::updatePreview() { if (!m_selection) return; - Q_INT32 x, y, w, h; + TQ_INT32 x, y, w, h; m_dev->exactBounds(x, y, w, h); - QPixmap pix = QPixmap(m_selection->maskImage().smoothScale(350, 350, QImage::ScaleMin)); + TQPixmap pix = TQPixmap(m_selection->tqmaskImage().smoothScale(350, 350, TQ_ScaleMin)); m_subject->canvasController()->updateCanvas(); m_page->pixSelection->setPixmap(pix); } @@ -284,22 +284,22 @@ void DlgColorRange::slotAdd(bool on) void DlgColorRange::slotSelectClicked() { - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); // XXX: Multithread this! - Q_INT32 x, y, w, h; + TQ_INT32 x, y, w, h; m_dev->exactBounds(x, y, w, h); KisColorSpace * cs = m_dev->colorSpace(); - Q_UINT8 opacity; + TQ_UINT8 opacity; for (int y2 = y; y2 < h - y; ++y2) { KisHLineIterator hiter = m_dev->createHLineIterator(x, y2, w, false); KisHLineIterator selIter = m_selection ->createHLineIterator(x, y2, w, true); while (!hiter.isDone()) { - QColor c; + TQColor c; - cs->toQColor(hiter.rawData(), &c, &opacity); + cs->toTQColor(hiter.rawData(), &c, &opacity); // Don't try to select transparent pixels. if (opacity > OPACITY_TRANSPARENT) { - Q_UINT8 match = matchColors(c, m_currentAction); + TQ_UINT8 match = matchColors(c, m_currentAction); if (match) { // Personally, I think the invert option a bit silly. But it's possible I don't quite understand it. BSAR. @@ -308,7 +308,7 @@ void DlgColorRange::slotSelectClicked() *(selIter.rawData()) = match; } else if (m_mode == SELECTION_SUBTRACT) { - Q_UINT8 selectedness = *(selIter.rawData()); + TQ_UINT8 selectedness = *(selIter.rawData()); if (match < selectedness) { *(selIter.rawData()) = selectedness - match; } @@ -319,7 +319,7 @@ void DlgColorRange::slotSelectClicked() } else { if (m_mode == SELECTION_ADD) { - Q_UINT8 selectedness = *(selIter.rawData()); + TQ_UINT8 selectedness = *(selIter.rawData()); if (match < selectedness) { *(selIter.rawData()) = selectedness - match; } @@ -338,7 +338,7 @@ void DlgColorRange::slotSelectClicked() } } updatePreview(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } void DlgColorRange::slotDeselectClicked() diff --git a/krita/plugins/viewplugins/colorrange/dlg_colorrange.h b/krita/plugins/viewplugins/colorrange/dlg_colorrange.h index 5a792abd..474a8b5e 100644 --- a/krita/plugins/viewplugins/colorrange/dlg_colorrange.h +++ b/krita/plugins/viewplugins/colorrange/dlg_colorrange.h @@ -20,7 +20,7 @@ #ifndef DLG_COLORRANGE #define DLG_COLORRANGE -#include <qcursor.h> +#include <tqcursor.h> #include <kdialogbase.h> @@ -51,18 +51,19 @@ enum enumAction { /** - * This dialog allows the user to create a selection mask based + * This dialog allows the user to create a selection tqmask based * on a (range of) colors. */ class DlgColorRange: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgColorRange(KisView * view, KisPaintDeviceSP layer, QWidget * parent = 0, const char* name = 0); + DlgColorRange(KisView * view, KisPaintDeviceSP layer, TQWidget * tqparent = 0, const char* name = 0); ~DlgColorRange(); private slots: @@ -79,7 +80,7 @@ private slots: void slotDeselectClicked(); private: - QImage createMask(KisSelectionSP selection, KisPaintDeviceSP layer); + TQImage createMask(KisSelectionSP selection, KisPaintDeviceSP layer); private: @@ -89,7 +90,7 @@ private: KisView * m_view; KisCanvasSubject * m_subject; enumSelectionMode m_mode; - QCursor m_oldCursor; + TQCursor m_oldCursor; KisSelectedTransaction *m_transaction; enumAction m_currentAction; bool m_invert; diff --git a/krita/plugins/viewplugins/colorrange/wdg_colorrange.ui b/krita/plugins/viewplugins/colorrange/wdg_colorrange.ui index e9ed74f5..3eafd180 100644 --- a/krita/plugins/viewplugins/colorrange/wdg_colorrange.ui +++ b/krita/plugins/viewplugins/colorrange/wdg_colorrange.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgColorRange</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgColorRange</cstring> </property> @@ -19,31 +19,31 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Reds</string> @@ -98,7 +98,7 @@ <cstring>cmbSelect</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chkInvert</cstring> </property> @@ -108,7 +108,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>grpSelection</cstring> </property> @@ -119,7 +119,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioAdd</cstring> </property> @@ -130,7 +130,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioSubtract</cstring> </property> @@ -142,15 +142,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>bnSelect</cstring> </property> @@ -158,7 +158,7 @@ <string>&Select</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>bnDeselect</cstring> </property> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -187,7 +187,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>grpPreview</cstring> </property> @@ -209,7 +209,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixSelection</cstring> </property> @@ -233,7 +233,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -248,5 +248,5 @@ </images> <tabstops> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc index 62528a0c..3ffc80fb 100644 --- a/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc +++ b/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc @@ -19,13 +19,13 @@ */ #include <stdlib.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qbuttongroup.h> -#include <qapplication.h> -#include <qcursor.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqbuttongroup.h> +#include <tqapplication.h> +#include <tqcursor.h> #include <klocale.h> #include <kiconloader.h> @@ -58,19 +58,19 @@ typedef KGenericFactory<ColorSpaceConversion> ColorSpaceConversionFactory; K_EXPORT_COMPONENT_FACTORY( kritacolorspaceconversion, ColorSpaceConversionFactory( "krita" ) ) -ColorSpaceConversion::ColorSpaceConversion(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ColorSpaceConversion::ColorSpaceConversion(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; setInstance(ColorSpaceConversionFactory::instance()); setXMLFile(locate("data","kritaplugins/colorspaceconversion.rc"), true); - (void) new KAction(i18n("&Convert Image Type..."), 0, 0, this, SLOT(slotImgColorSpaceConversion()), actionCollection(), "imgcolorspaceconversion"); - (void) new KAction(i18n("&Convert Layer Type..."), 0, 0, this, SLOT(slotLayerColorSpaceConversion()), actionCollection(), "layercolorspaceconversion"); + (void) new KAction(i18n("&Convert Image Type..."), 0, 0, this, TQT_SLOT(slotImgColorSpaceConversion()), actionCollection(), "imgcolorspaceconversion"); + (void) new KAction(i18n("&Convert Layer Type..."), 0, 0, this, TQT_SLOT(slotLayerColorSpaceConversion()), actionCollection(), "layercolorspaceconversion"); } } @@ -91,7 +91,7 @@ void ColorSpaceConversion::slotImgColorSpaceConversion() if (KMessageBox::warningContinueCancel(m_view, i18n("This conversion will convert your %1 image through 16-bit L*a*b* and back.\n" "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n") - .arg(image->colorSpace()->id().name()), + .tqarg(image->colorSpace()->id().name()), i18n("Colorspace Conversion"), KGuiItem(i18n("Continue")), "lab16degradation") != KMessageBox::Continue) return; @@ -103,14 +103,14 @@ void ColorSpaceConversion::slotImgColorSpaceConversion() dlgColorSpaceConversion->setCaption(i18n("Convert All Layers From ") + image->colorSpace()->id().name()); - if (dlgColorSpaceConversion->exec() == QDialog::Accepted) { + if (dlgColorSpaceConversion->exec() == TQDialog::Accepted) { // XXX: Do the rest of the stuff KisID cspace = dlgColorSpaceConversion->m_page->cmbColorSpaces->currentItem(); KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry()->getColorSpace(cspace, dlgColorSpaceConversion->m_page->cmbDestProfile->currentText()); - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); image->convertTo(cs, dlgColorSpaceConversion->m_page->grpIntent->selectedId()); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } delete dlgColorSpaceConversion; } @@ -128,7 +128,7 @@ void ColorSpaceConversion::slotLayerColorSpaceConversion() if (KMessageBox::warningContinueCancel(m_view, i18n("This conversion will convert your %1 layer through 16-bit L*a*b* and back.\n" "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n") - .arg(dev->colorSpace()->id().name()), + .tqarg(dev->colorSpace()->id().name()), i18n("Colorspace Conversion"), KGuiItem(i18n("Continue")), "lab16degradation") != KMessageBox::Continue) return; @@ -140,14 +140,14 @@ void ColorSpaceConversion::slotLayerColorSpaceConversion() dlgColorSpaceConversion->setCaption(i18n("Convert Current Layer From") + dev->colorSpace()->id().name()); - if (dlgColorSpaceConversion->exec() == QDialog::Accepted) { + if (dlgColorSpaceConversion->exec() == TQDialog::Accepted) { KisID cspace = dlgColorSpaceConversion->m_page->cmbColorSpaces->currentItem(); KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry() -> getColorSpace(cspace, dlgColorSpaceConversion->m_page->cmbDestProfile->currentText()); - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); dev->convertTo(cs, dlgColorSpaceConversion->m_page->grpIntent->selectedId()); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } delete dlgColorSpaceConversion; } diff --git a/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h b/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h index 3bf85530..402fde65 100644 --- a/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h +++ b/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h @@ -31,8 +31,9 @@ class KisView; class ColorSpaceConversion : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ColorSpaceConversion(QObject *parent, const char *name, const QStringList &); + ColorSpaceConversion(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ColorSpaceConversion(); private slots: diff --git a/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc index b59fb546..b296ca2f 100644 --- a/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc +++ b/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qptrlist.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqptrlist.h> #include <klocale.h> #include <knuminput.h> @@ -39,26 +39,26 @@ #include "wdgconvertcolorspace.h" #include "dlg_colorspaceconversion.h" -DlgColorSpaceConversion::DlgColorSpaceConversion( QWidget * parent, +DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Image Size"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Image Size"), Ok | Cancel, Ok) { m_page = new WdgConvertColorSpace(this, "colorspace_conversion"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); m_page->cmbColorSpaces->setIDList(KisMetaRegistry::instance()->csRegistry()->listKeys()); fillCmbDestProfile(m_page->cmbColorSpaces->currentItem()); - connect(m_page->cmbColorSpaces, SIGNAL(activated(const KisID &)), - this, SLOT(fillCmbDestProfile(const KisID &))); + connect(m_page->cmbColorSpaces, TQT_SIGNAL(activated(const KisID &)), + this, TQT_SLOT(fillCmbDestProfile(const KisID &))); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } @@ -79,8 +79,8 @@ void DlgColorSpaceConversion::fillCmbDestProfile(const KisID & s) { m_page->cmbDestProfile->clear(); - QValueVector<KisProfile *> profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor(s); - QValueVector<KisProfile *> ::iterator it; + TQValueVector<KisProfile *> profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor(s); + TQValueVector<KisProfile *> ::iterator it; for ( it = profileList.begin(); it != profileList.end(); ++it ) { m_page->cmbDestProfile->insertItem((*it)->productName()); diff --git a/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h b/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h index ed086a8d..48ef3efe 100644 --- a/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h +++ b/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h @@ -32,10 +32,11 @@ class WdgConvertColorSpace; class DlgColorSpaceConversion: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgColorSpaceConversion(QWidget * parent = 0, const char* name = 0); + DlgColorSpaceConversion(TQWidget * tqparent = 0, const char* name = 0); ~DlgColorSpaceConversion(); WdgConvertColorSpace * m_page; diff --git a/krita/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui b/krita/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui index 31f29be5..ae183206 100644 --- a/krita/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui +++ b/krita/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgConvertColorSpace</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgConvertColorSpace</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblConvert</cstring> </property> @@ -53,7 +53,7 @@ <cstring>cmbDestProfile</cstring> </property> </widget> - <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpIntent</cstring> </property> @@ -67,7 +67,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioPerceptual</cstring> </property> @@ -90,7 +90,7 @@ the perceived color. White point changed to result in neutral grays. Intended for images.</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioRelativeColorimetric</cstring> </property> @@ -110,7 +110,7 @@ then, it is used. Else reverts to perceptual intent.</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>radioSaturation</cstring> </property> @@ -135,7 +135,7 @@ then, it is used. Else reverts to perceptual intent.</string> </property> </widget> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>radioAbsoluteColorimetric</cstring> </property> @@ -159,7 +159,7 @@ colors (Pantone, TruMatch, logo colors, ...)</string> </widget> </grid> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDestICMProfile</cstring> </property> @@ -214,5 +214,5 @@ colors (Pantone, TruMatch, logo colors, ...)</string> <data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.cc index 545f886f..b61f4a9d 100644 --- a/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.cc +++ b/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.cc @@ -19,14 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qbutton.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qcolor.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qradiobutton.h> -#include <qslider.h> +#include <tqbutton.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqcolor.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqradiobutton.h> +#include <tqslider.h> #include <kcolorbutton.h> #include <kconfig.h> @@ -37,29 +37,29 @@ #include "dlg_dropshadow.h" #include "wdg_dropshadow.h" -DlgDropshadow::DlgDropshadow( const QString & /*imageCS*/, - const QString & /*layerCS*/, - QWidget * parent, +DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/, + const TQString & /*layerCS*/, + TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Drop Shadow"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Drop Shadow"), Ok | Cancel, Ok) { m_page = new WdgDropshadow(this, "dropshadow"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); KConfig * cfg = KGlobal::config(); m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) ); m_page->yOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_y", 8) ); m_page->blurRadiusSpinBox->setValue( cfg->readNumEntry("dropshadow_blurRadius", 5) ); - QColor black(0,0,0); + TQColor black(0,0,0); m_page->shadowColorButton->setColor( cfg->readColorEntry("dropshadow_color", &black) ); m_page->opacitySlider->setValue( cfg->readNumEntry("dropshadow_opacity", 80 ) ); m_page->opacitySpinBox->setValue( cfg->readNumEntry("dropshadow_opacity", 80 ) ); m_page->allowResizingCheckBox->setChecked( cfg->readBoolEntry("dropshadow_resizing", true ) ); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } DlgDropshadow::~DlgDropshadow() @@ -67,29 +67,29 @@ DlgDropshadow::~DlgDropshadow() delete m_page; } -Q_INT32 DlgDropshadow::getXOffset() +TQ_INT32 DlgDropshadow::getXOffset() { return m_page->xOffsetSpinBox->value(); } -Q_INT32 DlgDropshadow::getYOffset() +TQ_INT32 DlgDropshadow::getYOffset() { return m_page->yOffsetSpinBox->value(); } -Q_INT32 DlgDropshadow::getBlurRadius() +TQ_INT32 DlgDropshadow::getBlurRadius() { return m_page->blurRadiusSpinBox->value(); } -Q_UINT8 DlgDropshadow::getShadowOpacity() +TQ_UINT8 DlgDropshadow::getShadowOpacity() { double opacity = (double)m_page->opacitySpinBox->value(); //convert percent to a 8 bit opacity value - return (Q_UINT8)(opacity / 100 * 255); + return (TQ_UINT8)(opacity / 100 * 255); } -QColor DlgDropshadow::getShadowColor() +TQColor DlgDropshadow::getShadowColor() { return m_page->shadowColorButton->color(); } diff --git a/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.h b/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.h index 8e514658..9261e723 100644 --- a/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.h +++ b/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.h @@ -24,7 +24,7 @@ #include <kis_dropshadow.h> class WdgDropshadow; -class QColor; +class TQColor; /** * This dialog allows the user to configure the decomposition of an image @@ -33,20 +33,21 @@ class QColor; class DlgDropshadow: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgDropshadow(const QString & imageCS, const QString & layerCS, QWidget * parent = 0, + DlgDropshadow(const TQString & imageCS, const TQString & layerCS, TQWidget * tqparent = 0, const char* name = 0); ~DlgDropshadow(); public: - Q_INT32 getXOffset(); - Q_INT32 getYOffset(); - Q_INT32 getBlurRadius(); - Q_UINT8 getShadowOpacity(); - QColor getShadowColor(); + TQ_INT32 getXOffset(); + TQ_INT32 getYOffset(); + TQ_INT32 getBlurRadius(); + TQ_UINT8 getShadowOpacity(); + TQColor getShadowColor(); bool allowResizingChecked(); private slots: void okClicked(); diff --git a/krita/plugins/viewplugins/dropshadow/kis_dropshadow.cc b/krita/plugins/viewplugins/dropshadow/kis_dropshadow.cc index 7881f568..e8818760 100644 --- a/krita/plugins/viewplugins/dropshadow/kis_dropshadow.cc +++ b/krita/plugins/viewplugins/dropshadow/kis_dropshadow.cc @@ -25,7 +25,7 @@ #include <stdlib.h> #include <vector> -#include <qcolor.h> +#include <tqcolor.h> #include <klocale.h> #include <kiconloader.h> @@ -68,7 +68,7 @@ KisDropshadow::KisDropshadow(KisView * view) { } -void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, Q_INT32 xoffset, Q_INT32 yoffset, Q_INT32 blurradius, QColor color, Q_UINT8 opacity, bool allowResize) +void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, TQ_INT32 xoffset, TQ_INT32 yoffset, TQ_INT32 blurradius, TQColor color, TQ_UINT8 opacity, bool allowResize) { KisImageSP image = m_view->canvasSubject()->currentImg(); if (!image) return; @@ -92,9 +92,9 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, Q_INT32 x KisPaintDeviceSP bShadowDev; KisRgbColorSpace *rgb8cs = static_cast<KisRgbColorSpace *>(shadowDev->colorSpace()); - QRect rect = dev->exactBounds(); + TQRect rect = dev->exactBounds(); - for (Q_INT32 row = 0; row < rect.height(); ++row) + for (TQ_INT32 row = 0; row < rect.height(); ++row) { KisHLineIteratorPixel srcIt = dev->createHLineIterator(rect.x(), rect.y() + row, rect.width(), false); KisHLineIteratorPixel dstIt = shadowDev->createHLineIterator(rect.x(), rect.y() + row, rect.width(), true); @@ -103,7 +103,7 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, Q_INT32 x if (srcIt.isSelected()) { //set the shadow color - Q_UINT8 alpha = dev->colorSpace()->getAlpha(srcIt.rawData()); + TQ_UINT8 alpha = dev->colorSpace()->getAlpha(srcIt.rawData()); rgb8cs->setPixel(dstIt.rawData(), color.red(), color.green(), color.blue(), alpha); } ++srcIt; @@ -122,26 +122,26 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, Q_INT32 x if (!m_cancelRequested) { shadowDev->move (xoffset,yoffset); - KisGroupLayerSP parent = image->rootLayer(); + KisGroupLayerSP tqparent = image->rootLayer(); if (image->activeLayer()) - parent = image->activeLayer()->parent().data(); + tqparent = image->activeLayer()->tqparent().data(); KisPaintLayerSP l = new KisPaintLayer(image, i18n("Drop Shadow"), opacity, shadowDev); - image->addLayer( l.data(), parent, src->siblingBelow() ); + image->addLayer( l.data(), tqparent, src->siblingBelow() ); if (allowResize) { - QRect shadowBounds = shadowDev->exactBounds(); + TQRect shadowBounds = shadowDev->exactBounds(); - if (!image->bounds().contains(shadowBounds)) { + if (!image->bounds().tqcontains(shadowBounds)) { - QRect newImageSize = image->bounds() | shadowBounds; + TQRect newImageSize = image->bounds() | shadowBounds; image->resize(newImageSize.width(), newImageSize.height()); if (shadowBounds.left() < 0 || shadowBounds.top() < 0) { - Q_INT32 newRootX = image->rootLayer()->x(); - Q_INT32 newRootY = image->rootLayer()->y(); + TQ_INT32 newRootX = image->rootLayer()->x(); + TQ_INT32 newRootY = image->rootLayer()->y(); if (shadowBounds.left() < 0) { newRootX += -shadowBounds.left(); @@ -150,8 +150,8 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, Q_INT32 x newRootY += -shadowBounds.top(); } - KCommand *moveCommand = image->rootLayer()->moveCommand(QPoint(image->rootLayer()->x(), image->rootLayer()->y()), - QPoint(newRootX, newRootY)); + KCommand *moveCommand = image->rootLayer()->moveCommand(TQPoint(image->rootLayer()->x(), image->rootLayer()->y()), + TQPoint(newRootX, newRootY)); Q_ASSERT(moveCommand != 0); if (moveCommand) { @@ -175,41 +175,41 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, Q_INT32 x emit notifyProgressDone(); } -void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstDev, QRect& rect, double horz, double vert, BlurMethod method, KisProgressDisplayInterface *) +void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstDev, TQRect& rect, double horz, double vert, BlurMethod method, KisProgressDisplayInterface *) { - Q_INT32 width, height; - Q_INT32 bytes; - Q_UINT8 *dest, *dp; - Q_UINT8 *src, *sp, *sp_p, *sp_m; - Q_INT32 *buf = NULL; - Q_INT32 *bb; + TQ_INT32 width, height; + TQ_INT32 bytes; + TQ_UINT8 *dest, *dp; + TQ_UINT8 *src, *sp, *sp_p, *sp_m; + TQ_INT32 *buf = NULL; + TQ_INT32 *bb; double n_p[5], n_m[5]; double d_p[5], d_m[5]; double bd_p[5], bd_m[5]; double *val_p = NULL; double *val_m = NULL; double *vp, *vm; - Q_INT32 x1, y1, x2, y2; - Q_INT32 i, j; - Q_INT32 row, col, b; - Q_INT32 terms; + TQ_INT32 x1, y1, x2, y2; + TQ_INT32 i, j; + TQ_INT32 row, col, b; + TQ_INT32 terms; double progress, max_progress; - Q_INT32 initial_p[4]; - Q_INT32 initial_m[4]; + TQ_INT32 initial_p[4]; + TQ_INT32 initial_m[4]; double std_dev; - Q_INT32 pixels; - Q_INT32 total = 1; - Q_INT32 start, end; - Q_INT32 *curve; - Q_INT32 *sum = NULL; - Q_INT32 val; - Q_INT32 length; - Q_INT32 initial_pp, initial_mm; - - x1 = (Q_INT32)(rect.x() - horz); - y1 = (Q_INT32)(rect.y() - vert); - width = (Q_INT32)(rect.width() + 2 * horz); - height = (Q_INT32)(rect.height() + 2 * vert); + TQ_INT32 pixels; + TQ_INT32 total = 1; + TQ_INT32 start, end; + TQ_INT32 *curve; + TQ_INT32 *sum = NULL; + TQ_INT32 val; + TQ_INT32 length; + TQ_INT32 initial_pp, initial_mm; + + x1 = (TQ_INT32)(rect.x() - horz); + y1 = (TQ_INT32)(rect.y() - vert); + width = (TQ_INT32)(rect.width() + 2 * horz); + height = (TQ_INT32)(rect.height() + 2 * vert); x2 = x1 + width; y2 = y1 + height; @@ -227,12 +227,12 @@ void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstD break; case BLUR_RLE: - buf = new Q_INT32[MAX (width, height) * 2]; + buf = new TQ_INT32[MAX (width, height) * 2]; break; } - src = new Q_UINT8[MAX (width, height) * bytes]; - dest = new Q_UINT8[MAX (width, height) * bytes]; + src = new TQ_UINT8[MAX (width, height) * bytes]; + dest = new TQ_UINT8[MAX (width, height) * bytes]; progress = 0.0; max_progress = (horz <= 0.0 ) ? 0 : width * height * horz; @@ -256,7 +256,7 @@ void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstD case BLUR_RLE: curve = make_curve (std_dev, &length); - sum = new Q_INT32[2 * length + 1]; + sum = new TQ_INT32[2 * length + 1]; sum[0] = 0; @@ -382,7 +382,7 @@ void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstD dstDev->writeBytes(dest, col + x1, y1, 1, height); progress += height * vert; - if ((col % 5) == 0) emit notifyProgress( (Q_UINT32)((progress * 100) / max_progress)); + if ((col % 5) == 0) emit notifyProgress( (TQ_UINT32)((progress * 100) / max_progress)); } } @@ -406,7 +406,7 @@ void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstD case BLUR_RLE: curve = make_curve (std_dev, &length); - sum = new Q_INT32[2 * length + 1]; + sum = new TQ_INT32[2 * length + 1]; sum[0] = 0; @@ -535,7 +535,7 @@ void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstD progress += width * horz; //if ((row % 5) == 0) gimp_progress_update (progress / max_progress); - if ((row % 5) == 0) emit notifyProgress( (Q_UINT32)((progress * 100) / max_progress )); + if ((row % 5) == 0) emit notifyProgress( (TQ_UINT32)((progress * 100) / max_progress )); } } @@ -558,7 +558,7 @@ void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstD void KisDropshadow::find_constants (double n_p[], double n_m[], double d_p[], double d_m[], double bd_p[], double bd_m[], double std_dev) { - Q_INT32 i; + TQ_INT32 i; double constants [8]; double div; @@ -637,10 +637,10 @@ void KisDropshadow::find_constants (double n_p[], double n_m[], double d_p[], do } -void KisDropshadow::transfer_pixels (double *src1, double *src2, Q_UINT8 *dest, Q_INT32 bytes, Q_INT32 width) +void KisDropshadow::transfer_pixels (double *src1, double *src2, TQ_UINT8 *dest, TQ_INT32 bytes, TQ_INT32 width) { - Q_INT32 b; - Q_INT32 bend = bytes * width; + TQ_INT32 b; + TQ_INT32 bend = bytes * width; double sum; for(b = 0; b < bend; b++) @@ -649,12 +649,12 @@ void KisDropshadow::transfer_pixels (double *src1, double *src2, Q_UINT8 *dest, if (sum > 255) sum = 255; else if(sum < 0) sum = 0; - *dest++ = (Q_UINT8) sum; + *dest++ = (TQ_UINT8) sum; } } //The equations: g(r) = exp (- r^2 / (2 * sigma^2)), r = sqrt (x^2 + y ^2) -Q_INT32 * KisDropshadow::make_curve(double sigma, Q_INT32 *length) +TQ_INT32 * KisDropshadow::make_curve(double sigma, TQ_INT32 *length) { int *curve; double sigma2; @@ -669,7 +669,7 @@ Q_INT32 * KisDropshadow::make_curve(double sigma, Q_INT32 *length) if ((n % 2) == 0) n += 1; - curve = new Q_INT32[n]; + curve = new TQ_INT32[n]; *length = n / 2; curve += *length; @@ -677,7 +677,7 @@ Q_INT32 * KisDropshadow::make_curve(double sigma, Q_INT32 *length) for (i = 1; i <= *length; i++) { - temp = (Q_INT32) (exp (- (i * i) / sigma2) * 255); + temp = (TQ_INT32) (exp (- (i * i) / sigma2) * 255); curve[-i] = temp; curve[i] = temp; } @@ -685,12 +685,12 @@ Q_INT32 * KisDropshadow::make_curve(double sigma, Q_INT32 *length) return curve; } -void KisDropshadow::run_length_encode (Q_UINT8 *src, Q_INT32 *dest, Q_INT32 bytes, Q_INT32 width) +void KisDropshadow::run_length_encode (TQ_UINT8 *src, TQ_INT32 *dest, TQ_INT32 bytes, TQ_INT32 width) { - Q_INT32 start; - Q_INT32 i; - Q_INT32 j; - Q_UINT8 last; + TQ_INT32 start; + TQ_INT32 i; + TQ_INT32 j; + TQ_UINT8 last; last = *src; src += bytes; @@ -718,9 +718,9 @@ void KisDropshadow::run_length_encode (Q_UINT8 *src, Q_INT32 *dest, Q_INT32 byte } } -void KisDropshadow::multiply_alpha (Q_UINT8 *buf, Q_INT32 width, Q_INT32 bytes) +void KisDropshadow::multiply_alpha (TQ_UINT8 *buf, TQ_INT32 width, TQ_INT32 bytes) { - Q_INT32 i, j; + TQ_INT32 i, j; double alpha; for (i = 0; i < width * bytes; i += bytes) @@ -728,17 +728,17 @@ void KisDropshadow::multiply_alpha (Q_UINT8 *buf, Q_INT32 width, Q_INT32 bytes) alpha = buf[i + bytes - 1] * (1.0 / 255.0); for (j = 0; j < bytes - 1; j++) { double a = (double)(buf[i + j]) * alpha; - buf[i + j] = (Q_UINT8)a; + buf[i + j] = (TQ_UINT8)a; } } } -void KisDropshadow::separate_alpha (Q_UINT8 *buf, Q_INT32 width, Q_INT32 bytes) +void KisDropshadow::separate_alpha (TQ_UINT8 *buf, TQ_INT32 width, TQ_INT32 bytes) { - Q_INT32 i, j; - Q_UINT8 alpha; + TQ_INT32 i, j; + TQ_UINT8 alpha; double recip_alpha; - Q_UINT32 new_val; + TQ_UINT32 new_val; for (i = 0; i < width * bytes; i += bytes) { @@ -748,7 +748,7 @@ void KisDropshadow::separate_alpha (Q_UINT8 *buf, Q_INT32 width, Q_INT32 bytes) recip_alpha = 255.0 / alpha; for (j = 0; j < bytes - 1; j++) { - new_val = (Q_UINT32)(buf[i + j] * recip_alpha); + new_val = (TQ_UINT32)(buf[i + j] * recip_alpha); buf[i + j] = MIN (255, new_val); } } diff --git a/krita/plugins/viewplugins/dropshadow/kis_dropshadow.h b/krita/plugins/viewplugins/dropshadow/kis_dropshadow.h index 3aca424f..94c6decc 100644 --- a/krita/plugins/viewplugins/dropshadow/kis_dropshadow.h +++ b/krita/plugins/viewplugins/dropshadow/kis_dropshadow.h @@ -31,36 +31,37 @@ typedef enum } BlurMethod; -class QColor; +class TQColor; class KisView; class KisProgressDisplayInterface; class KisDropshadow : public KisProgressSubject { Q_OBJECT + TQ_OBJECT public: KisDropshadow(KisView * view); virtual ~KisDropshadow() {}; - void dropshadow(KisProgressDisplayInterface * progress, Q_INT32 xoffset, Q_INT32 yoffset, Q_INT32 blurradius, QColor color, Q_UINT8 opacity, bool allowResize); + void dropshadow(KisProgressDisplayInterface * progress, TQ_INT32 xoffset, TQ_INT32 yoffset, TQ_INT32 blurradius, TQColor color, TQ_UINT8 opacity, bool allowResize); public: // Implement KisProgressSubject virtual void cancel() { m_cancelRequested = true; } private: void gaussianblur (KisPaintDeviceSP src, KisPaintDeviceSP dst, - QRect& rect, double horz, double vert, + TQRect& rect, double horz, double vert, BlurMethod method, KisProgressDisplayInterface * progressDisplay); //gaussian blur helper functions void find_constants(double n_p[], double n_m[], double d_p[], double d_m[], double bd_p[], double bd_m[], double std_dev); - void transfer_pixels(double *src1, double *src2, Q_UINT8 *dest, Q_INT32 bytes, Q_INT32 width); - Q_INT32* make_curve(double sigma, Q_INT32 *length); - void run_length_encode (Q_UINT8 *src, Q_INT32 *dest, Q_INT32 bytes, Q_INT32 width); - void multiply_alpha (Q_UINT8 *buf, Q_INT32 width, Q_INT32 bytes); - void separate_alpha (Q_UINT8 *buf, Q_INT32 width, Q_INT32 bytes); + void transfer_pixels(double *src1, double *src2, TQ_UINT8 *dest, TQ_INT32 bytes, TQ_INT32 width); + TQ_INT32* make_curve(double sigma, TQ_INT32 *length); + void run_length_encode (TQ_UINT8 *src, TQ_INT32 *dest, TQ_INT32 bytes, TQ_INT32 width); + void multiply_alpha (TQ_UINT8 *buf, TQ_INT32 width, TQ_INT32 bytes); + void separate_alpha (TQ_UINT8 *buf, TQ_INT32 width, TQ_INT32 bytes); private: KisView * m_view; diff --git a/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc b/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc index efe01a95..eabbe0f1 100644 --- a/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc +++ b/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc @@ -39,16 +39,16 @@ K_EXPORT_COMPONENT_FACTORY( kritadropshadow, KGenericFactory<KisDropshadowPlugin>( "krita" ) ) -KisDropshadowPlugin::KisDropshadowPlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KisDropshadowPlugin::KisDropshadowPlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) { + if ( tqparent->inherits("KisView") ) { setInstance(KGenericFactory<KisDropshadowPlugin>::instance()); setXMLFile(locate("data","kritaplugins/dropshadow.rc"), true); - m_view = (KisView*) parent; - (void) new KAction(i18n("Add Drop Shadow..."), 0, 0, this, SLOT(slotDropshadow()), actionCollection(), "dropshadow"); + m_view = (KisView*) tqparent; + (void) new KAction(i18n("Add Drop Shadow..."), 0, 0, this, TQT_SLOT(slotDropshadow()), actionCollection(), "dropshadow"); } } @@ -71,7 +71,7 @@ void KisDropshadowPlugin::slotDropshadow() dlgDropshadow->setCaption(i18n("Drop Shadow")); - if (dlgDropshadow->exec() == QDialog::Accepted) { + if (dlgDropshadow->exec() == TQDialog::Accepted) { KisDropshadow dropshadow(m_view); dropshadow.dropshadow(m_view->canvasSubject()->progressDisplay(), diff --git a/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h b/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h index fd64acdb..fc888dfb 100644 --- a/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h +++ b/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h @@ -29,8 +29,9 @@ class KisView; class KisDropshadowPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KisDropshadowPlugin(QObject *parent, const char *name, const QStringList &); + KisDropshadowPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KisDropshadowPlugin(); private slots: diff --git a/krita/plugins/viewplugins/dropshadow/wdg_dropshadow.ui b/krita/plugins/viewplugins/dropshadow/wdg_dropshadow.ui index d78999c8..4bd2f38c 100644 --- a/krita/plugins/viewplugins/dropshadow/wdg_dropshadow.ui +++ b/krita/plugins/viewplugins/dropshadow/wdg_dropshadow.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgDropshadow</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgDropshadow</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -24,7 +24,7 @@ <string>Offset X:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -32,7 +32,7 @@ <string>Offset Y:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -40,7 +40,7 @@ <string>Blur radius:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -48,7 +48,7 @@ <string>Color:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -56,7 +56,7 @@ <string>Opacity:</string> </property> </widget> - <widget class="QSlider" row="4" column="1" rowspan="1" colspan="2"> + <widget class="TQSlider" row="4" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>opacitySlider</cstring> </property> @@ -70,7 +70,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QSpinBox" row="4" column="3"> + <widget class="TQSpinBox" row="4" column="3"> <property name="name"> <cstring>opacitySpinBox</cstring> </property> @@ -84,7 +84,7 @@ <number>80</number> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>allowResizingCheckBox</cstring> </property> @@ -95,7 +95,7 @@ <bool>true</bool> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>xOffsetSpinBox</cstring> </property> @@ -116,14 +116,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>200</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>yOffsetSpinBox</cstring> </property> @@ -144,14 +144,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>200</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>blurRadiusSpinBox</cstring> </property> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>190</width> <height>20</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>120</width> <height>31</height> @@ -228,7 +228,7 @@ <tabstop>opacitySpinBox</tabstop> <tabstop>allowResizingCheckBox</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/krita/plugins/viewplugins/filtersgallery/filters_gallery.cc b/krita/plugins/viewplugins/filtersgallery/filters_gallery.cc index f0849807..a6d2d6d9 100644 --- a/krita/plugins/viewplugins/filtersgallery/filters_gallery.cc +++ b/krita/plugins/viewplugins/filtersgallery/filters_gallery.cc @@ -21,7 +21,7 @@ #include "filters_gallery.h" -#include <qapplication.h> +#include <tqapplication.h> #include <kdebug.h> #include <kgenericfactory.h> @@ -48,25 +48,25 @@ namespace FiltersGallery { typedef KGenericFactory<KritaFiltersGallery> KritaFiltersGalleryFactory; K_EXPORT_COMPONENT_FACTORY( kritafiltersgallery, KritaFiltersGalleryFactory( "krita" ) ) -KritaFiltersGallery::KritaFiltersGallery(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaFiltersGallery::KritaFiltersGallery(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(KritaFiltersGallery::instance()); setXMLFile(locate("data","kritaplugins/kritafiltersgallery.rc"), true); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; - (void) new KAction(i18n("&Filters Gallery"), 0, 0, this, SLOT(showFiltersGalleryDialog()), actionCollection(), "krita_filters_gallery"); + (void) new KAction(i18n("&Filters Gallery"), 0, 0, this, TQT_SLOT(showFiltersGalleryDialog()), actionCollection(), "krita_filters_gallery"); // Add a docker with the list of filters -// QImage img; +// TQImage img; // if(img.load(locate("data","krita/images/previewfilter.png"))) // { // KisPaintDeviceSP preview = new KisPaintDevice(KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA",""),"")); -// preview->convertFromQImage(img,""); +// preview->convertFromTQImage(img,""); // m_view->canvasSubject()->paletteManager()->addWidget(new KisFiltersListView(preview,m_view),"filterslist",krita::EFFECTSBOX, 0); // } @@ -84,7 +84,7 @@ void KritaFiltersGallery::showFiltersGalleryDialog() KisDlgFiltersGallery dlg(m_view, m_view); if (dlg.exec()) { - QApplication::setOverrideCursor( Qt::waitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); KisFilter* filter = dlg.currentFilter(); if(filter ) @@ -94,13 +94,13 @@ void KritaFiltersGallery::showFiltersGalleryDialog() KisPaintDeviceSP dev = img->activeDevice(); if (!dev) return; - QRect r1 = dev->exactBounds(); - QRect r2 = img->bounds(); + TQRect r1 = dev->exactBounds(); + TQRect r2 = img->bounds(); - QRect rect = r1.intersect(r2); + TQRect rect = r1.intersect(r2); if (dev->hasSelection()) { - QRect r3 = dev->selection()->selectedExactRect(); + TQRect r3 = dev->selection()->selectedExactRect(); rect = rect.intersect(r3); } KisFilterConfiguration* config = filter->configuration( dlg.currentConfigWidget()); @@ -125,7 +125,7 @@ void KritaFiltersGallery::showFiltersGalleryDialog() delete cmd; } filter->disableProgress(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } } diff --git a/krita/plugins/viewplugins/filtersgallery/filters_gallery.h b/krita/plugins/viewplugins/filtersgallery/filters_gallery.h index 0e45e582..6be60d94 100644 --- a/krita/plugins/viewplugins/filtersgallery/filters_gallery.h +++ b/krita/plugins/viewplugins/filtersgallery/filters_gallery.h @@ -32,8 +32,9 @@ namespace FiltersGallery { class KritaFiltersGallery : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KritaFiltersGallery(QObject *parent, const char *name, const QStringList &); + KritaFiltersGallery(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaFiltersGallery(); public slots: void showFiltersGalleryDialog(); diff --git a/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc index bb7c20ee..8269ee57 100644 --- a/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc +++ b/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc @@ -21,10 +21,10 @@ */ #include "kis_dlg_filtersgallery.h" -#include <qgroupbox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qdatetime.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqdatetime.h> #include <kis_filter.h> #include <kis_filter_config_widget.h> @@ -43,8 +43,8 @@ namespace Plugins { namespace FiltersGallery { -KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, QWidget* parent,const char *name) - : KDialogBase(parent,name, true,i18n("Filters Gallery"), Ok | Cancel), m_view(view),m_currentConfigWidget(0), m_currentFilter(0) +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) { // Initialize main widget m_widget = new KisWdgFiltersGallery(this); @@ -53,21 +53,21 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, QWidget* parent,const setMainWidget(m_widget); // Initialize filters list - connect(m_widget->filtersList , SIGNAL(selectionChanged(QIconViewItem*)), this, SLOT(selectionHasChanged(QIconViewItem* ))); + connect(m_widget->filtersList , TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(selectionHasChanged(TQIconViewItem* ))); // Initialize configWidgetHolder m_widget->configWidgetHolder->setColumnLayout ( 0, Qt::Horizontal ); - //m_widget->configWidgetHolder->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); + //m_widget->configWidgetHolder->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); // Initialize preview widget if (m_view->canvasSubject()->currentImg() && m_view->canvasSubject()->currentImg()->activeDevice()) { m_widget->previewWidget->slotSetDevice( m_view->canvasSubject()->currentImg()->activeDevice().data() ); } - connect( m_widget->previewWidget, SIGNAL(updated()), this, SLOT(refreshPreview())); - resize( minimumSizeHint()); - m_widget->previewWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding); - m_labelNoCW = new QLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder); - m_widget->configWidgetHolder->layout()->add(m_labelNoCW); + connect( m_widget->previewWidget, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); + resize( tqminimumSizeHint()); + m_widget->previewWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); + m_labelNoCW = new TQLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder); + m_widget->configWidgetHolder->tqlayout()->add(m_labelNoCW); m_labelNoCW->hide(); } @@ -75,13 +75,13 @@ KisDlgFiltersGallery::~KisDlgFiltersGallery() { } -void KisDlgFiltersGallery::selectionHasChanged ( QIconViewItem * item ) +void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item ) { KisFiltersIconViewItem* kisitem = (KisFiltersIconViewItem*) item; m_currentFilter = kisitem->filter(); if(m_currentConfigWidget != 0) { - m_widget->configWidgetHolder->layout()->remove(m_currentConfigWidget); + m_widget->configWidgetHolder->tqlayout()->remove(m_currentConfigWidget); delete m_currentConfigWidget; m_currentConfigWidget = 0; } else { @@ -94,10 +94,10 @@ void KisDlgFiltersGallery::selectionHasChanged ( QIconViewItem * item ) m_currentConfigWidget = m_currentFilter->createConfigurationWidget(m_widget->configWidgetHolder, activeLayer->paintDevice()); if(m_currentConfigWidget != 0) { - //m_currentConfigWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - m_widget->configWidgetHolder->layout()->add(m_currentConfigWidget); + //m_currentConfigWidget->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_widget->configWidgetHolder->tqlayout()->add(m_currentConfigWidget); m_currentConfigWidget->show(); - connect(m_currentConfigWidget, SIGNAL(sigPleaseUpdatePreview()), this, SLOT(slotConfigChanged())); + connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); } else { m_labelNoCW->show(); diff --git a/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h b/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h index a6a216ca..258311c0 100644 --- a/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h +++ b/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h @@ -26,9 +26,9 @@ class KisView; class KisFilter; -class QIconViewItem; -class QLabel; -class QHBoxLayout; +class TQIconViewItem; +class TQLabel; +class TQHBoxLayout; class KisPreviewWidget; class KisWdgFiltersGallery; class KisFiltersListView; @@ -43,22 +43,23 @@ namespace FiltersGallery { class KisDlgFiltersGallery : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KisDlgFiltersGallery(KisView* view, QWidget* parent,const char *name = ""); + KisDlgFiltersGallery(KisView* view, TQWidget* tqparent,const char *name = ""); ~KisDlgFiltersGallery(); public: inline KisFilter* currentFilter() { return m_currentFilter; }; - inline QWidget* currentConfigWidget() { return m_currentConfigWidget; } + inline TQWidget* currentConfigWidget() { return m_currentConfigWidget; } private slots: void slotConfigChanged(); void refreshPreview(); - void selectionHasChanged ( QIconViewItem * item ); + void selectionHasChanged ( TQIconViewItem * item ); private: KisWdgFiltersGallery* m_widget; KisView* m_view; - QWidget* m_currentConfigWidget; + TQWidget* m_currentConfigWidget; KisFilter* m_currentFilter; - QLabel* m_labelNoCW; + TQLabel* m_labelNoCW; }; } diff --git a/krita/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui b/krita/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui index 35553294..488c9564 100644 --- a/krita/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui +++ b/krita/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KisWdgFiltersGallery</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KisWdgFiltersGallery</cstring> </property> @@ -37,7 +37,7 @@ <cstring>filtersList</cstring> </property> </widget> - <widget class="QGroupBox" row="0" column="2"> + <widget class="TQGroupBox" row="0" column="2"> <property name="name"> <cstring>configWidgetHolder</cstring> </property> @@ -49,7 +49,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -115,7 +115,7 @@ <data format="PNG" length="1122">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042949444154388db5954d6c545514c77ff7de37eff1a6a550da994e5ba798868f948fc847a2a2911816c436b0a02ed0083161a1981877ee10d90aa94656063491882c5cd4c4b8103f20cd806909a98604da8482341de80cb69de9bcd799799d79efba980f1da3a80b4f727273939bdff99f9b93f3175a6b6a21849080020c4002a29a8f0a5dcd002803bed63a1035f0d0d0504b6f6fef51d7758fa4d3e98d8ee3fc03af128ee3303939399548242eb8aefb09300f78464de9f0f0f0d148cc7caf3d5424de97a7ec17104220242805520a44557bbd4b21f083801d33e63a6d1bc7bf19c6064e0319a35a58b9ae7ba43d54e4d7c54b64dc097c7f09d30ef04b36736983cc7c11b4456b9b492c5e20dc54a6540e00896a8268a7017010f8bcae1830d2e9f4c69ebe3c197782b2ce60d94ddc9b30f9feeb45ae5d7181c5ead35636ef08d3ffe26a76ee3208b4031a56d80aa00768fda362e9380e25bf80ef3b587613d7afc099533380a4b5dda46fcb5aa42998b9eb7173dce5e6788e434763ec7fc942532008ea436003660d2caa7f8d69c3bd8910674e4d033e83877ad8d36fb0aa4d6058658ac5358c5df6383bf480f31fdda5a3632bbbfb6da4ccd5c00a10b2012cc12fd97cfb5516f0187c25cee0619396480ec3ca909d0f3372d1e5f9fe66de3ad605587c712ec55256a2540d5519d19ae24a29057329839f7ecc138944d833102290f3184ae1e6d6f0e98739c61229e6d21eafbed1c9c8c5558c8f3ee4ceed76946a1c43d97091828585223e2eebfbc295f60d45de89707628cb58224577bc85a79e5d4d786581cddb9b0148259711b20145836221400416e0232d1f6595c9ce4538773ac7b54406f0b15784e8e80aa1ac2594190220d021e49f2437960156b70ba095e95f96f18acd8c263cc6122962b1167a7ba34cdd7ec8c977a699bed546722a8fc2a02b6e2185fff78ab586ce78894ddb9ab9f5738ed14b1e030756929d8ff2e4ae5544632b38f96e89a99b298ebd6950cc2d12ed0eb3618b26f520788462ad09877df60db600f0f1fb49c646f21c7ebd836dcf94e9d9b4c0db27d6d3bd36c6426a96bce731703046d7da129a4670836284a054869d4f1b1c7e2dca67676ef3c1898091ef5ad8bc358c3205c93bf7c9a40ad4c660f4728edd7bbb3142ea2fc1da711cfc200011e08b45f6bd1c261adbce9717928c5f9d63fc6a19f0014567773303073790f8214bd6f5282dfbb8b9fa1f6b40d7c1939393533b92e63ad9240990484aec7e41b27d579cbb531e0f67023492d86316ebb768ba1e0f786e6f37e56550c62237aee7011e54abd7c1412291b8a06de378b4d3c0b215da9708e5a3a442192085404a83d4accfecac067c0c43e13a70e3fa12e96409e0325000966bbb354465339d04a6f9dd15fe6dde07ce030780278088d05ad72cc9a6b2f2daaaa74d75a1f0e8d0d5f60b40868a8364ead6248430000b0857a126ffcdf396abf03ce089ffcb4c7f033046c6b4a995e7a00000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kis_previewwidget.h</includehint> <includehint>kis_filters_listview.h</includehint> diff --git a/krita/plugins/viewplugins/histogram/dlg_histogram.cc b/krita/plugins/viewplugins/histogram/dlg_histogram.cc index 0440c9db..fe27b257 100644 --- a/krita/plugins/viewplugins/histogram/dlg_histogram.cc +++ b/krita/plugins/viewplugins/histogram/dlg_histogram.cc @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qbuttongroup.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qslider.h> -#include <qcombobox.h> -#include <qpixmap.h> -#include <qimage.h> -#include <qlabel.h> +#include <tqbuttongroup.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqslider.h> +#include <tqcombobox.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqlabel.h> #include <knuminput.h> #include <klocale.h> @@ -39,15 +39,15 @@ #include "kis_histogram_widget.h" -DlgHistogram::DlgHistogram( QWidget * parent, const char * name) - : super (parent, name, true, i18n("Histogram"), Ok | Cancel, Ok) +DlgHistogram::DlgHistogram( TQWidget * tqparent, const char * name) + : super (tqparent, name, true, i18n("Histogram"), Ok | Cancel, Ok) { m_page = new KisHistogramWidget(this, "histogram"); Q_CHECK_PTR(m_page); setCaption(i18n("Histogram")); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); } DlgHistogram::~DlgHistogram() diff --git a/krita/plugins/viewplugins/histogram/dlg_histogram.h b/krita/plugins/viewplugins/histogram/dlg_histogram.h index 790e77ef..8e3fda00 100644 --- a/krita/plugins/viewplugins/histogram/dlg_histogram.h +++ b/krita/plugins/viewplugins/histogram/dlg_histogram.h @@ -35,10 +35,11 @@ class KisHistogramWidget; class DlgHistogram: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgHistogram(QWidget * parent = 0, + DlgHistogram(TQWidget * tqparent = 0, const char* name = 0); ~DlgHistogram(); diff --git a/krita/plugins/viewplugins/histogram/histogram.cc b/krita/plugins/viewplugins/histogram/histogram.cc index 7db92dee..59ea0fff 100644 --- a/krita/plugins/viewplugins/histogram/histogram.cc +++ b/krita/plugins/viewplugins/histogram/histogram.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -52,27 +52,27 @@ typedef KGenericFactory<Histogram> HistogramFactory; K_EXPORT_COMPONENT_FACTORY( kritahistogram, HistogramFactory( "krita" ) ) -Histogram::Histogram(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +Histogram::Histogram(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) { + if ( tqparent->inherits("KisView") ) { setInstance(HistogramFactory::instance()); setXMLFile(locate("data","kritaplugins/histogram.rc"), true); - m_action = new KAction(i18n("&Histogram"), 0, 0, this, SLOT(slotActivated()), actionCollection(), "histogram"); + m_action = new KAction(i18n("&Histogram"), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "histogram"); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; if (KisImageSP img = m_view->canvasSubject()->currentImg()) { - connect(img, SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, SLOT(slotLayersChanged())); - connect(img, SIGNAL(sigLayerAdded(KisLayerSP)), this, SLOT(slotLayersChanged())); - connect(img, SIGNAL(sigLayerActivated(KisLayerSP)), this, SLOT(slotLayersChanged())); - connect(img, SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), this, SLOT(slotLayersChanged())); - connect(img, SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), - this, SLOT(slotLayersChanged())); - connect(img, SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), - this, SLOT(slotLayersChanged())); + connect(img, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQT_SLOT(slotLayersChanged())); + connect(img, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQT_SLOT(slotLayersChanged())); + connect(img, TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayersChanged())); + connect(img, TQT_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), this, TQT_SLOT(slotLayersChanged())); + connect(img, TQT_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), + this, TQT_SLOT(slotLayersChanged())); + connect(img, TQT_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), + this, TQT_SLOT(slotLayersChanged())); m_img = img; } } @@ -95,7 +95,7 @@ void Histogram::slotActivated() if (dev) dlgHistogram->setPaintDevice(dev); - if (dlgHistogram->exec() == QDialog::Accepted) { + if (dlgHistogram->exec() == TQDialog::Accepted) { // Do nothing; this is an informational dialog } delete dlgHistogram; diff --git a/krita/plugins/viewplugins/histogram/histogram.h b/krita/plugins/viewplugins/histogram/histogram.h index adaa6bfd..9cce8359 100644 --- a/krita/plugins/viewplugins/histogram/histogram.h +++ b/krita/plugins/viewplugins/histogram/histogram.h @@ -30,8 +30,9 @@ class KisImage; class Histogram : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - Histogram(QObject *parent, const char *name, const QStringList &); + Histogram(TQObject *tqparent, const char *name, const TQStringList &); virtual ~Histogram(); private slots: diff --git a/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc b/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc index 0e738435..12005e05 100644 --- a/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc +++ b/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc @@ -17,14 +17,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qpainter.h> -#include <qpixmap.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qbuttongroup.h> -#include <qpushbutton.h> -#include <qscrollbar.h> -#include <qtooltip.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqbuttongroup.h> +#include <tqpushbutton.h> +#include <tqscrollbar.h> +#include <tqtooltip.h> #include <kdebug.h> @@ -39,8 +39,8 @@ #include "kis_colorspace.h" -KisHistogramWidget::KisHistogramWidget(QWidget *parent, const char *name) - : super(parent, name) +KisHistogramWidget::KisHistogramWidget(TQWidget *tqparent, const char *name) + : super(tqparent, name) { m_from = 0.0; m_width = 0.0; @@ -72,11 +72,11 @@ void KisHistogramWidget::setPaintDevice(KisPaintDeviceSP dev) m_from = m_histogramView->currentProducer()->viewFrom(); m_width = m_histogramView->currentProducer()->viewWidth(); - connect(grpType, SIGNAL(clicked(int)), this, SLOT(slotTypeSwitched(int))); - connect(cmbChannel, SIGNAL(activated(int)), this, SLOT(setActiveChannel(int))); - connect(zoomIn, SIGNAL(clicked()), this, SLOT(slotZoomIn())); - connect(zoomOut, SIGNAL(clicked()), this, SLOT(slotZoomOut())); - connect(currentView, SIGNAL(valueChanged(int)), this, SLOT(slide(int))); + connect(grpType, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotTypeSwitched(int))); + connect(cmbChannel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setActiveChannel(int))); + connect(zoomIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomIn())); + connect(zoomOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomOut())); + connect(currentView, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slide(int))); } void KisHistogramWidget::setActiveChannel(int channel) diff --git a/krita/plugins/viewplugins/histogram/kis_histogram_widget.h b/krita/plugins/viewplugins/histogram/kis_histogram_widget.h index 84b551d8..f83394e7 100644 --- a/krita/plugins/viewplugins/histogram/kis_histogram_widget.h +++ b/krita/plugins/viewplugins/histogram/kis_histogram_widget.h @@ -30,9 +30,10 @@ class KisColorSpace; class KisHistogramWidget : public WdgHistogram { typedef WdgHistogram super; Q_OBJECT + TQ_OBJECT public: - KisHistogramWidget(QWidget *parent, const char *name); + KisHistogramWidget(TQWidget *tqparent, const char *name); virtual ~KisHistogramWidget(); void setPaintDevice(KisPaintDeviceSP dev); diff --git a/krita/plugins/viewplugins/histogram/wdghistogram.ui b/krita/plugins/viewplugins/histogram/wdghistogram.ui index e538adae..77c418ed 100644 --- a/krita/plugins/viewplugins/histogram/wdghistogram.ui +++ b/krita/plugins/viewplugins/histogram/wdghistogram.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgHistogram</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgHistogram</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>grpType</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="2"> + <widget class="TQRadioButton" row="0" column="2"> <property name="name"> <cstring>radioLinear</cstring> </property> @@ -38,7 +38,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="2" rowspan="2" colspan="1"> + <widget class="TQRadioButton" row="1" column="2" rowspan="2" colspan="1"> <property name="name"> <cstring>radioLog</cstring> </property> @@ -56,14 +56,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QComboBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQComboBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>cmbChannel</cstring> </property> @@ -75,14 +75,14 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> </size> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>lblChannel</cstring> </property> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -124,22 +124,22 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>256</width> <height>150</height> </size> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -147,7 +147,7 @@ <string>View:</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>zoomIn</cstring> </property> @@ -163,7 +163,7 @@ <string>+</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>zoomOut</cstring> </property> @@ -179,7 +179,7 @@ <string>-</string> </property> </widget> - <widget class="QScrollBar"> + <widget class="TQScrollBar"> <property name="name"> <cstring>currentView</cstring> </property> @@ -222,7 +222,7 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kis_histogram_view.h</includehint> </includehints> diff --git a/krita/plugins/viewplugins/histogram_docker/histogramdocker.cc b/krita/plugins/viewplugins/histogram_docker/histogramdocker.cc index 93d77bfb..2b458de4 100644 --- a/krita/plugins/viewplugins/histogram_docker/histogramdocker.cc +++ b/krita/plugins/viewplugins/histogram_docker/histogramdocker.cc @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qtooltip.h> +#include <tqtooltip.h> #include <klocale.h> #include <kiconloader.h> @@ -46,12 +46,12 @@ typedef KGenericFactory<KritaHistogramDocker> KritaHistogramDockerFactory; K_EXPORT_COMPONENT_FACTORY( kritahistogramdocker, KritaHistogramDockerFactory( "krita" ) ) -KritaHistogramDocker::KritaHistogramDocker(QObject *parent, const char *name, const QStringList&) - : KParts::Plugin(parent, name) +KritaHistogramDocker::KritaHistogramDocker(TQObject *tqparent, const char *name, const TQStringList&) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) { - m_view = dynamic_cast<KisView*>(parent); + if ( tqparent->inherits("KisView") ) { + m_view = dynamic_cast<KisView*>(tqparent); setInstance(KritaHistogramDockerFactory::instance()); setXMLFile(locate("data","kritaplugins/kritahistogramdocker.rc"), true); @@ -68,7 +68,7 @@ KritaHistogramDocker::KritaHistogramDocker(QObject *parent, const char *name, co m_hview = new KisHistogramView(m_view); - QToolTip::add(m_hview, i18n("Right-click to select histogram type")); + TQToolTip::add(m_hview, i18n("Right-click to select histogram type")); m_hview->setHistogram(m_histogram); m_hview->setColor(true); m_hview->setCurrentChannels(m_producer, m_producer->channels()); @@ -76,14 +76,14 @@ KritaHistogramDocker::KritaHistogramDocker(QObject *parent, const char *name, co m_hview->setCaption(i18n("Histogram")); - connect(m_hview, SIGNAL(rightClicked(const QPoint&)), - this, SLOT(popupMenu(const QPoint&))); - connect(m_cache, SIGNAL(cacheUpdated()), - new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), SLOT(updated())); - connect(&m_popup, SIGNAL(activated(int)), - this, SLOT(producerChanged(int))); - connect(img, SIGNAL(sigColorSpaceChanged(KisColorSpace*)), - this, SLOT(colorSpaceChanged(KisColorSpace*))); // No need to force updates here + connect(m_hview, TQT_SIGNAL(rightClicked(const TQPoint&)), + this, TQT_SLOT(popupMenu(const TQPoint&))); + connect(m_cache, TQT_SIGNAL(cacheUpdated()), + new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), TQT_SLOT(updated())); + connect(&m_popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(producerChanged(int))); + connect(img, TQT_SIGNAL(sigColorSpaceChanged(KisColorSpace*)), + this, TQT_SLOT(colorSpaceChanged(KisColorSpace*))); // No need to force updates here // Add it to the control palette m_view->canvasSubject()->paletteManager()->addWidget( @@ -143,12 +143,12 @@ void KritaHistogramDocker::producerChanged(int pos) m_hview->setColor(true); m_hview->setCurrentChannels(m_producer, m_producer->channels()); - connect(m_cache, SIGNAL(cacheUpdated()), - new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), SLOT(updated())); + connect(m_cache, TQT_SIGNAL(cacheUpdated()), + new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), TQT_SLOT(updated())); } } -void KritaHistogramDocker::popupMenu(const QPoint& pos) +void KritaHistogramDocker::popupMenu(const TQPoint& pos) { m_popup.popup(pos, m_currentProducerPos); } @@ -171,11 +171,11 @@ void KritaHistogramDocker::colorSpaceChanged(KisColorSpace* cs) producerChanged(0); } -HistogramDockerUpdater::HistogramDockerUpdater(QObject* /*parent*/, KisHistogramSP h, KisHistogramView* v, +HistogramDockerUpdater::HistogramDockerUpdater(TQObject* /*tqparent*/, KisHistogramSP h, KisHistogramView* v, KisAccumulatingHistogramProducer* p) : m_histogram(h), m_view(v), m_producer(p) { - connect(p, SIGNAL(completed()), this, SLOT(completed())); + connect(p, TQT_SIGNAL(completed()), this, TQT_SLOT(completed())); } void HistogramDockerUpdater::updated() { diff --git a/krita/plugins/viewplugins/histogram_docker/histogramdocker.h b/krita/plugins/viewplugins/histogram_docker/histogramdocker.h index 5cc57e18..bc023a89 100644 --- a/krita/plugins/viewplugins/histogram_docker/histogramdocker.h +++ b/krita/plugins/viewplugins/histogram_docker/histogramdocker.h @@ -21,8 +21,8 @@ #ifndef _HISTOGRAMDOCKER_H_ #define _HISTOGRAMDOCKER_H_ -#include <qobject.h> -#include <qpopupmenu.h> +#include <tqobject.h> +#include <tqpopupmenu.h> #include <kparts/plugin.h> #include <kis_histogram_view.h> @@ -39,12 +39,13 @@ class KisColorSpace; class KritaHistogramDocker : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KritaHistogramDocker(QObject *parent, const char *name, const QStringList &); + KritaHistogramDocker(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaHistogramDocker(); private slots: void producerChanged(int pos); - void popupMenu(const QPoint & pos); + void popupMenu(const TQPoint & pos); void colorSpaceChanged(KisColorSpace* cs); private: KisHistogramProducerFactory* m_factory; @@ -54,17 +55,18 @@ private: KisView* m_view; KisHistogramView* m_hview; KisImageRasteredCache* m_cache; - QPopupMenu m_popup; + TQPopupMenu m_popup; KisHistogramSP m_histogram; uint m_currentProducerPos; }; class KisGenericRGBHistogramProducerFactory; -class HistogramDockerUpdater : public QObject { +class HistogramDockerUpdater : public TQObject { Q_OBJECT + TQ_OBJECT public: - HistogramDockerUpdater(QObject* parent, KisHistogramSP h, KisHistogramView* v, + HistogramDockerUpdater(TQObject* tqparent, KisHistogramSP h, KisHistogramView* v, KisAccumulatingHistogramProducer* p); public slots: void updated(); diff --git a/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc b/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc index f899f2af..dd315549 100644 --- a/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc +++ b/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc @@ -18,20 +18,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qthread.h> -#include <qapplication.h> -#include <qevent.h> +#include <tqthread.h> +#include <tqapplication.h> +#include <tqevent.h> #include "kis_accumulating_producer.h" -static const int EmitCompletedType = QEvent::User + 1; +static const int EmitCompletedType = TQEvent::User + 1; /** * The threaded producer definition in c++ file because this is really an internal affair. * Note that since we _know_ that we'll only have a single instance of it running, at most, * we don't care too much about locking and synchronization **/ -class KisAccumulatingHistogramProducer::ThreadedProducer : public QThread { +class KisAccumulatingHistogramProducer::ThreadedProducer : public TQThread { KisAccumulatingHistogramProducer* m_source; bool m_stop; protected: @@ -71,7 +71,7 @@ void KisAccumulatingHistogramProducer::ThreadedProducer::run() { uint count = m_source->m_source->count(); // Talk about bad naming schemes... KisCachedHistogramObserver::Producers* source = m_source->m_source; - QValueVector<vBins>& bins = m_source->m_bins; + TQValueVector<vBins>& bins = m_source->m_bins; int channels = m_source->m_channels; int nrOfBins = m_source->m_nrOfBins; @@ -88,11 +88,11 @@ void KisAccumulatingHistogramProducer::ThreadedProducer::run() { if (!m_stop) { // This function is thread-safe; and it takes ownership of the event - QApplication::postEvent(m_source, new QCustomEvent(EmitCompletedType)); + TQApplication::postEvent(m_source, new TQCustomEvent(EmitCompletedType)); } } -void KisAccumulatingHistogramProducer::customEvent(QCustomEvent* e) { +void KisAccumulatingHistogramProducer::customEvent(TQCustomEvent* e) { if (e->type() == EmitCompletedType) { emit completed(); } diff --git a/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.h b/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.h index 4ef9f02a..46a0717d 100644 --- a/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.h +++ b/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.h @@ -21,7 +21,7 @@ #ifndef _KIS_ACCUMULATING_PRODUCER_H_ #define _KIS_ACCUMULATING_PRODUCER_H_ -#include <qobject.h> +#include <tqobject.h> #include <kis_basic_histogram_producers.h> #include "kis_cachedhistogram.h" @@ -34,23 +34,24 @@ * of HistogramProducers if you'd take addRegionsToBinAsync = addRegionToBin, but since that is * already violated with the asynchronousity of it that is not really an issue anymore, I think) **/ -class KisAccumulatingHistogramProducer : public QObject, public KisBasicHistogramProducer { +class KisAccumulatingHistogramProducer : public TQObject, public KisBasicHistogramProducer { Q_OBJECT + TQ_OBJECT public: KisAccumulatingHistogramProducer(KisCachedHistogramObserver::Producers* source); ~KisAccumulatingHistogramProducer(); /// Does _nothing_, use addRegionsToBinAsync - virtual void addRegionToBin(Q_UINT8 *, Q_UINT8*, Q_UINT32, KisColorSpace *) {} + virtual void addRegionToBin(TQ_UINT8 *, TQ_UINT8*, TQ_UINT32, KisColorSpace *) {} virtual void addRegionsToBinAsync(); - virtual QString positionToString(double pos) const + virtual TQString positionToString(double pos) const { return m_source->at(0)->positionToString(pos); } virtual void setView(double, double) {} // No view support virtual double maximalZoom() const { return 1.0; } - virtual Q_INT32 numberOfBins() { return m_source->at(0)->numberOfBins(); } + virtual TQ_INT32 numberOfBins() { return m_source->at(0)->numberOfBins(); } - virtual QValueVector<KisChannelInfo *> channels() { return m_source->at(0)->channels(); } + virtual TQValueVector<KisChannelInfo *> channels() { return m_source->at(0)->channels(); } /// Call this when the 'source' list has changed colorspace virtual void changedSourceProducer() { @@ -63,7 +64,7 @@ signals: void completed(); protected: - virtual void customEvent(QCustomEvent* e); + virtual void customEvent(TQCustomEvent* e); /// source already converts external to internal virtual int externalToInternal(int ext) { return ext; } KisCachedHistogramObserver::Producers* m_source; diff --git a/krita/plugins/viewplugins/histogram_docker/kis_cachedhistogram.h b/krita/plugins/viewplugins/histogram_docker/kis_cachedhistogram.h index dfe7a05e..a9b38a4a 100644 --- a/krita/plugins/viewplugins/histogram_docker/kis_cachedhistogram.h +++ b/krita/plugins/viewplugins/histogram_docker/kis_cachedhistogram.h @@ -21,14 +21,14 @@ #ifndef _CACHED_HISTOGRAM_H_ #define _CACHED_HISTOGRAM_H_ -#include <qvaluevector.h> +#include <tqvaluevector.h> #include <kis_histogram_producer.h> #include "kis_imagerasteredcache.h" class KisCachedHistogramObserver : public KisImageRasteredCache::Observer { public: - typedef QValueVector<KisHistogramProducer*> Producers; + typedef TQValueVector<KisHistogramProducer*> Producers; KisCachedHistogramObserver(Producers* p, KisHistogramProducerFactory* f, int x, int y, int w, int h, bool add = true) : m_producers(p), m_factory(f), m_x(x), m_y(y), m_w(w), m_h(h) diff --git a/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cc b/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cc index 2c6562df..19599cd9 100644 --- a/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cc +++ b/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cc @@ -20,7 +20,7 @@ #include <cmath> -#include <qapplication.h> +#include <tqapplication.h> #include <kdebug.h> @@ -47,21 +47,21 @@ KisImageRasteredCache::KisImageRasteredCache(KisView* view, Observer* o) imageSizeChanged(img->width(), img->height()); - connect(img, SIGNAL(sigImageUpdated(QRect)), - this, SLOT(imageUpdated(QRect))); - connect(img, SIGNAL(sigSizeChanged(Q_INT32, Q_INT32)), - this, SLOT(imageSizeChanged(Q_INT32, Q_INT32))); - connect(&m_timer, SIGNAL(timeout()), this, SLOT(timeOut())); + connect(img, TQT_SIGNAL(sigImageUpdated(TQRect)), + this, TQT_SLOT(imageUpdated(TQRect))); + connect(img, TQT_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), + this, TQT_SLOT(imageSizeChanged(TQ_INT32, TQ_INT32))); + connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeOut())); } KisImageRasteredCache::~KisImageRasteredCache() { cleanUpElements(); } -void KisImageRasteredCache::imageUpdated(QRect rc) { +void KisImageRasteredCache::imageUpdated(TQRect rc) { if (rc.isValid()) { - QRect r(0, 0, m_width * m_rasterSize, m_height * m_rasterSize); + TQRect r(0, 0, m_width * m_rasterSize, m_height * m_rasterSize); r &= rc; uint x = static_cast<int>(r.x() / m_rasterSize); @@ -93,7 +93,7 @@ void KisImageRasteredCache::imageUpdated(QRect rc) { } } -void KisImageRasteredCache::imageSizeChanged(Q_INT32 w, Q_INT32 h) { +void KisImageRasteredCache::imageSizeChanged(TQ_INT32 w, TQ_INT32 h) { KisImageSP image = m_view->canvasSubject()->currentImg(); @@ -120,7 +120,7 @@ void KisImageRasteredCache::imageSizeChanged(Q_INT32 w, Q_INT32 h) { rasterX++; } - imageUpdated(QRect(0,0, image->width(), image->height())); + imageUpdated(TQRect(0,0, image->width(), image->height())); } void KisImageRasteredCache::timeOut() { @@ -140,7 +140,7 @@ void KisImageRasteredCache::timeOut() { // If there are still elements, we need to be called again (this emulates processEvents) if (!m_queue.isEmpty()) { - QTimer::singleShot(0, this, SLOT(timeOut())); + TQTimer::singleShot(0, this, TQT_SLOT(timeOut())); } else { emit cacheUpdated(); m_imageProjection = 0; diff --git a/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.h b/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.h index 6335eadb..7df7df8f 100644 --- a/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.h +++ b/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.h @@ -21,17 +21,18 @@ #ifndef _KIS_IMAGE_RASTERED_CACHE_H_ #define _KIS_IMAGE_RASTERED_CACHE_H_ -#include <qobject.h> -#include <qvaluevector.h> -#include <qvaluelist.h> -#include <qtimer.h> +#include <tqobject.h> +#include <tqvaluevector.h> +#include <tqvaluelist.h> +#include <tqtimer.h> #include <kis_paint_device.h> class KisView; -class KisImageRasteredCache : public QObject { +class KisImageRasteredCache : public TQObject { Q_OBJECT + TQ_OBJECT public: class Observer { @@ -48,8 +49,8 @@ signals: void cacheUpdated(); private slots: - void imageUpdated(QRect rc); - void imageSizeChanged(Q_INT32 w, Q_INT32 h); + void imageUpdated(TQRect rc); + void imageSizeChanged(TQ_INT32 w, TQ_INT32 h); void timeOut(); private: @@ -59,15 +60,15 @@ private: Observer* observer; bool valid; }; - typedef QValueVector< QValueVector<Element*> > Raster; - typedef QValueList<Element*> Queue; + typedef TQValueVector< TQValueVector<Element*> > Raster; + typedef TQValueList<Element*> Queue; void cleanUpElements(); Observer* m_observer; Raster m_raster; Queue m_queue; - QTimer m_timer; + TQTimer m_timer; int m_timeOutMSec; int m_rasterSize; int m_width, m_height; diff --git a/krita/plugins/viewplugins/history_docker/historydocker.cc b/krita/plugins/viewplugins/history_docker/historydocker.cc index 20b1d013..69b952ea 100644 --- a/krita/plugins/viewplugins/history_docker/historydocker.cc +++ b/krita/plugins/viewplugins/history_docker/historydocker.cc @@ -37,13 +37,13 @@ typedef KGenericFactory<KritaHistoryDocker> KritaHistoryDockerFactory; K_EXPORT_COMPONENT_FACTORY( kritahistorydocker, KritaHistoryDockerFactory( "krita" ) ) -KritaHistoryDocker::KritaHistoryDocker(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaHistoryDocker::KritaHistoryDocker(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(KritaHistoryDockerFactory::instance()); // Create history docker diff --git a/krita/plugins/viewplugins/history_docker/historydocker.h b/krita/plugins/viewplugins/history_docker/historydocker.h index 8556d37c..922bb52e 100644 --- a/krita/plugins/viewplugins/history_docker/historydocker.h +++ b/krita/plugins/viewplugins/history_docker/historydocker.h @@ -26,7 +26,7 @@ class KritaHistoryDocker : public KParts::Plugin { public: - KritaHistoryDocker(QObject *parent, const char *name, const QStringList &); + KritaHistoryDocker(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaHistoryDocker(); }; diff --git a/krita/plugins/viewplugins/imagesize/dlg_imagesize.cc b/krita/plugins/viewplugins/imagesize/dlg_imagesize.cc index 9a641b94..ac3a1b11 100644 --- a/krita/plugins/viewplugins/imagesize/dlg_imagesize.cc +++ b/krita/plugins/viewplugins/imagesize/dlg_imagesize.cc @@ -26,11 +26,11 @@ using namespace std; -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <klocale.h> #include <knuminput.h> @@ -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( QWidget * parent, +DlgImageSize::DlgImageSize( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Image Size"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Image Size"), Ok | Cancel, Ok) { m_lock = false; @@ -58,13 +58,13 @@ DlgImageSize::DlgImageSize( QWidget * parent, m_page->cmbFilterType->setCurrentText("Mitchell"); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); unblockAll(); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } @@ -78,7 +78,7 @@ void DlgImageSize::hideScaleBox() m_page->grpResizeScale->hide(); } -void DlgImageSize::setWidth(Q_UINT32 w) +void DlgImageSize::setWidth(TQ_UINT32 w) { blockAll(); @@ -90,7 +90,7 @@ void DlgImageSize::setWidth(Q_UINT32 w) unblockAll(); } -void DlgImageSize::setWidthPercent(Q_UINT32 w) +void DlgImageSize::setWidthPercent(TQ_UINT32 w) { blockAll(); @@ -101,19 +101,19 @@ void DlgImageSize::setWidthPercent(Q_UINT32 w) } -void DlgImageSize::setMaximumWidth(Q_UINT32 w) +void DlgImageSize::setMaximumWidth(TQ_UINT32 w) { m_page->intWidth->setMaxValue(w); m_maxW = w; } -Q_INT32 DlgImageSize::width() +TQ_INT32 DlgImageSize::width() { - //return (Q_INT32)qRound(m_oldW); - return (Q_INT32)qRound(m_page->intWidth->value()); + //return (TQ_INT32)tqRound(m_oldW); + return (TQ_INT32)tqRound(m_page->intWidth->value()); } -void DlgImageSize::setHeight(Q_UINT32 h) +void DlgImageSize::setHeight(TQ_UINT32 h) { blockAll(); @@ -126,7 +126,7 @@ void DlgImageSize::setHeight(Q_UINT32 h) } -void DlgImageSize::setHeightPercent(Q_UINT32 h) +void DlgImageSize::setHeightPercent(TQ_UINT32 h) { blockAll(); @@ -138,17 +138,17 @@ void DlgImageSize::setHeightPercent(Q_UINT32 h) -void DlgImageSize::setMaximumHeight(Q_UINT32 h) +void DlgImageSize::setMaximumHeight(TQ_UINT32 h) { m_page->intHeight->setMaxValue(h); m_maxH = h; } -Q_INT32 DlgImageSize::height() +TQ_INT32 DlgImageSize::height() { - //return (Q_INT32)qRound(m_oldH); - return (Q_INT32)qRound(m_page->intHeight->value()); + //return (TQ_INT32)tqRound(m_oldH); + return (TQ_INT32)tqRound(m_page->intHeight->value()); } bool DlgImageSize::scale() @@ -181,14 +181,14 @@ void DlgImageSize::slotWidthPixelsChanged(int w) double wPercent = double(w) * 100 / double(m_origW); - m_page->intWidthPercent->setValue(qRound(wPercent)); + m_page->intWidthPercent->setValue(tqRound(wPercent)); // Set height in pixels and percent of necessary if (m_page->chkConstrain->isChecked()) { - m_page->intHeightPercent->setValue(qRound(wPercent)); + m_page->intHeightPercent->setValue(tqRound(wPercent)); - m_oldH = qRound(m_origH * wPercent / 100); - m_page->intHeight->setValue(qRound(m_oldH)); + m_oldH = tqRound(m_origH * wPercent / 100); + m_page->intHeight->setValue(tqRound(m_oldH)); } m_oldW = w; @@ -202,14 +202,14 @@ void DlgImageSize::slotHeightPixelsChanged(int h) double hPercent = double(h) * 100 / double(m_origH); - m_page->intHeightPercent->setValue(qRound(hPercent)); + m_page->intHeightPercent->setValue(tqRound(hPercent)); // Set width in pixels and percent of necessary if (m_page->chkConstrain->isChecked()) { - m_page->intWidthPercent->setValue(qRound(hPercent)); + m_page->intWidthPercent->setValue(tqRound(hPercent)); - m_oldW = qRound(m_origW * hPercent / 100); - m_page->intWidth->setValue(qRound(m_oldW)); + m_oldW = tqRound(m_origW * hPercent / 100); + m_page->intWidth->setValue(tqRound(m_oldW)); } m_oldH = h; @@ -221,11 +221,11 @@ void DlgImageSize::slotWidthPercentChanged(int w) { blockAll(); - m_page->intWidth->setValue(qRound(w * m_origW / 100)); + m_page->intWidth->setValue(tqRound(w * m_origW / 100)); if (m_page->chkConstrain->isChecked()) { m_page->intHeightPercent->setValue(w); - m_page->intHeight->setValue(qRound( w * m_origH / 100)); + m_page->intHeight->setValue(tqRound( w * m_origH / 100)); } unblockAll(); @@ -235,10 +235,10 @@ void DlgImageSize::slotHeightPercentChanged(int h) { blockAll(); - m_page->intHeight->setValue(qRound(h * m_origH / 100)); + m_page->intHeight->setValue(tqRound(h * m_origH / 100)); if (m_page->chkConstrain->isChecked()) { m_page->intWidthPercent->setValue(h); - m_page->intWidth->setValue(qRound( h * m_origW / 100)); + m_page->intWidth->setValue(tqRound( h * m_origW / 100)); } unblockAll(); @@ -259,17 +259,17 @@ void DlgImageSize::blockAll() void DlgImageSize::unblockAll() { // XXX: more efficient to use blockSignals? - connect (m_page->intWidth, SIGNAL(valueChanged(int)), - this, SLOT(slotWidthPixelsChanged(int))); + connect (m_page->intWidth, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotWidthPixelsChanged(int))); - connect (m_page->intHeight, SIGNAL(valueChanged(int)), - this, SLOT(slotHeightPixelsChanged(int))); + connect (m_page->intHeight, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotHeightPixelsChanged(int))); - connect (m_page->intWidthPercent, SIGNAL(valueChanged(int)), - this, SLOT(slotWidthPercentChanged(int))); + connect (m_page->intWidthPercent, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotWidthPercentChanged(int))); - connect (m_page->intHeightPercent, SIGNAL(valueChanged(int)), - this, SLOT(slotHeightPercentChanged(int))); + connect (m_page->intHeightPercent, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotHeightPercentChanged(int))); } diff --git a/krita/plugins/viewplugins/imagesize/dlg_imagesize.h b/krita/plugins/viewplugins/imagesize/dlg_imagesize.h index 169d8cbd..589f1ad6 100644 --- a/krita/plugins/viewplugins/imagesize/dlg_imagesize.h +++ b/krita/plugins/viewplugins/imagesize/dlg_imagesize.h @@ -26,30 +26,31 @@ class KisFilterStrategy; class WdgImageSize; /** - * This dialog allows the user to create a selection mask based + * This dialog allows the user to create a selection tqmask based * on a (range of) colors. */ class DlgImageSize: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgImageSize(QWidget * parent = 0, + DlgImageSize(TQWidget * tqparent = 0, const char* name = 0); ~DlgImageSize(); void hideScaleBox(); - void setWidth(Q_UINT32 w); - void setWidthPercent(Q_UINT32 w); - void setMaximumWidth(Q_UINT32 w); - Q_INT32 width(); + void setWidth(TQ_UINT32 w); + void setWidthPercent(TQ_UINT32 w); + void setMaximumWidth(TQ_UINT32 w); + TQ_INT32 width(); - void setHeight(Q_UINT32 h); - void setHeightPercent(Q_UINT32 h); - void setMaximumHeight(Q_UINT32 h); - Q_INT32 height(); + void setHeight(TQ_UINT32 h); + void setHeightPercent(TQ_UINT32 h); + void setMaximumHeight(TQ_UINT32 h); + TQ_INT32 height(); bool scale(); bool cropLayers(); diff --git a/krita/plugins/viewplugins/imagesize/dlg_layersize.cc b/krita/plugins/viewplugins/imagesize/dlg_layersize.cc index ba942eca..faf64c00 100644 --- a/krita/plugins/viewplugins/imagesize/dlg_layersize.cc +++ b/krita/plugins/viewplugins/imagesize/dlg_layersize.cc @@ -27,11 +27,11 @@ using namespace std; -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <klocale.h> #include <knuminput.h> @@ -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( QWidget * parent, +DlgLayerSize::DlgLayerSize( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Scale Layer"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Scale Layer"), Ok | Cancel, Ok) { m_lock = false; @@ -59,13 +59,13 @@ DlgLayerSize::DlgLayerSize( QWidget * parent, m_page->cmbFilterType->setCurrentText("Mitchell"); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); unblockAll(); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } @@ -74,7 +74,7 @@ DlgLayerSize::~DlgLayerSize() delete m_page; } -void DlgLayerSize::setWidth(Q_UINT32 w) +void DlgLayerSize::setWidth(TQ_UINT32 w) { blockAll(); @@ -86,7 +86,7 @@ void DlgLayerSize::setWidth(Q_UINT32 w) unblockAll(); } -void DlgLayerSize::setWidthPercent(Q_UINT32 w) +void DlgLayerSize::setWidthPercent(TQ_UINT32 w) { blockAll(); @@ -97,19 +97,19 @@ void DlgLayerSize::setWidthPercent(Q_UINT32 w) } -void DlgLayerSize::setMaximumWidth(Q_UINT32 w) +void DlgLayerSize::setMaximumWidth(TQ_UINT32 w) { m_page->intWidth->setMaxValue(w); m_maxW = w; } -Q_INT32 DlgLayerSize::width() +TQ_INT32 DlgLayerSize::width() { - //return (Q_INT32)qRound(m_oldW); - return (Q_INT32)qRound(m_page->intWidth->value()); + //return (TQ_INT32)tqRound(m_oldW); + return (TQ_INT32)tqRound(m_page->intWidth->value()); } -void DlgLayerSize::setHeight(Q_UINT32 h) +void DlgLayerSize::setHeight(TQ_UINT32 h) { blockAll(); @@ -122,7 +122,7 @@ void DlgLayerSize::setHeight(Q_UINT32 h) } -void DlgLayerSize::setHeightPercent(Q_UINT32 h) +void DlgLayerSize::setHeightPercent(TQ_UINT32 h) { blockAll(); @@ -132,16 +132,16 @@ void DlgLayerSize::setHeightPercent(Q_UINT32 h) unblockAll(); } -void DlgLayerSize::setMaximumHeight(Q_UINT32 h) +void DlgLayerSize::setMaximumHeight(TQ_UINT32 h) { m_page->intHeight->setMaxValue(h); m_maxH = h; } -Q_INT32 DlgLayerSize::height() +TQ_INT32 DlgLayerSize::height() { - //return (Q_INT32)qRound(m_oldH); - return (Q_INT32)qRound(m_page->intHeight->value()); + //return (TQ_INT32)tqRound(m_oldH); + return (TQ_INT32)tqRound(m_page->intHeight->value()); } KisFilterStrategy *DlgLayerSize::filterType() @@ -165,14 +165,14 @@ void DlgLayerSize::slotWidthPixelsChanged(int w) double wPercent = double(w) * 100 / double(m_origW); - m_page->intWidthPercent->setValue(qRound(wPercent)); + m_page->intWidthPercent->setValue(tqRound(wPercent)); // Set height in pixels and percent of necessary if (m_page->chkConstrain->isChecked()) { - m_page->intHeightPercent->setValue(qRound(wPercent)); + m_page->intHeightPercent->setValue(tqRound(wPercent)); - m_oldH = qRound(m_origH * wPercent / 100); - m_page->intHeight->setValue(qRound(m_oldH)); + m_oldH = tqRound(m_origH * wPercent / 100); + m_page->intHeight->setValue(tqRound(m_oldH)); } m_oldW = w; @@ -186,14 +186,14 @@ void DlgLayerSize::slotHeightPixelsChanged(int h) double hPercent = double(h) * 100 / double(m_origH); - m_page->intHeightPercent->setValue(qRound(hPercent)); + m_page->intHeightPercent->setValue(tqRound(hPercent)); // Set width in pixels and percent of necessary if (m_page->chkConstrain->isChecked()) { - m_page->intWidthPercent->setValue(qRound(hPercent)); + m_page->intWidthPercent->setValue(tqRound(hPercent)); - m_oldW = qRound(m_origW * hPercent / 100); - m_page->intWidth->setValue(qRound(m_oldW)); + m_oldW = tqRound(m_origW * hPercent / 100); + m_page->intWidth->setValue(tqRound(m_oldW)); } m_oldH = h; @@ -205,11 +205,11 @@ void DlgLayerSize::slotWidthPercentChanged(int w) { blockAll(); - m_page->intWidth->setValue(qRound(w * m_origW / 100)); + m_page->intWidth->setValue(tqRound(w * m_origW / 100)); if (m_page->chkConstrain->isChecked()) { m_page->intHeightPercent->setValue(w); - m_page->intHeight->setValue(qRound( w * m_origH / 100)); + m_page->intHeight->setValue(tqRound( w * m_origH / 100)); } unblockAll(); @@ -219,10 +219,10 @@ void DlgLayerSize::slotHeightPercentChanged(int h) { blockAll(); - m_page->intHeight->setValue(qRound(h * m_origH / 100)); + m_page->intHeight->setValue(tqRound(h * m_origH / 100)); if (m_page->chkConstrain->isChecked()) { m_page->intWidthPercent->setValue(h); - m_page->intWidth->setValue(qRound( h * m_origW / 100)); + m_page->intWidth->setValue(tqRound( h * m_origW / 100)); } unblockAll(); @@ -243,17 +243,17 @@ void DlgLayerSize::blockAll() void DlgLayerSize::unblockAll() { // XXX: more efficient to use blockSignals? - connect (m_page->intWidth, SIGNAL(valueChanged(int)), - this, SLOT(slotWidthPixelsChanged(int))); + connect (m_page->intWidth, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotWidthPixelsChanged(int))); - connect (m_page->intHeight, SIGNAL(valueChanged(int)), - this, SLOT(slotHeightPixelsChanged(int))); + connect (m_page->intHeight, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotHeightPixelsChanged(int))); - connect (m_page->intWidthPercent, SIGNAL(valueChanged(int)), - this, SLOT(slotWidthPercentChanged(int))); + connect (m_page->intWidthPercent, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotWidthPercentChanged(int))); - connect (m_page->intHeightPercent, SIGNAL(valueChanged(int)), - this, SLOT(slotHeightPercentChanged(int))); + connect (m_page->intHeightPercent, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotHeightPercentChanged(int))); } diff --git a/krita/plugins/viewplugins/imagesize/dlg_layersize.h b/krita/plugins/viewplugins/imagesize/dlg_layersize.h index fa27b732..d44e7a93 100644 --- a/krita/plugins/viewplugins/imagesize/dlg_layersize.h +++ b/krita/plugins/viewplugins/imagesize/dlg_layersize.h @@ -29,22 +29,23 @@ class KisFilterStrategy; class DlgLayerSize: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgLayerSize(QWidget * parent = 0, + DlgLayerSize(TQWidget * tqparent = 0, const char* name = 0); ~DlgLayerSize(); - void setWidth(Q_UINT32 w); - void setWidthPercent(Q_UINT32 w); - void setMaximumWidth(Q_UINT32 w); - Q_INT32 width(); + void setWidth(TQ_UINT32 w); + void setWidthPercent(TQ_UINT32 w); + void setMaximumWidth(TQ_UINT32 w); + TQ_INT32 width(); - void setHeight(Q_UINT32 h); - void setHeightPercent(Q_UINT32 h); - void setMaximumHeight(Q_UINT32 h); - Q_INT32 height(); + void setHeight(TQ_UINT32 h); + void setHeightPercent(TQ_UINT32 h); + void setMaximumHeight(TQ_UINT32 h); + TQ_INT32 height(); KisFilterStrategy *filterType(); private slots: diff --git a/krita/plugins/viewplugins/imagesize/imagesize.cc b/krita/plugins/viewplugins/imagesize/imagesize.cc index df400b5a..fff6cc27 100644 --- a/krita/plugins/viewplugins/imagesize/imagesize.cc +++ b/krita/plugins/viewplugins/imagesize/imagesize.cc @@ -23,9 +23,9 @@ #include <stdlib.h> -#include <qslider.h> -#include <qrect.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqrect.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -58,21 +58,21 @@ typedef KGenericFactory<ImageSize> ImageSizeFactory; K_EXPORT_COMPONENT_FACTORY( kritaimagesize, ImageSizeFactory( "krita" ) ) -ImageSize::ImageSize(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ImageSize::ImageSize(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(ImageSizeFactory::instance()); setXMLFile(locate("data","kritaplugins/imagesize.rc"), true); - (void) new KAction(i18n("Change &Image Size..."), 0, "Shift-s", this, SLOT(slotImageSize()), actionCollection(), "imagesize"); - (void) new KAction(i18n("&Scale Layer..."), 0, 0, this, SLOT(slotLayerSize()), actionCollection(), "layerscale"); + (void) new KAction(i18n("Change &Image Size..."), 0, "Shift-s", this, TQT_SLOT(slotImageSize()), actionCollection(), "imagesize"); + (void) new KAction(i18n("&Scale Layer..."), 0, 0, this, TQT_SLOT(slotLayerSize()), actionCollection(), "layerscale"); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; // Selection manager takes ownership? - KAction * a = new KAction(i18n("&Scale Selection..."), 0, 0, this, SLOT(slotSelectionScale()), actionCollection(), "selectionscale"); + KAction * a = new KAction(i18n("&Scale Selection..."), 0, 0, this, TQT_SLOT(slotSelectionScale()), actionCollection(), "selectionscale"); Q_CHECK_PTR(a); m_view ->canvasSubject()-> selectionManager()->addSelectionAction(a); } @@ -99,9 +99,9 @@ void ImageSize::slotImageSize() dlgImageSize->setWidth(image->width()); dlgImageSize->setHeight(image->height()); - if (dlgImageSize->exec() == QDialog::Accepted) { - Q_INT32 w = dlgImageSize->width(); - Q_INT32 h = dlgImageSize->height(); + if (dlgImageSize->exec() == TQDialog::Accepted) { + TQ_INT32 w = dlgImageSize->width(); + TQ_INT32 h = dlgImageSize->height(); if (dlgImageSize->scale()) { m_view->scaleCurrentImage((double)w / ((double)(image->width())), @@ -130,14 +130,14 @@ void ImageSize::slotLayerSize() KisConfig cfg; KisPaintDeviceSP dev = image->activeDevice(); - QRect rc = dev->exactBounds(); + TQRect rc = dev->exactBounds(); dlgLayerSize->setWidth(rc.width()); dlgLayerSize->setHeight(rc.height()); - if (dlgLayerSize->exec() == QDialog::Accepted) { - Q_INT32 w = dlgLayerSize->width(); - Q_INT32 h = dlgLayerSize->height(); + if (dlgLayerSize->exec() == TQDialog::Accepted) { + TQ_INT32 w = dlgLayerSize->width(); + TQ_INT32 h = dlgLayerSize->height(); m_view->scaleLayer((double)w / ((double)(rc.width())), (double)h / ((double)(rc.height())), @@ -165,14 +165,14 @@ void ImageSize::slotSelectionScale() dlgLayerSize->setCaption(i18n("Scale Selection")); KisConfig cfg; - QRect rc = layer->selection()->selectedRect(); + TQRect rc = layer->selection()->selectedRect(); dlgLayerSize->setWidth(rc.width()); dlgLayerSize->setHeight(rc.height()); - if (dlgLayerSize->exec() == QDialog::Accepted) { - Q_INT32 w = dlgLayerSize->width(); - Q_INT32 h = dlgLayerSize->height(); + if (dlgLayerSize->exec() == TQDialog::Accepted) { + TQ_INT32 w = dlgLayerSize->width(); + TQ_INT32 h = dlgLayerSize->height(); KisScaleWorker worker (layer->selection().data(), (double)w / ((double)(rc.width())), diff --git a/krita/plugins/viewplugins/imagesize/imagesize.h b/krita/plugins/viewplugins/imagesize/imagesize.h index ce8f0f41..e83f3f7a 100644 --- a/krita/plugins/viewplugins/imagesize/imagesize.h +++ b/krita/plugins/viewplugins/imagesize/imagesize.h @@ -28,8 +28,9 @@ class KisPainter; class ImageSize : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ImageSize(QObject *parent, const char *name, const QStringList &); + ImageSize(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ImageSize(); private slots: diff --git a/krita/plugins/viewplugins/imagesize/wdg_imagesize.ui b/krita/plugins/viewplugins/imagesize/wdg_imagesize.ui index 896bbb05..4cdd5c95 100644 --- a/krita/plugins/viewplugins/imagesize/wdg_imagesize.ui +++ b/krita/plugins/viewplugins/imagesize/wdg_imagesize.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgImageSize</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgImageSize</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpResizeScale</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2</cstring> </property> @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>65</width> <height>20</height> @@ -68,14 +68,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>65</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>pixmapLabel2_2</cstring> </property> @@ -94,7 +94,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioResize</cstring> </property> @@ -102,7 +102,7 @@ <string>&Resize</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkCrop</cstring> </property> @@ -123,14 +123,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton" row="1" column="3"> + <widget class="TQRadioButton" row="1" column="3"> <property name="name"> <cstring>radioScale</cstring> </property> @@ -143,7 +143,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpPixelDimensions</cstring> </property> @@ -154,7 +154,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblWidth</cstring> </property> @@ -173,7 +173,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -184,7 +184,7 @@ <cstring>intHeight</cstring> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblWidthOriginal</cstring> </property> @@ -197,11 +197,11 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>lblHeightOriginal</cstring> </property> @@ -214,11 +214,11 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblOrignal</cstring> </property> @@ -226,7 +226,7 @@ <string>Original:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblNew</cstring> </property> @@ -276,7 +276,7 @@ <string>%</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblPercent</cstring> </property> @@ -287,7 +287,7 @@ <cstring>intWidthPercent</cstring> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>chkConstrain</cstring> </property> @@ -300,14 +300,14 @@ </widget> </grid> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblFilterType</cstring> </property> <property name="text"> <string>Filter:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -358,7 +358,7 @@ <tabstop>chkConstrain</tabstop> <tabstop>radioScale</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/krita/plugins/viewplugins/imagesize/wdg_layersize.ui b/krita/plugins/viewplugins/imagesize/wdg_layersize.ui index 1b642fd8..fb7547d2 100644 --- a/krita/plugins/viewplugins/imagesize/wdg_layersize.ui +++ b/krita/plugins/viewplugins/imagesize/wdg_layersize.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgLayerSize</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgLayerSize</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpPixelDimensions</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblWidth</cstring> </property> @@ -52,7 +52,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -63,7 +63,7 @@ <cstring>intHeight</cstring> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblWidthOriginal</cstring> </property> @@ -76,11 +76,11 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>lblHeightOriginal</cstring> </property> @@ -93,11 +93,11 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblOrignal</cstring> </property> @@ -105,7 +105,7 @@ <string>Original:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblNew</cstring> </property> @@ -155,7 +155,7 @@ <string>%</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblPercent</cstring> </property> @@ -166,7 +166,7 @@ <cstring>intWidthPercent</cstring> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>chkConstrain</cstring> </property> @@ -179,7 +179,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblFilterType</cstring> </property> @@ -227,7 +227,7 @@ <tabstop>intHeightPercent</tabstop> <tabstop>chkConstrain</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/krita/plugins/viewplugins/imagesize/wdg_resolution.ui b/krita/plugins/viewplugins/imagesize/wdg_resolution.ui index ead01819..df0e010d 100644 --- a/krita/plugins/viewplugins/imagesize/wdg_resolution.ui +++ b/krita/plugins/viewplugins/imagesize/wdg_resolution.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgResolution</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgResolution</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpSize</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblHeight</cstring> </property> @@ -38,7 +38,7 @@ <string>Height:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblWidth</cstring> </property> @@ -64,7 +64,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpResolution</cstring> </property> @@ -75,7 +75,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblScreen</cstring> </property> @@ -83,7 +83,7 @@ <string>Screen resolution:</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblScreenResolution</cstring> </property> @@ -96,11 +96,11 @@ <property name="text"> <string>100</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblYResolution</cstring> </property> @@ -108,7 +108,7 @@ <string>Image Y resolution:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblImageXRes</cstring> </property> @@ -138,7 +138,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/krita/plugins/viewplugins/modify_selection/dlg_border_selection.cc index 748c5b9b..134610d6 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_border_selection.cc +++ b/krita/plugins/viewplugins/modify_selection/dlg_border_selection.cc @@ -26,11 +26,11 @@ using namespace std; -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <klocale.h> #include <knuminput.h> @@ -39,15 +39,15 @@ using namespace std; #include "dlg_border_selection.h" #include "wdg_border_selection.h" -DlgBorderSelection::DlgBorderSelection( QWidget * parent, const char * name) : super (parent, name, true, i18n("Border Selection"), Ok | Cancel, Ok) +DlgBorderSelection::DlgBorderSelection( TQWidget * tqparent, const char * name) : super (tqparent, name, true, i18n("Border Selection"), Ok | Cancel, Ok) { m_page = new WdgBorderSelection(this, "border_selection"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); - connect(this, SIGNAL(okClicked()), this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } DlgBorderSelection::~DlgBorderSelection() @@ -55,12 +55,12 @@ DlgBorderSelection::~DlgBorderSelection() delete m_page; } -Q_INT32 DlgBorderSelection::xradius() +TQ_INT32 DlgBorderSelection::xradius() { return m_page->radiusSpinBox->value(); } -Q_INT32 DlgBorderSelection::yradius() +TQ_INT32 DlgBorderSelection::yradius() { return m_page->radiusSpinBox->value(); } diff --git a/krita/plugins/viewplugins/modify_selection/dlg_border_selection.h b/krita/plugins/viewplugins/modify_selection/dlg_border_selection.h index baf716d4..b3d5a94d 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_border_selection.h +++ b/krita/plugins/viewplugins/modify_selection/dlg_border_selection.h @@ -27,14 +27,15 @@ class WdgBorderSelection; class DlgBorderSelection: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgBorderSelection(QWidget * parent = 0, const char* name = 0); + DlgBorderSelection(TQWidget * tqparent = 0, const char* name = 0); ~DlgBorderSelection(); - Q_INT32 xradius(); - Q_INT32 yradius(); + TQ_INT32 xradius(); + TQ_INT32 yradius(); private slots: diff --git a/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.cc index 82055aeb..b73acc69 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.cc +++ b/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.cc @@ -26,11 +26,11 @@ using namespace std; -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <klocale.h> #include <knuminput.h> @@ -39,15 +39,15 @@ using namespace std; #include "dlg_grow_selection.h" #include "wdg_grow_selection.h" -DlgGrowSelection::DlgGrowSelection( QWidget * parent, const char * name) : super (parent, name, true, i18n("Grow Selection"), Ok | Cancel, Ok) +DlgGrowSelection::DlgGrowSelection( TQWidget * tqparent, const char * name) : super (tqparent, name, true, i18n("Grow Selection"), Ok | Cancel, Ok) { m_page = new WdgGrowSelection(this, "grow_selection"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); - connect(this, SIGNAL(okClicked()), this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } DlgGrowSelection::~DlgGrowSelection() @@ -55,12 +55,12 @@ DlgGrowSelection::~DlgGrowSelection() delete m_page; } -Q_INT32 DlgGrowSelection::xradius() +TQ_INT32 DlgGrowSelection::xradius() { return m_page->radiusSpinBox->value(); } -Q_INT32 DlgGrowSelection::yradius() +TQ_INT32 DlgGrowSelection::yradius() { return m_page->radiusSpinBox->value(); } diff --git a/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.h b/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.h index f5cd36ff..bb2a8ab0 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.h +++ b/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.h @@ -27,14 +27,15 @@ class WdgGrowSelection; class DlgGrowSelection: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgGrowSelection(QWidget * parent = 0, const char* name = 0); + DlgGrowSelection(TQWidget * tqparent = 0, const char* name = 0); ~DlgGrowSelection(); - Q_INT32 xradius(); - Q_INT32 yradius(); + TQ_INT32 xradius(); + TQ_INT32 yradius(); private slots: diff --git a/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc index 69e31d1d..2a952816 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc +++ b/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc @@ -26,11 +26,11 @@ using namespace std; -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <klocale.h> #include <knuminput.h> @@ -39,15 +39,15 @@ using namespace std; #include "dlg_shrink_selection.h" #include "wdg_shrink_selection.h" -DlgShrinkSelection::DlgShrinkSelection( QWidget * parent, const char * name) : super (parent, name, true, i18n("Shrink Selection"), Ok | Cancel, Ok) +DlgShrinkSelection::DlgShrinkSelection( TQWidget * tqparent, const char * name) : super (tqparent, name, true, i18n("Shrink Selection"), Ok | Cancel, Ok) { m_page = new WdgShrinkSelection(this, "shrink_selection"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); - connect(this, SIGNAL(okClicked()), this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } DlgShrinkSelection::~DlgShrinkSelection() @@ -55,12 +55,12 @@ DlgShrinkSelection::~DlgShrinkSelection() delete m_page; } -Q_INT32 DlgShrinkSelection::xradius() +TQ_INT32 DlgShrinkSelection::xradius() { return m_page->radiusSpinBox->value(); } -Q_INT32 DlgShrinkSelection::yradius() +TQ_INT32 DlgShrinkSelection::yradius() { return m_page->radiusSpinBox->value(); } diff --git a/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.h b/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.h index e8e32f43..385d623a 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.h +++ b/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.h @@ -27,14 +27,15 @@ class WdgShrinkSelection; class DlgShrinkSelection: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgShrinkSelection(QWidget * parent = 0, const char* name = 0); + DlgShrinkSelection(TQWidget * tqparent = 0, const char* name = 0); ~DlgShrinkSelection(); - Q_INT32 xradius(); - Q_INT32 yradius(); + TQ_INT32 xradius(); + TQ_INT32 yradius(); bool shrinkFromImageBorder(); private slots: diff --git a/krita/plugins/viewplugins/modify_selection/modify_selection.cc b/krita/plugins/viewplugins/modify_selection/modify_selection.cc index 6f2d0511..9ed5ba18 100644 --- a/krita/plugins/viewplugins/modify_selection/modify_selection.cc +++ b/krita/plugins/viewplugins/modify_selection/modify_selection.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -55,20 +55,20 @@ typedef KGenericFactory<ModifySelection> ModifySelectionFactory; K_EXPORT_COMPONENT_FACTORY( kritamodifyselection, ModifySelectionFactory( "krita" ) ) -ModifySelection::ModifySelection(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ModifySelection::ModifySelection(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(ModifySelectionFactory::instance()); setXMLFile(locate("data","kritaplugins/modify_selection.rc"), true); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; // Selection manager takes ownership? - KAction* a = new KAction(i18n("Grow Selection..."), 0, 0, this, SLOT(slotGrowSelection()), actionCollection(), "growselection"); - KAction* b = new KAction(i18n("Shrink Selection..."), 0, 0, this, SLOT(slotShrinkSelection()), actionCollection(), "shrinkselection"); - KAction* c = new KAction(i18n("Border Selection..."), 0, 0, this, SLOT(slotBorderSelection()), actionCollection(), "borderselection"); + KAction* a = new KAction(i18n("Grow Selection..."), 0, 0, this, TQT_SLOT(slotGrowSelection()), actionCollection(), "growselection"); + KAction* b = new KAction(i18n("Shrink Selection..."), 0, 0, this, TQT_SLOT(slotShrinkSelection()), actionCollection(), "shrinkselection"); + KAction* c = new KAction(i18n("Border Selection..."), 0, 0, this, TQT_SLOT(slotBorderSelection()), actionCollection(), "borderselection"); Q_CHECK_PTR(a); Q_CHECK_PTR(b); @@ -98,9 +98,9 @@ void ModifySelection::slotGrowSelection() KisConfig cfg; - if (dlgGrowSelection->exec() == QDialog::Accepted) { - Q_INT32 xradius = dlgGrowSelection->xradius(); - Q_INT32 yradius = dlgGrowSelection->yradius(); + if (dlgGrowSelection->exec() == TQDialog::Accepted) { + TQ_INT32 xradius = dlgGrowSelection->xradius(); + TQ_INT32 yradius = dlgGrowSelection->yradius(); m_view ->canvasSubject()-> selectionManager()->grow(xradius, yradius); } @@ -121,9 +121,9 @@ void ModifySelection::slotShrinkSelection() KisConfig cfg; - if (dlgShrinkSelection->exec() == QDialog::Accepted) { - Q_INT32 xradius = dlgShrinkSelection->xradius(); - Q_INT32 yradius = dlgShrinkSelection->yradius(); + if (dlgShrinkSelection->exec() == TQDialog::Accepted) { + TQ_INT32 xradius = dlgShrinkSelection->xradius(); + TQ_INT32 yradius = dlgShrinkSelection->yradius(); bool shrinkFromImageBorder = dlgShrinkSelection->shrinkFromImageBorder(); m_view ->canvasSubject()-> selectionManager()->shrink(xradius, yradius, shrinkFromImageBorder); @@ -145,9 +145,9 @@ void ModifySelection::slotBorderSelection() KisConfig cfg; - if (dlgBorderSelection->exec() == QDialog::Accepted) { - Q_INT32 xradius = dlgBorderSelection->xradius(); - Q_INT32 yradius = dlgBorderSelection->yradius(); + if (dlgBorderSelection->exec() == TQDialog::Accepted) { + TQ_INT32 xradius = dlgBorderSelection->xradius(); + TQ_INT32 yradius = dlgBorderSelection->yradius(); m_view ->canvasSubject()-> selectionManager()->border(xradius, yradius); } diff --git a/krita/plugins/viewplugins/modify_selection/modify_selection.h b/krita/plugins/viewplugins/modify_selection/modify_selection.h index d3677088..173ca400 100644 --- a/krita/plugins/viewplugins/modify_selection/modify_selection.h +++ b/krita/plugins/viewplugins/modify_selection/modify_selection.h @@ -27,8 +27,9 @@ class KisView; class ModifySelection : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ModifySelection(QObject *parent, const char *name, const QStringList &); + ModifySelection(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ModifySelection(); private slots: diff --git a/krita/plugins/viewplugins/modify_selection/wdg_border_selection.ui b/krita/plugins/viewplugins/modify_selection/wdg_border_selection.ui index 621685da..06d01e9f 100644 --- a/krita/plugins/viewplugins/modify_selection/wdg_border_selection.ui +++ b/krita/plugins/viewplugins/modify_selection/wdg_border_selection.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgBorderSelection</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgBorderSelection</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -24,7 +24,7 @@ <string>Border selection by</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>radiusSpinBox</cstring> </property> @@ -38,7 +38,7 @@ <number>1</number> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>pixels</string> @@ -53,5 +53,5 @@ <tabstops> <tabstop>radiusSpinBox</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/viewplugins/modify_selection/wdg_grow_selection.ui b/krita/plugins/viewplugins/modify_selection/wdg_grow_selection.ui index d2eb12aa..d1180803 100644 --- a/krita/plugins/viewplugins/modify_selection/wdg_grow_selection.ui +++ b/krita/plugins/viewplugins/modify_selection/wdg_grow_selection.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgGrowSelection</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgGrowSelection</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -24,7 +24,7 @@ <string>Grow selection by</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>radiusSpinBox</cstring> </property> @@ -38,7 +38,7 @@ <number>1</number> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>pixels</string> @@ -53,5 +53,5 @@ <tabstops> <tabstop>radiusSpinBox</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui b/krita/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui index 2896325f..28429d72 100644 --- a/krita/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui +++ b/krita/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgShrinkSelection</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgShrinkSelection</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -24,7 +24,7 @@ <string>Shrink selection by</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>radiusSpinBox</cstring> </property> @@ -38,7 +38,7 @@ <number>1</number> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>pixels</string> @@ -48,7 +48,7 @@ <cstring>comboBox1</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>shrinkFromImageBorderCheckBox</cstring> </property> @@ -64,5 +64,5 @@ <tabstops> <tabstop>radiusSpinBox</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/viewplugins/performancetest/dlg_perftest.cc b/krita/plugins/viewplugins/performancetest/dlg_perftest.cc index 1d9a045e..f65507b6 100644 --- a/krita/plugins/viewplugins/performancetest/dlg_perftest.cc +++ b/krita/plugins/viewplugins/performancetest/dlg_perftest.cc @@ -26,10 +26,10 @@ using namespace std; -#include <qradiobutton.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqradiobutton.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> #include <klocale.h> #include <knuminput.h> @@ -39,9 +39,9 @@ using namespace std; #include "wdg_perftest.h" -DlgPerfTest::DlgPerfTest( QWidget * parent, +DlgPerfTest::DlgPerfTest( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Performance Test"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Performance Test"), Ok | Cancel, Ok) { m_lock = false; @@ -49,13 +49,13 @@ DlgPerfTest::DlgPerfTest( QWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); - connect(m_page->btnSelectAll, SIGNAL(clicked()), this, SLOT(selectAllClicked())); - connect(m_page->btnDeselectAll, SIGNAL(clicked()), this, SLOT(deselectAllClicked())); + connect(m_page->btnSelectAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAllClicked())); + connect(m_page->btnDeselectAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(deselectAllClicked())); } DlgPerfTest::~DlgPerfTest() diff --git a/krita/plugins/viewplugins/performancetest/dlg_perftest.h b/krita/plugins/viewplugins/performancetest/dlg_perftest.h index 7cb4f159..39f5cb41 100644 --- a/krita/plugins/viewplugins/performancetest/dlg_perftest.h +++ b/krita/plugins/viewplugins/performancetest/dlg_perftest.h @@ -27,10 +27,11 @@ class WdgPerfTest; class DlgPerfTest: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgPerfTest(QWidget * parent = 0, + DlgPerfTest(TQWidget * tqparent = 0, const char* name = 0); ~DlgPerfTest(); diff --git a/krita/plugins/viewplugins/performancetest/perftest.cc b/krita/plugins/viewplugins/performancetest/perftest.cc index 1c5ede34..2380037a 100644 --- a/krita/plugins/viewplugins/performancetest/perftest.cc +++ b/krita/plugins/viewplugins/performancetest/perftest.cc @@ -22,13 +22,13 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qtextedit.h> -#include <qdatetime.h> +#include <tqslider.h> +#include <tqpoint.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqtextedit.h> +#include <tqdatetime.h> #include <klocale.h> #include <kiconloader.h> @@ -41,7 +41,7 @@ #include <kgenericfactory.h> #include <knuminput.h> -#include <qcolor.h> +#include <tqcolor.h> #include "kis_meta_registry.h" #include <kis_resourceserver.h> @@ -78,17 +78,17 @@ typedef KGenericFactory<PerfTest> PerfTestFactory; K_EXPORT_COMPONENT_FACTORY( kritaperftest, PerfTestFactory( "krita" ) ) -PerfTest::PerfTest(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +PerfTest::PerfTest(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(PerfTestFactory::instance()); setXMLFile(locate("data","kritaplugins/perftest.rc"), true); - (void) new KAction(i18n("&Performance Test..."), 0, 0, this, SLOT(slotPerfTest()), actionCollection(), "perf_test"); + (void) new KAction(i18n("&Performance Test..."), 0, 0, this, TQT_SLOT(slotPerfTest()), actionCollection(), "perf_test"); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; } } @@ -108,111 +108,111 @@ void PerfTest::slotPerfTest() dlgPerfTest->setCaption(i18n("Performance Test")); - QString report = QString(""); + TQString report = TQString(""); - if (dlgPerfTest->exec() == QDialog::Accepted) { + if (dlgPerfTest->exec() == TQDialog::Accepted) { - Q_INT32 testCount = (Q_INT32)qRound(dlgPerfTest->page()->intTestCount->value()); + TQ_INT32 testCount = (TQ_INT32)tqRound(dlgPerfTest->page()->intTestCount->value()); if (dlgPerfTest->page()->chkBitBlt->isChecked()) { kdDebug() << "bltTest:\n"; - QString s = bltTest(testCount); + TQString s = bltTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkFill->isChecked()) { kdDebug() << "Filltest\n"; - QString s= fillTest(testCount); + TQString s= fillTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkGradient->isChecked()) { kdDebug() << "Gradienttest\n"; - QString s = gradientTest(testCount); + TQString s = gradientTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkPixel->isChecked()) { kdDebug() << "Pixeltest\n"; - QString s = pixelTest(testCount); + TQString s = pixelTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkShape->isChecked()) { kdDebug() << "Shapetest\n"; - QString s = shapeTest(testCount); + TQString s = tqshapeTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkLayer->isChecked()) { kdDebug() << "LayerTest\n"; - QString s = layerTest(testCount); + TQString s = layerTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkScale->isChecked()) { kdDebug() << "Scaletest\n"; - QString s = scaleTest(testCount); + TQString s = scaleTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkRotate->isChecked()) { kdDebug() << "Rotatetest\n"; - QString s = rotateTest(testCount); + TQString s = rotateTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkRender->isChecked()) { kdDebug() << "Rendertest\n"; - QString s = renderTest(testCount); + TQString s = renderTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkSelection->isChecked()) { kdDebug() << "Selectiontest\n"; - QString s = selectionTest(testCount); + TQString s = selectionTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkColorConversion->isChecked()) { kdDebug() << "Colorconversiontest\n"; - QString s = colorConversionTest(testCount); + TQString s = colorConversionTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkFilter-> isChecked()) { kdDebug() << "filtertest\n"; - QString s = filterTest(testCount); + TQString s = filterTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkReadBytes->isChecked()) { kdDebug() << "Readbytes test\n"; - QString s = readBytesTest(testCount); + TQString s = readBytesTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkWriteBytes-> isChecked()) { kdDebug() << "Writebytes test\n"; - QString s = writeBytesTest(testCount); + TQString s = writeBytesTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkIterators->isChecked()) { kdDebug() << "Iterators test\n"; - QString s = iteratorTest(testCount); + TQString s = iteratorTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkPaintView->isChecked()) { kdDebug() << "paintview test\n"; - QString s = paintViewTest(testCount); + TQString s = paintViewTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkPaintViewFPS->isChecked()) { kdDebug() << "paint current view (fps) test\n"; - QString s = paintViewFPSTest(); + TQString s = paintViewFPSTest(); report = report.append(s); kdDebug() << s << "\n"; } @@ -220,7 +220,7 @@ void PerfTest::slotPerfTest() Q_CHECK_PTR(d); d->setCaption("Performance test results"); - QTextEdit * e = new QTextEdit(d); + TQTextEdit * e = new TQTextEdit(d); Q_CHECK_PTR(e); d->setMainWidget(e); e->setText(report); @@ -233,9 +233,9 @@ void PerfTest::slotPerfTest() delete dlgPerfTest; } -QString PerfTest::bltTest(Q_UINT32 testCount) +TQString PerfTest::bltTest(TQ_UINT32 testCount) { - QString report = QString("* bitBlt test\n"); + TQString report = TQString("* bitBlt test\n"); KisDoc * doc = m_view->canvasSubject()->document(); KisIDList l = KisMetaRegistry::instance()->csRegistry()->listKeys(); @@ -265,15 +265,15 @@ QString PerfTest::bltTest(Q_UINT32 testCount) } -QString PerfTest::doBlit(const KisCompositeOp& op, +TQString PerfTest::doBlit(const KisCompositeOp& op, KisID cspace, - Q_UINT8 opacity, - Q_UINT32 testCount, + TQ_UINT8 opacity, + TQ_UINT32 testCount, KisImageSP img) { - QTime t; - QString report; + TQTime t; + TQString report; // ------------------------------------------------------------------------------ // Small @@ -282,21 +282,21 @@ QString PerfTest::doBlit(const KisCompositeOp& op, Q_CHECK_PTR(small); KisFillPainter pf(small.data()) ; - pf.fillRect(0, 0, 32, 32, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + pf.fillRect(0, 0, 32, 32, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); pf.end(); t.restart(); KisPainter p(img->activeDevice()); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.bitBlt(0, 0, op, small.data(),0,0,32, 32); } p.end(); - report = report.append(QString(" %1 blits of rectangles < tilesize with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + report = report.append(TQString(" %1 blits of rectangles < tilesize with opacity %2 and composite op %3: %4ms\n") + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -305,21 +305,21 @@ QString PerfTest::doBlit(const KisCompositeOp& op, Q_CHECK_PTR(medium); pf.begin(medium.data()) ; - pf.fillRect(0, 0, 64 * 3, 64 * 3, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + pf.fillRect(0, 0, 64 * 3, 64 * 3, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); pf.end(); t.restart(); p.begin(img->activeDevice().data()); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.bitBlt(0, 0, op, medium.data(),0,0,96, 96); } p.end(); - report = report.append(QString(" %1 blits of rectangles 3 * tilesize with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + report = report.append(TQString(" %1 blits of rectangles 3 * tilesize with opacity %2 and composite op %3: %4ms\n") + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -328,21 +328,21 @@ QString PerfTest::doBlit(const KisCompositeOp& op, Q_CHECK_PTR(big); pf.begin(big.data()) ; - pf.fillRect(0, 0, 800, 800, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + pf.fillRect(0, 0, 800, 800, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); pf.end(); t.restart(); p.begin(img->activeDevice().data()); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.bitBlt(0, 0, op, big.data(),0,0,800,800); } p.end(); - report = report.append(QString(" %1 blits of rectangles 800 x 800 with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + report = report.append(TQString(" %1 blits of rectangles 800 x 800 with opacity %2 and composite op %3: %4ms\n") + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -351,21 +351,21 @@ QString PerfTest::doBlit(const KisCompositeOp& op, KisPaintDeviceSP outside = new KisPaintDevice(KisMetaRegistry::instance()->csRegistry()->getColorSpace(cspace,""), "outside blit"); Q_CHECK_PTR(outside); pf.begin(outside.data()) ; - pf.fillRect(0, 0, 500, 500, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + pf.fillRect(0, 0, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); pf.end(); t.restart(); p.begin(img->activeDevice().data()); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.bitBlt(600, 600, op, outside.data(),0,0,500,500); } p.end(); - report = report.append(QString(" %1 blits of rectangles 500 x 500 at 600,600 with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + report = report.append(TQString(" %1 blits of rectangles 500 x 500 at 600,600 with opacity %2 and composite op %3: %4ms\n") + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); // ------------------------------------------------------------------------------ // Small with varied source opacity @@ -374,31 +374,31 @@ QString PerfTest::doBlit(const KisCompositeOp& op, Q_CHECK_PTR(small_with_alpha); pf.begin(small_with_alpha.data()) ; - pf.fillRect(0, 0, 32, 32, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_TRANSPARENT); - pf.fillRect(4, 4, 24, 24, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); - pf.fillRect(8, 8, 16, 16, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE); + pf.fillRect(0, 0, 32, 32, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_TRANSPARENT); + pf.fillRect(4, 4, 24, 24, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); + pf.fillRect(8, 8, 16, 16, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE); pf.end(); t.restart(); p.begin(img->activeDevice().data()); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.bitBlt(0, 0, op, small_with_alpha.data(), 0, 0, 32, 32); } p.end(); - report = report.append(QString(" %1 blits of rectangles < tilesize with source alpha, with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + report = report.append(TQString(" %1 blits of rectangles < tilesize with source alpha, with opacity %2 and composite op %3: %4ms\n") + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); return report; } -QString PerfTest::fillTest(Q_UINT32 testCount) +TQString PerfTest::fillTest(TQ_UINT32 testCount) { - QString report = QString("* Fill test\n"); + TQString report = TQString("* Fill test\n"); KisDoc * doc = m_view->canvasSubject()->document(); KisIDList l = KisMetaRegistry::instance()->csRegistry()->listKeys(); @@ -413,91 +413,91 @@ QString PerfTest::fillTest(Q_UINT32 testCount) // Rect fill KisFillPainter p(l.data()); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(0, 0, 1000, 1000); } - report = report.append(QString(" Erased 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Erased 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(50, 50, 500, 500); } - report = report.append(QString(" Erased 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Erased 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(-50, -50, 1100, 1100); } - report = report.append(QString(" Erased rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Erased rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); // Opaque Rect fill t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(QString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - p.fillRect(50, 50, 500, 500, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(QString(" Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - p.fillRect(-50, -50, 1100, 1100, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(QString(" Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); // Transparent rect fill t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(QString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - p.fillRect(50, 50, 500, 500, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(QString(" Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - p.fillRect(-50, -50, 1100, 1100, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(QString(" Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); // Colour fill t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(0, 0, 1000, 1000); // p.paintEllipse(500, 1000, 100, 0, 0); - p.setPaintColor(KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.setPaintColor(KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.setFillThreshold(15); p.setCompositeOp(COMPOSITE_OVER); p.fillColor(0,0); } - report = report.append(QString(" Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); // Pattern fill t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(0, 0, 1000, 1000); // p.paintEllipse(500, 1000, 100, 0, 0); - p.setPaintColor(KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.setPaintColor(KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); KisResourceServerBase* r = KisResourceServerRegistry::instance()->get("PatternServer"); Q_CHECK_PTR(r); p.setPattern((KisPattern*)r->resources().first()); @@ -505,7 +505,7 @@ QString PerfTest::fillTest(Q_UINT32 testCount) p.setCompositeOp(COMPOSITE_OVER); p.fillPattern(0,0); } - report = report.append(QString(" Opaque patternfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque patternfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); @@ -517,14 +517,14 @@ QString PerfTest::fillTest(Q_UINT32 testCount) } -QString PerfTest::gradientTest(Q_UINT32 testCount) +TQString PerfTest::gradientTest(TQ_UINT32 testCount) { - return QString("Gradient test\n"); + return TQString("Gradient test\n"); } -QString PerfTest::pixelTest(Q_UINT32 testCount) +TQString PerfTest::pixelTest(TQ_UINT32 testCount) { - QString report = QString("* pixel/setpixel test\n"); + TQString report = TQString("* pixel/setpixel test\n"); KisDoc * doc = m_view->canvasSubject()->document(); KisIDList l = KisMetaRegistry::instance()->csRegistry()->listKeys(); @@ -537,30 +537,30 @@ QString PerfTest::pixelTest(Q_UINT32 testCount) KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - QColor c = Qt::black; - Q_UINT8 opacity = OPACITY_OPAQUE; - for (Q_UINT32 i = 0; i < testCount; ++i) { - for (Q_UINT32 x = 0; x < 1000; ++x) { - for (Q_UINT32 y = 0; y < 1000; ++y) { + TQColor c = TQt::black; + TQ_UINT8 opacity = OPACITY_OPAQUE; + for (TQ_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 x = 0; x < 1000; ++x) { + for (TQ_UINT32 y = 0; y < 1000; ++y) { l->pixel(x, y, &c, &opacity); } } } - report = report.append(QString(" read 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); - c= Qt::black; + c= TQt::black; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - for (Q_UINT32 x = 0; x < 1000; ++x) { - for (Q_UINT32 y = 0; y < 1000; ++y) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 x = 0; x < 1000; ++x) { + for (TQ_UINT32 y = 0; y < 1000; ++y) { l->setPixel(x, y, c, 128); } } } - report = report.append(QString(" written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); } @@ -571,31 +571,31 @@ QString PerfTest::pixelTest(Q_UINT32 testCount) } -QString PerfTest::shapeTest(Q_UINT32 testCount) +TQString PerfTest::tqshapeTest(TQ_UINT32 testCount) { - return QString("Shape test\n"); + return TQString("Shape test\n"); } -QString PerfTest::layerTest(Q_UINT32 testCount) +TQString PerfTest::layerTest(TQ_UINT32 testCount) { - return QString("Layer test\n"); + return TQString("Layer test\n"); } -QString PerfTest::scaleTest(Q_UINT32 testCount) +TQString PerfTest::scaleTest(TQ_UINT32 testCount) { - return QString("Scale test\n"); + return TQString("Scale test\n"); } -QString PerfTest::rotateTest(Q_UINT32 testCount) +TQString PerfTest::rotateTest(TQ_UINT32 testCount) { - QString report = QString("* Rotate test\n"); + TQString report = TQString("* Rotate test\n"); KisDoc * doc = m_view->canvasSubject()->document(); KisIDList l = KisMetaRegistry::instance()->csRegistry()->listKeys(); for (KisIDList::Iterator it = l.begin(); it != l.end(); ++it) { doc->undoAdapter()->setUndo( false ); - QTime t; + TQTime t; for (uint i = 0; i < testCount; ++i) { for (double angle = 0; angle < 360; ++angle) { @@ -606,24 +606,24 @@ QString PerfTest::rotateTest(Q_UINT32 testCount) delete img; } } - report = report.append(QString(" rotated 1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" rotated 1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); } return report; } -QString PerfTest::renderTest(Q_UINT32 restCount) +TQString PerfTest::renderTest(TQ_UINT32 restCount) { - return QString("Render test\n"); + return TQString("Render test\n"); } -QString PerfTest::selectionTest(Q_UINT32 testCount) +TQString PerfTest::selectionTest(TQ_UINT32 testCount) { - return QString("Selection test\n"); + return TQString("Selection test\n"); } -QString PerfTest::colorConversionTest(Q_UINT32 testCount) +TQString PerfTest::colorConversionTest(TQ_UINT32 testCount) { - QString report = QString("* Colorspace conversion test\n"); + TQString report = TQString("* Colorspace conversion test\n"); KisDoc * doc = m_view->canvasSubject()->document(); KisIDList l = KisMetaRegistry::instance()->csRegistry()->listKeys(); @@ -631,7 +631,7 @@ QString PerfTest::colorConversionTest(Q_UINT32 testCount) KisImage * img = doc->newImage("cs-" + (*it).name(), 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(*it,"")); - QTime t; + TQTime t; KisIDList l2 = KisMetaRegistry::instance()->csRegistry()->listKeys(); for (KisIDList::Iterator it2 = l2.begin(); it2 != l2.end(); ++it2) { @@ -643,7 +643,7 @@ QString PerfTest::colorConversionTest(Q_UINT32 testCount) img2->convertTo(KisMetaRegistry::instance()->csRegistry()->getColorSpace(*it2,"")); delete img2; } - report = report.append(QString(" converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); } @@ -654,10 +654,10 @@ QString PerfTest::colorConversionTest(Q_UINT32 testCount) } -QString PerfTest::filterTest(Q_UINT32 testCount) +TQString PerfTest::filterTest(TQ_UINT32 testCount) { - QString report = QString("* Filter test\n"); + TQString report = TQString("* Filter test\n"); KisIDList filters = KisFilterRegistry::instance()->listKeys(); KisDoc * doc = m_view->canvasSubject()->document(); @@ -669,19 +669,19 @@ QString PerfTest::filterTest(Q_UINT32 testCount) KisImageSP img = doc->newImage("filter-" + (*it).name(), 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(*it,"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; for (KisIDList::Iterator it = filters.begin(); it != filters.end(); ++it) { KisFilterSP f = KisFilterRegistry::instance()->get(*it); t.restart(); kdDebug() << "test filter " << f->id().name() << " on " << img->colorSpace()->id().name() << endl; - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { f->enableProgress(); - f->process(l.data(), l.data(), f->configuration(f->createConfigurationWidget(m_view, l.data())), QRect(0, 0, 1000, 1000)); + f->process(l.data(), l.data(), f->configuration(f->createConfigurationWidget(m_view, l.data())), TQRect(0, 0, 1000, 1000)); f->disableProgress(); } - report = report.append(QString(" filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); } @@ -690,72 +690,72 @@ QString PerfTest::filterTest(Q_UINT32 testCount) } -QString PerfTest::readBytesTest(Q_UINT32 testCount) +TQString PerfTest::readBytesTest(TQ_UINT32 testCount) { - QString report = QString("* Read bytes test\n\n"); + TQString report = TQString("* Read bytes test\n\n"); // On default tiles KisDoc * doc = m_view->canvasSubject()->document(); KisImageSP img = doc->newImage("Readbytes ", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA",""),"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - Q_UINT8 * newData = new Q_UINT8[1000 * 1000 * l->pixelSize()]; + for (TQ_UINT32 i = 0; i < testCount; ++i) { + TQ_UINT8 * newData = new TQ_UINT8[1000 * 1000 * l->pixelSize()]; Q_CHECK_PTR(newData); l->readBytes(newData, 0, 0, 1000, 1000); delete[] newData; } - report = report.append(QString(" read 1000 x 1000 pixels %1 times from empty image: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times from empty image: %2\n").tqarg(testCount).tqarg(t.elapsed())); // On tiles with data KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - Q_UINT8 * newData = new Q_UINT8[1000 * 1000 * l->pixelSize()]; + for (TQ_UINT32 i = 0; i < testCount; ++i) { + TQ_UINT8 * newData = new TQ_UINT8[1000 * 1000 * l->pixelSize()]; Q_CHECK_PTR(newData); l->readBytes(newData, 0, 0, 1000, 1000); delete[] newData; } - report = report.append(QString(" read 1000 x 1000 pixels %1 times from filled image: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times from filled image: %2\n").tqarg(testCount).tqarg(t.elapsed())); return report; } -QString PerfTest::writeBytesTest(Q_UINT32 testCount) +TQString PerfTest::writeBytesTest(TQ_UINT32 testCount) { - QString report = QString("* Write bytes test"); + TQString report = TQString("* Write bytes test"); // On default tiles KisDoc * doc = m_view->canvasSubject()->document(); KisImageSP img = doc->newImage("Writebytes ", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - Q_UINT8 * data = new Q_UINT8[1000 * 1000 * l->pixelSize()]; + TQ_UINT8 * data = new TQ_UINT8[1000 * 1000 * l->pixelSize()]; Q_CHECK_PTR(data); l->readBytes(data, 0, 0, 1000, 1000); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { l->writeBytes(data, 0, 0, 1000, 1000); } delete[] data; - report = report.append(QString(" written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); return report; @@ -764,19 +764,19 @@ QString PerfTest::writeBytesTest(Q_UINT32 testCount) /////// Iterator tests -QString hlineRODefault(KisDoc * doc, Q_UINT32 testCount) +TQString hlineRODefault(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { int adv; - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisHLineIterator hiter = l->createHLineIterator(0, y2, 1000, false); while(! hiter.isDone()) @@ -788,27 +788,27 @@ QString hlineRODefault(KisDoc * doc, Q_UINT32 testCount) } - return QString(" hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString hlineRO(KisDoc * doc, Q_UINT32 testCount) +TQString hlineRO(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { int adv; - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisHLineIterator hiter = l->createHLineIterator(0, y2, 1000, false); while(! hiter.isDone()) @@ -820,22 +820,22 @@ QString hlineRO(KisDoc * doc, Q_UINT32 testCount) } - return QString(" hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString hlineWRDefault(KisDoc * doc, Q_UINT32 testCount) +TQString hlineWRDefault(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { int adv; - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisHLineIterator hiter = l->createHLineIterator(0, y2, 1000, true); while(! hiter.isDone()) @@ -847,26 +847,26 @@ QString hlineWRDefault(KisDoc * doc, Q_UINT32 testCount) } - return QString(" hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString hlineWR(KisDoc * doc, Q_UINT32 testCount) +TQString hlineWR(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { int adv; - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisHLineIterator hiter = l->createHLineIterator(0, y2, 1000, true); while(! hiter.isDone()) @@ -878,21 +878,21 @@ QString hlineWR(KisDoc * doc, Q_UINT32 testCount) } - return QString(" hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString vlineRODefault(KisDoc * doc, Q_UINT32 testCount) +TQString vlineRODefault(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for (TQ_UINT32 i = 0; i < testCount; ++i) { + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisVLineIterator hiter = l->createVLineIterator(y2, 0, 1000, true); while(! hiter.isDone()) @@ -903,25 +903,25 @@ QString vlineRODefault(KisDoc * doc, Q_UINT32 testCount) } - return QString(" vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString vlineRO(KisDoc * doc, Q_UINT32 testCount) +TQString vlineRO(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for (TQ_UINT32 i = 0; i < testCount; ++i) { + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisVLineIterator hiter = l->createVLineIterator(y2, 0, 1000, true); while(! hiter.isDone()) @@ -932,21 +932,21 @@ QString vlineRO(KisDoc * doc, Q_UINT32 testCount) } - return QString(" vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString vlineWRDefault(KisDoc * doc, Q_UINT32 testCount) +TQString vlineWRDefault(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisVLineIterator hiter = l->createVLineIterator(y2, 0, 1000, true); while(! hiter.isDone()) @@ -957,24 +957,24 @@ QString vlineWRDefault(KisDoc * doc, Q_UINT32 testCount) } - return QString(" vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString vlineWR(KisDoc * doc, Q_UINT32 testCount) +TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for (TQ_UINT32 i = 0; i < testCount; ++i) { + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisHLineIterator hiter = l->createHLineIterator(y2, 0, 1000, true); while(! hiter.isDone()) @@ -985,19 +985,19 @@ QString vlineWR(KisDoc * doc, Q_UINT32 testCount) } - return QString(" vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString rectRODefault(KisDoc * doc, Q_UINT32 testCount) +TQString rectRODefault(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); ; - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { KisRectIterator r = l->createRectIterator(0, 0, 1000, 1000, false); while(! r.isDone()) { @@ -1005,24 +1005,24 @@ QString rectRODefault(KisDoc * doc, Q_UINT32 testCount) } } - return QString(" rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString rectRO(KisDoc * doc, Q_UINT32 testCount) +TQString rectRO(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { KisRectIterator r = l->createRectIterator(0, 0, 1000, 1000, false); while(! r.isDone()) { @@ -1030,21 +1030,21 @@ QString rectRO(KisDoc * doc, Q_UINT32 testCount) } } - return QString(" rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString rectWRDefault(KisDoc * doc, Q_UINT32 testCount) +TQString rectWRDefault(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { KisRectIterator r = l->createRectIterator(0, 0, 1000, 1000, true); while(! r.isDone()) { @@ -1052,25 +1052,25 @@ QString rectWRDefault(KisDoc * doc, Q_UINT32 testCount) } } - return QString(" rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString rectWR(KisDoc * doc, Q_UINT32 testCount) +TQString rectWR(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { KisRectIterator r = l->createRectIterator(0, 0, 1000, 1000, true); while(! r.isDone()) { @@ -1079,13 +1079,13 @@ QString rectWR(KisDoc * doc, Q_UINT32 testCount) } - return QString(" rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString PerfTest::iteratorTest(Q_UINT32 testCount) +TQString PerfTest::iteratorTest(TQ_UINT32 testCount) { - QString report = "Iterator test"; + TQString report = "Iterator test"; KisDoc * doc = m_view->canvasSubject()->document(); @@ -1109,9 +1109,9 @@ QString PerfTest::iteratorTest(Q_UINT32 testCount) } -QString PerfTest::paintViewTest(Q_UINT32 testCount) +TQString PerfTest::paintViewTest(TQ_UINT32 testCount) { - QString report = QString("* paintView test\n\n"); + TQString report = TQString("* paintView test\n\n"); KisDoc * doc = m_view->canvasSubject()->document(); @@ -1122,56 +1122,56 @@ QString PerfTest::paintViewTest(Q_UINT32 testCount) KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 512, 512, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 512, 512, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); #if USE_CALLGRIND CALLGRIND_ZERO_STATS(); #endif - for (Q_UINT32 i = 0; i < testCount; ++i) { - m_view->getCanvasController()->updateCanvas(QRect(0, 0, 512, 512)); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + m_view->getCanvasController()->updateCanvas(TQRect(0, 0, 512, 512)); } #if USE_CALLGRIND CALLGRIND_DUMP_STATS(); #endif - report = report.append(QString(" painted a 512 x 512 image %1 times: %2 ms\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" painted a 512 x 512 image %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed())); img->newLayer("layer 2", OPACITY_OPAQUE); l = img->activeDevice(); p.begin(l.data()); - p.fillRect(0, 0, 512, 512, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 512, 512, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); img->newLayer("layer 3", OPACITY_OPAQUE); l = img->activeDevice(); p.begin(l.data()); - p.fillRect(0, 0, 512, 512, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 512, 512, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - m_view->getCanvasController()->updateCanvas(QRect(0, 0, 512, 512)); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + m_view->getCanvasController()->updateCanvas(TQRect(0, 0, 512, 512)); } - report = report.append(QString(" painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed())); return report; } -QString PerfTest::paintViewFPSTest() +TQString PerfTest::paintViewFPSTest() { - QString report = QString("* paintView (fps) test\n\n"); + TQString report = TQString("* paintView (fps) test\n\n"); - QTime t; + TQTime t; t.restart(); #if USE_CALLGRIND @@ -1190,7 +1190,7 @@ QString PerfTest::paintViewFPSTest() CALLGRIND_DUMP_STATS(); #endif - report = report.append(QString(" painted current view at %1 frames per second\n").arg(numViewsPainted)); + report = report.append(TQString(" painted current view at %1 frames per second\n").tqarg(numViewsPainted)); return report; } diff --git a/krita/plugins/viewplugins/performancetest/perftest.h b/krita/plugins/viewplugins/performancetest/perftest.h index 6a3365c5..807c0aee 100644 --- a/krita/plugins/viewplugins/performancetest/perftest.h +++ b/krita/plugins/viewplugins/performancetest/perftest.h @@ -31,8 +31,9 @@ class KisID; class PerfTest : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - PerfTest(QObject *parent, const char *name, const QStringList &); + PerfTest(TQObject *tqparent, const char *name, const TQStringList &); virtual ~PerfTest(); private slots: @@ -41,28 +42,28 @@ private slots: private: - QString bltTest(Q_UINT32 testCount); - QString fillTest(Q_UINT32 testCount); - QString gradientTest(Q_UINT32 testCount); - QString pixelTest(Q_UINT32 testCount); - QString shapeTest(Q_UINT32 testCount); - QString layerTest(Q_UINT32 testCount); - QString scaleTest(Q_UINT32 testCount); - QString rotateTest(Q_UINT32 testCount); - QString renderTest(Q_UINT32 restCount); - QString selectionTest(Q_UINT32 testCount); - QString colorConversionTest(Q_UINT32 testCount); - QString filterTest(Q_UINT32 testCount); - QString readBytesTest(Q_UINT32 testCount); - QString writeBytesTest(Q_UINT32 testCount); - QString iteratorTest(Q_UINT32 testCount); - QString paintViewTest(Q_UINT32 testCount); - QString paintViewFPSTest(); + TQString bltTest(TQ_UINT32 testCount); + TQString fillTest(TQ_UINT32 testCount); + TQString gradientTest(TQ_UINT32 testCount); + TQString pixelTest(TQ_UINT32 testCount); + TQString tqshapeTest(TQ_UINT32 testCount); + TQString layerTest(TQ_UINT32 testCount); + TQString scaleTest(TQ_UINT32 testCount); + TQString rotateTest(TQ_UINT32 testCount); + TQString renderTest(TQ_UINT32 restCount); + TQString selectionTest(TQ_UINT32 testCount); + TQString colorConversionTest(TQ_UINT32 testCount); + TQString filterTest(TQ_UINT32 testCount); + TQString readBytesTest(TQ_UINT32 testCount); + TQString writeBytesTest(TQ_UINT32 testCount); + TQString iteratorTest(TQ_UINT32 testCount); + TQString paintViewTest(TQ_UINT32 testCount); + TQString paintViewFPSTest(); - QString doBlit(const KisCompositeOp& op, + TQString doBlit(const KisCompositeOp& op, KisID cspace, - Q_UINT8 opacity, - Q_UINT32 testCount, + TQ_UINT8 opacity, + TQ_UINT32 testCount, KisImageSP img); private: diff --git a/krita/plugins/viewplugins/performancetest/wdg_perftest.ui b/krita/plugins/viewplugins/performancetest/wdg_perftest.ui index 4f9ca4a0..7dc14f17 100644 --- a/krita/plugins/viewplugins/performancetest/wdg_perftest.ui +++ b/krita/plugins/viewplugins/performancetest/wdg_perftest.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>WdgPerfTest</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgPerfTest</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>grpPerfTest</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblTests</cstring> </property> @@ -41,7 +41,7 @@ <cstring>intWidth</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>chkBitBlt</cstring> </property> @@ -52,7 +52,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>chkFill</cstring> </property> @@ -63,7 +63,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>chkGradient</cstring> </property> @@ -74,7 +74,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkPixel</cstring> </property> @@ -85,7 +85,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>chkShape</cstring> </property> @@ -96,7 +96,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="6" column="0"> + <widget class="TQCheckBox" row="6" column="0"> <property name="name"> <cstring>chkLayer</cstring> </property> @@ -107,7 +107,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="7" column="0"> + <widget class="TQCheckBox" row="7" column="0"> <property name="name"> <cstring>chkScale</cstring> </property> @@ -118,7 +118,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="8" column="0"> + <widget class="TQCheckBox" row="8" column="0"> <property name="name"> <cstring>chkRotate</cstring> </property> @@ -129,7 +129,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="9" column="0"> + <widget class="TQCheckBox" row="9" column="0"> <property name="name"> <cstring>chkRender</cstring> </property> @@ -140,7 +140,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="10" column="0"> + <widget class="TQCheckBox" row="10" column="0"> <property name="name"> <cstring>chkSelection</cstring> </property> @@ -151,7 +151,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="11" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="11" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkColorConversion</cstring> </property> @@ -162,7 +162,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="12" column="0"> + <widget class="TQCheckBox" row="12" column="0"> <property name="name"> <cstring>chkFilter</cstring> </property> @@ -187,7 +187,7 @@ <number>1000000</number> </property> </widget> - <widget class="QCheckBox" row="13" column="0"> + <widget class="TQCheckBox" row="13" column="0"> <property name="name"> <cstring>chkReadBytes</cstring> </property> @@ -198,7 +198,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="14" column="0"> + <widget class="TQCheckBox" row="14" column="0"> <property name="name"> <cstring>chkWriteBytes</cstring> </property> @@ -209,7 +209,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="15" column="0"> + <widget class="TQCheckBox" row="15" column="0"> <property name="name"> <cstring>chkIterators</cstring> </property> @@ -220,7 +220,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="16" column="0"> + <widget class="TQCheckBox" row="16" column="0"> <property name="name"> <cstring>chkPaintView</cstring> </property> @@ -231,15 +231,15 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="18" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="18" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnSelectAll</cstring> </property> @@ -247,7 +247,7 @@ <string>&Select All</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnDeselectAll</cstring> </property> @@ -257,7 +257,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="17" column="0"> + <widget class="TQCheckBox" row="17" column="0"> <property name="name"> <cstring>chkPaintViewFPS</cstring> </property> @@ -275,7 +275,7 @@ <tabstops> <tabstop>intTestCount</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.cc index 9bf20fec..28d60154 100644 --- a/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.cc +++ b/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.cc @@ -26,10 +26,10 @@ using namespace std; -#include <qgroupbox.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqgroupbox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> #include <klocale.h> #include <knuminput.h> @@ -39,9 +39,9 @@ using namespace std; #include "wdg_rotateimage.h" -DlgRotateImage::DlgRotateImage( QWidget * parent, +DlgRotateImage::DlgRotateImage( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Rotate Image"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Rotate Image"), Ok | Cancel, Ok) { m_lock = false; @@ -49,12 +49,12 @@ DlgRotateImage::DlgRotateImage( QWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); - connect( m_page->doubleCustom, SIGNAL( valueChanged ( double ) ), - this, SLOT( slotAngleValueChanged( double ) ) ); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); + connect( m_page->doubleCustom, TQT_SIGNAL( valueChanged ( double ) ), + this, TQT_SLOT( slotAngleValueChanged( double ) ) ); } @@ -104,7 +104,7 @@ double DlgRotateImage::angle() angle = 270; } else { - angle = qRound(m_page->doubleCustom->value()); + angle = tqRound(m_page->doubleCustom->value()); } if (m_page->radioCW->isChecked()) { return angle; diff --git a/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.h b/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.h index c6eef135..8c00df81 100644 --- a/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.h +++ b/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.h @@ -35,10 +35,11 @@ enum enumRotationDirection { class DlgRotateImage: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgRotateImage(QWidget * parent = 0, + DlgRotateImage(TQWidget * tqparent = 0, const char* name = 0); ~DlgRotateImage(); diff --git a/krita/plugins/viewplugins/rotateimage/rotateimage.cc b/krita/plugins/viewplugins/rotateimage/rotateimage.cc index 8b85ef3a..0b1b1a8c 100644 --- a/krita/plugins/viewplugins/rotateimage/rotateimage.cc +++ b/krita/plugins/viewplugins/rotateimage/rotateimage.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -51,24 +51,24 @@ typedef KGenericFactory<RotateImage> RotateImageFactory; K_EXPORT_COMPONENT_FACTORY( kritarotateimage, RotateImageFactory( "krita" ) ) // XXX: this plugin could also provide layer scaling/resizing -RotateImage::RotateImage(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +RotateImage::RotateImage(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) { + if ( tqparent->inherits("KisView") ) { setInstance(RotateImageFactory::instance()); setXMLFile(locate("data","kritaplugins/rotateimage.rc"), true); - m_view = (KisView*) parent; - (void) new KAction(i18n("&Rotate Image..."), 0, 0, this, SLOT(slotRotateImage()), actionCollection(), "rotateimage"); - (void) new KAction(i18n("Rotate Image CW"), "rotate_cw", 0, this, SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90"); - (void) new KAction(i18n("Rotate Image 1&80"), 0, 0, this, SLOT(slotRotateImage180()), actionCollection(), "rotateImage180"); - (void) new KAction(i18n("Rotate Image CCW"), "rotate_ccw", 0, this, SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90"); + m_view = (KisView*) tqparent; + (void) new KAction(i18n("&Rotate Image..."), 0, 0, this, TQT_SLOT(slotRotateImage()), actionCollection(), "rotateimage"); + (void) new KAction(i18n("Rotate Image CW"), "rotate_cw", 0, this, TQT_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90"); + (void) new KAction(i18n("Rotate Image 1&80"), 0, 0, this, TQT_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180"); + (void) new KAction(i18n("Rotate Image CCW"), "rotate_ccw", 0, this, TQT_SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90"); - (void) new KAction(i18n("&Rotate Layer..."), 0, 0, this, SLOT(slotRotateLayer()), actionCollection(), "rotatelayer"); + (void) new KAction(i18n("&Rotate Layer..."), 0, 0, this, TQT_SLOT(slotRotateLayer()), actionCollection(), "rotatelayer"); - (void)new KAction(i18n("Rotate 1&80"), 0, m_view, SLOT(rotateLayer180()), actionCollection(), "rotateLayer180"); - (void)new KAction(i18n("Rotate CCW"), "rotate_ccw", 0, m_view, SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90"); - (void)new KAction(i18n("Rotate CW"), "rotate_cw", 0, m_view, SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90"); + (void)new KAction(i18n("Rotate 1&80"), 0, m_view, TQT_SLOT(rotateLayer180()), actionCollection(), "rotateLayer180"); + (void)new KAction(i18n("Rotate CCW"), "rotate_ccw", 0, m_view, TQT_SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90"); + (void)new KAction(i18n("Rotate CW"), "rotate_cw", 0, m_view, TQT_SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90"); } } @@ -88,7 +88,7 @@ void RotateImage::slotRotateImage() dlgRotateImage->setCaption(i18n("Rotate Image")); - if (dlgRotateImage->exec() == QDialog::Accepted) { + if (dlgRotateImage->exec() == TQDialog::Accepted) { double angle = dlgRotateImage->angle(); angle *= M_PI/180; m_view->rotateCurrentImage(angle); @@ -123,7 +123,7 @@ void RotateImage::slotRotateLayer() dlgRotateImage->setCaption(i18n("Rotate Layer")); - if (dlgRotateImage->exec() == QDialog::Accepted) { + if (dlgRotateImage->exec() == TQDialog::Accepted) { double angle = dlgRotateImage->angle(); angle *= M_PI/180; m_view->rotateLayer(angle); diff --git a/krita/plugins/viewplugins/rotateimage/rotateimage.h b/krita/plugins/viewplugins/rotateimage/rotateimage.h index 7c09179c..71223282 100644 --- a/krita/plugins/viewplugins/rotateimage/rotateimage.h +++ b/krita/plugins/viewplugins/rotateimage/rotateimage.h @@ -27,8 +27,9 @@ class KisView; class RotateImage : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - RotateImage(QObject *parent, const char *name, const QStringList &); + RotateImage(TQObject *tqparent, const char *name, const TQStringList &); virtual ~RotateImage(); private slots: diff --git a/krita/plugins/viewplugins/rotateimage/wdg_rotateimage.ui b/krita/plugins/viewplugins/rotateimage/wdg_rotateimage.ui index f672db7f..d58c458d 100644 --- a/krita/plugins/viewplugins/rotateimage/wdg_rotateimage.ui +++ b/krita/plugins/viewplugins/rotateimage/wdg_rotateimage.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgRotateImage</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgRotateImage</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>grpDirection</cstring> </property> @@ -30,9 +30,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -48,14 +48,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel1</cstring> </property> @@ -65,7 +65,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -79,14 +79,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel2</cstring> </property> @@ -96,7 +96,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> @@ -119,7 +119,7 @@ </spacer> </hbox> </widget> - <widget class="QRadioButton" row="1" column="1"> + <widget class="TQRadioButton" row="1" column="1"> <property name="name"> <cstring>radioCW</cstring> </property> @@ -130,7 +130,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioCCW</cstring> </property> @@ -140,7 +140,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>grpAngle</cstring> </property> @@ -151,7 +151,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radio90</cstring> </property> @@ -159,7 +159,7 @@ <string>90 &degrees</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radio180</cstring> </property> @@ -167,7 +167,7 @@ <string>180 d&egrees</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radio270</cstring> </property> @@ -175,15 +175,15 @@ <string>270 de&grees</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioCustom</cstring> </property> @@ -219,7 +219,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>91</height> @@ -238,7 +238,7 @@ <data format="PNG" length="363">89504e470d0a1a0a0000000d494844520000002c0000002e0806000000534cfb0a00000132494441545885ed994b12032108449b54ee7f65b3cd5440f92a56a5f7326f5a11451a63608b8806c6a0689857068b5a446177f6020361e8fdc04008fa0c30e086a6b4a4f3ba664cc418704212013041fb80b340bfa5847e9b825680022687f549d70016d03aac815d7d988be1a87c6be015acb7dc3ac7cd8167b091734160acbc861bc2029e4a77101690f661c9dd840f46a577b8012cc00157edb749d239dcc45de0e4f1d2a927705235aad4e50e5fa03f70b56c0778ab227bba90ec7d1d167eb62f30c0423f81b9696856aa7b3bcc487fa7f3543ccb18e54cfe3adca914332ce7aff9c6d83cb0e47205b4f176634fba4c68472c1978b69633a09db7f2753330bb91128ca7eb5e56b5aaac316069b756573ce54cf5b8e65fd3d0769870e6c920305bfb1e659296541ef0265d77bcbc0ef803779f9c39421cd9b50000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/krita/plugins/viewplugins/screenshot/ksnapshot.cpp b/krita/plugins/viewplugins/screenshot/ksnapshot.cpp index 77b4da4b..09bdca48 100644 --- a/krita/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/krita/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -22,11 +22,11 @@ #include <ksavefile.h> #include <ktempfile.h> -#include <qbitmap.h> -#include <qdragobject.h> -#include <qimage.h> -#include <qclipboard.h> -#include <qvbox.h> +#include <tqbitmap.h> +#include <tqdragobject.h> +#include <tqimage.h> +#include <tqclipboard.h> +#include <tqvbox.h> #include <kaccel.h> #include <knotifyclient.h> @@ -35,11 +35,11 @@ #include <kpushbutton.h> #include <kstartupinfo.h> -#include <qcursor.h> -#include <qregexp.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> -#include <qwhatsthis.h> +#include <tqcursor.h> +#include <tqregexp.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> +#include <tqwhatsthis.h> #include <stdlib.h> @@ -58,10 +58,10 @@ #include <kglobal.h> -KSnapshot::KSnapshot(QWidget *parent, const char *name) - : super(parent, name, false, QString::null, Ok|Cancel) +KSnapshot::KSnapshot(TQWidget *tqparent, const char *name) + : super(tqparent, name, false, TQString(), Ok|Cancel) { - grabber = new QWidget( 0, 0, WStyle_Customize | WX11BypassWM ); + grabber = new TQWidget( 0, 0, WStyle_Customize | WX11BypassWM ); Q_CHECK_PTR(grabber); grabber->move( -1000, -1000 ); grabber->installEventFilter( this ); @@ -72,21 +72,21 @@ KSnapshot::KSnapshot(QWidget *parent, const char *name) haveXShape = XShapeQueryExtension( qt_xdisplay(), &tmp1, &tmp2 ); #endif - QVBox *vbox = makeVBoxMainWidget(); + TQVBox *vbox = makeVBoxMainWidget(); mainWidget = new KSnapshotWidget( vbox, "mainWidget" ); Q_CHECK_PTR(mainWidget); mainWidget->btnSave->hide(); mainWidget->btnPrint->hide(); - connect(mainWidget, SIGNAL(startImageDrag()), SLOT(slotDragSnapshot())); + connect(mainWidget, TQT_SIGNAL(startImageDrag()), TQT_SLOT(slotDragSnapshot())); - connect( mainWidget, SIGNAL( newClicked() ), SLOT( slotGrab() ) ); - connect( mainWidget, SIGNAL( printClicked() ), SLOT( slotPrint() ) ); + connect( mainWidget, TQT_SIGNAL( newClicked() ), TQT_SLOT( slotGrab() ) ); + connect( mainWidget, TQT_SIGNAL( printClicked() ), TQT_SLOT( slotPrint() ) ); grabber->show(); grabber->grabMouse( waitCursor ); - snapshot = QPixmap::grabWindow( qt_xrootwin() ); + snapshot = TQPixmap::grabWindow( qt_xrootwin() ); updatePreview(); grabber->releaseMouse(); grabber->hide(); @@ -97,16 +97,16 @@ KSnapshot::KSnapshot(QWidget *parent, const char *name) mainWidget->setMode( conf->readNumEntry( "mode", 0 ) ); mainWidget->setIncludeDecorations(conf->readBoolEntry("includeDecorations",true)); - connect( &grabTimer, SIGNAL( timeout() ), this, SLOT( grabTimerDone() ) ); + connect( &grabTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( grabTimerDone() ) ); KAccel* accel = new KAccel(this); Q_CHECK_PTR(accel); - accel->insert(KStdAccel::Print, this, SLOT(slotPrint())); - accel->insert(KStdAccel::New, this, SLOT(slotGrab())); + accel->insert(KStdAccel::Print, this, TQT_SLOT(slotPrint())); + accel->insert(KStdAccel::New, this, TQT_SLOT(slotGrab())); - accel->insert( "Print2", Qt::Key_P, this, SLOT(slotPrint())); - accel->insert( "New2", Qt::Key_N, this, SLOT(slotGrab())); - accel->insert( "New3", Qt::Key_Space, this, SLOT(slotGrab())); + accel->insert( "Print2", TQt::Key_P, this, TQT_SLOT(slotPrint())); + accel->insert( "New2", TQt::Key_N, this, TQT_SLOT(slotGrab())); + accel->insert( "New3", TQt::Key_Space, this, TQT_SLOT(slotGrab())); mainWidget->btnNew->setFocus(); @@ -116,14 +116,14 @@ KSnapshot::~KSnapshot() { } -bool KSnapshot::save( const QString &filename ) +bool KSnapshot::save( const TQString &filename ) { return save( KURL::fromPathOrURL( filename )); } bool KSnapshot::save( const KURL& url ) { - QString type( KImageIO::type(url.path()) ); + TQString type( KImageIO::type(url.path()) ); if ( type.isNull() ) type = "PNG"; @@ -147,13 +147,13 @@ bool KSnapshot::save( const KURL& url ) } } - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); if ( !ok ) { kdWarning() << "KSnapshot was unable to save the snapshot" << endl; - QString caption = i18n("Unable to Save Image"); - QString text = i18n("KSnapshot was unable to save the image to\n%1.") - .arg(url.prettyURL()); + TQString caption = i18n("Unable to Save Image"); + TQString text = i18n("KSnapshot was unable to save the image to\n%1.") + .tqarg(url.prettyURL()); KMessageBox::error(this, text, caption); } @@ -162,13 +162,13 @@ bool KSnapshot::save( const KURL& url ) void KSnapshot::slotCopy() { - QClipboard *cb = QApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setPixmap( snapshot ); } void KSnapshot::slotDragSnapshot() { - QDragObject *drobj = new QImageDrag(snapshot.convertToImage(), this); + TQDragObject *drobj = new TQImageDrag(snapshot.convertToImage(), this); Q_CHECK_PTR(drobj); drobj->setPixmap(mainWidget->preview()); drobj->dragCopy(); @@ -181,8 +181,8 @@ void KSnapshot::slotGrab() { rgnGrab = new RegionGrabber(); Q_CHECK_PTR(rgnGrab); - connect( rgnGrab, SIGNAL( regionGrabbed( const QPixmap & ) ), - SLOT( slotRegionGrabbed( const QPixmap & ) ) ); + connect( rgnGrab, TQT_SIGNAL( regionGrabbed( const TQPixmap & ) ), + TQT_SLOT( slotRegionGrabbed( const TQPixmap & ) ) ); } else { @@ -203,14 +203,14 @@ void KSnapshot::slotPrint() else printer.setOrientation(KPrinter::Portrait); - qApp->processEvents(); + tqApp->processEvents(); if (printer.setup(this, i18n("Print Screenshot"))) { - qApp->processEvents(); + tqApp->processEvents(); - QPainter painter(&printer); - QPaintDeviceMetrics metrics(painter.device()); + TQPainter painter(&printer); + TQPaintDeviceMetrics metrics(painter.device()); float w = snapshot.width(); float dw = w - metrics.width(); @@ -223,8 +223,8 @@ void KSnapshot::slotPrint() if ( scale ) { - QImage img = snapshot.convertToImage(); - qApp->processEvents(); + TQImage img = snapshot.convertToImage(); + tqApp->processEvents(); float newh, neww; if ( dw > dh ) { @@ -236,8 +236,8 @@ void KSnapshot::slotPrint() neww = newh/h*w; } - img = img.smoothScale( int(neww), int(newh), QImage::ScaleMin ); - qApp->processEvents(); + img = img.smoothScale( int(neww), int(newh), TQ_ScaleMin ); + tqApp->processEvents(); int x = (metrics.width()-img.width())/2; int y = (metrics.height()-img.height())/2; @@ -251,10 +251,10 @@ void KSnapshot::slotPrint() } } - qApp->processEvents(); + tqApp->processEvents(); } -void KSnapshot::slotRegionGrabbed( const QPixmap &pix ) +void KSnapshot::slotRegionGrabbed( const TQPixmap &pix ) { if ( !pix.isNull() ) { @@ -264,15 +264,15 @@ void KSnapshot::slotRegionGrabbed( const QPixmap &pix ) } delete rgnGrab; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); show(); } -bool KSnapshot::eventFilter( QObject* o, QEvent* e) +bool KSnapshot::eventFilter( TQObject* o, TQEvent* e) { - if ( o == grabber && e->type() == QEvent::MouseButtonPress ) { - QMouseEvent* me = (QMouseEvent*) e; - if ( QWidget::mouseGrabber() != grabber ) + if ( o == grabber && e->type() == TQEvent::MouseButtonPress ) { + TQMouseEvent* me = (TQMouseEvent*) e; + if ( TQWidget::mouseGrabber() != grabber ) return false; if ( me->button() == LeftButton ) performGrab(); @@ -282,7 +282,7 @@ bool KSnapshot::eventFilter( QObject* o, QEvent* e) void KSnapshot::updatePreview() { - QImage img = snapshot.convertToImage(); + TQImage img = snapshot.convertToImage(); double r1 = ((double) snapshot.height() ) / snapshot.width(); if ( r1 * mainWidget->previewWidth() < mainWidget->previewHeight() ) img = img.smoothScale( mainWidget->previewWidth(), @@ -291,7 +291,7 @@ void KSnapshot::updatePreview() img = img.smoothScale( (int) (((double)mainWidget->previewHeight()) / r1), (mainWidget->previewHeight() ) ); - QPixmap pm; + TQPixmap pm; pm.convertFromImage( img ); mainWidget->setPreview( pm ); } @@ -319,17 +319,17 @@ Window findRealWindow( Window w, int depth = 0 ) if( type != None ) return w; } - Window root, parent; - Window* children; - unsigned int nchildren; + Window root, tqparent; + Window* tqchildren; + unsigned int ntqchildren; Window ret = None; - if( XQueryTree( qt_xdisplay(), w, &root, &parent, &children, &nchildren ) != 0 ) { + if( XQueryTree( qt_xdisplay(), w, &root, &tqparent, &tqchildren, &ntqchildren ) != 0 ) { for( unsigned int i = 0; - i < nchildren && ret == None; + i < ntqchildren && ret == None; ++i ) - ret = findRealWindow( children[ i ], depth + 1 ); - if( children != NULL ) - XFree( children ); + ret = findRealWindow( tqchildren[ i ], depth + 1 ); + if( tqchildren != NULL ) + XFree( tqchildren ); } return ret; } @@ -343,11 +343,11 @@ void KSnapshot::performGrab() if ( mainWidget->mode() == WindowUnderCursor ) { Window root; Window child; - uint mask; + uint tqmask; int rootX, rootY, winX, winY; XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child, &rootX, &rootY, &winX, &winY, - &mask); + &tqmask); if( child == None ) child = qt_xrootwin(); if( !mainWidget->includeDecorations()) { @@ -364,77 +364,77 @@ void KSnapshot::performGrab() w += 2 * border; h += 2 * border; - Window parent; - Window* children; - unsigned int nchildren; - if( XQueryTree( qt_xdisplay(), child, &root, &parent, - &children, &nchildren ) != 0 ) { - if( children != NULL ) - XFree( children ); + Window tqparent; + Window* tqchildren; + unsigned int ntqchildren; + if( XQueryTree( qt_xdisplay(), child, &root, &tqparent, + &tqchildren, &ntqchildren ) != 0 ) { + if( tqchildren != NULL ) + XFree( tqchildren ); int newx, newy; Window dummy; - if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(), + if( XTranslateCoordinates( qt_xdisplay(), tqparent, qt_xrootwin(), x, y, &newx, &newy, &dummy )) { x = newx; y = newy; } } - snapshot = QPixmap::grabWindow( qt_xrootwin(), x, y, w, h ); + snapshot = TQPixmap::grabWindow( qt_xrootwin(), x, y, w, h ); #ifdef HAVE_X11_EXTENSIONS_SHAPE_H //No XShape - no work. if (haveXShape) { - QBitmap mask(w, h); - //As the first step, get the mask from XShape. + TQBitmap tqmask(w, h); + //As the first step, get the tqmask from XShape. int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child, ShapeBounding, &count, &order); - //The ShapeBounding region is the outermost shape of the window; + //The ShapeBounding region is the outermost tqshape of the window; //ShapeBounding - ShapeClipping is defined to be the border. //Since the border area is part of the window, we use bounding // to limit our work region if (rects) { - //Create a QRegion from the rectangles describing the bounding mask. - QRegion contents; + //Create a TQRegion from the rectangles describing the bounding tqmask. + TQRegion contents; for (int pos = 0; pos < count; pos++) - contents += QRegion(rects[pos].x, rects[pos].y, + contents += TQRegion(rects[pos].x, rects[pos].y, rects[pos].width, rects[pos].height); XFree(rects); //Create the bounding box. - QRegion bbox(0, 0, snapshot.width(), snapshot.height()); + TQRegion bbox(0, 0, snapshot.width(), snapshot.height()); if( border > 0 ) { contents.translate( border, border ); - contents += QRegion( 0, 0, border, h ); - contents += QRegion( 0, 0, w, border ); - contents += QRegion( 0, h - border, w, border ); - contents += QRegion( w - border, 0, border, h ); + contents += TQRegion( 0, 0, border, h ); + contents += TQRegion( 0, 0, w, border ); + contents += TQRegion( 0, h - border, w, border ); + contents += TQRegion( w - border, 0, border, h ); } - //Get the masked away area. - QRegion maskedAway = bbox - contents; - QMemArray<QRect> maskedAwayRects = maskedAway.rects(); - - //Construct a bitmap mask from the rectangles - QPainter p(&mask); - p.fillRect(0, 0, w, h, Qt::color1); - for (uint pos = 0; pos < maskedAwayRects.count(); pos++) - p.fillRect(maskedAwayRects[pos], Qt::color0); + //Get the tqmasked away area. + TQRegion tqmaskedAway = bbox - contents; + TQMemArray<TQRect> tqmaskedAwayRects = tqmaskedAway.rects(); + + //Construct a bitmap tqmask from the rectangles + TQPainter p(&tqmask); + p.fillRect(0, 0, w, h, TQt::color1); + for (uint pos = 0; pos < tqmaskedAwayRects.count(); pos++) + p.fillRect(tqmaskedAwayRects[pos], TQt::color0); p.end(); - snapshot.setMask(mask); + snapshot.setMask(tqmask); } } #endif } else { - snapshot = QPixmap::grabWindow( qt_xrootwin() ); + snapshot = TQPixmap::grabWindow( qt_xrootwin() ); } XUngrabServer( qt_xdisplay()); updatePreview(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); modified = true; // show(); slotOk(); @@ -445,7 +445,7 @@ void KSnapshot::setTime(int newTime) mainWidget->setDelay(newTime); } -void KSnapshot::setURL( const QString &url ) +void KSnapshot::setURL( const TQString &url ) { KURL newURL = KURL::fromPathOrURL( url ); if ( newURL == filename ) @@ -461,7 +461,7 @@ void KSnapshot::setGrabMode( int m ) void KSnapshot::slotMovePointer(int x, int y) { - QCursor::setPos( x, y ); + TQCursor::setPos( x, y ); } void KSnapshot::exit() @@ -473,7 +473,7 @@ void KSnapshot::exit() conf->writeEntry("mode",mainWidget->mode()); conf->writeEntry("includeDecorations",mainWidget->includeDecorations()); KURL url = filename; - url.setPass( QString::null ); + url.setPass( TQString() ); conf->writePathEntry("filename",url.url()); reject(); @@ -488,7 +488,7 @@ void KSnapshot::slotOk() conf->writeEntry("mode",mainWidget->mode()); conf->writeEntry("includeDecorations",mainWidget->includeDecorations()); KURL url = filename; - url.setPass( QString::null ); + url.setPass( TQString() ); conf->writePathEntry("filename",url.url()); emit screenGrabbed(); diff --git a/krita/plugins/viewplugins/screenshot/ksnapshot.h b/krita/plugins/viewplugins/screenshot/ksnapshot.h index 7eeccb62..030cad12 100644 --- a/krita/plugins/viewplugins/screenshot/ksnapshot.h +++ b/krita/plugins/viewplugins/screenshot/ksnapshot.h @@ -23,9 +23,9 @@ #ifndef KSNAPSHOT_H #define KSNAPSHOT_H -#include <qlabel.h> -#include <qpixmap.h> -#include <qtimer.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqtimer.h> #include <dcopclient.h> #include <kglobalsettings.h> @@ -35,15 +35,16 @@ class RegionGrabber; class KSnapshotWidget; -class KSnapshotThumb : public QLabel +class KSnapshotThumb : public TQLabel { Q_OBJECT + TQ_OBJECT public: - KSnapshotThumb(QWidget *parent, const char *name = 0) - : QLabel(parent, name) + KSnapshotThumb(TQWidget *tqparent, const char *name = 0) + : TQLabel(tqparent, name) { - setAlignment(AlignHCenter | AlignVCenter); + tqsetAlignment(AlignHCenter | AlignVCenter); } virtual ~KSnapshotThumb() {} @@ -51,44 +52,45 @@ signals: void startDrag(); protected: - void mousePressEvent(QMouseEvent * e) + void mousePressEvent(TQMouseEvent * e) { mClickPt = e->pos(); } - void mouseMoveEvent(QMouseEvent * e) + void mouseMoveEvent(TQMouseEvent * e) { - if (mClickPt != QPoint(0, 0) && + if (mClickPt != TQPoint(0, 0) && (e->pos() - mClickPt).manhattanLength() > KGlobalSettings::dndEventDelay()) { - mClickPt = QPoint(0, 0); + mClickPt = TQPoint(0, 0); emit startDrag(); } } - void mouseReleaseEvent(QMouseEvent * /*e*/) + void mouseReleaseEvent(TQMouseEvent * /*e*/) { - mClickPt = QPoint(0, 0); + mClickPt = TQPoint(0, 0); } - QPoint mClickPt; + TQPoint mClickPt; }; class KSnapshot : public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - KSnapshot(QWidget *parent= 0, const char *name= 0); + KSnapshot(TQWidget *tqparent= 0, const char *name= 0); ~KSnapshot(); enum CaptureMode { FullScreen=0, WindowUnderCursor=1, Region=2 }; - bool save( const QString &filename ); + bool save( const TQString &filename ); bool save( const KURL& url ); - QString url() const { return filename.url(); } + TQString url() const { return filename.url(); } signals: void screenGrabbed(); @@ -100,7 +102,7 @@ protected slots: void slotMovePointer( int x, int y ); void setTime(int newTime); - void setURL(const QString &newURL); + void setURL(const TQString &newURL); void setGrabMode( int m ); void exit(); @@ -109,21 +111,21 @@ protected slots: protected: void reject() { close(); } - bool eventFilter( QObject*, QEvent* ); + bool eventFilter( TQObject*, TQEvent* ); private slots: void grabTimerDone(); void slotDragSnapshot(); - void slotRegionGrabbed( const QPixmap & ); + void slotRegionGrabbed( const TQPixmap & ); private: void updatePreview(); void performGrab(); void autoincFilename(); - QPixmap snapshot; - QTimer grabTimer; - QWidget* grabber; + TQPixmap snapshot; + TQTimer grabTimer; + TQWidget* grabber; KURL filename; KSnapshotWidget *mainWidget; RegionGrabber *rgnGrab; diff --git a/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui b/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui index bd24e6ef..33b64e81 100644 --- a/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui +++ b/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KSnapshotWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSnapshotWidget</cstring> </property> @@ -23,7 +23,7 @@ <property name="name"> <cstring>lblImage</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>130</height> @@ -76,7 +76,7 @@ The image can be dragged to another application or document to copy the full scr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> @@ -111,7 +111,7 @@ The image can be dragged to another application or document to copy the full scr <enum>Horizontal</enum> </property> </widget> - <widget class="QSpinBox" row="6" column="1"> + <widget class="TQSpinBox" row="6" column="1"> <property name="name"> <cstring>spinDelay</cstring> </property> @@ -135,7 +135,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b </qt></string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>lblDelay</cstring> </property> @@ -146,7 +146,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <cstring>spinDelay</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -167,14 +167,14 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>156</width> <height>16</height> </size> </property> </spacer> - <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>cbIncludeDecorations</cstring> </property> @@ -188,7 +188,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <string>When enabled, snapshot of a window will also include the window decorations</string> </property> </widget> - <widget class="QComboBox" row="5" column="1" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="5" column="1" rowspan="1" colspan="3"> <item> <property name="text"> <string>Full Screen</string> @@ -225,7 +225,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -304,13 +304,13 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <include location="global" impldecl="in implementation">kglobalsettings.h</include> <include location="local" impldecl="in implementation">ksnapshotwidget.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>newClicked()</signal> <signal>saveClicked()</signal> <signal>printClicked()</signal> <signal>startImageDrag()</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot access="protected" specifier="non virtual">slotModeChanged( int mode )</slot> <slot access="protected" specifier="non virtual">slotNewClicked()</slot> <slot access="protected" specifier="non virtual">slotSaveClicked()</slot> @@ -318,7 +318,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <slot access="protected" specifier="non virtual">slotStartDrag()</slot> <slot specifier="non virtual" returnType="int">previewWidth()</slot> <slot specifier="non virtual" returnType="int">previewHeight()</slot> -</slots> +</Q_SLOTS> <functions> <function specifier="non virtual">setPreview( const QPixmap & pm )</function> <function specifier="non virtual">setDelay( int i )</function> @@ -327,9 +327,9 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <function specifier="non virtual" returnType="int">delay()</function> <function specifier="non virtual" returnType="bool">includeDecorations()</function> <function specifier="non virtual" returnType="int">mode()</function> - <function specifier="non virtual" returnType="QPixmap">preview()</function> + <function specifier="non virtual" returnType="TQPixmap">preview()</function> </functions> <pixmapfunction>SmallIconSet</pixmapfunction> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui.h b/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui.h index e61b0c6e..3c552868 100644 --- a/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui.h +++ b/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -32,7 +32,7 @@ void KSnapshotWidget::slotModeChanged( int mode ) } -void KSnapshotWidget::setPreview( const QPixmap &pm ) +void KSnapshotWidget::setPreview( const TQPixmap &pm ) { lblImage->setPixmap(pm); } @@ -99,7 +99,7 @@ void KSnapshotWidget::slotStartDrag() } -QPixmap KSnapshotWidget::preview() +TQPixmap KSnapshotWidget::preview() { return *lblImage->pixmap(); } diff --git a/krita/plugins/viewplugins/screenshot/regiongrabber.cpp b/krita/plugins/viewplugins/screenshot/regiongrabber.cpp index f42f6b94..570c9e3f 100644 --- a/krita/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/krita/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -20,29 +20,29 @@ #include "regiongrabber.h" -#include <qpainter.h> -#include <qpalette.h> -#include <qstyle.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqstyle.h> +#include <tqtimer.h> +#include <tqtooltip.h> #include <kglobalsettings.h> -SizeTip::SizeTip( QWidget *parent, const char *name ) - : QLabel( parent, name, WStyle_Customize | WX11BypassWM | +SizeTip::SizeTip( TQWidget *tqparent, const char *name ) + : TQLabel( tqparent, name, WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop | WStyle_NoBorder | WStyle_Tool ) { setMargin( 2 ); setIndent( 0 ); - setFrameStyle( QFrame::Plain | QFrame::Box ); + setFrameStyle( TQFrame::Plain | TQFrame::Box ); - setPalette( QToolTip::palette() ); + setPalette( TQToolTip::palette() ); } -void SizeTip::setTip( const QRect &rect ) +void SizeTip::setTip( const TQRect &rect ) { - QString tip = QString( "%1x%2" ).arg( rect.width() ) - .arg( rect.height() ); + TQString tip = TQString( "%1x%2" ).tqarg( rect.width() ) + .tqarg( rect.height() ); setText( tip ); adjustSize(); @@ -50,34 +50,34 @@ void SizeTip::setTip( const QRect &rect ) positionTip( rect ); } -void SizeTip::positionTip( const QRect &rect ) +void SizeTip::positionTip( const TQRect &rect ) { - QRect tipRect = geometry(); - tipRect.moveTopLeft( QPoint( 0, 0 ) ); + TQRect tipRect = tqgeometry(); + tipRect.moveTopLeft( TQPoint( 0, 0 ) ); if ( rect.intersects( tipRect ) ) { - QRect deskR = KGlobalSettings::desktopGeometry( QPoint( 0, 0 ) ); + TQRect deskR = KGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) ); - tipRect.moveCenter( QPoint( deskR.width()/2, deskR.height()/2 ) ); - if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) ) - tipRect.moveBottomRight( geometry().bottomRight() ); + tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) ); + if ( !rect.tqcontains( tipRect, true ) && rect.intersects( tipRect ) ) + tipRect.moveBottomRight( tqgeometry().bottomRight() ); } move( tipRect.topLeft() ); } RegionGrabber::RegionGrabber() - : QWidget( 0, 0 ), + : TQWidget( 0, 0 ), mouseDown( false ), sizeTip( 0L ) { - sizeTip = new SizeTip( ( QWidget * )0L ); + sizeTip = new SizeTip( ( TQWidget * )0L ); - tipTimer = new QTimer( this ); + tipTimer = new TQTimer( this ); Q_CHECK_PTR(tipTimer); - connect( tipTimer, SIGNAL( timeout() ), SLOT( updateSizeTip() ) ); + connect( tipTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateSizeTip() ) ); - QTimer::singleShot( 200, this, SLOT( initGrabber() ) ); + TQTimer::singleShot( 200, this, TQT_SLOT( initGrabber() ) ); } RegionGrabber::~RegionGrabber() @@ -87,7 +87,7 @@ RegionGrabber::~RegionGrabber() void RegionGrabber::initGrabber() { - pixmap = QPixmap::grabWindow( qt_xrootwin() ); + pixmap = TQPixmap::grabWindow( qt_xrootwin() ); setPaletteBackgroundPixmap( pixmap ); showFullScreen(); @@ -95,16 +95,16 @@ void RegionGrabber::initGrabber() grabMouse( crossCursor ); } -void RegionGrabber::mousePressEvent( QMouseEvent *e ) +void RegionGrabber::mousePressEvent( TQMouseEvent *e ) { if ( e->button() == LeftButton ) { mouseDown = true; - grabRect = QRect( e->pos(), e->pos() ); + grabRect = TQRect( e->pos(), e->pos() ); } } -void RegionGrabber::mouseMoveEvent( QMouseEvent *e ) +void RegionGrabber::mouseMoveEvent( TQMouseEvent *e ) { if ( mouseDown ) { @@ -117,7 +117,7 @@ void RegionGrabber::mouseMoveEvent( QMouseEvent *e ) } } -void RegionGrabber::mouseReleaseEvent( QMouseEvent *e ) +void RegionGrabber::mouseReleaseEvent( TQMouseEvent *e ) { mouseDown = false; drawRubber(); @@ -126,7 +126,7 @@ void RegionGrabber::mouseReleaseEvent( QMouseEvent *e ) grabRect.setBottomRight( e->pos() ); grabRect = grabRect.normalize(); - QPixmap region = QPixmap::grabWindow( winId(), grabRect.x(), grabRect.y(), + TQPixmap region = TQPixmap::grabWindow( winId(), grabRect.x(), grabRect.y(), grabRect.width(), grabRect.height() ); releaseMouse(); @@ -134,12 +134,12 @@ void RegionGrabber::mouseReleaseEvent( QMouseEvent *e ) emit regionGrabbed( region ); } -void RegionGrabber::keyPressEvent( QKeyEvent *e ) +void RegionGrabber::keyPressEvent( TQKeyEvent *e ) { - if ( e->key() == Qt::Key_Escape ) + if ( e->key() == TQt::Key_Escape ) { releaseMouse(); - emit regionGrabbed( QPixmap() ); + emit regionGrabbed( TQPixmap() ); } else e->ignore(); @@ -147,7 +147,7 @@ void RegionGrabber::keyPressEvent( QKeyEvent *e ) void RegionGrabber::updateSizeTip() { - QRect rect = grabRect.normalize(); + TQRect rect = grabRect.normalize(); sizeTip->setTip( rect ); sizeTip->show(); @@ -155,14 +155,14 @@ void RegionGrabber::updateSizeTip() void RegionGrabber::drawRubber() { - QPainter p; + TQPainter p; p.begin( this ); p.setRasterOp( NotROP ); - p.setPen( QPen( color0, 1 ) ); + p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - style().drawPrimitive( QStyle::PE_FocusRect, &p, grabRect, colorGroup(), - QStyle::Style_Default, QStyleOption( colorGroup().base() ) ); + style().drawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(), + TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) ); p.end(); } diff --git a/krita/plugins/viewplugins/screenshot/regiongrabber.h b/krita/plugins/viewplugins/screenshot/regiongrabber.h index 74bf78c9..b1da1049 100644 --- a/krita/plugins/viewplugins/screenshot/regiongrabber.h +++ b/krita/plugins/viewplugins/screenshot/regiongrabber.h @@ -21,24 +21,25 @@ #ifndef REGIONGRABBER_H #define REGIONGRABBER_H -#include <qlabel.h> -#include <qpixmap.h> +#include <tqlabel.h> +#include <tqpixmap.h> -class QTimer; +class TQTimer; -class SizeTip : public QLabel +class SizeTip : public TQLabel { public: - SizeTip( QWidget *parent, const char *name=0 ); + SizeTip( TQWidget *tqparent, const char *name=0 ); ~SizeTip() {} - void setTip( const QRect &rect ); - void positionTip( const QRect &rect ); + void setTip( const TQRect &rect ); + void positionTip( const TQRect &rect ); }; -class RegionGrabber : public QWidget +class RegionGrabber : public TQWidget { Q_OBJECT + TQ_OBJECT public: RegionGrabber(); @@ -49,22 +50,22 @@ protected slots: void updateSizeTip(); signals: - void regionGrabbed( const QPixmap & ); + void regionGrabbed( const TQPixmap & ); protected: - void mousePressEvent( QMouseEvent *e ); - void mouseReleaseEvent( QMouseEvent *e ); - void mouseMoveEvent( QMouseEvent *e ); - void keyPressEvent( QKeyEvent *e ); + void mousePressEvent( TQMouseEvent *e ); + void mouseReleaseEvent( TQMouseEvent *e ); + void mouseMoveEvent( TQMouseEvent *e ); + void keyPressEvent( TQKeyEvent *e ); void drawRubber(); bool mouseDown; - QRect grabRect; - QPixmap pixmap; + TQRect grabRect; + TQPixmap pixmap; SizeTip *sizeTip; - QTimer *tipTimer; + TQTimer *tipTimer; }; #endif // REGIONGRABBER_H diff --git a/krita/plugins/viewplugins/screenshot/screenshot.cpp b/krita/plugins/viewplugins/screenshot/screenshot.cpp index c7508ae9..9133b002 100644 --- a/krita/plugins/viewplugins/screenshot/screenshot.cpp +++ b/krita/plugins/viewplugins/screenshot/screenshot.cpp @@ -41,8 +41,8 @@ K_EXPORT_COMPONENT_FACTORY( kritascreenshot, KGenericFactory<Screenshot>( "krita" ) ) -Screenshot::Screenshot(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +Screenshot::Screenshot(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { KGlobal::locale()->insertCatalogue("kscreenshot_plugin"); setInstance(KGenericFactory<Screenshot>::instance()); @@ -51,9 +51,9 @@ Screenshot::Screenshot(QObject *parent, const char *name, const QStringList &) snapshot = new KSnapshot(); Q_CHECK_PTR(snapshot); - connect( snapshot, SIGNAL( screenGrabbed() ), SLOT( slotScreenGrabbed() ) ); + connect( snapshot, TQT_SIGNAL( screenGrabbed() ), TQT_SLOT( slotScreenGrabbed() ) ); - (void) new KAction(i18n("&Screenshot..."), SmallIcon("tool_screenshot"), 0, this, SLOT(slotScreenshot()), actionCollection(), "screenshot"); + (void) new KAction(i18n("&Screenshot..."), SmallIcon("tool_screenshot"), 0, this, TQT_SLOT(slotScreenshot()), actionCollection(), "screenshot"); } @@ -72,7 +72,7 @@ void Screenshot::slotScreenGrabbed() KTempFile temp(locateLocal("tmp", "screenshot"), ".png"); snapshot->save(temp.name()); - KisView *view = dynamic_cast<KisView *>(parent()); + KisView *view = dynamic_cast<KisView *>(tqparent()); if(view) view->importImage(temp.name()); } diff --git a/krita/plugins/viewplugins/screenshot/screenshot.h b/krita/plugins/viewplugins/screenshot/screenshot.h index 5e4c7c5d..d1100836 100644 --- a/krita/plugins/viewplugins/screenshot/screenshot.h +++ b/krita/plugins/viewplugins/screenshot/screenshot.h @@ -27,8 +27,9 @@ class KSnapshot; class Screenshot : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - Screenshot(QObject *parent, const char *name, const QStringList &); + Screenshot(TQObject *tqparent, const char *name, const TQStringList &); virtual ~Screenshot(); private slots: diff --git a/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.cpp b/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.cpp index 899291ce..d4eea16f 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> //#include <api/variant.h> -#include <api/qtobject.h> +#include <api/tqtobject.h> #include <main/manager.h> #include <kis_autobrush_resource.h> @@ -60,7 +60,7 @@ extern "C" using namespace Kross::KritaCore; -KritaCoreFactory::KritaCoreFactory(QString packagePath) : Kross::Api::Event<KritaCoreFactory>("KritaCoreFactory"), m_packagePath(packagePath) +KritaCoreFactory::KritaCoreFactory(TQString packagePath) : Kross::Api::Event<KritaCoreFactory>("KritaCoreFactory"), m_packagePath(packagePath) { addFunction("newRGBColor", &KritaCoreFactory::newRGBColor); addFunction("newHSVColor", &KritaCoreFactory::newHSVColor); @@ -77,22 +77,22 @@ KritaCoreFactory::KritaCoreFactory(QString packagePath) : Kross::Api::Event<Krit Kross::Api::Object::Ptr KritaCoreFactory::newRGBColor(Kross::Api::List::Ptr args) { - Color* c = new Color(Kross::Api::Variant::toUInt(args->item(0)), Kross::Api::Variant::toUInt(args->item(1)), Kross::Api::Variant::toUInt(args->item(2)), QColor::Rgb); + Color* c = new Color(Kross::Api::Variant::toUInt(args->item(0)), Kross::Api::Variant::toUInt(args->item(1)), Kross::Api::Variant::toUInt(args->item(2)), TQColor::Rgb); return c; } Kross::Api::Object::Ptr KritaCoreFactory::newHSVColor(Kross::Api::List::Ptr args) { - return new Color(Kross::Api::Variant::toUInt(args->item(0)), Kross::Api::Variant::toUInt(args->item(1)), Kross::Api::Variant::toUInt(args->item(2)), QColor::Hsv); + return new Color(Kross::Api::Variant::toUInt(args->item(0)), Kross::Api::Variant::toUInt(args->item(1)), Kross::Api::Variant::toUInt(args->item(2)), TQColor::Hsv); } Kross::Api::Object::Ptr KritaCoreFactory::getPattern(Kross::Api::List::Ptr args) { KisResourceServerBase* rServer = KisResourceServerRegistry::instance()->get("PatternServer"); - QValueList<KisResource*> resources = rServer->resources(); + TQValueList<KisResource*> resources = rServer->resources(); - QString name = Kross::Api::Variant::toString(args->item(0)); + TQString name = Kross::Api::Variant::toString(args->item(0)); - for (QValueList<KisResource*>::iterator it = resources.begin(); it != resources.end(); ++it ) + for (TQValueList<KisResource*>::iterator it = resources.begin(); it != resources.end(); ++it ) { if((*it)->name() == name) { @@ -106,7 +106,7 @@ Kross::Api::Object::Ptr KritaCoreFactory::getPattern(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr KritaCoreFactory::loadPattern(Kross::Api::List::Ptr args) { - QString filename = Kross::Api::Variant::toString(args->item(0)); + TQString filename = Kross::Api::Variant::toString(args->item(0)); KisPattern* pattern = new KisPattern(filename); if(pattern->load()) { @@ -121,11 +121,11 @@ Kross::Api::Object::Ptr KritaCoreFactory::loadPattern(Kross::Api::List::Ptr args Kross::Api::Object::Ptr KritaCoreFactory::getBrush(Kross::Api::List::Ptr args) { KisResourceServerBase* rServer = KisResourceServerRegistry::instance()->get("BrushServer"); - QValueList<KisResource*> resources = rServer->resources(); + TQValueList<KisResource*> resources = rServer->resources(); - QString name = Kross::Api::Variant::toString(args->item(0)); + TQString name = Kross::Api::Variant::toString(args->item(0)); - for (QValueList<KisResource*>::iterator it = resources.begin(); it != resources.end(); ++it ) + for (TQValueList<KisResource*>::iterator it = resources.begin(); it != resources.end(); ++it ) { if((*it)->name() == name) { @@ -138,7 +138,7 @@ Kross::Api::Object::Ptr KritaCoreFactory::getBrush(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr KritaCoreFactory::loadBrush(Kross::Api::List::Ptr args) { - QString filename = Kross::Api::Variant::toString(args->item(0)); + TQString filename = Kross::Api::Variant::toString(args->item(0)); KisBrush* brush = new KisBrush(filename); if(brush->load()) { @@ -152,7 +152,7 @@ Kross::Api::Object::Ptr KritaCoreFactory::loadBrush(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr KritaCoreFactory::getFilter(Kross::Api::List::Ptr args) { - QString name = Kross::Api::Variant::toString(args->item(0)); + TQString name = Kross::Api::Variant::toString(args->item(0)); KisFilter* filter = KisFilterRegistry::instance()->get(name); if(filter) { @@ -164,8 +164,8 @@ Kross::Api::Object::Ptr KritaCoreFactory::getFilter(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr KritaCoreFactory::newCircleBrush(Kross::Api::List::Ptr args) { - uint w = QMAX(1, Kross::Api::Variant::toUInt(args->item(0))); - uint h = QMAX(1, Kross::Api::Variant::toUInt(args->item(1))); + uint w = TQMAX(1, Kross::Api::Variant::toUInt(args->item(0))); + uint h = TQMAX(1, Kross::Api::Variant::toUInt(args->item(1))); uint hf = 0; uint vf = 0; if( args.count() > 2) @@ -174,14 +174,14 @@ Kross::Api::Object::Ptr KritaCoreFactory::newCircleBrush(Kross::Api::List::Ptr a vf = Kross::Api::Variant::toUInt(args->item(3)); } KisAutobrushShape* kas = new KisAutobrushCircleShape(w, h, hf, vf); - QImage* brsh = new QImage(); + TQImage* brsh = new TQImage(); kas->createBrush(brsh); return new Brush(new KisAutobrushResource(*brsh), false); } Kross::Api::Object::Ptr KritaCoreFactory::newRectBrush(Kross::Api::List::Ptr args) { - uint w = QMAX(1, Kross::Api::Variant::toUInt(args->item(0))); - uint h = QMAX(1, Kross::Api::Variant::toUInt(args->item(1))); + uint w = TQMAX(1, Kross::Api::Variant::toUInt(args->item(0))); + uint h = TQMAX(1, Kross::Api::Variant::toUInt(args->item(1))); uint hf = 0; uint vf = 0; if( args.count() > 2) @@ -190,7 +190,7 @@ Kross::Api::Object::Ptr KritaCoreFactory::newRectBrush(Kross::Api::List::Ptr arg vf = Kross::Api::Variant::toUInt(args->item(3)); } KisAutobrushShape* kas = new KisAutobrushRectShape(w, h, hf, vf); - QImage* brsh = new QImage(); + TQImage* brsh = new TQImage(); kas->createBrush(brsh); return new Brush(new KisAutobrushResource(*brsh), false);; } @@ -199,8 +199,8 @@ Kross::Api::Object::Ptr KritaCoreFactory::newImage(Kross::Api::List::Ptr args) { int w = Kross::Api::Variant::toInt(args->item(0)); int h = Kross::Api::Variant::toInt(args->item(1)); - QString csname = Kross::Api::Variant::toString(args->item(2)); - QString name = Kross::Api::Variant::toString(args->item(3)); + TQString csname = Kross::Api::Variant::toString(args->item(2)); + TQString name = Kross::Api::Variant::toString(args->item(3)); if( w < 0 || h < 0) { throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Invalid image size") ) ); @@ -209,7 +209,7 @@ Kross::Api::Object::Ptr KritaCoreFactory::newImage(Kross::Api::List::Ptr args) KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(csname, ""), ""); if(!cs) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(csname ) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(csname ) ) ); return 0; } @@ -225,9 +225,9 @@ KritaCoreModule::KritaCoreModule(Kross::Api::Manager* manager) : Kross::Api::Module("kritacore") , m_manager(manager), m_factory(0) { - QMap<QString, Object::Ptr> children = manager->getChildren(); - kdDebug(41011) << " there are " << children.size() << endl; - for(QMap<QString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++) + TQMap<TQString, Object::Ptr> tqchildren = manager->getChildren(); + kdDebug(41011) << " there are " << tqchildren.size() << endl; + for(TQMap<TQString, Object::Ptr>::const_iterator it = tqchildren.begin(); it != tqchildren.end(); it++) { kdDebug(41011) << it.key() << " " << it.data() << endl; } @@ -235,7 +235,7 @@ KritaCoreModule::KritaCoreModule(Kross::Api::Manager* manager) // Wrap doc Kross::Api::Object::Ptr kritadocument = manager->getChild("KritaDocument"); if(kritadocument) { - Kross::Api::QtObject* kritadocumentqt = (Kross::Api::QtObject*)( kritadocument.data() ); + Kross::Api::TQtObject* kritadocumentqt = (Kross::Api::TQtObject*)( kritadocument.data() ); if(kritadocumentqt) { ::KisDoc* document = (::KisDoc*)( kritadocumentqt->getObject() ); if(document) { @@ -246,10 +246,10 @@ KritaCoreModule::KritaCoreModule(Kross::Api::Manager* manager) } } // Wrap KritaScriptProgress - QString packagePath; + TQString packagePath; Kross::Api::Object::Ptr kritascriptprogress = manager->getChild("KritaScriptProgress"); if(kritadocument) { - Kross::Api::QtObject* kritascriptprogressqt = (Kross::Api::QtObject*)( kritascriptprogress.data() ); + Kross::Api::TQtObject* kritascriptprogressqt = (Kross::Api::TQtObject*)( kritascriptprogress.data() ); if(kritascriptprogressqt) { ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( kritascriptprogressqt->getObject() ); scriptprogress->activateAsSubject(); @@ -271,12 +271,12 @@ KritaCoreModule::~KritaCoreModule() } -const QString KritaCoreModule::getClassName() const +const TQString KritaCoreModule::getClassName() const { return "Kross::KritaCore::KritaCoreModule"; } -Kross::Api::Object::Ptr KritaCoreModule::call(const QString& name, Kross::Api::List::Ptr arguments) +Kross::Api::Object::Ptr KritaCoreModule::call(const TQString& name, Kross::Api::List::Ptr arguments) { kdDebug(41011) << "KritaCoreModule::call = " << name << endl; if( m_factory->isAFunction(name)) diff --git a/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.h b/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.h index 97abc8b9..f3cc28c9 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.h +++ b/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.h @@ -19,8 +19,8 @@ #ifndef KRITA_KROSS_KRITACOREMODULE_H #define KRITA_KROSS_KRITACOREMODULE_H -#include <qstring.h> -#include <qvariant.h> +#include <tqstring.h> +#include <tqvariant.h> #define KROSS_MAIN_EXPORT KDE_EXPORT @@ -38,7 +38,7 @@ namespace Kross { namespace KritaCore { class KritaCoreFactory : public Kross::Api::Event<KritaCoreFactory> { public: - KritaCoreFactory(QString packagePath); + KritaCoreFactory(TQString packagePath); private: /** * This function return a new Image. @@ -108,7 +108,7 @@ namespace Kross { namespace KritaCore { */ Kross::Api::Object::Ptr getBrush(Kross::Api::List::Ptr); /** - * This function return a Brush with a circular shape + * This function return a Brush with a circular tqshape * It takes at least two arguments : * - width * - height @@ -127,7 +127,7 @@ namespace Kross { namespace KritaCore { */ Kross::Api::Object::Ptr newCircleBrush(Kross::Api::List::Ptr); /** - * This function return a Brush with a rectangular shape + * This function return a Brush with a rectangular tqshape * It takes at least two arguments : * - width * - height @@ -172,7 +172,7 @@ namespace Kross { namespace KritaCore { */ Kross::Api::Object::Ptr getPackagePath(Kross::Api::List::Ptr); private: - QString m_packagePath; + TQString m_packagePath; }; /** * @@ -191,8 +191,8 @@ namespace Kross { namespace KritaCore { virtual ~KritaCoreModule(); /// \see Kross::Api::Object::getClassName - virtual const QString getClassName() const; - virtual Kross::Api::Object::Ptr call(const QString& name, Kross::Api::List::Ptr arguments); + virtual const TQString getClassName() const; + virtual Kross::Api::Object::Ptr call(const TQString& name, Kross::Api::List::Ptr arguments); private: Kross::Api::Manager* m_manager; KritaCoreFactory* m_factory; diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_color.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_color.cpp index e459b1cd..cbea1890 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_color.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_color.cpp @@ -22,7 +22,7 @@ namespace Kross { namespace KritaCore { -Color::Color ( int x, int y, int z, QColor::Spec colorSpec ) +Color::Color ( int x, int y, int z, TQColor::Spec colorSpec ) : Kross::Api::Class<Color>("KritaColor"), m_color(x,y,z,colorSpec) { } diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_color.h b/krita/plugins/viewplugins/scripting/kritacore/krs_color.h index 8d46760b..4c6283ee 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_color.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_color.h @@ -19,7 +19,7 @@ #ifndef KROSS_APIKRS_COLOR_H #define KROSS_APIKRS_COLOR_H -#include <qcolor.h> +#include <tqcolor.h> #include <api/class.h> @@ -30,16 +30,16 @@ namespace KritaCore { class Color : public Kross::Api::Class<Color> { public: - Color ( int x, int y, int z, QColor::Spec colorSpec ); + Color ( int x, int y, int z, TQColor::Spec colorSpec ); Color (); ~Color(); public: - inline const QString getClassName() const + inline const TQString getClassName() const { return "Kross::Krita::Color"; }; - inline QColor toQColor() { return m_color; }; + inline TQColor toTQColor() { return m_color; }; private: - QColor m_color; + TQColor m_color; }; } diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_doc.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_doc.cpp index 23dffabb..4c4d029b 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_doc.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_doc.cpp @@ -33,7 +33,7 @@ Doc::~Doc() { } -const QString Doc::getClassName() const { +const TQString Doc::getClassName() const { return "Kross::KritaCore::Doc"; } diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_doc.h b/krita/plugins/viewplugins/scripting/kritacore/krs_doc.h index 16336f94..4ac72d3d 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_doc.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_doc.h @@ -30,7 +30,7 @@ class Doc : public Kross::Api::Class<Doc> public: explicit Doc(::KisDoc* doc); virtual ~Doc(); - virtual const QString getClassName() const; + virtual const TQString getClassName() const; private: /** * This function return the Image associated with this Doc. diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_filter.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_filter.cpp index ee11d35d..4b382b65 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_filter.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_filter.cpp @@ -39,7 +39,7 @@ Filter::~Filter() { } -const QString Filter::getClassName() const { +const TQString Filter::getClassName() const { return "Kross::KritaCore::Filter"; } @@ -53,19 +53,19 @@ Kross::Api::Object::Ptr Filter::process(Kross::Api::List::Ptr args) PaintLayer* src = (PaintLayer*)args->item(0).data(); if(!m_filter->workWith( src->paintLayer()->paintDevice()->colorSpace())) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("process") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("process") ) ); } - QRect rect; + TQRect rect; if( args->count() >1) { uint x = Kross::Api::Variant::toVariant(args->item(1)).toUInt(); uint y = Kross::Api::Variant::toVariant(args->item(2)).toUInt(); uint w = Kross::Api::Variant::toVariant(args->item(3)).toUInt(); uint h = Kross::Api::Variant::toVariant(args->item(4)).toUInt(); - rect = QRect(x, y, w, h); + rect = TQRect(x, y, w, h); } else { - QRect r1 = src->paintLayer()->paintDevice()->extent(); - QRect r2 = src->paintLayer()->image()->bounds(); + TQRect r1 = src->paintLayer()->paintDevice()->extent(); + TQRect r2 = src->paintLayer()->image()->bounds(); rect = r1.intersect(r2); } m_filter->process( src->paintLayer()->paintDevice(), src->paintLayer()->paintDevice(), m_config->filterConfiguration(), rect ); diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_filter.h b/krita/plugins/viewplugins/scripting/kritacore/krs_filter.h index 62554ef9..0788edbd 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_filter.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_filter.h @@ -64,7 +64,7 @@ class Filter : public Kross::Api::Class<Filter> */ Kross::Api::Object::Ptr process(Kross::Api::List::Ptr args); public: - virtual const QString getClassName() const; + virtual const TQString getClassName() const; private: KisFilter* m_filter; FilterConfiguration* m_config; diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.cpp index 3479cf38..eaecb0bf 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.cpp @@ -37,22 +37,22 @@ FilterConfiguration::~FilterConfiguration() { } -const QString FilterConfiguration::getClassName() const { +const TQString FilterConfiguration::getClassName() const { return "Kross::KritaCore::FilterConfiguration"; } Kross::Api::Object::Ptr FilterConfiguration::setProperty(Kross::Api::List::Ptr args) { - QString name = Kross::Api::Variant::toString(args->item(0)); - QVariant value = Kross::Api::Variant::toVariant(args->item(1)); + TQString name = Kross::Api::Variant::toString(args->item(0)); + TQVariant value = Kross::Api::Variant::toVariant(args->item(1)); m_fConfig->setProperty(name, value); return 0; } Kross::Api::Object::Ptr FilterConfiguration::getProperty(Kross::Api::List::Ptr args) { - QString name = Kross::Api::Variant::toString(args->item(0)); - QVariant value; + TQString name = Kross::Api::Variant::toString(args->item(0)); + TQVariant value; if(m_fConfig->getProperty( name, value)) { return new Kross::Api::Variant(value); @@ -63,7 +63,7 @@ Kross::Api::Object::Ptr FilterConfiguration::getProperty(Kross::Api::List::Ptr a Kross::Api::Object::Ptr FilterConfiguration::fromXML(Kross::Api::List::Ptr args) { - QString xml = Kross::Api::Variant::toString(args->item(0)); + TQString xml = Kross::Api::Variant::toString(args->item(0)); m_fConfig->fromXML( xml ); return 0; } diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.h b/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.h index 7c8c3020..466c91dc 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.h @@ -35,7 +35,7 @@ class FilterConfiguration : public Kross::Api::Class<FilterConfiguration> FilterConfiguration(KisFilterConfiguration*); ~FilterConfiguration(); public: - virtual const QString getClassName() const; + virtual const TQString getClassName() const; inline KisFilterConfiguration* filterConfiguration() { return m_fConfig; }; private: /** diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.cpp index 953eb868..83342070 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.cpp @@ -47,7 +47,7 @@ Histogram::~Histogram() { } -const QString Histogram::getClassName() const { +const TQString Histogram::getClassName() const { return "Kross::KritaCore::Histogram"; } diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.h b/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.h index b238c5db..bb8af6fa 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.h @@ -50,7 +50,7 @@ class Histogram : public Kross::Api::Class<Histogram> public: Histogram(KisPaintLayerSP layer, KisHistogramProducerSP producer, const enumHistogramType type); ~Histogram(); - virtual const QString getClassName() const; + virtual const TQString getClassName() const; private: /** * This function return the maximum bound of the histogram diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_image.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_image.cpp index b274ad33..bf1c281f 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_image.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_image.cpp @@ -52,7 +52,7 @@ Image::~Image() { } -const QString Image::getClassName() const { +const TQString Image::getClassName() const { return "Kross::KritaCore::Image"; } @@ -80,7 +80,7 @@ Kross::Api::Object::Ptr Image::convertToColorspace(Kross::Api::List::Ptr args) KisColorSpace * dstCS = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(Kross::Api::Variant::toString(args->item(0)), ""), ""); if(!dstCS) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) ); return 0; } m_image->convertTo(dstCS); @@ -95,10 +95,10 @@ Kross::Api::Object::Ptr Image::colorSpaceId(Kross::Api::List::Ptr ) Kross::Api::Object::Ptr Image::createPaintLayer(Kross::Api::List::Ptr args) { - QString name = Kross::Api::Variant::toString(args->item(0)); + TQString name = Kross::Api::Variant::toString(args->item(0)); int opacity = Kross::Api::Variant::toInt(args->item(1)); opacity = CLAMP(opacity, 0, 255); - QString csname; + TQString csname; if(args->count() > 2) { csname = Kross::Api::Variant::toString(args->item(2)); diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_image.h b/krita/plugins/viewplugins/scripting/kritacore/krs_image.h index 0be2e46f..19e9ba6b 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_image.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_image.h @@ -34,7 +34,7 @@ class Image : public Kross::Api::Class<Image> public: Image(KisImageSP image, KisDoc* doc = 0); ~Image(); - virtual const QString getClassName() const; + virtual const TQString getClassName() const; private: /** * Return the active PaintLayer, if any. diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_iterator.h b/krita/plugins/viewplugins/scripting/kritacore/krs_iterator.h index 9493f49a..acd9b061 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_iterator.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_iterator.h @@ -19,7 +19,7 @@ #ifndef KROSS_KRITACOREKRS_ITERATOR_H #define KROSS_KRITACOREKRS_ITERATOR_H -#include <qobject.h> +#include <tqobject.h> #include <api/class.h> //#include <api/proxy.h> //#include <api/variant.h> @@ -36,25 +36,26 @@ namespace Kross { namespace KritaCore { -//<beurk> stupid Qt which doesn't support templated QObject +//<beurk> stupid TQt which doesn't support templated TQObject class IteratorMemoryManaged { public: - virtual void invalidateIterator() = 0; + virtual void tqinvalidateIterator() = 0; }; -class IteratorMemoryManager : public QObject { +class IteratorMemoryManager : public TQObject { Q_OBJECT + TQ_OBJECT public: IteratorMemoryManager(IteratorMemoryManaged* it) : m_it(it) { // Connect the Monitor to know when the invalidating of iterator is needed - connect(KisScriptMonitor::instance(), SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, SLOT(invalidateIterator())); + connect(KisScriptMonitor::instance(), TQT_SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, TQT_SLOT(tqinvalidateIterator())); } public slots: - void invalidateIterator() + void tqinvalidateIterator() { - m_it->invalidateIterator(); + m_it->tqinvalidateIterator(); } private: IteratorMemoryManaged* m_it; @@ -97,9 +98,9 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem >(this, &Iterator<_T_It>::isDone)); // get/set value - QValueVector<KisChannelInfo *> channels = layer->paintDevice()->colorSpace()->channels(); - QString initiales = ""; - for(QValueVector<KisChannelInfo *>::iterator itC = channels.begin(); itC != channels.end(); itC++) + TQValueVector<KisChannelInfo *> channels = layer->paintDevice()->colorSpace()->channels(); + TQString initiales = ""; + for(TQValueVector<KisChannelInfo *>::iterator itC = channels.begin(); itC != channels.end(); itC++) { KisChannelInfo * ci = *itC; initiales += ci->name().left(1); @@ -146,10 +147,10 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem ~Iterator() { - invalidateIterator(); + tqinvalidateIterator(); delete m_itmm; } - virtual const QString getClassName() const { + virtual const TQString getClassName() const { return "Kross::KritaCore::KrsDoc"; }; private: @@ -163,7 +164,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem */ Kross::Api::Object::Ptr darken(Kross::Api::List::Ptr args) { - Q_INT32 shade = Kross::Api::Variant::toUInt( args->item(0) ); + TQ_INT32 shade = Kross::Api::Variant::toUInt( args->item(0) ); bool compensate = (args->count() == 2); double compensation = compensate ? Kross::Api::Variant::toDouble( args->item(2) ) : 0.; m_layer->paintDevice()->colorSpace()->darken(m_it->rawData(), m_it->rawData(), shade, compensate, compensation, 1); @@ -194,23 +195,23 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem } Kross::Api::Object::Ptr getChannelUINT8(Kross::Api::List::Ptr, uint channelpos) { - Q_UINT8* data = (Q_UINT8*)(m_it->rawData() + channelpos); + TQ_UINT8* data = (TQ_UINT8*)(m_it->rawData() + channelpos); return new Kross::Api::Variant( * data); } Kross::Api::Object::Ptr setChannelUINT8(Kross::Api::List::Ptr args, uint channelpos) { - Q_UINT8* data = (Q_UINT8*)(m_it->rawData() + channelpos); //*(uint*)channelpos); + TQ_UINT8* data = (TQ_UINT8*)(m_it->rawData() + channelpos); //*(uint*)channelpos); *data = Kross::Api::Variant::toUInt( args->item(0) ); return 0; } Kross::Api::Object::Ptr getChannelUINT16(Kross::Api::List::Ptr, uint channelpos) { - Q_UINT16* data = (Q_UINT16*)(m_it->rawData() + channelpos); + TQ_UINT16* data = (TQ_UINT16*)(m_it->rawData() + channelpos); return new Kross::Api::Variant( * data); } Kross::Api::Object::Ptr setChannelUINT16(Kross::Api::List::Ptr args, uint channelpos) { - Q_UINT16* data = (Q_UINT16*)(m_it->rawData() + channelpos); + TQ_UINT16* data = (TQ_UINT16*)(m_it->rawData() + channelpos); *data = Kross::Api::Variant::toUInt( args->item(0) ); return 0; } @@ -227,25 +228,25 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem } Kross::Api::Object::Ptr getPixel(Kross::Api::List::Ptr) { - QValueVector<KisChannelInfo *> channels = m_layer->paintDevice()->colorSpace()->channels(); - QValueList<QVariant> pixel; - for(QValueVector<KisChannelInfo *>::iterator itC = channels.begin(); itC != channels.end(); itC++) + TQValueVector<KisChannelInfo *> channels = m_layer->paintDevice()->colorSpace()->channels(); + TQValueList<TQVariant> pixel; + for(TQValueVector<KisChannelInfo *>::iterator itC = channels.begin(); itC != channels.end(); itC++) { KisChannelInfo * ci = *itC; - Q_UINT8* data = (Q_UINT8*)(m_it->rawData() + ci->pos()); + TQ_UINT8* data = (TQ_UINT8*)(m_it->rawData() + ci->pos()); switch(ci->channelValueType()) { case KisChannelInfo::UINT8: pixel.push_back( *data); break; case KisChannelInfo::UINT16: - pixel.push_back( *((Q_UINT16*) data) ); + pixel.push_back( *((TQ_UINT16*) data) ); break; case KisChannelInfo::FLOAT32: pixel.push_back( *((float*) data) ); break; default: - kdDebug(41011) << i18n("An error has occurred in %1").arg("getPixel") << endl; + kdDebug(41011) << i18n("An error has occurred in %1").tqarg("getPixel") << endl; kdDebug(41011) << i18n("unsupported data format in scripts") << endl; break; } @@ -254,26 +255,26 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem } Kross::Api::Object::Ptr setPixel(Kross::Api::List::Ptr args) { - QValueList<QVariant> pixel = Kross::Api::Variant::toList( args->item(0) ); - QValueVector<KisChannelInfo *> channels = m_layer->paintDevice()->colorSpace()->channels(); + TQValueList<TQVariant> pixel = Kross::Api::Variant::toList( args->item(0) ); + TQValueVector<KisChannelInfo *> channels = m_layer->paintDevice()->colorSpace()->channels(); uint i = 0; - for(QValueVector<KisChannelInfo *>::iterator itC = channels.begin(); itC != channels.end(); itC++, i++) + for(TQValueVector<KisChannelInfo *>::iterator itC = channels.begin(); itC != channels.end(); itC++, i++) { KisChannelInfo * ci = *itC; - Q_UINT8* data = (Q_UINT8*)(m_it->rawData() + ci->pos()); + TQ_UINT8* data = (TQ_UINT8*)(m_it->rawData() + ci->pos()); switch(ci->channelValueType()) { case KisChannelInfo::UINT8: *data = pixel[i].toUInt(); break; case KisChannelInfo::UINT16: - *((Q_UINT16*) data) = pixel[i].toUInt(); + *((TQ_UINT16*) data) = pixel[i].toUInt(); break; case KisChannelInfo::FLOAT32: *((float*) data) = pixel[i].toDouble(); break; default: - kdDebug(41011) << i18n("An error has occurred in %1").arg("setPixel") << endl; + kdDebug(41011) << i18n("An error has occurred in %1").tqarg("setPixel") << endl; kdDebug(41011) << i18n("unsupported data format in scripts") << endl; break; } @@ -281,7 +282,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem return 0; } private: - virtual void invalidateIterator() + virtual void tqinvalidateIterator() { kdDebug(41011) << "invalidating iterator" << endl; if(m_it) diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.cpp index 1f79b22c..519a63d9 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.cpp @@ -60,7 +60,7 @@ PaintLayer::~PaintLayer() { } -const QString PaintLayer::getClassName() const { +const TQString PaintLayer::getClassName() const { return "Kross::KritaCore::PaintLayer"; } @@ -91,22 +91,22 @@ Kross::Api::Object::Ptr PaintLayer::createVLineIterator(Kross::Api::List::Ptr ar } Kross::Api::Object::Ptr PaintLayer::getWidth(Kross::Api::List::Ptr) { - QRect r1 = paintLayer()->extent(); - QRect r2 = paintLayer()->image()->bounds(); - QRect rect = r1.intersect(r2); + TQRect r1 = paintLayer()->extent(); + TQRect r2 = paintLayer()->image()->bounds(); + TQRect rect = r1.intersect(r2); return new Kross::Api::Variant(rect.width()); } Kross::Api::Object::Ptr PaintLayer::getHeight(Kross::Api::List::Ptr) { - QRect r1 = paintLayer()->extent(); - QRect r2 = paintLayer()->image()->bounds(); - QRect rect = r1.intersect(r2); + TQRect r1 = paintLayer()->extent(); + TQRect r2 = paintLayer()->image()->bounds(); + TQRect rect = r1.intersect(r2); return new Kross::Api::Variant(rect.height()); } Kross::Api::Object::Ptr PaintLayer::createHistogram(Kross::Api::List::Ptr args) { - QString histoname = Kross::Api::Variant::toString(args->item(0)); + TQString histoname = Kross::Api::Variant::toString(args->item(0)); KisHistogramProducerFactory* factory = KisHistogramProducerFactoryRegistry::instance()->get(histoname); /* KisIDList listID = KisHistogramProducerFactoryRegistry::instance()->listKeys(); @@ -130,7 +130,7 @@ Kross::Api::Object::Ptr PaintLayer::createHistogram(Kross::Api::List::Ptr args) { return new Histogram( paintLayer().data(), factory->generate() , type); } else { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("createHistogram") + "\n" + i18n("The histogram %1 is not available").arg(histoname) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("createHistogram") + "\n" + i18n("The histogram %1 is not available").tqarg(histoname) ) ); } return 0; } @@ -142,7 +142,7 @@ Kross::Api::Object::Ptr PaintLayer::createPainter(Kross::Api::List::Ptr ) Kross::Api::Object::Ptr PaintLayer::beginPainting(Kross::Api::List::Ptr args) { - QString name = Kross::Api::Variant::toString(args->item(0)); + TQString name = Kross::Api::Variant::toString(args->item(0)); if(m_cmd != 0) { delete m_cmd; @@ -172,7 +172,7 @@ Kross::Api::Object::Ptr PaintLayer::convertToColorspace(Kross::Api::List::Ptr ar if(!dstCS) { // FIXME: inform user - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) ); return 0; } paintLayer()->paintDevice()->convertTo(dstCS); @@ -188,7 +188,7 @@ Kross::Api::Object::Ptr PaintLayer::colorSpaceId(Kross::Api::List::Ptr ) Kross::Api::Object::Ptr PaintLayer::fastWaveletTransformation(Kross::Api::List::Ptr ) { KisMathToolbox* mathToolbox = KisMetaRegistry::instance()->mtRegistry()->get( paintLayer()->paintDevice()->colorSpace()->mathToolboxID() ); - QRect rect = paintLayer()->exactBounds(); + TQRect rect = paintLayer()->exactBounds(); KisMathToolbox::KisWavelet* wav = mathToolbox->fastWaveletTransformation(paintLayer()->paintDevice(), rect); return new Wavelet(wav); } @@ -196,7 +196,7 @@ Kross::Api::Object::Ptr PaintLayer::fastWaveletUntransformation(Kross::Api::List { Wavelet* wav = (Wavelet*)args->item(0).data(); KisMathToolbox* mathToolbox = KisMetaRegistry::instance()->mtRegistry()->get( paintLayer()->paintDevice()->colorSpace()->mathToolboxID() ); - QRect rect = paintLayer()->exactBounds(); + TQRect rect = paintLayer()->exactBounds(); mathToolbox->fastWaveletUntransformation( paintLayer()->paintDevice(), rect, wav->wavelet() ); return 0; } diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.h b/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.h index 4ddfd4bd..9e00bf91 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.h @@ -39,7 +39,7 @@ class PaintLayer : public Kross::Api::Class<PaintLayer> public: explicit PaintLayer(KisPaintLayerSP layer, KisDoc* doc = 0); virtual ~PaintLayer(); - virtual const QString getClassName() const; + virtual const TQString getClassName() const; private: /** * Create an iterator over a layer, it will iterate on a rectangle area. diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_painter.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_painter.cpp index 621a173d..370f78c5 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_painter.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_painter.cpp @@ -77,7 +77,7 @@ Painter::~Painter() Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args) { KisConvolutionPainter* cp = new KisConvolutionPainter(m_painter->device()); - QRect rect; + TQRect rect; KisKernel kernel; kernel.factor = Kross::Api::Variant::toInt(args->item(1)); kernel.offset = Kross::Api::Variant::toInt(args->item(2)); @@ -98,43 +98,43 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args) uint y = Kross::Api::Variant::toUInt(args->item(6)); uint w = Kross::Api::Variant::toUInt(args->item(7)); uint h = Kross::Api::Variant::toUInt(args->item(8)); - rect = QRect(x,y,w,h); + rect = TQRect(x,y,w,h); } else { - QRect r1 = paintLayer()->paintDevice()->extent(); - QRect r2 = paintLayer()->image()->bounds(); + TQRect r1 = paintLayer()->paintDevice()->extent(); + TQRect r2 = paintLayer()->image()->bounds(); rect = r1.intersect(r2); } - QValueList<QVariant> kernelH = Kross::Api::Variant::toList( args->item(0) ); + TQValueList<TQVariant> kernelH = Kross::Api::Variant::toList( args->item(0) ); - QVariant firstlineVariant = *kernelH.begin(); - if(firstlineVariant.type() != QVariant::List) + TQVariant firstlineVariant = *kernelH.begin(); + if(firstlineVariant.type() != TQVariant::List) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); } - QValueList<QVariant> firstline = firstlineVariant.toList(); + TQValueList<TQVariant> firstline = firstlineVariant.toList(); kernel.height = kernelH.size(); kernel.width = firstline.size(); - kernel.data = new Q_INT32[kernel.height * kernel.width]; + kernel.data = new TQ_INT32[kernel.height * kernel.width]; uint i = 0; - for(QValueList<QVariant>::iterator itK = kernelH.begin(); itK != kernelH.end(); itK++, i ++ ) + for(TQValueList<TQVariant>::iterator itK = kernelH.begin(); itK != kernelH.end(); itK++, i ++ ) { - QVariant lineVariant = *kernelH.begin(); - if(lineVariant.type() != QVariant::List) + TQVariant lineVariant = *kernelH.begin(); + if(lineVariant.type() != TQVariant::List) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); } - QValueList<QVariant> line = firstlineVariant.toList(); + TQValueList<TQVariant> line = firstlineVariant.toList(); if(line.size() != kernel.width) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); } uint j = 0; - for(QValueList<QVariant>::iterator itLine = line.begin(); itLine != line.end(); itLine++, j ++ ) + for(TQValueList<TQVariant>::iterator itLine = line.begin(); itLine != line.end(); itLine++, j ++ ) { kernel.data[ j + i * kernel.width ] = (*itLine).toInt(); } @@ -221,7 +221,7 @@ Kross::Api::Object::Ptr Painter::setFillStyle(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr Painter::setOpacity(Kross::Api::List::Ptr args) { - Q_UINT8 opacity = Kross::Api::Variant::toVariant(args->item(0)).toUInt(); + TQ_UINT8 opacity = Kross::Api::Variant::toVariant(args->item(0)).toUInt(); m_painter->setOpacity(opacity); return 0; } @@ -236,8 +236,8 @@ Kross::Api::Object::Ptr Painter::setDuplicateOffset(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr Painter::paintPolyline(Kross::Api::List::Ptr args) { - QValueList<QVariant> pointsX = Kross::Api::Variant::toList( args->item(0) ); - QValueList<QVariant> pointsY = Kross::Api::Variant::toList( args->item(1) ); + TQValueList<TQVariant> pointsX = Kross::Api::Variant::toList( args->item(0) ); + TQValueList<TQVariant> pointsY = Kross::Api::Variant::toList( args->item(1) ); if(pointsX.size() != pointsY.size()) { throw Kross::Api::Exception::Ptr( new Kross::Api::Exception("the two lists should have the same size.") ); @@ -287,8 +287,8 @@ Kross::Api::Object::Ptr Painter::paintEllipse(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr Painter::paintPolygon(Kross::Api::List::Ptr args) { - QValueList<QVariant> pointsX = Kross::Api::Variant::toList( args->item(0) ); - QValueList<QVariant> pointsY = Kross::Api::Variant::toList( args->item(1) ); + TQValueList<TQVariant> pointsX = Kross::Api::Variant::toList( args->item(0) ); + TQValueList<TQVariant> pointsY = Kross::Api::Variant::toList( args->item(1) ); if(pointsX.size() != pointsY.size()) { throw Kross::Api::Exception::Ptr( new Kross::Api::Exception("the two lists should have the same size.") ); @@ -320,14 +320,14 @@ Kross::Api::Object::Ptr Painter::paintAt(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr Painter::setBackgroundColor(Kross::Api::List::Ptr args) { Color* c = (Color*)args->item(0).data(); - m_painter->setBackgroundColor( KisColor(c->toQColor(), paintLayer()->paintDevice()->colorSpace() )); + m_painter->setBackgroundColor( KisColor(c->toTQColor(), paintLayer()->paintDevice()->colorSpace() )); return 0; } Kross::Api::Object::Ptr Painter::setPaintColor(Kross::Api::List::Ptr args) { Color* c = (Color*)args->item(0).data(); - m_painter->setPaintColor( KisColor(c->toQColor(), paintLayer()->paintDevice()->colorSpace() )); + m_painter->setPaintColor( KisColor(c->toTQColor(), paintLayer()->paintDevice()->colorSpace() )); return 0; } @@ -347,7 +347,7 @@ Kross::Api::Object::Ptr Painter::setBrush(Kross::Api::List::Ptr args) } Kross::Api::Object::Ptr Painter::setPaintOp(Kross::Api::List::Ptr args) { - QString id = Kross::Api::Variant::toString(args->item(0)); + TQString id = Kross::Api::Variant::toString(args->item(0)); KisPaintOp* op = KisPaintOpRegistry::instance()->paintOp( id, 0, m_painter ); m_painter->setPaintOp( op ); return 0; diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_painter.h b/krita/plugins/viewplugins/scripting/kritacore/krs_painter.h index 37ae7993..64cf6940 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_painter.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_painter.h @@ -217,11 +217,11 @@ class Painter : public Kross::Api::Class<Painter> protected: inline KisPaintLayerSP paintLayer() { return m_layer; } private: - inline vKisPoint createPointsVector( QValueList<QVariant> xs, QValueList<QVariant> ys) + inline vKisPoint createPointsVector( TQValueList<TQVariant> xs, TQValueList<TQVariant> ys) { vKisPoint a; - QValueList<QVariant>::iterator itx = xs.begin(); - QValueList<QVariant>::iterator ity = ys.begin(); + TQValueList<TQVariant>::iterator itx = xs.begin(); + TQValueList<TQVariant>::iterator ity = ys.begin(); for(; itx != xs.end(); ++itx, ++ity) { a.push_back(KisPoint( (*itx).toDouble(), (*ity).toDouble())); diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_wavelet.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_wavelet.cpp index d2786780..9c652a07 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_wavelet.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_wavelet.cpp @@ -49,21 +49,21 @@ Wavelet::~Wavelet() Kross::Api::Object::Ptr Wavelet::getNCoeff(Kross::Api::List::Ptr args) { - Q_UINT32 n = Kross::Api::Variant::toUInt(args->item(0)); + TQ_UINT32 n = Kross::Api::Variant::toUInt(args->item(0)); if( n > m_numCoeff) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getNCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getNCoeff") + "\n" + i18n("Index out of bound") ) ); } return new Kross::Api::Variant(*(m_wavelet->coeffs + n )); } Kross::Api::Object::Ptr Wavelet::setNCoeff(Kross::Api::List::Ptr args) { - Q_UINT32 n = Kross::Api::Variant::toUInt(args->item(0)); + TQ_UINT32 n = Kross::Api::Variant::toUInt(args->item(0)); double v = Kross::Api::Variant::toDouble(args->item(1)); if( n > m_numCoeff) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setNCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setNCoeff") + "\n" + i18n("Index out of bound") ) ); } *(m_wavelet->coeffs + n ) = v; return 0; @@ -71,23 +71,23 @@ Kross::Api::Object::Ptr Wavelet::setNCoeff(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr Wavelet::getXYCoeff(Kross::Api::List::Ptr args) { - Q_UINT32 x = Kross::Api::Variant::toUInt(args->item(0)); - Q_UINT32 y = Kross::Api::Variant::toUInt(args->item(1)); + TQ_UINT32 x = Kross::Api::Variant::toUInt(args->item(0)); + TQ_UINT32 y = Kross::Api::Variant::toUInt(args->item(1)); if( x > m_wavelet->size && y > m_wavelet->size) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getXYCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getXYCoeff") + "\n" + i18n("Index out of bound") ) ); } return new Kross::Api::Variant(*(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth )); } Kross::Api::Object::Ptr Wavelet::setXYCoeff(Kross::Api::List::Ptr args) { - Q_UINT32 x = Kross::Api::Variant::toUInt(args->item(0)); - Q_UINT32 y = Kross::Api::Variant::toUInt(args->item(1)); + TQ_UINT32 x = Kross::Api::Variant::toUInt(args->item(0)); + TQ_UINT32 y = Kross::Api::Variant::toUInt(args->item(1)); double v = Kross::Api::Variant::toDouble(args->item(2)); if( x > m_wavelet->size && y > m_wavelet->size) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setXYCoeff") + "\n" + i18n("Index out of bound") )); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setXYCoeff") + "\n" + i18n("Index out of bound") )); } *(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth ) = v; return 0; diff --git a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.cpp b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.cpp index 8bb12596..3967ffe7 100644 --- a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.cpp +++ b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.cpp @@ -34,8 +34,8 @@ KisScriptMonitor::~KisScriptMonitor() void KisScriptMonitor::monitor(Kross::Api::ScriptGUIClient* guiClient) { - connect(guiClient, SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), SIGNAL(executionFinished( const Kross::Api::ScriptAction* ))); - connect(guiClient, SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), SIGNAL(executionStarted( const Kross::Api::ScriptAction* ))); + connect(guiClient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* ))); + connect(guiClient, TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* ))); } KisScriptMonitor* KisScriptMonitor::s_instance = 0; diff --git a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.h b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.h index de1e0380..c1ee64c0 100644 --- a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.h +++ b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.h @@ -19,7 +19,7 @@ #ifndef KIS_SCRIPT_MONITOR_H #define KIS_SCRIPT_MONITOR_H -#include <qobject.h> +#include <tqobject.h> namespace Kross { namespace Api { @@ -31,8 +31,9 @@ namespace Kross { /** @author Cyrille Berger <cberger@cberger.net> */ -class KisScriptMonitor : public QObject { +class KisScriptMonitor : public TQObject { Q_OBJECT + TQ_OBJECT private: KisScriptMonitor(); ~KisScriptMonitor(); diff --git a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.cpp b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.cpp index c3629304..d7af4eb4 100644 --- a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.cpp +++ b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.cpp @@ -26,7 +26,7 @@ void KisScriptProgress::activateAsSubject() m_view->canvasSubject()->progressDisplay()->setSubject( this, true, false /* TODO: how to cancel a script ? */ ); } -void KisScriptProgress::setProgressTotalSteps(Q_INT32 totalSteps) +void KisScriptProgress::setProgressTotalSteps(TQ_INT32 totalSteps) { m_progressTotalSteps = totalSteps; m_progressSteps = 0; @@ -34,10 +34,10 @@ void KisScriptProgress::setProgressTotalSteps(Q_INT32 totalSteps) emit notifyProgress(0); } -void KisScriptProgress::setProgress(Q_INT32 progress) +void KisScriptProgress::setProgress(TQ_INT32 progress) { m_progressSteps = progress; - Q_INT32 progressPerCent = (m_progressSteps * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1); + TQ_INT32 progressPerCent = (m_progressSteps * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1); if (progressPerCent != m_lastProgressPerCent) { @@ -51,9 +51,9 @@ void KisScriptProgress::incProgress() setProgress( ++m_progressSteps ); } -void KisScriptProgress::setProgressStage(const QString& stage, Q_INT32 progress) +void KisScriptProgress::setProgressStage(const TQString& stage, TQ_INT32 progress) { - Q_INT32 progressPerCent = (progress * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1); + TQ_INT32 progressPerCent = (progress * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1); m_lastProgressPerCent = progress; emit notifyProgressStage( stage, progressPerCent); } diff --git a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.h b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.h index 864a6760..48af433c 100644 --- a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.h +++ b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.h @@ -38,17 +38,17 @@ class KisScriptProgress : public KisProgressSubject void activateAsSubject(); virtual void cancel() {}; public: - void setProgressTotalSteps(Q_INT32 totalSteps); - void setProgress(Q_INT32 progress); + void setProgressTotalSteps(TQ_INT32 totalSteps); + void setProgress(TQ_INT32 progress); void incProgress(); - void setProgressStage(const QString& stage, Q_INT32 progress); + void setProgressStage(const TQString& stage, TQ_INT32 progress); void progressDone(); - inline void setPackagePath(QString path) { m_packagePath = path; }; - inline QString packagePath() { return m_packagePath; } + inline void setPackagePath(TQString path) { m_packagePath = path; }; + inline TQString packagePath() { return m_packagePath; } private: - Q_INT32 m_progressSteps, m_progressTotalSteps, m_lastProgressPerCent; + TQ_INT32 m_progressSteps, m_progressTotalSteps, m_lastProgressPerCent; KisView * m_view; - QString m_packagePath; + TQString m_packagePath; }; #endif diff --git a/krita/plugins/viewplugins/scripting/samples/python/reshapehisto.py b/krita/plugins/viewplugins/scripting/samples/python/reshapehisto.py index 4a79e68c..02371826 100644 --- a/krita/plugins/viewplugins/scripting/samples/python/reshapehisto.py +++ b/krita/plugins/viewplugins/scripting/samples/python/reshapehisto.py @@ -18,7 +18,7 @@ import math -# it's an experimental script to try to reshape histogram, while the results are far to be convincing yet +# it's an experimental script to try to reshape.histogram, while the results are far to be convincing yet # it is still an example on how to use histogram in a script def sign(a): diff --git a/krita/plugins/viewplugins/scripting/samples/ruby/randompaint.rb b/krita/plugins/viewplugins/scripting/samples/ruby/randompaint.rb index 9e2f504f..ab5f6205 100644 --- a/krita/plugins/viewplugins/scripting/samples/ruby/randompaint.rb +++ b/krita/plugins/viewplugins/scripting/samples/ruby/randompaint.rb @@ -60,11 +60,11 @@ for i in 1..100 painter.setBrush( Krosskritacore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) ) end # paint a point - shape = rand * 7 + tqshape = rand * 7 painter.setStrokeStyle(1) - if( shape < 1 ) + if( tqshape < 1 ) painter.paintAt(rand * width , rand * height,1.1) - elsif(shape < 2 ) + elsif(tqshape < 2 ) xs = Array.new ys = Array.new for i in 0..6 @@ -72,14 +72,14 @@ for i in 1..100 ys[i] = rand*height end painter.paintPolyline(xs,ys) - elsif(shape < 3) + elsif(tqshape < 3) painter.paintLine(rand * width, rand * height, 1.1, rand * width, rand * height,1.1) - elsif(shape < 4) + elsif(tqshape < 4) painter.paintBezierCurve(rand * width, rand * height, 1.1, rand * width, rand * height, rand * width , rand * height, rand * width, rand * height, 1.1) - elsif(shape < 5) + elsif(tqshape < 5) randomizeStyle(painter) painter.paintEllipse(rand * width, rand * height, rand * width, rand * height, 1.1) - elsif(shape < 6) + elsif(tqshape < 6) xs = Array.new ys = Array.new for i in 0..6 @@ -88,7 +88,7 @@ for i in 1..100 end randomizeStyle(painter) painter.paintPolygon(xs, ys) - elsif(shape < 7) + elsif(tqshape < 7) randomizeStyle(painter) painter.paintRect(rand * width, rand * height, rand * width, rand * height, 1.1) end diff --git a/krita/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb b/krita/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb index 67042de2..47216761 100644 --- a/krita/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb +++ b/krita/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb @@ -91,11 +91,11 @@ class TorturePainting painter.setBrush( Krosskritacore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) ) end # paint a point - shape = rand * 7 + tqshape = rand * 7 painter.setStrokeStyle(1) - if( shape < 1 ) + if( tqshape < 1 ) painter.paintAt(rand * @width , rand * @height,1.1) - elsif(shape < 2 ) + elsif(tqshape < 2 ) xs = Array.new ys = Array.new for i in 0..6 @@ -103,14 +103,14 @@ class TorturePainting ys[i] = rand*@height end painter.paintPolyline(xs,ys) - elsif(shape < 3) + elsif(tqshape < 3) painter.paintLine(rand * @width, rand * @height, 1.1, rand * @width, rand * @height,1.1) - elsif(shape < 4) + elsif(tqshape < 4) painter.paintBezierCurve(rand * @width, rand * @height, 1.1, rand * @width, rand * @height, rand * @width , rand * @height, rand * @width, rand * @height, 1.1) - elsif(shape < 5) + elsif(tqshape < 5) randomizeStyle(painter) painter.paintEllipse(rand * @width, rand * @height, rand * @width, rand * @height, 1.1) - elsif(shape < 6) + elsif(tqshape < 6) xs = Array.new ys = Array.new for i in 0..6 @@ -119,7 +119,7 @@ class TorturePainting end randomizeStyle(painter) painter.paintPolygon(xs, ys) - elsif(shape < 7) + elsif(tqshape < 7) randomizeStyle(painter) painter.paintRect(rand * @width, rand * @height, rand * @width, rand * @height, 1.1) end diff --git a/krita/plugins/viewplugins/scripting/scripting.cc b/krita/plugins/viewplugins/scripting/scripting.cc index d7f5fde7..210b8eff 100644 --- a/krita/plugins/viewplugins/scripting/scripting.cc +++ b/krita/plugins/viewplugins/scripting/scripting.cc @@ -21,8 +21,8 @@ #include <stdlib.h> #include <vector> -#include <qapplication.h> -#include <qpoint.h> +#include <tqapplication.h> +#include <tqpoint.h> #include <kdebug.h> #include <kfiledialog.h> @@ -54,36 +54,36 @@ typedef KGenericFactory<Scripting> KritaScriptingFactory; K_EXPORT_COMPONENT_FACTORY( kritascripting, KritaScriptingFactory( "krita" ) ) -Scripting::Scripting(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +Scripting::Scripting(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaScriptingFactory::instance()); - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(Scripting::instance()); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; m_scriptguiclient = new Kross::Api::ScriptGUIClient( m_view, m_view ); // m_scriptguiclient ->setXMLFile(locate("data","kritaplugins/scripting.rc"), true); //BEGIN TODO: understand why the ScriptGUIClient doesn't "link" its actions to the menu setXMLFile(locate("data","kritaplugins/scripting.rc"), true); - new KAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); - new KAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, SLOT(showScriptManager()), actionCollection(), "configurescripts"); + new KAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); + new KAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); //END TODO - QWidget * w = new Kross::Api::WdgScriptsManager(m_scriptguiclient, m_view); + TQWidget * w = new Kross::Api::WdgScriptsManager(m_scriptguiclient, m_view); m_view->canvasSubject()->paletteManager()->addWidget(w, "Scripts Manager", krita::LAYERBOX, 10, PALETTE_DOCKER, false); - connect(m_scriptguiclient, SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, SLOT(executionFinished(const Kross::Api::ScriptAction*))); - connect(m_scriptguiclient, SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), this, SLOT(executionStarted(const Kross::Api::ScriptAction*))); + connect(m_scriptguiclient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, TQT_SLOT(executionFinished(const Kross::Api::ScriptAction*))); + connect(m_scriptguiclient, TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), this, TQT_SLOT(executionStarted(const Kross::Api::ScriptAction*))); KisScriptMonitor::instance()->monitor( m_scriptguiclient ); - Kross::Api::Manager::scriptManager()->addQObject(m_view->canvasSubject()->document(), "KritaDocument"); - Kross::Api::Manager::scriptManager()->addQObject(m_view, "KritaView"); + Kross::Api::Manager::scriptManager()->addTQObject(m_view->canvasSubject()->document(), "KritaDocument"); + Kross::Api::Manager::scriptManager()->addTQObject(m_view, "KritaView"); m_scriptProgress = new KisScriptProgress(m_view); - Kross::Api::Manager::scriptManager()->addQObject(m_scriptProgress, "KritaScriptProgress"); + Kross::Api::Manager::scriptManager()->addTQObject(m_scriptProgress, "KritaScriptProgress"); } @@ -98,7 +98,7 @@ void Scripting::executionFinished(const Kross::Api::ScriptAction*) m_view->canvasSubject()->document()->setModified(true); m_view->canvasSubject()->document()->currentImage()->activeLayer()->setDirty(); m_scriptProgress->progressDone(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } void Scripting::executionStarted(const Kross::Api::ScriptAction* act) diff --git a/krita/plugins/viewplugins/scripting/scripting.h b/krita/plugins/viewplugins/scripting/scripting.h index 238483c8..20675043 100644 --- a/krita/plugins/viewplugins/scripting/scripting.h +++ b/krita/plugins/viewplugins/scripting/scripting.h @@ -37,8 +37,9 @@ namespace Kross { class Scripting : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - Scripting(QObject *parent, const char *name, const QStringList &); + Scripting(TQObject *tqparent, const char *name, const TQStringList &); virtual ~Scripting(); private slots: void executionFinished(const Kross::Api::ScriptAction*); diff --git a/krita/plugins/viewplugins/selectopaque/selectopaque.cc b/krita/plugins/viewplugins/selectopaque/selectopaque.cc index cfbcb4e7..c83250ee 100644 --- a/krita/plugins/viewplugins/selectopaque/selectopaque.cc +++ b/krita/plugins/viewplugins/selectopaque/selectopaque.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qcursor.h> -#include <qapplication.h> +#include <tqcursor.h> +#include <tqapplication.h> #include <klocale.h> #include <kiconloader.h> @@ -53,15 +53,15 @@ typedef KGenericFactory<SelectOpaque> SelectOpaqueFactory; K_EXPORT_COMPONENT_FACTORY( kritaselectopaque, SelectOpaqueFactory( "krita" ) ) -SelectOpaque::SelectOpaque(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +SelectOpaque::SelectOpaque(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if (parent->inherits("KisView")) { + if (tqparent->inherits("KisView")) { setInstance(SelectOpaqueFactory::instance()); setXMLFile(locate("data","kritaplugins/selectopaque.rc"), true); - m_view = dynamic_cast<KisView*>(parent); - m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, SLOT(slotActivated()), actionCollection(), "selectopaque") ); + m_view = dynamic_cast<KisView*>(tqparent); + m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "selectopaque") ); } } @@ -76,11 +76,11 @@ void SelectOpaque::slotActivated() KisPaintDeviceSP layer = m_view->canvasSubject()->currentImg()->activeDevice(); if (!layer) return; - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); if (layer->image()->undo()) transaction = new KisSelectedTransaction(i18n("Select Opaque Pixels"), layer); // XXX: Multithread this! - Q_INT32 x, y, w, h; + TQ_INT32 x, y, w, h; layer->exactBounds(x, y, w, h); KisColorSpace * cs = layer->colorSpace(); @@ -104,7 +104,7 @@ void SelectOpaque::slotActivated() hiter.nextRow(); selIter.nextRow(); } - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); layer->setDirty(); layer->emitSelectionChanged(); diff --git a/krita/plugins/viewplugins/selectopaque/selectopaque.h b/krita/plugins/viewplugins/selectopaque/selectopaque.h index 5215ecfe..86c66945 100644 --- a/krita/plugins/viewplugins/selectopaque/selectopaque.h +++ b/krita/plugins/viewplugins/selectopaque/selectopaque.h @@ -28,8 +28,9 @@ class KisView; class SelectOpaque : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - SelectOpaque(QObject *parent, const char *name, const QStringList &); + SelectOpaque(TQObject *tqparent, const char *name, const TQStringList &); virtual ~SelectOpaque(); private slots: diff --git a/krita/plugins/viewplugins/separate_channels/dlg_separate.cc b/krita/plugins/viewplugins/separate_channels/dlg_separate.cc index 760786ec..cb1d8322 100644 --- a/krita/plugins/viewplugins/separate_channels/dlg_separate.cc +++ b/krita/plugins/viewplugins/separate_channels/dlg_separate.cc @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qbutton.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqbutton.h> #include <klocale.h> #include <knuminput.h> @@ -32,26 +32,26 @@ #include "dlg_separate.h" #include "wdg_separations.h" -DlgSeparate::DlgSeparate( const QString & imageCS, - const QString & layerCS, - QWidget * parent, +DlgSeparate::DlgSeparate( const TQString & imageCS, + const TQString & layerCS, + TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Separate Image"), Ok | Cancel, Ok), + : super (tqparent, name, true, i18n("Separate Image"), Ok | Cancel, Ok), m_imageCS(imageCS), m_layerCS(layerCS) { m_page = new WdgSeparations(this, "separate_image"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); m_page->lblColormodel->setText(layerCS); m_page->grpOutput->hide(); - connect(m_page->grpSource, SIGNAL(clicked(int)), this, SLOT(slotSetColorSpaceLabel(int))); - connect(m_page->chkColors, SIGNAL(toggled(bool)), m_page->chkDownscale, SLOT(setDisabled(bool))); + connect(m_page->grpSource, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotSetColorSpaceLabel(int))); + connect(m_page->chkColors, TQT_SIGNAL(toggled(bool)), m_page->chkDownscale, TQT_SLOT(setDisabled(bool))); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } DlgSeparate::~DlgSeparate() diff --git a/krita/plugins/viewplugins/separate_channels/dlg_separate.h b/krita/plugins/viewplugins/separate_channels/dlg_separate.h index 08432014..cf871566 100644 --- a/krita/plugins/viewplugins/separate_channels/dlg_separate.h +++ b/krita/plugins/viewplugins/separate_channels/dlg_separate.h @@ -32,10 +32,11 @@ class WdgSeparations; class DlgSeparate: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgSeparate(const QString & imageCS, const QString & layerCS, QWidget * parent = 0, + DlgSeparate(const TQString & imageCS, const TQString & layerCS, TQWidget * tqparent = 0, const char* name = 0); ~DlgSeparate(); @@ -59,8 +60,8 @@ private slots: private: WdgSeparations * m_page; - QString m_imageCS; - QString m_layerCS; + TQString m_imageCS; + TQString m_layerCS; }; diff --git a/krita/plugins/viewplugins/separate_channels/kis_channel_separator.cc b/krita/plugins/viewplugins/separate_channels/kis_channel_separator.cc index 75622312..3747f485 100644 --- a/krita/plugins/viewplugins/separate_channels/kis_channel_separator.cc +++ b/krita/plugins/viewplugins/separate_channels/kis_channel_separator.cc @@ -83,9 +83,9 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS KisColorSpace * dstCs = 0; - Q_UINT32 numberOfChannels = src->nChannels(); + TQ_UINT32 numberOfChannels = src->nChannels(); KisColorSpace * srcCs = src->colorSpace(); - QValueVector<KisChannelInfo *> channels = srcCs->channels(); + TQValueVector<KisChannelInfo *> channels = srcCs->channels(); // Use the flattened image, if required switch(sourceOps) { @@ -99,15 +99,15 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS vKisPaintDeviceSP layers; - QValueVector<KisChannelInfo *>::const_iterator begin = channels.begin(); - QValueVector<KisChannelInfo *>::const_iterator end = channels.end(); + TQValueVector<KisChannelInfo *>::const_iterator begin = channels.begin(); + TQValueVector<KisChannelInfo *>::const_iterator end = channels.end(); - QRect rect = src->exactBounds(); + TQRect rect = src->exactBounds(); int i = 0; - Q_UINT32 channelIndex = 0; - for (QValueVector<KisChannelInfo *>::const_iterator it = begin; it != end; ++it, ++channelIndex) + TQ_UINT32 channelIndex = 0; + for (TQValueVector<KisChannelInfo *>::const_iterator it = begin; it != end; ++it, ++channelIndex) { KisChannelInfo * ch = (*it); @@ -116,9 +116,9 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS continue; } - Q_INT32 channelSize = ch->size(); - Q_INT32 channelPos = ch->pos(); - Q_INT32 destSize = 1; + TQ_INT32 channelSize = ch->size(); + TQ_INT32 channelPos = ch->pos(); + TQ_INT32 destSize = 1; KisPaintDeviceSP dev; if (toColor) { @@ -139,7 +139,7 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS layers.push_back(dev); - for (Q_INT32 row = 0; row < rect.height(); ++row) { + for (TQ_INT32 row = 0; row < rect.height(); ++row) { KisHLineIteratorPixel srcIt = src->createHLineIterator(rect.x(), rect.y() + row, rect.width(), false); KisHLineIteratorPixel dstIt = dev->createHLineIterator(rect.x(), rect.y() + row, rect.width(), true); @@ -238,7 +238,7 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS break; } - for (QValueVector<KisChannelInfo *>::const_iterator it = begin; it != end; ++it) + for (TQValueVector<KisChannelInfo *>::const_iterator it = begin; it != end; ++it) { KisChannelInfo * ch = (*it); @@ -253,10 +253,10 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS image->addLayer( dynamic_cast<KisLayer*>(l.data()), image->rootLayer(), 0); } else { - QStringList listMimeFilter = KoFilterManager::mimeFilter("application/x-krita", KoFilterManager::Export); - QString mimelist = listMimeFilter.join(" "); + TQStringList listMimeFilter = KoFilterManager::mimeFilter("application/x-krita", KoFilterManager::Export); + TQString mimelist = listMimeFilter.join(" "); - KFileDialog fd (QString::null, mimelist, m_view, "Export Layer", true); + KFileDialog fd (TQString(), mimelist, m_view, "Export Layer", true); fd.setCaption(i18n("Export Layer") + "(" + ch->name() + ")"); fd.setMimeFilter(listMimeFilter); fd.setOperationMode(KFileDialog::Saving); @@ -264,13 +264,13 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS if (!fd.exec()) return; KURL url = fd.selectedURL(); - QString mimefilter = fd.currentMimeFilter(); + TQString mimefilter = fd.currentMimeFilter(); if (url.isEmpty()) return; KisPaintLayerSP l = new KisPaintLayer( image, ch->name(), OPACITY_OPAQUE, *deviceIt); - QRect r = l->exactBounds(); + TQRect r = l->exactBounds(); KisDoc d; d.prepareForImport(); diff --git a/krita/plugins/viewplugins/separate_channels/kis_channel_separator.h b/krita/plugins/viewplugins/separate_channels/kis_channel_separator.h index 0c0d80c9..d8bf777e 100644 --- a/krita/plugins/viewplugins/separate_channels/kis_channel_separator.h +++ b/krita/plugins/viewplugins/separate_channels/kis_channel_separator.h @@ -48,6 +48,7 @@ enum enumSepOutput { class KisChannelSeparator : public KisProgressSubject { Q_OBJECT + TQ_OBJECT public: diff --git a/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc b/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc index 4f7134f8..2edc9b36 100644 --- a/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc +++ b/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc @@ -39,15 +39,15 @@ K_EXPORT_COMPONENT_FACTORY( kritaseparatechannels, KGenericFactory<KisSeparateChannelsPlugin>( "krita" ) ) -KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) { + if ( tqparent->inherits("KisView") ) { setInstance(KGenericFactory<KisSeparateChannelsPlugin>::instance()); setXMLFile(locate("data","kritaplugins/imageseparate.rc"), true); - m_view = (KisView*) parent; - (void) new KAction(i18n("Separate Image..."), 0, 0, this, SLOT(slotSeparate()), actionCollection(), "separate"); + m_view = (KisView*) tqparent; + (void) new KAction(i18n("Separate Image..."), 0, 0, this, TQT_SLOT(slotSeparate()), actionCollection(), "separate"); } } @@ -77,7 +77,7 @@ void KisSeparateChannelsPlugin::slotSeparate() dlgSeparate->enableDownscale(false); } - if (dlgSeparate->exec() == QDialog::Accepted) { + if (dlgSeparate->exec() == TQDialog::Accepted) { KisChannelSeparator separator(m_view); separator.separate(m_view->canvasSubject()->progressDisplay(), diff --git a/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h b/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h index a4a4fd61..0c62dcaf 100644 --- a/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h +++ b/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h @@ -29,8 +29,9 @@ class KisView; class KisSeparateChannelsPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KisSeparateChannelsPlugin(QObject *parent, const char *name, const QStringList &); + KisSeparateChannelsPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KisSeparateChannelsPlugin(); private slots: diff --git a/krita/plugins/viewplugins/separate_channels/wdg_separations.ui b/krita/plugins/viewplugins/separate_channels/wdg_separations.ui index 6c7a8cf7..0593258b 100644 --- a/krita/plugins/viewplugins/separate_channels/wdg_separations.ui +++ b/krita/plugins/viewplugins/separate_channels/wdg_separations.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgSeparations</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgSeparations</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>chkColors</cstring> </property> @@ -24,7 +24,7 @@ <string>Output to color, not grayscale</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>chkDownscale</cstring> </property> @@ -32,7 +32,7 @@ <string>Downscale to 8-bit before separating</string> </property> </widget> - <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>grpAlpha</cstring> </property> @@ -43,7 +43,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioCopyAlpha</cstring> </property> @@ -51,7 +51,7 @@ <string>Copy alpha channel to each separated channel as an alpha channel</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioDiscardAlpha</cstring> </property> @@ -62,7 +62,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioSeparateAlpha</cstring> </property> @@ -82,14 +82,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpSource</cstring> </property> @@ -100,7 +100,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioCurrentLayer</cstring> </property> @@ -111,7 +111,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioAllLayers</cstring> </property> @@ -121,7 +121,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="2"> + <widget class="TQButtonGroup" row="1" column="2"> <property name="name"> <cstring>grpOutput</cstring> </property> @@ -132,7 +132,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioLayers</cstring> </property> @@ -143,7 +143,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioImages</cstring> </property> @@ -153,7 +153,7 @@ </widget> </vbox> </widget> - <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lblColormodel</cstring> </property> @@ -161,7 +161,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -178,5 +178,5 @@ <tabstop>chkDownscale</tabstop> <tabstop>chkColors</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/viewplugins/shearimage/dlg_shearimage.cc b/krita/plugins/viewplugins/shearimage/dlg_shearimage.cc index 9a6a2f66..896a947a 100644 --- a/krita/plugins/viewplugins/shearimage/dlg_shearimage.cc +++ b/krita/plugins/viewplugins/shearimage/dlg_shearimage.cc @@ -26,10 +26,10 @@ using namespace std; -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <klocale.h> #include <knuminput.h> @@ -39,21 +39,21 @@ using namespace std; #include "wdg_shearimage.h" -DlgShearImage::DlgShearImage( QWidget * parent, +DlgShearImage::DlgShearImage( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Shear Image"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Shear Image"), Ok | Cancel, Ok) { m_lock = false; m_page = new WdgShearImage(this, "shear_image"); - m_page->layout()->setMargin(0); + m_page->tqlayout()->setMargin(0); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } @@ -62,28 +62,28 @@ DlgShearImage::~DlgShearImage() delete m_page; } -void DlgShearImage::setAngleX(Q_UINT32 angle) +void DlgShearImage::setAngleX(TQ_UINT32 angle) { m_page->shearAngleX->setValue(angle); m_oldAngle = angle; } -void DlgShearImage::setAngleY(Q_UINT32 angle) +void DlgShearImage::setAngleY(TQ_UINT32 angle) { m_page->shearAngleY->setValue(angle); m_oldAngle = angle; } -Q_INT32 DlgShearImage::angleX() +TQ_INT32 DlgShearImage::angleX() { - return (Q_INT32)qRound(m_page->shearAngleX->value()); + return (TQ_INT32)tqRound(m_page->shearAngleX->value()); } -Q_INT32 DlgShearImage::angleY() +TQ_INT32 DlgShearImage::angleY() { - return (Q_INT32)qRound(m_page->shearAngleY->value()); + return (TQ_INT32)tqRound(m_page->shearAngleY->value()); } // SLOTS diff --git a/krita/plugins/viewplugins/shearimage/dlg_shearimage.h b/krita/plugins/viewplugins/shearimage/dlg_shearimage.h index 183f166a..b5ed0e7f 100644 --- a/krita/plugins/viewplugins/shearimage/dlg_shearimage.h +++ b/krita/plugins/viewplugins/shearimage/dlg_shearimage.h @@ -27,17 +27,18 @@ class WdgShearImage; class DlgShearImage: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgShearImage(QWidget * parent = 0, + DlgShearImage(TQWidget * tqparent = 0, const char* name = 0); ~DlgShearImage(); - void setAngleX(Q_UINT32 w); - void setAngleY(Q_UINT32 w); - Q_INT32 angleX(); - Q_INT32 angleY(); + void setAngleX(TQ_UINT32 w); + void setAngleY(TQ_UINT32 w); + TQ_INT32 angleX(); + TQ_INT32 angleY(); private slots: diff --git a/krita/plugins/viewplugins/shearimage/shearimage.cc b/krita/plugins/viewplugins/shearimage/shearimage.cc index d8c839ce..83792762 100644 --- a/krita/plugins/viewplugins/shearimage/shearimage.cc +++ b/krita/plugins/viewplugins/shearimage/shearimage.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -51,18 +51,18 @@ typedef KGenericFactory<ShearImage> ShearImageFactory; K_EXPORT_COMPONENT_FACTORY( kritashearimage, ShearImageFactory( "krita" ) ) // XXX: this plugin could also provide layer scaling/resizing -ShearImage::ShearImage(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ShearImage::ShearImage(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(ShearImageFactory::instance()); setXMLFile(locate("data","kritaplugins/shearimage.rc"), true); - (void) new KAction(i18n("&Shear Image..."), 0, 0, this, SLOT(slotShearImage()), actionCollection(), "shearimage"); - (void) new KAction(i18n("&Shear Layer..."), 0, 0, this, SLOT(slotShearLayer()), actionCollection(), "shearlayer"); + (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*) parent; + m_view = (KisView*) tqparent; } } @@ -82,9 +82,9 @@ void ShearImage::slotShearImage() dlgShearImage->setCaption(i18n("Shear Image")); - if (dlgShearImage->exec() == QDialog::Accepted) { - Q_INT32 angleX = dlgShearImage->angleX(); - Q_INT32 angleY = dlgShearImage->angleY(); + if (dlgShearImage->exec() == TQDialog::Accepted) { + TQ_INT32 angleX = dlgShearImage->angleX(); + TQ_INT32 angleY = dlgShearImage->angleY(); m_view->shearCurrentImage(angleX, angleY); } delete dlgShearImage; @@ -101,9 +101,9 @@ void ShearImage::slotShearLayer() dlgShearImage->setCaption(i18n("Shear Layer")); - if (dlgShearImage->exec() == QDialog::Accepted) { - Q_INT32 angleX = dlgShearImage->angleX(); - Q_INT32 angleY = dlgShearImage->angleY(); + if (dlgShearImage->exec() == TQDialog::Accepted) { + TQ_INT32 angleX = dlgShearImage->angleX(); + TQ_INT32 angleY = dlgShearImage->angleY(); m_view->shearLayer(angleX, angleY); } diff --git a/krita/plugins/viewplugins/shearimage/shearimage.h b/krita/plugins/viewplugins/shearimage/shearimage.h index bfff2ac2..73ee8908 100644 --- a/krita/plugins/viewplugins/shearimage/shearimage.h +++ b/krita/plugins/viewplugins/shearimage/shearimage.h @@ -27,8 +27,9 @@ class KisView; class ShearImage : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ShearImage(QObject *parent, const char *name, const QStringList &); + ShearImage(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ShearImage(); private slots: diff --git a/krita/plugins/viewplugins/shearimage/wdg_shearimage.ui b/krita/plugins/viewplugins/shearimage/wdg_shearimage.ui index 20de0b6b..d63b58f5 100644 --- a/krita/plugins/viewplugins/shearimage/wdg_shearimage.ui +++ b/krita/plugins/viewplugins/shearimage/wdg_shearimage.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgShearImage</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgShearImage</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>grpPixelDimensions</cstring> </property> @@ -44,7 +44,7 @@ <string>°</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblShearAngelY</cstring> </property> @@ -56,7 +56,7 @@ <property name="name"> <cstring>shearAngleY</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>100</height> @@ -72,7 +72,7 @@ <string>°</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblShearAngleX</cstring> </property> @@ -92,7 +92,7 @@ <tabstops> <tabstop>shearAngleX</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/viewplugins/substrate/dlg_substrate.cc b/krita/plugins/viewplugins/substrate/dlg_substrate.cc index d1bbe38f..51de887d 100644 --- a/krita/plugins/viewplugins/substrate/dlg_substrate.cc +++ b/krita/plugins/viewplugins/substrate/dlg_substrate.cc @@ -24,19 +24,19 @@ #include "wdgsubstrate.h" -DlgSubstrate::DlgSubstrate( QWidget * parent, +DlgSubstrate::DlgSubstrate( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok) { - m_previewPix = QPixmap(); + m_previewPix = TQPixmap(); m_page = new WdgSubstrate(this, "substrate"); Q_CHECK_PTR(m_page); setCaption(i18n("Substrate")); setMainWidget(m_page); resize(m_page -> size()); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } DlgSubstrate::~DlgSubstrate() @@ -44,7 +44,7 @@ DlgSubstrate::~DlgSubstrate() delete m_page; } -void DlgSubstrate::setPixmap(QPixmap pix) +void DlgSubstrate::setPixmap(TQPixmap pix) { m_previewPix = pix; m_previewPix.detach(); diff --git a/krita/plugins/viewplugins/substrate/dlg_substrate.h b/krita/plugins/viewplugins/substrate/dlg_substrate.h index 0a566b11..869eaafa 100644 --- a/krita/plugins/viewplugins/substrate/dlg_substrate.h +++ b/krita/plugins/viewplugins/substrate/dlg_substrate.h @@ -20,7 +20,7 @@ #ifndef DLG_SUBSTRATE #define DLG_SUBSTRATE -#include <qpixmap.h> +#include <tqpixmap.h> #include <kdialogbase.h> @@ -36,17 +36,18 @@ class DlgSubstrate: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgSubstrate(QWidget * parent = 0, + DlgSubstrate(TQWidget * tqparent = 0, const char* name = 0); ~DlgSubstrate(); /** * Set the initial preview pixmap */ - void setPixmap(QPixmap pix); + void setPixmap(TQPixmap pix); private slots: @@ -55,7 +56,7 @@ private slots: private: WdgSubstrate * m_page; - QPixmap m_previewPix; + TQPixmap m_previewPix; }; #endif // DLG_SUBSTRATE diff --git a/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h b/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h index 9dc512d1..1a229dc1 100644 --- a/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h +++ b/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h @@ -18,7 +18,7 @@ #ifndef KIS_SUBSTRATE_H #define KIS_SUBSTRATE_H -#include <qrect.h> +#include <tqrect.h> #include <ksharedptr.h> class KisImage; @@ -55,7 +55,7 @@ public: * Copy the pixel values in the specified rect into an array of Substrate. * Make sure the array is big enough! */ - virtual void getPixels(KisSubstratePixel * /*substrate*/, const QRect & /*rc*/) = 0; + virtual void getPixels(KisSubstratePixel * /*substrate*/, const TQRect & /*rc*/) = 0; /** * Return a pointer to the substrate at the specified position. Note that diff --git a/krita/plugins/viewplugins/substrate/substrate.cc b/krita/plugins/viewplugins/substrate/substrate.cc index aac9ef94..996516e1 100644 --- a/krita/plugins/viewplugins/substrate/substrate.cc +++ b/krita/plugins/viewplugins/substrate/substrate.cc @@ -19,8 +19,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -44,18 +44,18 @@ typedef KGenericFactory<SubstratePlugin> SubstrateFactory; K_EXPORT_COMPONENT_FACTORY( kritasubstrate, SubstrateFactory( "krita" ) ) -SubstratePlugin::SubstratePlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +SubstratePlugin::SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(SubstrateFactory::instance()); setXMLFile(locate("data","kritaplugins/substrate.rc"), true); - (void) new KAction(i18n("&Substrate..."), 0, 0, this, SLOT(slotSubstrateActivated()), actionCollection(), "substrate"); + (void) new KAction(i18n("&Substrate..."), 0, 0, this, TQT_SLOT(slotSubstrateActivated()), actionCollection(), "substrate"); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; } } @@ -67,7 +67,7 @@ void SubstratePlugin::slotSubstrateActivated() { DlgSubstrate * dlgSubstrate = new DlgSubstrate(m_view, "Substrate"); Q_CHECK_PTR(dlgSubstrate); - if (dlgSubstrate -> exec() == QDialog::Accepted) { + if (dlgSubstrate -> exec() == TQDialog::Accepted) { // Retrieve changes made by dialog // Apply changes to layer (selection) } diff --git a/krita/plugins/viewplugins/substrate/substrate.h b/krita/plugins/viewplugins/substrate/substrate.h index ebb9e48e..2d00e234 100644 --- a/krita/plugins/viewplugins/substrate/substrate.h +++ b/krita/plugins/viewplugins/substrate/substrate.h @@ -28,8 +28,9 @@ class KisView; class SubstratePlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - SubstratePlugin(QObject *parent, const char *name, const QStringList &); + SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~SubstratePlugin(); private slots: diff --git a/krita/plugins/viewplugins/substrate/wdgsubstrate.ui b/krita/plugins/viewplugins/substrate/wdgsubstrate.ui index 846b43a7..be0713ed 100644 --- a/krita/plugins/viewplugins/substrate/wdgsubstrate.ui +++ b/krita/plugins/viewplugins/substrate/wdgsubstrate.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgSubstrate</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>grpCustom</cstring> </property> @@ -27,15 +27,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="2"> <item> <property name="text"> <string>Custom</string> @@ -53,7 +53,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -61,7 +61,7 @@ <string>Save custom substrate as:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblPredefined</cstring> </property> @@ -72,7 +72,7 @@ <cstring>cmbPredefinedCanvases</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>lblColor</cstring> </property> @@ -83,22 +83,22 @@ <cstring>bnBackground</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lineEdit1</cstring> </property> </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider" row="3" column="1"> + <widget class="TQSlider" row="3" column="1"> <property name="name"> <cstring>slAbsorbency</cstring> </property> @@ -106,7 +106,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QSlider" row="2" column="1"> + <widget class="TQSlider" row="2" column="1"> <property name="name"> <cstring>slFiber</cstring> </property> @@ -114,7 +114,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -122,7 +122,7 @@ <string>Grainy</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblSmoothness</cstring> </property> @@ -133,7 +133,7 @@ <cstring>slSlippery</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblAbsorbency</cstring> </property> @@ -144,7 +144,7 @@ <cstring>slAbsorbency</cstring> </property> </widget> - <widget class="QSlider" row="0" column="1"> + <widget class="TQSlider" row="0" column="1"> <property name="name"> <cstring>slSlippery</cstring> </property> @@ -152,7 +152,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblHeight</cstring> </property> @@ -163,7 +163,7 @@ <cstring>slHeight</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblFiber</cstring> </property> @@ -174,7 +174,7 @@ <cstring>slFiber</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>lblRough</cstring> </property> @@ -182,7 +182,7 @@ <string>Rough</string> </property> </widget> - <widget class="QSlider" row="1" column="1"> + <widget class="TQSlider" row="1" column="1"> <property name="name"> <cstring>slHeight</cstring> </property> @@ -190,7 +190,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -198,7 +198,7 @@ <string>Absorbent</string> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -214,7 +214,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/krita/plugins/viewplugins/variations/dlg_variations.cc b/krita/plugins/viewplugins/variations/dlg_variations.cc index 7d81b078..c4c27275 100644 --- a/krita/plugins/viewplugins/variations/dlg_variations.cc +++ b/krita/plugins/viewplugins/variations/dlg_variations.cc @@ -24,19 +24,19 @@ #include "wdg_variations.h" -DlgVariations::DlgVariations( QWidget * parent, +DlgVariations::DlgVariations( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok) { - m_previewPix = QPixmap(); + m_previewPix = TQPixmap(); m_page = new WdgVariations(this, "variations"); Q_CHECK_PTR(m_page); setCaption(i18n("Variations")); setMainWidget(m_page); resize(m_page -> size()); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } DlgVariations::~DlgVariations() @@ -44,7 +44,7 @@ DlgVariations::~DlgVariations() delete m_page; } -void DlgVariations::setPixmap(QPixmap pix) +void DlgVariations::setPixmap(TQPixmap pix) { m_previewPix = pix; m_previewPix.detach(); diff --git a/krita/plugins/viewplugins/variations/dlg_variations.h b/krita/plugins/viewplugins/variations/dlg_variations.h index 48538687..b3844dfd 100644 --- a/krita/plugins/viewplugins/variations/dlg_variations.h +++ b/krita/plugins/viewplugins/variations/dlg_variations.h @@ -20,7 +20,7 @@ #ifndef DLG_VARIATIONS #define DLG_VARIATIONS -#include <qpixmap.h> +#include <tqpixmap.h> #include <kdialogbase.h> @@ -36,17 +36,18 @@ class DlgVariations: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgVariations(QWidget * parent = 0, + DlgVariations(TQWidget * tqparent = 0, const char* name = 0); ~DlgVariations(); /** * Set the initial preview pixmap */ - void setPixmap(QPixmap pix); + void setPixmap(TQPixmap pix); private slots: @@ -55,7 +56,7 @@ private slots: private: WdgVariations * m_page; - QPixmap m_previewPix; + TQPixmap m_previewPix; }; #endif // DLG_VARIATIONS diff --git a/krita/plugins/viewplugins/variations/variations.cc b/krita/plugins/viewplugins/variations/variations.cc index eef4d6e5..6f9fbf6f 100644 --- a/krita/plugins/viewplugins/variations/variations.cc +++ b/krita/plugins/viewplugins/variations/variations.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -48,18 +48,18 @@ typedef KGenericFactory<Variations> VariationsFactory; K_EXPORT_COMPONENT_FACTORY( kritavariations, VariationsFactory( "krita" ) ) -Variations::Variations(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +Variations::Variations(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(VariationsFactory::instance()); setXMLFile(locate("data","kritaplugins/variations.rc"), true); - (void) new KAction(i18n("&Variations..."), 0, 0, this, SLOT(slotVariationsActivated()), actionCollection(), "variations"); + (void) new KAction(i18n("&Variations..."), 0, 0, this, TQT_SLOT(slotVariationsActivated()), actionCollection(), "variations"); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; } } @@ -71,13 +71,13 @@ void Variations::slotVariationsActivated() { DlgVariations * dlgVariations = new DlgVariations(m_view, "Variations"); Q_CHECK_PTR(dlgVariations); - // Render layer to a QIMage -- keep in mind possibility of selection + // Render layer to a TQIMage -- keep in mind possibility of selection - // Scale QImage + // Scale TQImage - // Set original QImage in dialog + // Set original TQImage in dialog - if (dlgVariations -> exec() == QDialog::Accepted) { + if (dlgVariations -> exec() == TQDialog::Accepted) { // Retrieve changes made by dialog // Apply changes to layer (selection) } diff --git a/krita/plugins/viewplugins/variations/variations.h b/krita/plugins/viewplugins/variations/variations.h index 7aa40daf..d5ddc684 100644 --- a/krita/plugins/viewplugins/variations/variations.h +++ b/krita/plugins/viewplugins/variations/variations.h @@ -28,8 +28,9 @@ class KisView; class Variations : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - Variations(QObject *parent, const char *name, const QStringList &); + Variations(TQObject *tqparent, const char *name, const TQStringList &); virtual ~Variations(); private slots: diff --git a/krita/plugins/viewplugins/variations/wdg_variations.ui b/krita/plugins/viewplugins/variations/wdg_variations.ui index e6d8336d..191b84bb 100644 --- a/krita/plugins/viewplugins/variations/wdg_variations.ui +++ b/krita/plugins/viewplugins/variations/wdg_variations.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>WdgVariations</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgVariations</cstring> </property> @@ -23,7 +23,7 @@ <property name="caption"> <string>Variations</string> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>framePreview</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblOriginal</cstring> </property> @@ -64,13 +64,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -83,7 +83,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblCurrentPick</cstring> </property> @@ -95,13 +95,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -114,31 +114,31 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel4</cstring> </property> <property name="text"> <string>Current Pick</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>Original</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>grpOptions</cstring> </property> @@ -157,7 +157,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>radioShadows</cstring> </property> @@ -165,7 +165,7 @@ <string>&Shadows</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>radioMidtones</cstring> </property> @@ -176,7 +176,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>radioHighlights</cstring> </property> @@ -184,7 +184,7 @@ <string>&Highlights</string> </property> </widget> - <widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>radioSaturation</cstring> </property> @@ -192,7 +192,7 @@ <string>&Saturation</string> </property> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkClipping</cstring> </property> @@ -200,7 +200,7 @@ <string>Show &clipping</string> </property> </widget> - <widget class="QSlider" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQSlider" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>slider1</cstring> </property> @@ -208,7 +208,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lblFine</cstring> </property> @@ -216,7 +216,7 @@ <string>Fine</string> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>lblCoars</cstring> </property> @@ -226,9 +226,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <property name="geometry"> <rect> @@ -242,7 +242,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>bnLoad</cstring> </property> @@ -250,7 +250,7 @@ <string>&Load...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>bnSave</cstring> </property> @@ -268,14 +268,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>187</height> </size> </property> </spacer> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frameLight</cstring> </property> @@ -287,7 +287,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>556</height> @@ -310,7 +310,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblLighter</cstring> </property> @@ -322,13 +322,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -341,18 +341,18 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel12</cstring> </property> <property name="text"> <string>Lighter</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblCurrentPick3</cstring> </property> @@ -364,13 +364,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -383,18 +383,18 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel13</cstring> </property> <property name="text"> <string>Current Pick</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lblDarker</cstring> </property> @@ -406,13 +406,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -425,14 +425,14 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel14</cstring> </property> <property name="text"> <string>Darker</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -440,7 +440,7 @@ </widget> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frameColor</cstring> </property> @@ -460,13 +460,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>540</width> <height>556</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>540</width> <height>556</height> @@ -485,7 +485,7 @@ <property name="frameShadow"> <enum>Plain</enum> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblMoreCyan</cstring> </property> @@ -497,13 +497,13 @@ <height>150</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -516,7 +516,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -531,11 +531,11 @@ <property name="text"> <string>More Red</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -550,11 +550,11 @@ <property name="text"> <string>More Cyan</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblMoreBlue</cstring> </property> @@ -574,13 +574,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -593,7 +593,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -608,11 +608,11 @@ <property name="text"> <string>More Green</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblMoreRed</cstring> </property> @@ -632,13 +632,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -651,7 +651,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblMoreYellow</cstring> </property> @@ -671,13 +671,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -690,7 +690,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblMoreMagenta</cstring> </property> @@ -710,13 +710,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -729,7 +729,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -744,11 +744,11 @@ <property name="text"> <string>Current Pick</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -763,11 +763,11 @@ <property name="text"> <string>More Yellow</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblCurrentPick2</cstring> </property> @@ -787,13 +787,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -809,7 +809,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblMoreGreen</cstring> </property> @@ -829,13 +829,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -848,7 +848,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -863,11 +863,11 @@ <property name="text"> <string>More Magenta</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -882,7 +882,7 @@ <property name="text"> <string>More Blue</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -893,5 +893,5 @@ <data format="XPM.GZ" length="55092">789cccbd47b7eb38b2ef397f9fa2d6e5ecae5e7cf266d0035266cb6da7ed77af1ed07b2f1aa9bf7c83883f704c56d5cd7c75bb5f95d6c9ca5f8a22114044202200f0fccffffcdbe7d3fddffef37ffe8fea625c02eb6f966f947ffb4fbb4e92ebfff57fff9fffcffff88fe160f0b7fecf68389bfe6df41fffc7fff80febf96fd6df9401ff5fcff64232ffde36244f7a762ac953fefd56f29cf35cf2a267f3072ff9f733c906e7836493f35eb2c59fd74ab6797b1f243bfcfb46b2cb7fef0a1e72799c5af2907f7f94cce5732cc963fefd483297cf3a8387d43f992999ffde0c25f3dfb79a64de5f662099dfcfe924cf386f24f3fe4a44ff0fd17e5b327f9e772799dfcfb8078fa87d662499cbebbb9249de6fc9bcbd9d2f99dab795ccc7b31a48e6e3b71a4ae6e315ed25f3f1b04f82a93f0dc1636a9ff32999daf32599f757a54ae6fde17e48e6fae23892b97e78a2bd63ea1f438cef849e97e892f9f7652b99b76f3d91cce53763f0947e6f08fd9c1137b664de5e43c83fc7f53bf0022cf475499c8be719c4f113d824de5cc01671fd0eb6895dbaff50d8ab174ae6f2ad3ac9a47f63c924df4832d73f732a99f777f324998fb73993ccfb5f7f96ccc7df3a49e6e3514592b9bd3aa664ae1fd6bd646eaf9a2b98f4ddf52573fdb58e60d89f6d49e6df9b13c97c3c1d45326fbf634826ffb2934cfee40086fdf88164de7ff65232d9eb9b646e1fa607867e9bbe641a8f816092cf14f2423f4d070c7d8b9f25f3e7bbaf60e89fb791ccfb3b15df43ffe22f30f42f13f240ffea1b18fab716bf877ee967b043dc92bf1f0ea16fdd9af3a8f740bc3dbe64f2f70bc9bcbfcd2fc9bcbfbd4432f90b4730f5cff55e3297bfc9c0187f732899f4772099c6e35b321f7f6b0fc6f8daa6649aff7692f9f3724d32d7f7cb4932ef6ffb4e32e9b302c6f86723c9dcdefc50326f9ff32e99f7975382a10fd75c32d7e795906742fdd3bd49e6df67a2bdd09ff20886beb89164fefcd54932ef9ffa2c98fca72bda0b7d6a9f25f3feb0c4f842bf9a07b0d02fd13fd0afe2090cffd6c660e85b24ae87be05a40f63e1df8277c9bc7debab643e5e575732efef6e2799cb1bfcf89ecbdbed2573fd5cfd781e1fcf952d98fa3b91cf277f74cd24f3fe0f3ec08807ba8d64ae9fc54232e98f27993faff9f13df787ae680ff4d57995cce57103c95c7fac3bc97c7c7c5f308d67b8028bf9f72299cbd3dc49e6f2981f92797fd69664de5f7e2499dbb33b92ccdb6f2dc1d067772099fca72e99b7ff6a49a6f946f437f4b9bd48267934b0d0ef77c9bc7dad68df9cee9fee25f3fe69447fcc31df88f1843eaf6e92f9f3da89649a0fee25f3f1cb85be41ff0331bed07f5f8ca7f0a7d43f13a1df9d2a99f777f32899dfffea80111faeae92b93cee41f090f7effa0c463ce77f48a6f9ee51321fafeb4930f547bb01433fecb164fe7cff5b321f2f2f92ccfb3f93d793bd745b30f421ae2593bfd94be6fd1b2692b93cde4e32b79fda164ced8ddec1d017e74332f9dbb564de5e772899e299140c7dcaa692b93db8df92797fe61d18fe3117e303fd59b792e979b164de3f8918ff05f5cf46f40ff4c715e301fdb9bd80e13f57f792797fad4a30fce906bf17f3f51ae331c4fc19a13d43f89780e693a9f0a7ed028cebfd4e321fafe6198c7cc00b2473f9bc77c95cdf4a4ff0908fc75a5c8f78bfb52553fcf02999ebbfdf08a6f10e5ec1c2bfdc49a6f97c2b99e6ff27c9642f3fbee7fab416f2407fc299643efe912f99ec692099cbd3b492b9bc9ab8ff94c63711fd0bfdb2a792c93e2ac9140f689229df5125f3feed5660e85ffd2a99fce34432efdfee00867e5e14c9941f8ec0d0bfcc904cf9572a99b7a76e25f3fe73c760a1afaa646ebf99e85fe86f2ec61bfaea0b79e11f0ba12f2eda8bfb4b7d267b98897c64dd81a1cfeb503297afbd934cf1d45e30fc93f81ef363b896ccefbf3a4a26793dc1149fae7d30f247ff2a99ea1d3fbee7fed68b05a31eb1924cf9c2083ca5f6076bc9542fd948e6fa900e2473fdbbbc09463d630246be1a6692f9f84481643edef95532b73f5df01cfd7993ccdb7be92453beb5924cf3c14432efbf5cfc7e01fffa2999e6bfb1646e5f9b022ce2cba364de3e37114cfec132c0d047f74d32f9e37b30f26b2f05431f5763c9bc7f42c1d04797e6cf99d0c71be41fc21fa52a18fe24207d9f0bfd5a1d04d3f8570fe009d573dca3642e7fbb054f697ca237c1246f3a944cf53a5b32c5a72f60f81bd796ccaf4f2bc994af2d2593be6f2453bea682e7345eed4e32d5ff14c9bcbf2f57c95cff7dd15ef8a35097ccdb93cd25537e2bfa6b3124fffd055ec2bfcc24537c548045fe518331decda7647ebd2eda6ba37fc478c01f6d44ffb8d43e1ded17e3af3960cc97f5022cf481e257a6dd149fd96bf08cc6ffe64aa6f92604c35eec4032b7efab2799e2375b30e94b2aae5f50ff58aa642e6fe148a67ce1065e927fb80d2553bd2494cc9fdf3e49a6fc45c863c07e1dc97cfcd3a3606a5f7d05633e887682497faf4bb08df8e2030cfb2bc9de17a2ff4bf49f886762f4cf10f666bd80618f3e8dff92f5177f5e914be6ed2f36e005c91b5f24533cf22598ecafeec04be467ae64f28757b041bfaf5f040f29fe68c0268d9726da63917e14a2bdd0c7f424998f5f44fdb314fd91bf83a18f8105467fdc4660e86783e789fee94a30e215e3118c78a3a0f9dc60fd45fa34072f491fc329d8a0f685a964aae7dfc0265d5f2f05537f568f60d86bb091ccfbe36248e6fad988dfbba85f8e24533e48f66f88fe892b30fa67634ba6f97508467f6d1cb0a827435ed11f35fa6388f9c9a7f8c814f157fd065e92fe5f6e6083e42f5cb0897ac417d8227dca3fc036f55fb305431fba77c1747f3b02bba4df3ad9ab29e42f669229df46fb647fe460d8d3aa0243fecd2758d4bbefc0a21eb403a33f2a8a772c263f6fff35055ba827d1f85aa2bf2f1a58f4f70a8cfb252a18febdf1c0f02701f58f2dda7f5d48a6fe9b8071fff21d2cfc83603caf51c1b87fb106433f4b1a1f87fd17eebf1b17ec903efbd43e46b0f71a0c79cb2d58c4e72d18cf2f1bb078be0dc6f3339abf5cd11f8906c6f5de1a8cf846e3f6c1cbe724df068cf6548964ae3f1b130c7f9096608c7f7603a3bde90e8ce7bb2f60b4d77e00c39f075c9f98f639e47fa34832d7e7f84c2c9eb7ba80216ffb08c6f3cc042cd64f1a30e42f9760d88fe382d19e1ced19c11e42aebf0cf17cd306435ecb04a33d610e16f20b16f1470a16ed3981457cf9443c82bdae2660e19f79bc341c8be7d70e18cfd71ec022df8ac178feaa05e379d72bf108e3df70ff369cc8fe1d8345bc9c81d1fe60452cfaeb7a03c3be74ba7e2adbd382f1fbcb3b18e3910dc1689f4df24e657fd4603cafb2c168bffb0cc6f32b1ebf0c67e2fe01e9d34cdcef1283e12faa6f30ee67f860e1ffe660a1efdc7f0ee7e2fed58c58b6e70cc6ef8d002cd6173db0a83f2dc0d0b78edbf77021e5bd078bf6aec1f87d41fabd14f2155bb0f8fd108cdfeb2330da93de83f1fc8ac6d310f2ac1a309ed772ff3734c5fdb48d64ee0fb72e58d4e75ec0f87d7202a33f0d713df4a5237bb7e4782a60b11ee681d15eed112cee1782a1cf158f4f86b6b8bf6581c5fa2af5a733823f762d30eed7d2efdd11f2efcd1d18d76bdc5e468311f2a3c007e379f5082cea75f760e8fbfa8d782cf49dfba3d150fcbebc030b7bdc83a17f099faf472371ffe64c2ceed73460e883cefb6b3416f7ab4fc463e10f2c30e46b8927e279b94b2cee6f6cc1d087ec092cec4930c6f342f24f85fc46442caef75660e8cf85fb93d18cfd9ec783f1162ceaa37cfe19cdc5fd3ceabfb990d79d80d13eeb152cd64fe9fa85f8de7c05a33df9188cf66cbec0d0c7f50d0c7df3b8ff1f2d85bcce002ce227078ceb1d0f2cfca54e3c41fb6f74bd21ef5780f17c5d058bf53beeaf46e618ebd77a2299c77f5bba9f25c6b7f4c1c2bfbd80d19eeb07f104fda1933cb678de2603e37eba01c6ef6f57b0a8ff71ff3d72c6a8b7e8d47faee88fb507c6effd188cdf3bdc1ec67d38c739e2e3c5a63393e21723269e60fde4f22c99d677b93e307577285eb7b8fd8f27ecfe9cf50e0c7d8a79ff8ca7ec7bfefb6b412cc627db81c57e823730ead9eb1158d43fb8bce399b8fe7a0716eb5d7330c663c3fb733c67eda1fa484d2cc6c39a83a11fed193ca57a651282b13e16f3f96ebc9860bdc8d880c5fe810c2cf21bae8fe3e544d4cb23c93c5ed30a30ea071b170cff92d0f81813d443d71730eaed9a07c6f53eb7b7b1c9bee7fa117c49a6f5024b30c5b3760cb6b19ec9e3adb13331e8face93ccfbaf3883f13c23013ba8a72e05d3fd0d1b8c7c734df23b53d8df86facf9da03e7e1b80f1fc82f7e76430813e6d63e229fa3be5e333194e4cd40b52b04ded31b8fe4e4653110ff2fa0a73a736f28d9a788afd67fa180cfd6a1db0588fe3fe7f32610accfb77c3f59721f2c77c493cc5fe0aaf00e37eb731788afa4e059ed1f8361f60d48f6dde1f93d914ebc7460a46bd2fe4fd37994fc7940f6cbec1e89f98cf5f93a578def5013c433d86da6f4c51bf09b9bd4dcce982f2b39cebcbc49a22fff6b83e4dec29ea15d95932adb704c433acffebf43c776ad1fd039d7886f5d315bf3f5356f09acf77d3d1d4a5fa65734f3cc3fe035d134cf7372c30ec355b824dc413dc3fb0e9906574dcdf79c4e2f74501c6fa5b74104cdfb73c3e9d4ea6d6887f7fdb10b3e791bef1f9940ddf1ceb078fe005f5b7c5e7e3e96c86f58f8d0246fd3a76c1f311f9b377b043e31bf07c693a9fa1de19df816dec07f804bb584fa3fe5accc47a86069e517b82002cd6f775b043f39bc6e3dde9923d8eeb7332035bd47f3705ec60ff824d3cc7fecf84ebefd498c19e2faf609bfa2be6f9f0d49c2d51cff5c016e5fb2b176c8f78fb8b15d8a5fa99c9e7d7a93543fdab1b831dfafde6287844f5d10e8cf1af49bfac39c63bff024f499e98ee6fb3fb937f7d023bd4fed407bb435aafb124d37e2d5d30b53f03cf87d43eeb0d8cf5dd7803c67cb7e1f63d75587f707df1e9fece7c30a2fd5d7b30f6b3469f9269fdc792cce5594dc1587fba52ffb84c1edebecd5e326f7f41faebceb19f2cda8271bfa6133ca2e727e0118d4fb2164cfa9c2892f978af4c30eca1f1c19321d7bf2bff7e3660e34ff5e53bb043cfaf5dc174bf6c0076a97fdb929805acfcfb6d0446bdbee4ed9f0d857eddd660f89b6e2298da5f05c4ac3f687e6bc0c311ad87e07a263f9f0fda77f094da537f8067245fc5f569369a1963d29f2b31eb5fdabfe20ba6e7a777e0d188ff3eb9815906c29fa78227d04f053ca3f6b65c3f6663260fd553a93d2cfca4fec91bc95cfeea041e517f5fb8fece2662fcdd023c86ff33c1d31167cd06cf21cf5c308d679d8017d41f0df72fb3e9cc1ef3ebab14ec8c69bfc05432ed47d38885fe5d4cc9b4fe37028fc8fecb37c9649f25784cf6ebbf82e7f47dbc042fe87e05f5cf4ce8936b82e7f4fb36113ca6f17a002fe8f986b8de80fe8bef4dd28fc292cce52fa68269fc4d1effb0db2f49decd0c0c7fdc92fe2ce6131a3f6d2d98fcb7bf02cf49bf370330d68fea5a30fdde38831dfabea3fe59b2fea178b0009bd41e4f03db23aeff37713decb5f00593fc2df5a7c1ee47eb6f2330eadd17156c8ea87ff7609bfc45590b267f78d5c02e714bfa6ab2f1207ff80136c87ef22918f34dfe06c67cd186c48b018dafcee3cd99c5ee47faa48217647f99609bf4c7a0f1b2160392afa3f6da6cfc68bcd69279ff949f6093daef4ec1f067f5817831a4e76de8f70ebb9ece177c806d6abfb3235ec0dfba2bc9b4df9bc6d7ed1376ae5f5c3fe703263f6f4f520a1e53fc99102f66d4be8cf7cf7cc8e4e3d7673e784c7cdd82a7d4de5a03c3fe751e9f3265c2fca09be009d94fc2e397394b87c99f186bf08cfa4fe3fd3b9fb0e7717dacc792e97c0b8f5f58f8bb20d6793d613e5f2cc7b49fc5005bd49e35b56fb1c4fcecf1fe9e2fd9f7743dfdde582ca83f8267b049ed59f3f9686eb2eb69fd782699d62fa83de67244f67de1fa3eb79643b237ef2698f4ab9e8347d4feb0008fc99e1c6a8fbd70d05f4762261e6f9f46e3e730a6f3160618fdbbe6f9c6dc5d0ea8bd0df5bf6b88f89aebdfa25f00a5f8ff4e32edd749c0636aff66019ee17939780e7de2f92a73f643e8bb031e537b7c133c237bf5dec073ba7f44f71f1a225ea3e78f447f79dfe011ddcfe3f22dc68c29feff06e379ba0e9ed2ef0b1effb1747d44f3b1fd0d5ed2f78d0236c65cdf367c7e5fb0009858bf07cfd15f7bf082f4a3492473f96f19d8257b6df8f82e66cb05f55fbe223630ff6f797cbc98b3f67079527afe82319d17e1f6b7581a03fafdc693ccc7d7a0fb194b97da7bbb111b63f2af1bae9f0bd31810eb7cbd61612d1dd2bf94da671943c8cfe7af856d8c69be6e0563be594f2573fdd7b8bd2c1c763ded0f53c01392c7bb4ae6fdd3717d5db8c684fa4bbb134cdfa767f094e28180fba3e5c080fff15fc0b309f5ef9764d24ff13dfc43cae7a3e5d0807d6cf8782d47acbdfcfeed0b783ea1fad50ebca0ef6f3ed82079a32f30f2c5644f6c627f5acce7df655fd0e1e3930460a662dc3f1cc14beaaf40133ca178a8069bf47cdf90ccc74ff3c10e8de78dfa676c8afd09b564daff5982b1ff36a6f64c58ffd2fed40b7836a1fac504bc9c50fd6101c6fc97abc426e2b3700fc67911f3018cf33ac99d643e1edd198cf3176e07463da4fa0063bf8826be47bd53e7fe773965e345fded806db217eb1d8c78f29612b3f6923ea9603cbffb0663bf4949d7b38083c663b3022f68fceb7bb043f6118682a9ff8c02ec92bfcbe9fe7dba49f5c30d18fb636c9e2f2ce7ecf7144f2a6097e4bbe5c4ecf7140fcdc0b0b734018bfde03a784af3c53504cfb15f47dc0ffb0bbb8160ecbffc002fa95e58edc1d8bf1a4dc1163d2f36c1a8575495609c5f1a4aa6f3a134febd83e2ed2f376093faafa3e72fcc01f1f50b3c217ddd5660ac37ad63f00cfe5407cf69beef5230ea35c6026c60bfe55532e55b39d8a4eb6f73b0d8df20ee6f637fe04a32cdff03b043fd757b904cf9d9168c7ae7ed2299ce7b3692697fc898d8c2f99ddb128cf3b317f49f85fa6348f75f1a06d9afb604c37ff817b04dfa1c0ec10ee9bb4ef22ecd015d7fdd8047345eb5079e907e598e60d2d7b40363ffe3762598e2d5750e16e703d692297ffc128cf35768af897afb36108cfaee5c32d56b0f9269fe2e24f3f61731d880ff5125d37ed80558ac974c25d37ec09d64de7fe64132f73fea27d8a2f15732c9b4bea008a6f655a23fb1dfb28c24d3fe470d8c7ae1ed5132e95b2099cf8fa6e82fd4e3c32fc9b4bee3125b38ef7723ff641816d99b7d03dbe48fc22bd8a1f9f95a825d9adf4af28706eb1ede5eaf060fe97aaf133ca1fc5605237e6d8ee009e5bbd5198cf58b4efc1efb6fb71730f67bae66e025c5df8a09c6fecae020998fafd248a6f3ba909fd93b6f4f71025bb0af52329ddf9849e6cf533fc036e993924ba6f96726993f2fcec00ef57ff12e99e2c34a32ed7f0cc1f017d5bb649aef7cc9bc3f22f13c97fa4fc3f859388f5a6d25f3f69443c1d86f3b06e37c4be54ae6edd354c9bc7dd791643aefdc4aa67acf2b18e7f134f13dced325a4ef26d3379affc95f9826e2cb952a99c6f7153ca57835fd0463ff691108267fb579028b78c2001b34dee14532bf7f62814df88b4832d52f2ab085f59d0118eba3752899ecff2699eae307c9b43fb405431f9454329d2fbb97ccdb938cc02ee95b2adaebd2f8b590dfc279e448974ce3f12998e67b4d30ce074713c934ff403e0be72d2dba9fc5e607defeca014fc85f5413f094e2313b954cfea0114cfe467901233fd41792a99e6a49a6f527c198afd71bc9549fb9822dea8fba944cf9502799dad782b17e6d7592c9be6782495fea42321fdff8c7f77cbcb477b043fa1deb9229ff4904e37cc697641a7f0decd27828aa647abfc45032ade7b982495f13b25fcbc2fb0c944032d9cb93606abf5949a6f314cf60bc4fc00a24f3f6b79960d29f5a914cf11dfa53d87bf82999d6df303e16ceb755a4cf369b3fc8ff7660ec3f57de04933ff0f760ac5f665bc114df2b67c1a44f57156c507f5f1cc9b49ff3198cfdc69bab60aac7ac4f601be7fd22c1781fc95132ddaf95ccdbabd492b93e794f60e883229e87fd9ef959326fbf3a964cf9e00318fe5d9d4be6fda192fed916ce83a92f92a93dbe64ca8fd11f229e4c6f92f9f3938164ca1f4f82b1fe994ae6df871f60acf79a6bc9bc7f62f49785f3b1b75230d95775914cf30bfacfc279b22df90f47c413a621995f9f7be011f99b6d2b98e2136d021e4f683d63059e4cb83e7ae2fa19dd4f3b83e734df943118f581f22099cba33c8397549f592dc026d69b8f9279fb6f9f60e453d6156c537f5a63c9644f8160aa47695330fc8dee0aa6e7c5b964f28791648a6fe692297e580aa6fa6628da8bf8c3bc974cf9642118fa38954cf58f89649acf1692e93c27e9936361ffbdd149e6df2b9e609c1f7d96ccf549ad24d37974e887d0676721998f8fba924cf1fa9364b247713df687754f92e9fc672399ea45a23d581f35af92f9f7b9f81eef13885ac1181f4b32d5dfa10f16f6a3044bc974dee9158cfd3f892399fcbb2d993fff26fa6786fd3ba23f711ef146d7bbcc7e283f7b944ce7995ec0639aafab25784af671db0a9e52feb200cfc9fe320f2cec650f5e52beae7d49a6f319e2fe4bd457766083f453bf80b11fa878154cf6b2adc1585f37c4fde0af235530f251717fc45b9e90d7c17ca848a67add5530ad1f74a160aa8f76e279c8e7c34630f97f3b174cf2379a645abf247fe35a781f90ff2818f3c1443297571d49a67cfd4930cd87da1b58e8ff5630ece74b32cd1fa564aaef7982697dc87900633f73694ae6faa0be4aa6fd789a648aa724637fd25a32ed3f79924ceb3d3330f6f325ad64de1fd98364927f2598facbd42553fd3594ccafcf311e16cecbdf22c95c5e652a99de7f267e8ff3c9e1bb641a6f4732bf3efb008bfd812f92297eb32473794b31bec87fa30a2ccea3ee0493ff30f79269bfe23718f53e6b2099ea0377609c7f34be2453fc7b914cf91c1f2f63c0e6478a0fb6e019d58be207c1538aff8fe039e503712b99e6eb5c3297a750c04b1afff22618fb1922c1347fc73bc9b47f4630f2f9eda360b2efab2e98fcd1ea158cfd83452598f47f6b48e6cf8feec1a8b7a40bc1f05f3bc9bcffb61918f596f85d32d5e3447fbaa48ff94030f6ffdc24737bf267c416f6a7ac3f2453fe580bc67e99122cceeb9c24533d6b2299f4ad108cfce30773fd500cc9341f7792a9fe6b0ba6f5da6b2399ce372ec1d85f1d9d25f3efd59b60f89f3bc9bc3fd4a364f22f6f60ec97543792797fa8a960d8c74d32f9932918f61ed49269ff832d99e44d24f3f61a23c1d43f96fc1ef1fe1c8cf763448e645a3f16cfc3fe3d632899e2955832cdafd01f0be7d5ad4a32ad9f3792b9fcc64030ced3d792b93e9723c9b41feb02c6fe67732b99f68b7c4aa6faa3180f9c17f6499ffa032dc46bf098ec5d8f24d3fe08133ca1f530ed049e527eb7f50593ffb83c48a6fd570a7846f7d36b30e6fff25b32d5ab73c1145f28ef82299ed1e660d473b64f92a9def92698fcdd5a3cdf46fd24914cfbcd74c9b43e21e445fda611f7437cb1fe124cf65edcc02edd3f7225d3fb001e05d3fc5ebd108b7879bb93ccfbc72f05937e66a9605abf538e92493f56e021d99f6249a6fa5b2b98fc9f72914cedc3785a789f52f12698e42943c964ef17c9e40fe792697e1849e6f2648e60ac470660bc9f243b4aa6fd3fa1647ebda20826f9d24c32ef0ff55e32d5d7447f60fe2f9f25933f5a4aa6f8e62c18f9502299f40ffa61e1fd4b4a2899f6279492495ed19e29e297028cf795048d64dedef05530e29137c9e47fe4efb19f740cc6fed152134ced0f55c9fcfb488c17dedf74b9934cf64dfa3c326754ffab0cc1643f510ac67a78ba04633e77466083ecb309c026cdffa921998f476582b19fa7ba0aa6f93e5e0ba6fca6188051bf4b447bb1bf4aff00237ff60f92e9fd41f792e9bc7d2599e6f717c1d8cf247e8f7a5d160ba6fecf23c1b4bf21a0f86264e13c72f82499f2fd57c1f06727c954bfcec098df755b30d9ef7a2e98ecdf78974cf54cb447d47b3d5330e2cb0fc9b4df47dc0ffbd12ea9647a9fec1e2cde07f92e99f60b1c05239e3e4ba6f9df974cf9d74932ed9ffff17b2e5f70014f90ef288261df8664b25f5332bd6f0ae36be1fc4ef92499f22d4b3297ff593c0fefb7525dc9e4df3c30de5fa53a9229feb12553bc2ec66f46f2565f92c97f37609ca7b4df25d37e825a32adff89fba39eaafb92293fea24f3ebb7627cb13ebbfd944cfbadbf2453fe37154cf287a664d257d15e715e80fa6fcce673f2af117846f94076075e503d2188c1d88f9a9b82c91f2457c954cf38832df2279ba9647adfe70a8cfaecf62098e2ef6e2699ce27ed04533cb2d5c0d8efaa3c09a6fa46f12199ec5d3c0feba51dcd9f63517f5dbd0886bd3f4be6d76f7f30d59b62c164afde5432d5271f2453bdf0118c7abd77124ced4f1ac914afae2553bd5edc0ff3b9f32498ec6d1308a6f66c55c9341fdd83313f9ba23da8ef46a564dabf664aa6fd21f27b8a37e291643abfe249a6f9ce174cfb13a2028cf78b25b9647a1fd4a364f20fdf92c97f0c25d37a512599d607a03f22bf375ac994ffa49229ff78944cf94a2618fe48fe1ef59e4632bd3f270163becf2ac994bf8beb71fe4b0d2453bd27964cf552d13fa807da2f9269ff612499e627d13ed40f424330b55f13d763bfc6ed4332c50f37c1f0f78a64daff3d964cfb43c578637daf7a138cfd39429f719e6745fa30314df21f590ec6fedd32134cfbb10c5d30f98bcb8b64da2f3c01dbd87fbc174cf5c92001e37c4d25eee760fff1b7605a0fc8b792e9fc81b8bf43f149740263ff68fe2a989eb722fb9c8878201849a6f75f9e25d3f37cc974fee15532bdaf752898ecdd0904d37a475080512faf7e30e9432e18e7f56e82914f5482c91e0bf13ce4ff7e2698c627fb924cebcfe2f7d8ff1b3e80719eaa934cfaee3992491e717ff80f6f2699f22ff13dcecfa753c9e4bf0e92293f394aa6fd139660b2cfc8904cf9df4230e68b4a32add78bf1c0feda740ec6fbebcab3648a8f2792c95fd492299e1848a67ccd164cf25b2d58f887ab64f2379d64de3fea4132bd6f4efc7e8e7827944cfb7f1e2553bd4f134cfa6c799269ffb6781eea8df14432b57f2718ebe591645a2f8b05231f15bfc77e0f652699e229f13cbc7faa9a4ba6f361427fb03f5013fa8cf5e2c495ccbfd73dc924af180fec0fd33e24737922f17c9c6f6cc91ea626f69b5e13f082fccfe64d32d547bfc0385f565ec0886fba1cecd07a663394ccfb237b05633d627b144cf6779949a6f75fd682c93f06349f4dc5fa433d154cfaace982697d721b4aa6f3c11918f585742299fce5bd64aa67958229be5ac560ac27ac12c178bfd79b64da0ff1e37b7adf95fc3dcef70592a95ebb174cfe3a10cf47fda01c08c67e1b5f32bdcfb0134cfde12a92493ed17f585fc81f25d378dc49a6f8e253308d57249e3f417c7a904cfbcd7e30c5d382b11e982592797f24df82b1de954ba67aa6907f4af69baec138af6c8d24533d692f99ea733bc1e4ff3c0b2cde37be944cfe712499f2b1b964b2675732c52bd0670bfb45d54832e58fba64da0fb301e3fd8d4a2499d67f857ee0fc72f82d99be5f81713e3e194aa6fd49e27e588fb89ec1884fae13c9d4ffa27fb0bff0229e67537fae481f66e612fb2d776083ec3debc026eaa53618f18a3b0323fe580f04d3f5c98b64da7f63825df217852e99ce77907c33113f6c4dc134df6f1f24d37c9982b17ee04f05537b9a77c9148f88dfa3deb07a92ccfb7f73168cf365778229be48bf25537d19f28bf501e55e309d4fc94f92c97fcec158cf2b12c1e41fbb4fc9b43e3d104cf3f7f6158cf87ebb170cffe448267942c1e47fba05187f1f455049a6f5614330f4ff0d8cf3b88ab83fde3770d94ba6fafc12bca0f6a557c1c80f6dc9644fb964aa7f1492a99eb1934cf3f718bc44fd632199f2ab67c914bfd782518f16e389f78346a23dd8bfa58c25d379ba4030c95b5f2453fc5c824deacfec2299f6eb6c25d37ae74630e2b94632ad170bf9b13fb87b964cf514713df61bd4aa643a9f0f7bb31cecbf10fa28f6e3f89269bd83e2adb9399f52bd33032fa6fcfef9086cd07e8d95f81eeb1b97a964b2bf0dd8a2f958ff02dbb41fbbbb825d9a3f2eb5608a3fe28560caafb6141fcd45fdb11a83b11e180f05d37e5c5f114cfe669d8051ef6f3dc1a40fab108cf3d9e55a30ce3b1a60d4d78bab649a5fe5f7645f978364dededbb360f247452899ea616730d6e7d6779269fdfb4330f9bbd4148cf8e7058cf5b8e44932bdffe25e30f6835c24d3f9d1b964b27f713decdd16ed9b937fd2f792a99ed2082679a247b0380f33964cf3ab18af05c52f57d1df381f5baf2453bcff0046fcacfe60daaf6a4aa6f9ed4b30ce7fce25d3fedd1918f65f8af1c37e6d4f954cf9cf5a32c927fa17fbede254326faf22aec77c1bd582a9fd971d58ecef3524d3fe5ea1bfd84f97d1f82ec47a83be124cf5c8ca07dba4efbab8de9df2dffba44f0b51afeb5cc1747d32154cf61eecc043ccf74f9269ffd3098cf7495c1e25d3f9c14a30ad9f281f92693de2001ee3bcf34430e94f71114cfe259883f17ef6b52599de2f36144cfaa23c4aa6fafd188cfa79d60a267de832c1345f1786649a3f7e30cd97a2bdc86ff55232c54fb9648a6fc4f367e44fbaa1649a5f669269ffb7f87e4ef6915f2453beaf4ba6f9443c1feb655a2c99e47b944cfb532493ff6bef25d3f86ec1e2bc532318ef1712fa82f3cdc55e32b5ff1b0c7b5acd25d3df9fa04ba67ac25e32bd0f44b4cfc0f95ad13f787f759c08c6fb8f34c9141f6e2453fee80b46fe22fac7c2fbafef24933f17fa8efdf9590dc6fb8d4a8a079626ceb3d513b04bfa5a527cb664f645eb65067848f359fd8369bfec063cc27ae45532d5e31f25f3f15c3d83315f5d12c9544f740553fe1e6592a93f3dc158bfb88127145ffb9560b2873a96cce5d75f25537ce90ba6fa62f283a95e2ae49bd2f82b0f82c93ef385645a6f17ed453d39984aa6fac04c32fdfd5607c1a42ff14a30cdb7b74232e5a76f60e483fe5132cdafb960c4fb5f60c4aba52218ebaf7b30d69fb6e27b9c1f0ceec1d82f962b92c95f1d24537da7148cf93d05239f534f92e9bc8bb81fcefb1547c9544fabc1383fe68af1c67e92f807d3fe43213ff6af7662fcb19fdaa37cc410f5ebfc5e30cd1f6b07ecd2f85a347e06332faa8f1cc0d0efdb17784cf6e91a82499ff44ff004eb318f92693fdebd649adf5f05937efa67c1347fe91618e7bb6e7782112faa60ac8736a1601a8fac00a31ee98c05e37d155bc1347ff8aa647a1fc009bca0f1f21682c99f9ae2fe0b6acf360763fd62bb168cfcb0148cf7790879f1be9ad4954cf53cd17fd8bfe49f24533db1164cfdbd7d07e33cd346fc1efb17b789643a4f300423bf303760bcdfec42f669b27885ee47f38169e1bc977e124cf18d3706e3fd11fa163c22fdda9482a7b43e7805c3ff058660ba9f2b9e87f364d14632d5fb4792e9ef37fe02e33cd926028bf364efe039c9b712f747fdd9ad24d3f58231fee58b601affdb9b648a6f7230dedfe12d25d3fa760a467d3817f218145fd99f9269bda1924cefdf93df23fe7e009b349f98623c2c1a5ffb2298ee97d8609c3f32e6609c3f8b2cc9646f0bc914cf3f4aa6786607c6fe958ee20f8bcdafb43f81e20b165e93fe5c3e25d37e30f13dea3ddd093cc27ede2d18f5983804e3fd1d9a25989ed7168269ff61fa089e223f9e8167d47f862699d6f39e25d3fe68152ce2b70318e7c9ec67c9f4fe12138cf70f252918f1932b9e67507caf08f9f1be9938069b648fc15e308dbf32108cf7df88e7637f627c150cff7a0163ff42f000c6f99c88ec9b4d37a867d1fc62b3f1a3fd3c743f5b8c5ff102463cb2da82117fb4df9269bde12498ec510f25d3fef01c8cfcb8b425d37eaa5232bd5f2506235ed85a9269bda4154ce31d89f6cef17ea8037841f76b447b17d84fb6012fa9fd6b211fea49978b608a4f0c156c423f3bc9b49f3602c31e6f7bc1d0bf4a32c50fe44f6c1bfb3be22918e7e93a6287d907adb70ec063eacfd51b784afdb3d1c0c85f8a5232cd97afe0398ddf652d99fcf75130e5879d09c67c961482c97eae7bb049f74b3ac9349e86649a4f2692b93cb978be8df749b88229be509660eca7f39f24d3f922713dd6afaedf8269bcd690c7c6f9d755001e52bc5b533ceb5a63d29fab2199ce63edc1139a9f82083c25f9f5068cf745dd2cf082c6238d25d3fb1d378229bf503ec178dfce6a0946fce9bd0aa6fe5ccf04e37d0af27aca77ac1bd8a2e747df9229fe2dc136f98ffc4530e9f34a934cf9f10fa6e78be739387f48fde9daa8f7273c3e310716f67b260f9269ffde1318efefb91e24537dcd06e3fd79f6156ca0deb1904cf6a080d1fe6a2199e67b5f303d4fbb801dd8fb0a8cf8f9a611db78ff5dac8211df745f60d413133e7e2c389be17ccc183c27ff97459279ffac4b30de27947e0826f94c4532bd7f5d032fa9fd6d2a784af58e21d8a0f9e1aa48a6f53f5b30d58ffd6730de5f94ad89ed01d9ef86eb2b0b2eb0feac6fc04b92af7525d3fbcd8f6093fccde64532d9cb4d30c57fe1128cfd33eb77c1a41feb028cf7355a1f82e9f9ee1cec62ffea9b60f227892918e785f0bd8dfdafe9b3601a4f270463fda81980f17ea59adbbf3966fd41ef472dc14bf2075b1b6c60fdec4132d50f0bc9944f1cc126c693dad7bf5e9ff2075c6f63bd6b45fd33b1e6549fb8adc0580fdc7682c97fdd5ab035a5f74309c67961e50bec523c1de2f736eaf7f11c3ca4feaba8bfa6d664467fffdc080c7f53b492a97e6f08a6f686776013fab4964cf69982717ed224ff30b5b15fe81608c6fbd3ce60c48b2d8dd78cdd8ff2eb5430c5839b5730f2dff60086be74a4af33d6ff148fdd8391ff6a74bf390b30693de808b6917f64c436ce8fdf1230f6bfb7345e0b6b3a27fbe9c0f319bdaf8bfcc782a5f7e43f0f60cc4705f99f256b3fedf71c826d92ef3625b627349f68dcdf9b2c9f9b927f237d3458ffd1fc5b8327f007241f530f1aaf6b00467cad51ffb2f8674efd41fed5b6711ed0e4fac192cf39b57733022fe97ecf977feda32abf7d8c9f3e26ffa7827fa74fcf0afb9da5daaac3fe58ff6a0be8f3df21cb2f72b9ecf3bb5c0afe9b90afff77f7df5116d62247f5d81ffad87ddba87590cbfd87bfb3f1f9779605f20899fa6be8cfffb79fff167b71e9f393743ffadc1663f4e33aa96fbdedf8eccf3f18b9ffff65e16dfbc90e6009240d1fa9bf2b3bc9439ee0df4d1661eb3f64f9313a3f24f3e4e717cbfa7791e5379fecfefa91d758f05a8e94457a8a7f2b590235542335561335553335570b364ea55aa917b5669f86e951ab76ec7365b2de544dd5d99f15ff9dc67eb1fe379365a3aed827652391a85bf6b963d2ecd43dfbec982c07464726dd91fdfb4e3da9f74cce7bf5817d0c76e53ff4daff5b6479e43dfdc446e699fddb597d515fb94ebda9efea87faa906ec9a9449f8c524f85607ea501da96375a24ed5993a67d2fc1bc9c25a7a5637ec9f91ba607f02d8fd92c9f2cafe6929aafaa4284cc7be15431d2ba662b18fad380af31a8aa7f8ff3d92fcf7cc954aa0844aa4c44aa2a44aa6e44ccf5ca63d2dfbf4b6622a059b45064aa954ca45a9954669954eb92a3745537465a5acffe8b5ff37cab251b6ca9db253cf8aa2ec95036bf1513929f7ca83f2a83c29cfca5979515e9537e55df9503e952ff6dfbf9581325446ca589928d37f23596c65a6cc9505d3b393b26413cd83f261288661b044c0b00dc7700dcff08dc0088dc8888dc4488dccc88dc2288dcab8a87746fddf23c99f9345b58ca6ff23a390df6677a3353ae36adc0ccdd08d95b13636c6d6b83376c69efd391847e364dcb3cf897d8e8c1fd8e7d178329e8db3f162bc1a6fc6bbf1c1b4b0cf02685e757f9b797f9aadfe999ff8af6561527c1a5feccfb7313086c6c818315fd4186363624c8d194b9916c6b2370ad3304dd3326de3683aa68b8fc73ebe19b04f684666c465eaa53a9a31936a6726666a66666e16666956e6c5accdc66ccdcebc9a375333757365aecdcd2f33b1f2eb1cfcd764311a736bde3169becd9db9e7b21ccc8379344fe6bdf9603e9a4fe6b379365fcc57f3cd7c373fcc4ff38b7dbecd8139c467648ed967c23e63736aceccb9b960992a3334e3de322cd3b22cdb722cd7f22cdf0aacd08aacd84aacd4caacdc2aac12b9dc2f91c5ffaa2c56655dac4b3f2e566d0cad5a3d5b8dd55a9d75b56e9666e9d6ca5a5b1bd6d3f7ccd96ead3bd6522689b5b3f61677bfd6019f2393666a9dac7beb817d1ead27ebd93ab351da592fd6abf566bd5b1fd6274b98bf5884b0601e3d61b3e9c0faeea3cf1fd1d1bfa2634cb31a8bfe82f001fff74a89aca135b2c6d6c49a5a336b6e2d7acdb196cc74fa4a9ed18f85b5b34d48f2439643bf4c614e6ddb766cd77ab03ddbb7033bb42326cfc178b4633bb1533bb37336abda766197ea935dd997de92fecce74fc932307756cdc6646055aa67d77663b776675fed9badd9ba71303fec95bdb6376c249ef9676fed9924625414662bcc5e602bf766681bf6d6beb377f6de3eb0cfde3eda27fb9e8debde7eb01fed27fbd93eb319d7b35fec57656fbfb1d1b07efffcafc9f27cb16a66274cb78cc6f8b4df992c1ff6a7fd657fdb037bc8faf3c47a7864bbe6dc1edb137b6a2db924bb7e64fab161ff9cb1f6ce85fd9b91bdb0972c485698ddcc1dc3311d662c8eed384cd2bde33a9ee33b8113b218f5dd89545df17fcdecfe155954d7183ab113333bb1edda499cd4c9ec2f27778a5e0ea7640ff0ed3d6b55653d3b17361acf4cc706cc6216dc6ed8ff3b356b6be3b44ca6b9d3998173756e8e66f7938feeac9cb5b3b1b7ecf78eb365d21c8d9d73e7ec9cbd73708ecec9b9771e7ec9107ecb7a7eb6a03f234b2f09f3c683fe7ecea3f3e43c3b67e7c58cadb33db1ced6b33d6656cc3ece2b6b5dc5dab5c0a7f765ec63cfe9e374f8bc39efbd24f6d20e9d0f66fd47e7d3f9ea7fe954ce379366dffff5f6cec8e9ff5acca933b3eb9fe4f8576599ab9db3b05f9c25fba1e21a6ce2b08c23f34accd3bab6ebb8aebd702a73e17ab66b1f5d9ff9a8931b981fccdacfaca5f76ec86c2ae673e6d18ddcd84d98bde0e3746e6a7acc73b02b594fbcd93336be67377373b7704bb7722f6e6d176e63356e6b358ae67656f3afe8987a70afaaeddeecd6d55cdd5db96b3626cfeec6dd9a43f7ceddb97b3622dbde86dd837bb4576e6031ed331df7e4debb0feea3fbe43e1b817b765fdc472195fbeabeb9efec5707f7c3f9703fdd2ff7db1db84377c474f1c0fe7dec4edca93b73e7eec25daabd2f6091b8a7aa81f70fbdda9f91c533d8f46d79b6e778ae937b9e71b2179eef055ec8e4601fdbf0222ff612e6030eb6d1eb8c977a99977b85577a9577f16aaff15aaff3aedecdd33cdd5b796b36e7c7c6c9db785befce7a70471ebb0b1b5d9dfd3ff36fde8e59cec1db7b07efe89dbc7bb5f01e58467af31ebcc71f5af5bb1ff853b23c79cfded97bf15ebd37a730637362dbde3bd32f2e099368cbe6f229b39ae7de76bd0fefd3fbf2bebd8137f446ded89b78536fe6cdbd85b76441d7a3aff8866ffa966ffb8e71f45ddfb31e7c9ff9e8ad6df8811ff663e547ee8069e4831ffb899ffa198bd6be51bffd523c9189fe75599e2f7eee177ee957fec5af0d6603e6d46f7a49fc967d3aff6acead27ffd6cf77bee6ebfeca5ffb1b7febdff93b7fef1ffca37f62f966a2bef8f78aea3ff88ffe93ffec9ffd17ffd57ff3df8da3bdf03ffc4fff8bf9f485bd30c74ee57ffb037fe88f8cbd3ff627fed49ff9737fa1382c27fd6679f70f597ea97dfc99d8d25f066aa004060b112da65f6aff97c0f7fae5b7811d38fe3570cd0fe31478811f04411844411c24411a64411e14411954c14509839a7d1afb3d68838ee59af3e06a3f07b7400bf460c5fc48ef0d9560ddeb99ad30d906f6c27a0e36ecaedbe02ed8057ba50e0e4a191c8353708f0af54f35ab3f2d8b1d3c048fc153f01c9ccdd829ad73f012bcf6da15bc05ef81137c049fccf38c83afe03b1804c360148c8309fb330d66c19c49b47016c1325443253442d3188416fbc39c71e8865ee88741188651c86cc73a8709f3cb4698f29881c50f61d6fbfc300f8bb00cabf012d661e32fd421d3b41fb2387f94e5e77af6cf63d25f1db661175ec39b19875aa8b3bbafac636f27e13a5c33795e8c7b2f0d37e136bc0b77e13e3c84c7f014de870fe163f8143e8767f52d7c095fc337ab08dfc38ff033fc62d2982c22f6d97ff90e07e1301c8563e3184ed82cb40dd6e1943d63e6ee99fd7c9b53f6dfe7e1225c466aa428456444e68fcacdaf5a46b288ff862c28f1d4c8525fd5d7c88e1c7f19b9e673e41987c8376751c02375a61351c8e2f7cf88e524511c25511a65c62dca8347ab65f369cafe3c4645f01895aa1255d125aaa3266a5910d345d7e8166966678ccc75d4467ab48ad6d126da4677c629da452c82f0039ef778d68ecdb40bf6bc7d74888ed129ba77d2e8217aecefcdabed866af4d1eeaff6f2932c068fb043b77516ca2e7a8a9ea373f4629ea357f6a437e6750d16a79ca37773c2e6e8aad7eae823fa8cbea2ef68a0ce153f1a2aea8f2a2c7f9e1b8da27134096d2b8ca6d1cc8aa379b48896b11a2b56111b319bac629b85166eccbc3d9f73962c7f93b29843e33ef6e3200ea3fb388ae3f081f554cadbcafc5a1f25fe2c0b7ff68f7131d4f8f9e22cd4f73889d3388bf3b888cbb86277bcb0f87111d7d6dedd5b4f7c2639b959dcc46ddcc557ff515dfdb4f662cb3bbaca5875e25bacc5ba3f8b57f13adec4dbf82edec57ba5890fea323ec6a7f83e7e881fe327e3143fb3d866c9bc7380b86e689de373fc120ce2d76011bfc5effd88736b3055a38fdeff992c0ad34726cb6b9cb8adba8a3f4c23fe649db7641ec6b09ee3da665ed3fc0c33f6dcaff83b1ec4c378a456eaca7e51ee94713c862c3c1eecff9dfdb7493c55f57816cfe345bc4c54e3c17e4894c448ccc44aecc449dcc44bfc24484263efde9b3e8bd8d887e7a42c3b65f3d6d17c4da2244e92244db2a84872b1baf07765b1c886f8155b36bbb2fe65914fa2b8499194e69b71f26fd69e8dc9d9b998dff6c13ad953e39054c925a99326d6d5f7beea9db4ccca52f40d55c1d97d95bb385332bb4abae49adc12cd38252ceb4956c93ad924dbe42eba26bb641f1c9243724cd82c657a8ec272014364d94c9b4b2f4dee9387e4d158264f09b34ab146d2e722ff4c96e499f5e198e50e2bf6efe7e4257935dfad3e3f3f276f56ff8afa7df26ece8dfb709c7c249fc957f29d0c143d192a8b64c4abe3bdc7b4fbac8dc9c264b2df93713231de9269324be6c63159d8c76469c6a99a2aa9919aa995daa9e3dfa76eeaa5bef1603a2cbfe1b2f45910cb54b769601cd3308dd2384dd294cbc2d76dfa7cc4180aaff6932c96b0fe3453466e6b97cc8e9d344f8bb4343fd22a4c98f75a5afdfe8687f4621becee75daa46ddaa5d7d451f4a04b6fa996ea91c9fd3f978549c3644957e93adda4dbf42eddb15fedd3837d4c8fe9c9d8a7f7e943fa18fae953642b7a344c9fd373fa92bed2c8902c2ca7db4681719fbea5efe947fa997ef5feb197a56f7f9f5bfd2acb8f91e17a78607dbb5412ff2139a7dfce9069eb673ae86da5f7c54ee5fa696f8f553a4ac7e9249da6b3a4b50b65c3f42c5177fe23ef31361a7d0edad724d379ba4897999a29c63163f971b4efb3e3ccecb3e2649559999d39ea57ea0475e6665ee66781e9fa81a3a06ab0eb675096e1c5599845599c25ce23b3172e8b6af5b9d52fb2889a9add3f99d14efd4a064ccf952c553eb2cc74cc2fe61b077dcecbf477613d982316e37efaeb2ccf8aaccc2a61e7e45b98b34db24b56678d5dc763f53b6bb32ebb662c62f343d6df6ff6c2fd66de9c652c99661ce3a74ccf56d93adb306bd3b36d76e74efa5999c53363a603cf76bfcd8445369691edb23d93e5901db313d31d85db7491ddff268bf28b2ca67a973d3032b24743c99eb82ccc37f67d642ebcc4661146f69c9db397ec357bcbde852c1855577d4bdaec23fb8c9e93419a655fd97736c8d8e866a36cec8eb24936355da7cc66d9bcf7ebacbf17d93257734509552b377233b7723b77d8377d3d6dc29edad74398b7cedddccbfdec900779a828ff4496be024a7dabf8bd36f63edacc23c330ee982cbd97efed70c024619219f7799c27fe364ff32c3c30597eac4172bf95e779919779a556f925aff3266f8d63dee5d75eb7dc613f1ef9cdfdeeb3e25cb316f153aee7ab7cad9eed32dfe4dbfcced67396c1b09879c8729a4bafd9feb7719f29f93e3fe4c73cc88e4c9b1392c52afe812cbd0f559209d332db2ed5263f1926f32baed05ca6678eed5877ecbfbce6f7fe5dfe104cf347a3fd690d92d97afe943f671725cecff94bfe9abfe5ef7dd4937ff49909af719cddaf6cca73628dcd8871fe997fe5dff9404d9cc833f3613ecac7f1579ff1997dbc4c51b4cfee30c9a7f92cc9988e1d59a699f47e377c0bdffe200bb75792259fab7b854d65ea77be302c63cfd2fb1dd5bc481673943bf9b2500b8545f5b3e8814547b6dcabc0575793b1fa919f0ba33059b7d9ac557d2cbfe8f312ebaeb7e4c2e96b1785cb62ad53e1157e111461112923d52ee22229d22233f67d5ec365611ac6aecdd98cb92f8aa22caa3c2459faf6b398f5f597f9e5375958c6b34f6fcc62be8b0b7be4ce74a97227646177ae8ba6688b2e288a6b714bf25f7684303d53fc645268855eac8ab5710835e7b597a5d8b06cabaf6a7ef4d5be60cd243916dbe2aed815fbe2a0d8c5317b284ec57df1503c16cc3efa1a279764614e0b268f7128cec54bf15abcfd248b1aaa7f57164fcab22bde59fe742a3ed894b5efa33c5420875c9645f1597c15dfc5a01806398ba2c90bffd8555114a3625c4c8a692f4931ebd72c989ea8c5bc8f467b5b6677e03163b12cd5ecbb544287c540d7d250c2d22cadd22e9dd2354ebc22c2ae36c7f6a1f498cdc6a55f06e1ae64290dd731f7efc822d654c40cf3adb665c472b053191b2ecbef852cfb5e16f3cb3a9749999659996749745f163f564a7824669465599597b22e9b5e92b2cd34661b565f3b6371dc985bb4e10ffaaca7ecca6b79b3be4acd0a4a9d8d67c4a45995eb72536e992cbabdeda326368e5bebbecf64cabb7257ee7b591425cd7a6d28b552fb45961fd13ef773ea8dcd103b75c56439183e1bebc81c5b7d3d2cb0674e63cfcb63792aefcb87f2b17c6271ce86e527a398c594ca9d5d97cfe5b97c295fcbb7f29d79d12eef32adafee9bb3bebec13f337b5f7eb079bc2c3fcbaff2bb1c985d392c47e5b89c94d3c42d67e5bc5c944be3c45c7d156a7c4c0f665f1939564a655466d06746a7e0d4ef2ab2aadf62fedefb3059d8b7663f36c8d834bbaa2c26cbbd19b2deec97483a264b6b06c6a1b22bc79bc5e3a00996e5c4dc562e538ba86236cfa29545e5574115329fca66bb3ea736471513d73a313946fd9a4515dbdb2aa9d22aabf2aaa84a2bacaaea52d55553b5556745c1b1ba062b362e5ba7a355b57ebda3aff254b74aabf42467b21c83a36ad9f51f641151a5cf6571d488e9e246bd315559556b264bc4662c268b193269f64c96a37bf65a6fae2e2387e9eb5bb5a9b6d55db5abf6cab53a54c7ea54f575e17be6c717d681c5d5233e26a3fe2ebd3d570f4c96c7eaa97af646d5b97ab1aaead5dc556fd57bf5517d565ff128afabef5e966ac07ac2e5f5cf678bddb11a56a36a9ce4ce23c6c5339adf627e4bca6270efba60d1ee539ac5a36a524db98e912c51af654c965335f33a8f656bca3c34ccae9a87af9eaac6ac3f17d5f2a26637f7f5a25cb81fb615f38349d17f26b406c3ee7570377d7e75312fd6c5be38e1cbc5bd78179f8d897f092e6134b8449798c9d2b91fccbadefb159cde673059946a7449823e47f6d9c7fea32ca859283c96225912f549bdbfa4ec9e593fc6fdfa9c6df523d4af3d18a774e75d2fb9925e8ad0c8eefbbcfd525eaacbe5525f9a4b6b9c2edde56a6fcdd1e5165f98bd93244764f10773e445d68e5da55df4cbeab2b6c2cbe6b2bddc5d7655a7b697fde57039ba2fbd2c173633b1d8cde27fd5d684fde2fef27079e4b2a0adfd5add3f95256071f24d29c2faf27479eeb585d61bfb95a07ecd81e9d8a377f35545b3df7975c88ca6feec72bebc5c5ecdc4383afae58daf136d8235f75dbd7e8db92c7c3d96f5f196c5dd5333bebc5f3e2e9f97afcb777cbcf06a13d388e16578195dc66c869ddb6c66cd466c967db5ee7adbbf4c2ed3cb8ccba2f0bcc2fe5d16392f4096545373b5cdcf97f9657159f6eb90bdcdb2d8b85fd50accc08d8c83a7298f8a1fb4c620fca8d55a49b6b5519bc98ac9f9565bb56def1cc38bfaf99ecd8d336ef74cc7b8341e9b3146e6dcdef82cdeac9ddaadbddaaf83484b46e9ad0eeba88eeb84e5ca9fcce3796c6e9db008f4c9dd32590e755a67756e325990875bfd0aeaeff9cbcfb2287eaa2b6e5dd4a5f25557c68149c0bc0fb3dfa8978569716cc69eee2b6aa9cc422bfc8caa9a4590ec7f0d6b5beb7eb84347cdaf2c63af9cd73063f67faa22f6ebdeaff7d27875c746f9cbfc626d5cd6d7fa566bb55eafea35d36ca77c8af27a536fcdd8b9b23cdceb6318d6239bdec2eabb7a57efcb3d932515759e3fe695d8112074cc55efd44370523ae5b13e184cb3597e7f6fdbbc12cfda581f599b4ff57dfde0b6a1556d13b77eac9fea67e3549feb17a65b8bfab59f159cd728b02d1691ceeb37bfb1b7fe376fd994b220ca89acbdfb5abfd71ff56738a8bfeaef7a500fcba01e992ed3c27db17077aec3f29881cb324b63578feb493de5b2507ef20f7264f6a797a59ffb13f6ff0d9bfda7f5ac9ed70b9657b2fc8bc52e5b7b592f9d779bcdc98dda288de13f5a35f3ca1f8dd958c64363db47f6d9374e3f438693be6ed3fbb2c665ff34a2d0def09a9af1cb1ae0d074eb5be3357e1334a1f3d4444ddc244dcafae291e54977eeaec9ac2dfb158b429bbc299ab2a9b8bdd09ca8f42b763fcb42732397c5e4b364aa8cd2cc99c77a7369eaa6316377c3eefb7039352d0b8359d6e186c6aee99a6b738badd0b48a466b74fbc18c9b557aecc7c57c6fd64cdfc76c2c3efa5cbdd9345bebdcdcb9dbbe8283d53fac9c9b5ebfb3a4d935fbe6604d9a63736aee9b0726c363f3d43c3799bbeb6be64c2fe3e6dcbc34afcd9b948559c51f65a1d95ecaa2f1959bb5faa138cd7bf3c1a22ac7ff609e89d973bfa6686f9b4fe3e0dbcd57f31dbae167ad3483669828d60b7bde283359ae356bc66c961b46611f41369366dacc9ab971b296eeb6e1e3815566167d9b9ed3354b63efad5bb5555aa3355bcbe8ebd581396efb15c45d9f2b87ba71689dd66dbdd6ef63181e7719aadfaf09ff365752a5cfa4bdc2fdfa937a8bc76de03dc65d1b1afd4afdb658703fbbed6dba8d8c531bb7499b865ef5de666d9e9fdaa22ddbcad8370fed85595585fce4beaddba66ddbaebd5e5876dfded8bcf3ddd70ee4eabfefed5aaddf1de36baddeaeda755bb35f6dda6df0dede056f5ec89eb7734a63d7eedb437b6c4f52163f38fd41161bd97abff39945bc2c951e313ddbe5b9a2b7f7ed43fbc8b4f7686ffa9d05b5d53ef55adf326fdf9edb97f6d518861f4e5c44ed5bb269df59ccb3cf3b7bc9645ef5f949fbd17eb65fed773b6887eda865b3068b697aed123b19f67e906bf6b69db0acf8d44edb593b6751cb397875ed76d12e3bb59fdbeace38754a67746667c571922779af472c8e39fe4116e75759d84c99a94967770e93e6dab99d67192cd770d89cb063be56ef7c7b5b9f7d3753baa00bbba8da767197746997b1b0b8e8ca7e6dc8db75157bfea5abbbc6df756dd775d7eed6699ddeadfaac8e723b5ec95b326b687b8fe2fb4e65dce75db7ee36eeaedb76776c02d875fbe6397aef0eddb13b75f7dd43f7f8ab2cbfc563b40fdae2fbb87b59fabdb76ef7d43de7cfddb97be95e6bc738b9ae7de8ff1a4166c38eb3eddeba77964f9cba8feeb3fbeabe9d85fad80dba6137eac6d19d195b0b33f6b56ed24dbb5937ef16ddf2aa5e95ab71358d9dfbca7763f9bd1ce6d00ffa99fd6ad97bc7bada4cbe73b7bb322bb18ee1cadd5d5deffdea3109dfaffe35b886d7280fa302b66ffe1d1d13eb0b72bf196a7fdcef5de36b52b2d65d53ebe19ab119ef6c9dddcf7eb5f79ab3ff5a5ccb6bc5e29897ebe55a5bfeb5b9b6d7ee7acd27d7db55bb321d5533b30bdf8da69c5c57d7f57573dde6937efe655aa8f4750ce623a2be06c6f7638dd87c74ecfd38d515ade7de5aaa8171bcde5d77d7bdda3847b5edab2c5993353c07367f9c07f8afd7f89ca7ebe17a8cd953afa7eb3d3dddbf998b6641d1eef5e1fa787dba3e5fcfd797eb6bad3069deaeefd78febe7f5ebfa5d75d74139bc0eafa3eb987d26d7e975769d7b6bd60b8bcccccceb92dba2f5f327f2dd7d73c7fc1c27ebcc52c3a79b7263f955348c4c36f3b9aa6dbf33591cbebef31764b99937eb66df1cd6379ecb66877edf8bad140b2fb9b139d0b8f7b51b0b346f8152ddc25b748bd5db2db9a5b7ec96df8a68d025e15755df4a7377ab6e97f0e3c626c65b5bac6e9db1ef772df0fd16d6af1f5eafb0d86cc4246aee7236b3dcaeb7db4d4bc6d133cb2d44fefb87ddf3ffb52ce6e34dbfad6eeb86c5860d1b0d663515f3f8ecff6d8fc5eecc9fe593dbe6b6bdddd5a5fa62d7cae2b65386b7fdeda0d4ea58dd869f55773bde4eb7fbcbddede1f6787bba3ddfce51623f180fb71733643e7af24759983454afa4fbbfdede54f7f67efb48068a226ac97f7d7d3f2a6e9fb7afdbf76dc02b565f2cb35c58776c86d89a73162f6d6e43e3741bddc6b7c96d9abab759eadce6f1241ef77bf56f8bc80a5fa2eab6d4d4a8d394a85202f5ac199aa9599aadb1b16e5acdedade4e78fbbef3396c82759cc58f3345f0bb4508bf242d1d20ce3f287d3597fc25e1eb5584bb454cbfad981dd7b617e7a119385f624cdedad96f733a75668a5566917ad564325615ed0b65fe289b25322add15aadd3aedacdf84c1dd573979aa6e9da4a5b6b1b7ba16da99af0ebc8b03f2a8bb1ad7667dada9db653bba0b9bddbef2c7f37642dcfa1f8f22fc8926a7beda01db59376af3db008efce9cfa1f2c3bda71eb6451633568f92e43ed517bd29eb5b3f6a2bd46b935d2de8c85f61e4fb40f36269f2c216e94246ccb2767e999da97f6ad0d3436a6edeeefd98bf5dcee2c35f2b59136d6260a8bd955d72eed525db37111f562ef2fcbf2a84db59936d716da52578d7da8318f79673d9993b86e6fecb363518056b6bac26c79a71bbad92a9dab5bc64db77527327457c97596ee844e7fe622ce597e32d4033dd4233dd6133dedc7e0d74f98f5b2447e2f95bbd7333dcfebb2d20bf6fbfe0c84266b797c86ff2b3a16157aa957fa45aff5466ff5aedf11c3f2de39af8f322fa45ffb798faffbfaa6ebbe66817ed3355dd757fa5adfe85bfdcef850bff59dbe77c6d5413fe847fda4dfeb0ffaa3fe14bd07aece722db28dde4ef86e0bf3e78fe9e8e764adbfe8af4aa36ead86cdca34abf4f6eff075c43fbd8724c9f537fdbdb8ea1ffaa7fea57febcc07588affed6ed3ca56a3f7beea637afd3a561f4733895c33d687fa888dd0589fe8537da6cff585be5ca92b6565accc95e5eddd3c7ded778d38d5ca5e39b6e1eec90f0b0ff68b2cae7170dc95bbf2567e3c535f56415f310a4e2cdeea57df6a5a7bfb73b2048fab701505b355bc4a56e92a5be5ed78555807166b6efa5ccb3afe248bc9b28265dee5ceed8565b4b755b9aa5697555dcd568d3e5ab5b1c7f7c23129dcddaaeb76abab395e752c5bbbe3f66e626ef955166f7533e3b261f9d270a5b1f178e335567efeafaf2afd9571311f57fa6ab55a6bb362b8daacb6abbbcbc76ad75767d2a05f79b0b67d0ecf64796372ec983c0adfc570cff7819ef85efea3d8cf6bdcbbdf76e87ff8cd6abf3aac8ead1d7cb84edffa7e9e679aa6b63b6627bfcae2af4eab7b9643ad570fcdfbea919fce727f3a052c4f69fca971795a3dafceab176db67ad5ebd5dbea7df5b1fa8cbff26ef595f615a31fbbddf98749f7c177bc0f9d57f6795b7daf06d17e35147b2cfbbdbccd9339ee7739b58bd5a8d72e173b9358e3acdf65b1ceab717d67ec5693d574355bcd51c3b7708ec1fdf3314c92af16abe55a5d2b6b439badcdb5b5b6d7ceda5d7bc69e45cffb1f7bdefb489eaffb32097a7b62b3105fc7e3fba9f9beea7e36627e6318266b7f1dacc3c0091cbecb91452c6431bd17f85d967e7473dbd8d7efeb681dab77e20c2d9745f9b16be9cff8b1f03198af933c5d5bc1789daeb375be2ed6e5ba5a5fd6b5b5b437741601fbf7fbd5b30fbe57a25f6bb15a16fc34ceba757416dfb3e83e9ce9d77ecd807df6ebceefd6cc62bc50c8d2eeb411f366bfd90bd7d26374b7beadb53573e4b2fee5fed5793f628aba5eaf37ebedfa6ebd5befd787f5717d5adfaf1fd68feba790c5fdd69eef5ac1b8b04fbf9ef76a7e704b3e584bbedb9f5950bffba8f7e2eb7e97fcb1df83b63eaf5f02d736cc28effa73246c8e1feb193f73d2e7373edfafe4b23c69bb7e5dbf35cafa7dfdc1e617c8f2f7f78ffdf38ff3283f69566595d196e7f5e7fa6bfdbd1eac87eb11d335bea38c568b980e4db0afbf8fa6c6acc7cffc04c6b2dfadd7cbe90f7a7bea77569a43967505d5e0a69a713e6171d79d36d1f3f5b8f776eb49bfa3b61f93cb389f38de7aba9eade7eabdd8d32b674be7afc8f2d3d9621ecf798f6a11dcaf179774bdcc5f36ea46d9181bb37faead164ebf368979c230a77db5439cb4602336661ab91436d3dc39174ba1fd0a2caa7f6511e4ae0f0b36569fdfacc6cce59f8ce3c6c9271b77e36dfc4d607da94f56f35b9bfed2b8fc7eb6381a2a9ee2da55972acd26dc449b78936cd24db6c9f9aa0bcb6eac27ffdbf68bbc782effdf76ae6549552488eee733a6f615fdba7dbb6356a899203e5a6db51f3b4444f0c14b1489987f9faa8202a4bd37b457331113b9d010943a661645669d93b6d9e37b5a6207f5ce54d90a7b630ee6244ed8f3c2d4532060d9afca32ad349d280e4d481246103617866ae8b10a11c3b2b36c86248e1fe983506f36cb7bd7f59cde1344592e9dd23decc91c0e90c0115250a0014d680104cf80a691efb672cf7c667bc1191af13a6a6c8d2ed758790ea8a041fba8a546ca6681e23a2c67047dffd9b4a1130fb9e20cbad0833e2ce34747a706bc2c0e85fef98baee722bfd4f4404187dc51957668dcd0c2d0b660004318c12b8c61025378f3347fb13bb0acbe5df0f8ab3a31cdd0e01d3ee0136ee036e9c2ddb1ed7437f7e95459c13d7169c0bcfd003fe0117eb2bb700a4ff08c94def1b9eef5e9337dca1557dfc052a8ea8aefae6ed98c216b9d45ef4ffa485524aebeeaa181333471eeaa5edbb7f71bff47100423b4421517519a70a1686ff7106f632dbe471b97ebe0a027b3a4874ec8a276354cdffc603e255ca59dee228325a4b8c2354b719e8d29bbca113774bcb961e319c8f15c1f6327bd3884873ca043ee1bdcda7dce35430f7d0c30740718e10e636fed2f7ddd7f0cc2861b3aa1161991827b3cecfa8d66ec6112bce2115354f693204dfadb96d559cd6ccab25f967cd21655d61b3627a2d61336b0892d72a03dc20e53978ef868d8fa229f5faee75a7fe935c07eb745b764495b08ec7d0311d5f514356ca3bffd70224ff774bfb3f1822818bb5ad8461d3bd8c5de6e837df6fe0507fb088787258ef015c7d68bd0fa1a7cc79ef3f0a8623d21573237714a0f6bb636061dba66de58d0211dac1b76bfe293ef6039b59ad281736c393795d713791dceebf80ee712f96e3009ddd07544a5d179e13613e6e4967d435ca3ec245389a0cad56bfd58aad7bf7aee9fc122ff178e852391e3f3ba9c7d9399eff23a234758aeb7d96b869def6fe7fb0f468e60216ac18678a2378b9890bd31a42ee18c42f1d27b720dcf09969c1fb0909d7904e76ec356026184f0baafc89d66956e3da5fecbf6f6f369d67545d6b5c5d924df135a7ec542cb5e26e49a7cbfc201afa191da8093df3604f79408ae9ab0ad576031ca9ca3caca1635c83935653d22cfb448ce3bcf6adc752c32e62a9eb9443352aa19aaaae7e288acea1ab4729f2cb50e052bf5d4871cf952b02732ae47d9db635ea9689b453c57bc2062244752ad5f5e84c592fcc3e1ee4c949995795bc152fdbea830d827ffc84c20e9088f91d2fb395e4b665b520152c3422492ebf27dce3a1163b10a2cc60916c11710bad85b6ed69a7320cdc09db863ceee0a1533e20c1ccef6c814cd995eb334f9fc9ecf4b7ebda988b5c23b67b1108e04dff03d63da7fc32f8b9a5f4caeec2fc7c9c7e6f5bc5e154b795ce2e596e3679fca7dd222b624e3bc58134fe3a1e0bbcd199677fcb81c4b3d6a7ea7d6aeb0fb7e71ceb9a3f5738b7cbeda2ba7de3ba79caf57e52fff15fb1fcbbfd3fefcfbaf3ffe0193cc32fd</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> |