summaryrefslogtreecommitdiffstats
path: root/kolourpaint/pixmapfx
diff options
context:
space:
mode:
Diffstat (limited to 'kolourpaint/pixmapfx')
-rw-r--r--kolourpaint/pixmapfx/kpeffectbalance.cpp8
-rw-r--r--kolourpaint/pixmapfx/kpeffectblursharpen.cpp2
-rw-r--r--kolourpaint/pixmapfx/kpeffectemboss.cpp2
-rw-r--r--kolourpaint/pixmapfx/kpeffectflatten.cpp2
-rw-r--r--kolourpaint/pixmapfx/kpeffectinvert.cpp2
-rw-r--r--kolourpaint/pixmapfx/kpeffectreducecolors.cpp2
-rw-r--r--kolourpaint/pixmapfx/kpeffectsdialog.cpp20
-rw-r--r--kolourpaint/pixmapfx/kppixmapfx.cpp12
8 files changed, 25 insertions, 25 deletions
diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp
index d66f6c91..946814d5 100644
--- a/kolourpaint/pixmapfx/kpeffectbalance.cpp
+++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp
@@ -35,7 +35,7 @@
#include <tqfontmetrics.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
@@ -275,9 +275,9 @@ kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection,
// TODO: This is what should be shown in the m_gammaInput spinbox
m_gammaLabel = new TQLabel (this);
// TODO: This doesn't seem to be wide enough with some fonts so the
- // whole layout moves when we drag the gamma slider.
+ // whole tqlayout moves when we drag the gamma slider.
m_gammaLabel->setMinimumWidth (m_gammaLabel->fontMetrics ().width (" 10.00 "));
- m_gammaLabel->setAlignment (m_gammaLabel->alignment () | TQt::AlignRight);
+ m_gammaLabel->tqsetAlignment (m_gammaLabel->tqalignment () | TQt::AlignRight);
TQPushButton *gammaResetPushButton = new TQPushButton (i18n ("Rese&t"), this);
@@ -438,7 +438,7 @@ void kpEffectBalanceWidget::recalculateGammaLabel ()
'f'/*[-]9.9*/,
2/*precision*/) +
" ");
- m_gammaLabel->repaint ();
+ m_gammaLabel->tqrepaint ();
}
diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
index 5d1ba4b1..e1feaaa3 100644
--- a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
+++ b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp
@@ -32,7 +32,7 @@
#include <tqimage.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
diff --git a/kolourpaint/pixmapfx/kpeffectemboss.cpp b/kolourpaint/pixmapfx/kpeffectemboss.cpp
index 7de6a6ac..0783021d 100644
--- a/kolourpaint/pixmapfx/kpeffectemboss.cpp
+++ b/kolourpaint/pixmapfx/kpeffectemboss.cpp
@@ -33,7 +33,7 @@
#include <tqcheckbox.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp
index a0fd8506..1768aa96 100644
--- a/kolourpaint/pixmapfx/kpeffectflatten.cpp
+++ b/kolourpaint/pixmapfx/kpeffectflatten.cpp
@@ -32,7 +32,7 @@
#include <tqcheckbox.h>
#include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqvbox.h>
diff --git a/kolourpaint/pixmapfx/kpeffectinvert.cpp b/kolourpaint/pixmapfx/kpeffectinvert.cpp
index 6ad04905..ad05d013 100644
--- a/kolourpaint/pixmapfx/kpeffectinvert.cpp
+++ b/kolourpaint/pixmapfx/kpeffectinvert.cpp
@@ -32,7 +32,7 @@
#include <tqcheckbox.h>
#include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpixmap.h>
#include <kdebug.h>
diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
index 0b764683..83dd997d 100644
--- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
+++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp
@@ -33,7 +33,7 @@
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
#include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqradiobutton.h>
diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
index d7624775..098e0396 100644
--- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp
+++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp
@@ -33,7 +33,7 @@
#include <tqgroupbox.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtimer.h>
#include <kapplication.h>
@@ -255,23 +255,23 @@ void kpEffectsDialog::selectEffect (int which)
// Don't resize the preview when showing the widget:
// TODO: actually work
- TQSize previewGroupBoxMinSize = m_previewGroupBox->minimumSize ();
- TQSize previewGroupBoxMaxSize = m_previewGroupBox->maximumSize ();
+ TQSize previewGroupBoxMinSize = m_previewGroupBox->tqminimumSize ();
+ TQSize previewGroupBoxMaxSize = m_previewGroupBox->tqmaximumSize ();
TQLayout::ResizeMode previewGroupBoxResizeMode =
- m_previewGroupBox->layout () ?
- m_previewGroupBox->layout ()->resizeMode () :
+ m_previewGroupBox->tqlayout () ?
+ m_previewGroupBox->tqlayout ()->tqresizeMode () :
TQLayout::Auto;
#if DEBUG_KP_EFFECTS_DIALOG
kdDebug () << "\tpreviewGroupBox: minSize=" << previewGroupBoxMinSize
<< " maxSize=" << previewGroupBoxMaxSize
<< " size=" << m_previewGroupBox->size ()
- << " layout=" << m_previewGroupBox->layout ()
+ << " tqlayout=" << m_previewGroupBox->tqlayout ()
<< " resizeMode=" << previewGroupBoxResizeMode
<< endl;
#endif
- if (m_previewGroupBox->layout ())
- m_previewGroupBox->layout ()->setResizeMode (TQLayout::FreeResize);
+ if (m_previewGroupBox->tqlayout ())
+ m_previewGroupBox->tqlayout ()->setResizeMode (TQLayout::FreeResize);
#if DEBUG_KP_EFFECTS_DIALOG
kdDebug () << "\tafter set resizeMode, previewGroupBox.size="
<< m_previewGroupBox->size () << endl;
@@ -300,8 +300,8 @@ void kpEffectsDialog::selectEffect (int which)
kdDebug () << "\tafter set fixedSize, previewGroupBox.size="
<< m_previewGroupBox->size () << endl;
#endif
- if (m_previewGroupBox->layout ())
- m_previewGroupBox->layout ()->setResizeMode (previewGroupBoxResizeMode);
+ if (m_previewGroupBox->tqlayout ())
+ m_previewGroupBox->tqlayout ()->setResizeMode (previewGroupBoxResizeMode);
#if DEBUG_KP_EFFECTS_DIALOG
kdDebug () << "\tafter restore resizeMode, previewGroupBox.size="
<< m_previewGroupBox->size () << endl;
diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp
index 2543f962..5b281606 100644
--- a/kolourpaint/pixmapfx/kppixmapfx.cpp
+++ b/kolourpaint/pixmapfx/kppixmapfx.cpp
@@ -1403,12 +1403,12 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_,
painter.setWorldMatrix (transformMatrix);
#if DEBUG_KP_PIXMAP_FX && 0
kdDebug () << "\ttranslate top=" << painter.xForm (TQPoint (0, 0)) << endl;
- kdDebug () << "\tmatrix: m11=" << painter.worldMatrix ().m11 ()
- << " m12=" << painter.worldMatrix ().m12 ()
- << " m21=" << painter.worldMatrix ().m21 ()
- << " m22=" << painter.worldMatrix ().m22 ()
- << " dx=" << painter.worldMatrix ().dx ()
- << " dy=" << painter.worldMatrix ().dy ()
+ kdDebug () << "\tmatrix: m11=" << painter.tqworldMatrix ().m11 ()
+ << " m12=" << painter.tqworldMatrix ().m12 ()
+ << " m21=" << painter.tqworldMatrix ().m21 ()
+ << " m22=" << painter.tqworldMatrix ().m22 ()
+ << " dx=" << painter.tqworldMatrix ().dx ()
+ << " dy=" << painter.tqworldMatrix ().dy ()
<< endl;
#endif
painter.drawPixmap (TQPoint (0, 0), pm);