From e69e8b1d09fb579316595b4e6a850e717358a8b1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 19 Jun 2011 19:03:33 +0000 Subject: TQt4 port kdegraphics This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kolourpaint/pixmapfx/kpeffectemboss.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'kolourpaint/pixmapfx/kpeffectemboss.cpp') diff --git a/kolourpaint/pixmapfx/kpeffectemboss.cpp b/kolourpaint/pixmapfx/kpeffectemboss.cpp index f58f248a..647794db 100644 --- a/kolourpaint/pixmapfx/kpeffectemboss.cpp +++ b/kolourpaint/pixmapfx/kpeffectemboss.cpp @@ -75,10 +75,10 @@ TQPixmap kpEffectEmbossCommand::apply (const TQPixmap &pixmap, << endl; #endif - // (KImageEffect::emboss() ignores mask) + // (KImageEffect::emboss() ignores tqmask) TQPixmap usePixmap = kpPixmapFX::pixmapWithDefinedTransparentPixels ( pixmap, - Qt::white/*arbitrarily chosen*/); + TQt::white/*arbitrarily chosen*/); TQImage image = kpPixmapFX::convertToImage (usePixmap); @@ -91,9 +91,9 @@ TQPixmap kpEffectEmbossCommand::apply (const TQPixmap &pixmap, TQPixmap retPixmap = kpPixmapFX::convertToPixmap (image); - // KImageEffect::emboss() nukes mask - restore it - if (usePixmap.mask ()) - retPixmap.setMask (*usePixmap.mask ()); + // KImageEffect::emboss() nukes tqmask - restore it + if (usePixmap.tqmask ()) + retPixmap.setMask (*usePixmap.tqmask ()); return retPixmap; @@ -109,8 +109,8 @@ TQPixmap kpEffectEmbossCommand::applyColorEffect (const TQPixmap &pixmap) kpEffectEmbossWidget::kpEffectEmbossWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *parent, const char *name) - : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) + TQWidget *tqparent, const char *name) + : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) { TQGridLayout *lay = new TQGridLayout (this, 4, 2, marginHint (), spacingHint ()); @@ -138,7 +138,7 @@ kpEffectEmbossWidget::kpEffectEmbossWidget (bool actOnSelection, m_enableCheckBox = new TQCheckBox (i18n ("E&nable"), this); - lay->addMultiCellWidget (m_enableCheckBox, 0, 0, 0, 1, Qt::AlignCenter); + lay->addMultiCellWidget (m_enableCheckBox, 0, 0, 0, 1, TQt::AlignCenter); // (settingsChangedDelayed() instead of settingsChanged() so that the @@ -156,7 +156,7 @@ kpEffectEmbossWidget::~kpEffectEmbossWidget () // public virtual [base kpColorEffectWidget] TQString kpEffectEmbossWidget::caption () const { - return TQString::null; + return TQString(); } -- cgit v1.2.1