summaryrefslogtreecommitdiffstats
path: root/kolourpaint/pixmapfx
diff options
context:
space:
mode:
Diffstat (limited to 'kolourpaint/pixmapfx')
-rw-r--r--kolourpaint/pixmapfx/kpcoloreffect.h2
-rw-r--r--kolourpaint/pixmapfx/kpeffectbalance.cpp44
-rw-r--r--kolourpaint/pixmapfx/kpeffectbalance.h2
-rw-r--r--kolourpaint/pixmapfx/kpeffectblursharpen.cpp8
-rw-r--r--kolourpaint/pixmapfx/kpeffectblursharpen.h2
-rw-r--r--kolourpaint/pixmapfx/kpeffectemboss.cpp8
-rw-r--r--kolourpaint/pixmapfx/kpeffectemboss.h2
-rw-r--r--kolourpaint/pixmapfx/kpeffectflatten.cpp12
-rw-r--r--kolourpaint/pixmapfx/kpeffectflatten.h2
-rw-r--r--kolourpaint/pixmapfx/kpeffectinvert.cpp18
-rw-r--r--kolourpaint/pixmapfx/kpeffectinvert.h2
-rw-r--r--kolourpaint/pixmapfx/kpeffectreducecolors.cpp28
-rw-r--r--kolourpaint/pixmapfx/kpeffectreducecolors.h2
-rw-r--r--kolourpaint/pixmapfx/kpeffectsdialog.cpp20
-rw-r--r--kolourpaint/pixmapfx/kpeffectsdialog.h2
-rw-r--r--kolourpaint/pixmapfx/kppixmapfx.cpp8
16 files changed, 81 insertions, 81 deletions
diff --git a/kolourpaint/pixmapfx/kpcoloreffect.h b/kolourpaint/pixmapfx/kpcoloreffect.h
index 793978de..d92fee5c 100644
--- a/kolourpaint/pixmapfx/kpcoloreffect.h
+++ b/kolourpaint/pixmapfx/kpcoloreffect.h
@@ -73,7 +73,7 @@ private:
class kpColorEffectWidget : public TQWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp
index a6b0a7ac..d9b503d6 100644
--- a/kolourpaint/pixmapfx/kpeffectbalance.cpp
+++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp
@@ -327,28 +327,28 @@ kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection,
// (no need for settingsChangedDelayed() since BCG effect is so fast :))
- connect (m_brightnessInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SIGNAL (settingsChangedNoWaitCursor ()));
- connect (m_contrastInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SIGNAL (settingsChangedNoWaitCursor ()));
-
- connect (m_gammaInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (recalculateGammaLabel ()));
- connect (m_gammaInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SIGNAL (settingsChangedNoWaitCursor ()));
-
- connect (m_channelsComboBox, TQT_SIGNAL (activated (int)),
- this, TQT_SIGNAL (settingsChanged ()));
-
- connect (brightnessResetPushButton, TQT_SIGNAL (clicked ()),
- this, TQT_SLOT (resetBrightness ()));
- connect (contrastResetPushButton, TQT_SIGNAL (clicked ()),
- this, TQT_SLOT (resetContrast ()));
- connect (gammaResetPushButton, TQT_SIGNAL (clicked ()),
- this, TQT_SLOT (resetGamma ()));
-
- connect (resetPushButton, TQT_SIGNAL (clicked ()),
- this, TQT_SLOT (resetAll ()));
+ connect (m_brightnessInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SIGNAL (settingsChangedNoWaitCursor ()));
+ connect (m_contrastInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SIGNAL (settingsChangedNoWaitCursor ()));
+
+ connect (m_gammaInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (recalculateGammaLabel ()));
+ connect (m_gammaInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SIGNAL (settingsChangedNoWaitCursor ()));
+
+ connect (m_channelsComboBox, TQ_SIGNAL (activated (int)),
+ this, TQ_SIGNAL (settingsChanged ()));
+
+ connect (brightnessResetPushButton, TQ_SIGNAL (clicked ()),
+ this, TQ_SLOT (resetBrightness ()));
+ connect (contrastResetPushButton, TQ_SIGNAL (clicked ()),
+ this, TQ_SLOT (resetContrast ()));
+ connect (gammaResetPushButton, TQ_SIGNAL (clicked ()),
+ this, TQ_SLOT (resetGamma ()));
+
+ connect (resetPushButton, TQ_SIGNAL (clicked ()),
+ this, TQ_SLOT (resetAll ()));
recalculateGammaLabel ();
diff --git a/kolourpaint/pixmapfx/kpeffectbalance.h b/kolourpaint/pixmapfx/kpeffectbalance.h
index 2357a72c..17155cfb 100644
--- a/kolourpaint/pixmapfx/kpeffectbalance.h
+++ b/kolourpaint/pixmapfx/kpeffectbalance.h
@@ -73,7 +73,7 @@ protected:
class kpEffectBalanceWidget : public kpColorEffectWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
index 000b2114..f92ac99d 100644
--- a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
+++ b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
@@ -149,11 +149,11 @@ kpEffectBlurSharpenWidget::kpEffectBlurSharpenWidget (bool actOnSelection,
lay->setColStretch (1, 1);
- connect (m_amountInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SIGNAL (settingsChangedDelayed ()));
+ connect (m_amountInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SIGNAL (settingsChangedDelayed ()));
- connect (m_amountInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SLOT (slotUpdateTypeLabel ()));
+ connect (m_amountInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SLOT (slotUpdateTypeLabel ()));
}
kpEffectBlurSharpenWidget::~kpEffectBlurSharpenWidget ()
diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.h b/kolourpaint/pixmapfx/kpeffectblursharpen.h
index 5f42b712..0c4e148c 100644
--- a/kolourpaint/pixmapfx/kpeffectblursharpen.h
+++ b/kolourpaint/pixmapfx/kpeffectblursharpen.h
@@ -73,7 +73,7 @@ protected:
class kpEffectBlurSharpenWidget : public kpColorEffectWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/kolourpaint/pixmapfx/kpeffectemboss.cpp b/kolourpaint/pixmapfx/kpeffectemboss.cpp
index 87cb7d14..9ed8eb17 100644
--- a/kolourpaint/pixmapfx/kpeffectemboss.cpp
+++ b/kolourpaint/pixmapfx/kpeffectemboss.cpp
@@ -131,8 +131,8 @@ kpEffectEmbossWidget::kpEffectEmbossWidget (bool actOnSelection,
lay->setColStretch (1, 1);
- connect (m_amountInput, TQT_SIGNAL (valueChanged (int)),
- this, TQT_SIGNAL (settingsChanged ()));
+ connect (m_amountInput, TQ_SIGNAL (valueChanged (int)),
+ this, TQ_SIGNAL (settingsChanged ()));
#endif
m_enableCheckBox = new TQCheckBox (i18n ("E&nable"), this);
@@ -144,8 +144,8 @@ kpEffectEmbossWidget::kpEffectEmbossWidget (bool actOnSelection,
// (settingsChangedDelayed() instead of settingsChanged() so that the
// user can quickly press OK to apply effect to document directly and
// not have to wait for the also slow preview)
- connect (m_enableCheckBox, TQT_SIGNAL (toggled (bool)),
- this, TQT_SIGNAL (settingsChangedDelayed ()));
+ connect (m_enableCheckBox, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SIGNAL (settingsChangedDelayed ()));
}
kpEffectEmbossWidget::~kpEffectEmbossWidget ()
diff --git a/kolourpaint/pixmapfx/kpeffectemboss.h b/kolourpaint/pixmapfx/kpeffectemboss.h
index dfb4847e..fbd9f3fc 100644
--- a/kolourpaint/pixmapfx/kpeffectemboss.h
+++ b/kolourpaint/pixmapfx/kpeffectemboss.h
@@ -65,7 +65,7 @@ protected:
class kpEffectEmbossWidget : public kpColorEffectWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp
index 51d74381..a6b482bb 100644
--- a/kolourpaint/pixmapfx/kpeffectflatten.cpp
+++ b/kolourpaint/pixmapfx/kpeffectflatten.cpp
@@ -168,13 +168,13 @@ kpEffectFlattenWidget::kpEffectFlattenWidget (bool actOnSelection,
lay->addWidget (colorButtonContainer);
- connect (m_enableCheckBox, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotEnableChanged (bool)));
+ connect (m_enableCheckBox, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotEnableChanged (bool)));
- connect (m_color1Button, TQT_SIGNAL (changed (const TQColor &)),
- this, TQT_SIGNAL (settingsChanged ()));
- connect (m_color2Button, TQT_SIGNAL (changed (const TQColor &)),
- this, TQT_SIGNAL (settingsChanged ()));
+ connect (m_color1Button, TQ_SIGNAL (changed (const TQColor &)),
+ this, TQ_SIGNAL (settingsChanged ()));
+ connect (m_color2Button, TQ_SIGNAL (changed (const TQColor &)),
+ this, TQ_SIGNAL (settingsChanged ()));
}
kpEffectFlattenWidget::~kpEffectFlattenWidget ()
diff --git a/kolourpaint/pixmapfx/kpeffectflatten.h b/kolourpaint/pixmapfx/kpeffectflatten.h
index 78252f5d..0b471b0b 100644
--- a/kolourpaint/pixmapfx/kpeffectflatten.h
+++ b/kolourpaint/pixmapfx/kpeffectflatten.h
@@ -75,7 +75,7 @@ protected:
class kpEffectFlattenWidget : public kpColorEffectWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/kolourpaint/pixmapfx/kpeffectinvert.cpp b/kolourpaint/pixmapfx/kpeffectinvert.cpp
index d6229aca..20a55726 100644
--- a/kolourpaint/pixmapfx/kpeffectinvert.cpp
+++ b/kolourpaint/pixmapfx/kpeffectinvert.cpp
@@ -192,15 +192,15 @@ kpEffectInvertWidget::kpEffectInvertWidget (bool actOnSelection,
m_inSignalHandler = false;
- connect (m_redCheckBox, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotRGBCheckBoxToggled ()));
- connect (m_greenCheckBox, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotRGBCheckBoxToggled ()));
- connect (m_blueCheckBox, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotRGBCheckBoxToggled ()));
-
- connect (m_allCheckBox, TQT_SIGNAL (toggled (bool)),
- this, TQT_SLOT (slotAllCheckBoxToggled ()));
+ connect (m_redCheckBox, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotRGBCheckBoxToggled ()));
+ connect (m_greenCheckBox, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotRGBCheckBoxToggled ()));
+ connect (m_blueCheckBox, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotRGBCheckBoxToggled ()));
+
+ connect (m_allCheckBox, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SLOT (slotAllCheckBoxToggled ()));
}
kpEffectInvertWidget::~kpEffectInvertWidget ()
diff --git a/kolourpaint/pixmapfx/kpeffectinvert.h b/kolourpaint/pixmapfx/kpeffectinvert.h
index cfe5b6b5..1c975ddf 100644
--- a/kolourpaint/pixmapfx/kpeffectinvert.h
+++ b/kolourpaint/pixmapfx/kpeffectinvert.h
@@ -90,7 +90,7 @@ protected:
class kpEffectInvertWidget : public kpColorEffectWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
index 910e78ac..528acf27 100644
--- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
+++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
@@ -154,10 +154,10 @@ TQImage convertImageDepth (const TQImage &image, int depth, bool dither)
TQImage retImage = image.convertDepth (depth,
- Qt::AutoColor |
- (dither ? Qt::DiffuseDither : Qt::ThresholdDither) |
- Qt::ThresholdAlphaDither |
- (dither ? Qt::PreferDither : Qt::AvoidDither));
+ TQt::AutoColor |
+ (dither ? TQt::DiffuseDither : TQt::ThresholdDither) |
+ TQt::ThresholdAlphaDither |
+ (dither ? TQt::PreferDither : TQt::AvoidDither));
#if DEBUG_KP_EFFECT_REDUCE_COLORS && 0
kdDebug () << "After colour reduction:" << endl;
@@ -361,16 +361,16 @@ kpEffectReduceColorsWidget::kpEffectReduceColorsWidget (bool actOnSelection,
lay->addWidget (m_24BitRadioButton);
- connect (m_blackAndWhiteRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SIGNAL (settingsChanged ()));
- connect (m_blackAndWhiteDitheredRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SIGNAL (settingsChanged ()));
- connect (m_8BitRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SIGNAL (settingsChanged ()));
- connect (m_8BitDitheredRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SIGNAL (settingsChanged ()));
- connect (m_24BitRadioButton, TQT_SIGNAL (toggled (bool)),
- this, TQT_SIGNAL (settingsChanged ()));
+ connect (m_blackAndWhiteRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SIGNAL (settingsChanged ()));
+ connect (m_blackAndWhiteDitheredRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SIGNAL (settingsChanged ()));
+ connect (m_8BitRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SIGNAL (settingsChanged ()));
+ connect (m_8BitDitheredRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SIGNAL (settingsChanged ()));
+ connect (m_24BitRadioButton, TQ_SIGNAL (toggled (bool)),
+ this, TQ_SIGNAL (settingsChanged ()));
}
kpEffectReduceColorsWidget::~kpEffectReduceColorsWidget ()
diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.h b/kolourpaint/pixmapfx/kpeffectreducecolors.h
index 0dfd18e2..3be807b0 100644
--- a/kolourpaint/pixmapfx/kpeffectreducecolors.h
+++ b/kolourpaint/pixmapfx/kpeffectreducecolors.h
@@ -72,7 +72,7 @@ protected:
class kpEffectReduceColorsWidget : public kpColorEffectWidget
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
index c23c028f..87ef6859 100644
--- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp
+++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
@@ -84,8 +84,8 @@ kpEffectsDialog::kpEffectsDialog (bool actOnSelection,
setCaption (i18n ("More Image Effects"));
- connect (m_delayedUpdateTimer, TQT_SIGNAL (timeout ()),
- this, TQT_SLOT (slotUpdateWithWaitCursor ()));
+ connect (m_delayedUpdateTimer, TQ_SIGNAL (timeout ()),
+ this, TQ_SLOT (slotUpdateWithWaitCursor ()));
TQHBox *effectContainer = new TQHBox (mainWidget ());
@@ -116,8 +116,8 @@ kpEffectsDialog::kpEffectsDialog (bool actOnSelection,
addCustomWidgetToBack (m_settingsGroupBox);
- connect (m_effectsComboBox, TQT_SIGNAL (activated (int)),
- this, TQT_SLOT (selectEffect (int)));
+ connect (m_effectsComboBox, TQ_SIGNAL (activated (int)),
+ this, TQ_SLOT (selectEffect (int)));
selectEffect (0);
@@ -308,12 +308,12 @@ void kpEffectsDialog::selectEffect (int which)
#endif
- connect (m_colorEffectWidget, TQT_SIGNAL (settingsChangedNoWaitCursor ()),
- this, TQT_SLOT (slotUpdate ()));
- connect (m_colorEffectWidget, TQT_SIGNAL (settingsChanged ()),
- this, TQT_SLOT (slotUpdateWithWaitCursor ()));
- connect (m_colorEffectWidget, TQT_SIGNAL (settingsChangedDelayed ()),
- this, TQT_SLOT (slotDelayedUpdate ()));
+ connect (m_colorEffectWidget, TQ_SIGNAL (settingsChangedNoWaitCursor ()),
+ this, TQ_SLOT (slotUpdate ()));
+ connect (m_colorEffectWidget, TQ_SIGNAL (settingsChanged ()),
+ this, TQ_SLOT (slotUpdateWithWaitCursor ()));
+ connect (m_colorEffectWidget, TQ_SIGNAL (settingsChangedDelayed ()),
+ this, TQ_SLOT (slotDelayedUpdate ()));
slotUpdateWithWaitCursor ();
#if DEBUG_KP_EFFECTS_DIALOG
kdDebug () << "\tafter slotUpdateWithWaitCursor, previewGroupBox.size="
diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.h b/kolourpaint/pixmapfx/kpeffectsdialog.h
index a0621a70..4432e18c 100644
--- a/kolourpaint/pixmapfx/kpeffectsdialog.h
+++ b/kolourpaint/pixmapfx/kpeffectsdialog.h
@@ -47,7 +47,7 @@ class kpMainWindow;
class kpEffectsDialog : public kpToolPreviewDialog
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp
index ac5fca44..cbc69b1d 100644
--- a/kolourpaint/pixmapfx/kppixmapfx.cpp
+++ b/kolourpaint/pixmapfx/kppixmapfx.cpp
@@ -694,9 +694,9 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect,
0, 0,
destRect.width (), destRect.height ());
#else
- bitBlt (TQT_TQPAINTDEVICE(destPixmapPtr),
+ bitBlt (destPixmapPtr,
destRect.x (), destRect.y (),
- TQT_TQPAINTDEVICE(const_cast<TQPixmap*>(&srcPixmap)),
+ const_cast<TQPixmap*>(&srcPixmap),
0, 0,
destRect.width (), destRect.height (),
TQt::CopyROP,
@@ -705,9 +705,9 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect,
if (srcPixmap.mask ())
{
TQBitmap mask = getNonNullMask (*destPixmapPtr);
- bitBlt (TQT_TQPAINTDEVICE(&mask),
+ bitBlt (&mask,
destRect.x (), destRect.y (),
- TQT_TQPAINTDEVICE(const_cast<TQBitmap*>(srcPixmap.mask ())),
+ const_cast<TQBitmap*>(srcPixmap.mask ()),
0, 0,
destRect.width (), destRect.height (),
TQt::CopyROP,