diff options
Diffstat (limited to 'kolourpaint')
91 files changed, 326 insertions, 326 deletions
diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp index d92c43e6..06948815 100644 --- a/kolourpaint/kpcommandhistory.cpp +++ b/kolourpaint/kpcommandhistory.cpp @@ -927,7 +927,7 @@ void kpCommandHistory::redo () // Not completely obvious but what else can we do? // // Ignoring the request would not be intuitive for tools like - // Polygon & Polyline (where it's not always aptqparent to the user + // Polygon & Polyline (where it's not always apparent to the user // that s/he's still drawing a tqshape even though the mouse isn't // down). m_mainWindow->tool ()->cancelShapeInternal (); diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp index 9b7d5936..fe91bfee 100644 --- a/kolourpaint/kpdocument.cpp +++ b/kolourpaint/kpdocument.cpp @@ -231,12 +231,12 @@ TQPixmap kpDocument::convertToPixmapAsLosslessAsPossible ( // public static TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExistDialog, - TQWidget *tqparent, + TQWidget *parent, kpDocumentSaveOptions *saveOptions, kpDocumentMetaInfo *metaInfo) { #if DEBUG_KP_DOCUMENT - kdDebug () << "kpDocument::getPixmapFromFile(" << url << "," << tqparent << ")" << endl; + kdDebug () << "kpDocument::getPixmapFromFile(" << url << "," << parent << ")" << endl; #endif if (saveOptions) @@ -247,11 +247,11 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis TQString tempFile; - if (url.isEmpty () || !KIO::NetAccess::download (url, tempFile, tqparent)) + if (url.isEmpty () || !KIO::NetAccess::download (url, tempFile, parent)) { if (!suppressDoesntExistDialog) { - KMessageBox::sorry (tqparent, + KMessageBox::sorry (parent, i18n ("Could not open \"%1\".") .arg (kpDocument::prettyFilenameForURL (url))); } @@ -277,7 +277,7 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis if (detectedMimeType.isEmpty ()) { - KMessageBox::sorry (tqparent, + KMessageBox::sorry (parent, i18n ("Could not open \"%1\" - unknown mimetype.") .arg (kpDocument::prettyFilenameForURL (url))); KIO::NetAccess::removeTempFile (tempFile); @@ -292,7 +292,7 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis if (image.isNull ()) { - KMessageBox::sorry (tqparent, + KMessageBox::sorry (parent, i18n ("Could not open \"%1\" - unsupported image format.\n" "The file may be corrupt.") .arg (kpDocument::prettyFilenameForURL (url))); @@ -310,7 +310,7 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis " contains translucency which is not fully" " supported. The translucency data will be" - " approximated with a 1-bit transparency tqmask.") + " approximated with a 1-bit transparency mask.") .arg (prettyFilenameForURL (url)), i18n ("The image \"%1\"" " may have more colors than the current screen mode." @@ -320,16 +320,16 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis i18n ("The image \"%1\"" " contains translucency which is not fully" " supported. The translucency data will be" - " approximated with a 1-bit transparency tqmask.") + " approximated with a 1-bit transparency mask.") .arg (prettyFilenameForURL (url)), "docOpen", - tqparent), + parent), saveOptions, metaInfo); if (newPixmap.isNull ()) { - KMessageBox::sorry (tqparent, + KMessageBox::sorry (parent, i18n ("Could not open \"%1\" - out of graphics memory.") .arg (kpDocument::prettyFilenameForURL (url))); return TQPixmap (); @@ -446,7 +446,7 @@ bool kpDocument::save (bool overwritePrompt, bool lossyPrompt) // public static bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap, const kpDocumentSaveOptions &saveOptions, - TQWidget *tqparent) + TQWidget *parent) { #if DEBUG_KP_DOCUMENT kdDebug () << "kpDocument::lossyPromptContinue()" << endl; @@ -465,7 +465,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap, kpDocumentSaveOptions::Quality)) { TQUIT_IF_CANCEL ( - KMessageBox::warningContinueCancel (tqparent, + KMessageBox::warningContinueCancel (parent, i18n ("<qt><p>The <b>%1</b> format may not be able" " to preserve all of the image's color information.</p>" @@ -480,7 +480,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap, else if (lossyType & kpDocumentSaveOptions::ColorDepthLow) { TQUIT_IF_CANCEL ( - KMessageBox::warningContinueCancel (tqparent, + KMessageBox::warningContinueCancel (parent, i18n ("<qt><p>Saving the image at the low color depth of %1-bit" " may result in the loss of color information." @@ -503,7 +503,7 @@ bool kpDocument::savePixmapToDevice (const TQPixmap &pixmap, const kpDocumentSaveOptions &saveOptions, const kpDocumentMetaInfo &metaInfo, bool lossyPrompt, - TQWidget *tqparent, + TQWidget *parent, bool *userCancelled) { if (userCancelled) @@ -515,7 +515,7 @@ bool kpDocument::savePixmapToDevice (const TQPixmap &pixmap, << " type=" << type << endl; #endif - if (lossyPrompt && !lossyPromptContinue (pixmap, saveOptions, tqparent)) + if (lossyPrompt && !lossyPromptContinue (pixmap, saveOptions, parent)) { if (userCancelled) *userCancelled = true; @@ -596,16 +596,16 @@ bool kpDocument::savePixmapToDevice (const TQPixmap &pixmap, return true; } -static void CouldNotCreateTemporaryFileDialog (TQWidget *tqparent) +static void CouldNotCreateTemporaryFileDialog (TQWidget *parent) { - KMessageBox::error (tqparent, + KMessageBox::error (parent, i18n ("Could not save image - unable to create temporary file.")); } -static void CouldNotSaveDialog (const KURL &url, TQWidget *tqparent) +static void CouldNotSaveDialog (const KURL &url, TQWidget *parent) { // TODO: use file.errorString() - KMessageBox::error (tqparent, + KMessageBox::error (parent, i18n ("Could not save as \"%1\".") .arg (kpDocument::prettyFilenameForURL (url))); } @@ -617,7 +617,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, const kpDocumentMetaInfo &metaInfo, bool overwritePrompt, bool lossyPrompt, - TQWidget *tqparent) + TQWidget *parent) { // TODO: Use KIO::NetAccess:mostLocalURL() for accessing home:/ (and other // such local URLs) for efficiency and because only local writes @@ -632,9 +632,9 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, metaInfo.printDebug (TQString::tqfromLatin1 ("\tmetaInfo")); #endif - if (overwritePrompt && KIO::NetAccess::exists (url, false/*write*/, tqparent)) + if (overwritePrompt && KIO::NetAccess::exists (url, false/*write*/, parent)) { - int result = KMessageBox::warningContinueCancel (tqparent, + int result = KMessageBox::warningContinueCancel (parent, i18n ("A document called \"%1\" already exists.\n" "Do you want to overwrite it?") .arg (prettyFilenameForURL (url)), @@ -652,7 +652,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, } - if (lossyPrompt && !lossyPromptContinue (pixmap, saveOptions, tqparent)) + if (lossyPrompt && !lossyPromptContinue (pixmap, saveOptions, parent)) { #if DEBUG_KP_DOCUMENT kdDebug () << "\treturning false because of lossyPrompt" << endl; @@ -681,7 +681,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, kdDebug () << "\treturning false because could not open KSaveFile" << " status=" << atomicFileWriter.status () << endl; #endif - ::CouldNotCreateTemporaryFileDialog (tqparent); + ::CouldNotCreateTemporaryFileDialog (parent); return false; } @@ -689,7 +689,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, if (!savePixmapToDevice (pixmap, TQT_TQIODEVICE(atomicFileWriter.file ()), saveOptions, metaInfo, false/*no lossy prompt*/, - tqparent)) + parent)) { atomicFileWriter.abort (); @@ -697,7 +697,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, kdDebug () << "\treturning false because could not save pixmap to device" << endl; #endif - ::CouldNotSaveDialog (url, tqparent); + ::CouldNotSaveDialog (url, parent); return false; } @@ -710,7 +710,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, #if DEBUG_KP_DOCUMENT kdDebug () << "\tcould not close KSaveFile" << endl; #endif - ::CouldNotSaveDialog (url, tqparent); + ::CouldNotSaveDialog (url, parent); return false; } } // sync KSaveFile.abort() @@ -729,7 +729,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, #if DEBUG_KP_DOCUMENT kdDebug () << "\treturning false because tempFile empty" << endl; #endif - ::CouldNotCreateTemporaryFileDialog (tqparent); + ::CouldNotCreateTemporaryFileDialog (parent); return false; } @@ -742,20 +742,20 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, kdDebug () << "\treturning false because can't open file" << " errorString=" << file.errorString () << endl; #endif - ::CouldNotCreateTemporaryFileDialog (tqparent); + ::CouldNotCreateTemporaryFileDialog (parent); return false; } if (!savePixmapToDevice (pixmap, TQT_TQIODEVICE(&file), saveOptions, metaInfo, false/*no lossy prompt*/, - tqparent)) + parent)) { #if DEBUG_KP_DOCUMENT kdDebug () << "\treturning false because could not save pixmap to device" << endl; #endif - ::CouldNotSaveDialog (url, tqparent); + ::CouldNotSaveDialog (url, parent); return false; } } @@ -765,7 +765,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, #if DEBUG_KP_DOCUMENT kdDebug () << "\treturning false because could not close" << endl; #endif - ::CouldNotSaveDialog (url, tqparent); + ::CouldNotSaveDialog (url, parent); return false; } @@ -773,12 +773,12 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap, // TODO: No one seems to know how to do this atomically // [http://lists.kde.org/?l=kde-core-devel&m=117845162728484&w=2]. // At least, fish:// (ssh) is definitely not atomic. - if (!KIO::NetAccess::upload (filename, url, tqparent)) + if (!KIO::NetAccess::upload (filename, url, parent)) { #if DEBUG_KP_DOCUMENT kdDebug () << "\treturning false because could not upload" << endl; #endif - KMessageBox::error (tqparent, + KMessageBox::error (parent, i18n ("Could not save image - failed to upload.")); return false; } @@ -1267,7 +1267,7 @@ TQPixmap kpDocument::getSelectedPixmap (const TQBitmap &maskBitmap_) const if (maskBitmap.isNull ()) { - kdError () << "kpDocument::getSelectedPixmap() could not get tqmask" << endl; + kdError () << "kpDocument::getSelectedPixmap() could not get mask" << endl; return TQPixmap (); } } @@ -1325,7 +1325,7 @@ bool kpDocument::selectionPullFromDocument (const kpColor &backgroundColor) // - // Figure out tqmask for non-rectangular selections + // Figure out mask for non-rectangular selections // TQBitmap maskBitmap = sel->maskForOwnType (true/*return null bitmap for rectangular*/); @@ -1355,8 +1355,8 @@ bool kpDocument::selectionPullFromDocument (const kpColor &backgroundColor) TQPixmap erasePixmap (boundingRect.width (), boundingRect.height ()); erasePixmap.fill (backgroundColor.toTQColor ()); - if (selTransparentPixmap.tqmask ()) - erasePixmap.setMask (*selTransparentPixmap.tqmask ()); + if (selTransparentPixmap.mask ()) + erasePixmap.setMask (*selTransparentPixmap.mask ()); paintPixmapAt (erasePixmap, boundingRect.topLeft ()); } diff --git a/kolourpaint/kpdocument.h b/kolourpaint/kpdocument.h index 67ce32f3..b2dfb55b 100644 --- a/kolourpaint/kpdocument.h +++ b/kolourpaint/kpdocument.h @@ -78,7 +78,7 @@ public: kpDocumentMetaInfo *metaInfo = 0); static TQPixmap getPixmapFromFile (const KURL &url, bool suppressDoesntExistDialog, - TQWidget *tqparent, + TQWidget *parent, kpDocumentSaveOptions *saveOptions = 0, kpDocumentMetaInfo *metaInfo = 0); // TODO: fix: open*() should only be called once. @@ -88,13 +88,13 @@ public: static bool lossyPromptContinue (const TQPixmap &pixmap, const kpDocumentSaveOptions &saveOptions, - TQWidget *tqparent); + TQWidget *parent); static bool savePixmapToDevice (const TQPixmap &pixmap, TQIODevice *device, const kpDocumentSaveOptions &saveOptions, const kpDocumentMetaInfo &metaInfo, bool lossyPrompt, - TQWidget *tqparent, + TQWidget *parent, bool *userCancelled = 0); static bool savePixmapToFile (const TQPixmap &pixmap, const KURL &url, @@ -102,7 +102,7 @@ public: const kpDocumentMetaInfo &metaInfo, bool overwritePrompt, bool lossyPrompt, - TQWidget *tqparent); + TQWidget *parent); bool save (bool overwritePrompt = false, bool lossyPrompt = false); bool saveAs (const KURL &url, const kpDocumentSaveOptions &saveOptions, diff --git a/kolourpaint/kpdocumentsaveoptions.cpp b/kolourpaint/kpdocumentsaveoptions.cpp index 89eaf2d8..c217cffb 100644 --- a/kolourpaint/kpdocumentsaveoptions.cpp +++ b/kolourpaint/kpdocumentsaveoptions.cpp @@ -545,7 +545,7 @@ int kpDocumentSaveOptions::isLossyForSaving (const TQPixmap &pixmap) const if (mimeTypeHasConfigurableColorDepth () && !colorDepthIsInvalid () /*TODO: prevent*/ && (colorDepth () < pixmap.depth () || - colorDepth () < 32 && pixmap.tqmask ())) + colorDepth () < 32 && pixmap.mask ())) { ret |= ColorDepthLow; } diff --git a/kolourpaint/kpdocumentsaveoptions.h b/kolourpaint/kpdocumentsaveoptions.h index 22feaaa9..d6279885 100644 --- a/kolourpaint/kpdocumentsaveoptions.h +++ b/kolourpaint/kpdocumentsaveoptions.h @@ -119,7 +119,7 @@ public: bool mimeTypeHasConfigurableQuality () const; - // TODO: checking for tqmask loss due to format e.g. BMP + // TODO: checking for mask loss due to format e.g. BMP enum LossyType { LossLess = 0, @@ -127,7 +127,7 @@ public: // mimeTypeMaximumColorDepth() < <pixmap>.depth() MimeTypeMaximumColorDepthLow = 1, // i.e. colorDepth() < <pixmap>.depth() || - // colorDepth() < 32 && <pixmap>.tqmask() + // colorDepth() < 32 && <pixmap>.mask() ColorDepthLow = 2, // i.e. mimeTypeHasConfigurableQuality() Quality = 4 diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp index 4309fbf1..372743af 100644 --- a/kolourpaint/kpdocumentsaveoptionswidget.cpp +++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp @@ -62,15 +62,15 @@ const TQSize kpDocumentSaveOptionsPreviewDialog::s_pixmapLabelMinimumSize (25, 2 kpDocumentSaveOptionsPreviewDialog::kpDocumentSaveOptionsPreviewDialog ( - TQWidget *tqparent, + TQWidget *parent, const char *name) - : TQWidget (tqparent, name, + : TQWidget (parent, name, TQt::WType_TopLevel | TQt::WStyle_Customize | TQt::WStyle_DialogBorder | TQt::WStyle_Title), #if 0 -KDialogBase (tqparent, name, false/*non-modal*/, +KDialogBase (parent, name, false/*non-modal*/, i18n ("Save Preview"), 0/*no buttons*/), #endif @@ -270,9 +270,9 @@ kpDocumentSaveOptionsWidget::kpDocumentSaveOptionsWidget ( const TQPixmap &docPixmap, const kpDocumentSaveOptions &saveOptions, const kpDocumentMetaInfo &metaInfo, - TQWidget *tqparent, const char *name) - : TQWidget (tqparent, name), - m_visualParent (tqparent) + TQWidget *parent, const char *name) + : TQWidget (parent, name), + m_visualParent (parent) { init (); setDocumentSaveOptions (saveOptions); @@ -281,9 +281,9 @@ kpDocumentSaveOptionsWidget::kpDocumentSaveOptionsWidget ( } kpDocumentSaveOptionsWidget::kpDocumentSaveOptionsWidget ( - TQWidget *tqparent, const char *name) - : TQWidget (tqparent, name), - m_visualParent (tqparent) + TQWidget *parent, const char *name) + : TQWidget (parent, name), + m_visualParent (parent) { init (); } diff --git a/kolourpaint/kpdocumentsaveoptionswidget.h b/kolourpaint/kpdocumentsaveoptionswidget.h index 49d4bc20..3266582f 100644 --- a/kolourpaint/kpdocumentsaveoptionswidget.h +++ b/kolourpaint/kpdocumentsaveoptionswidget.h @@ -47,7 +47,7 @@ Q_OBJECT TQ_OBJECT public: - kpDocumentSaveOptionsPreviewDialog (TQWidget *tqparent, const char *name = 0); + kpDocumentSaveOptionsPreviewDialog (TQWidget *parent, const char *name = 0); virtual ~kpDocumentSaveOptionsPreviewDialog (); TQSize preferredMinimumSize () const; @@ -102,8 +102,8 @@ public: kpDocumentSaveOptionsWidget (const TQPixmap &docPixmap, const kpDocumentSaveOptions &saveOptions, const kpDocumentMetaInfo &metaInfo, - TQWidget *tqparent, const char *name = 0); - kpDocumentSaveOptionsWidget (TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); + kpDocumentSaveOptionsWidget (TQWidget *parent, const char *name = 0); private: void init (); public: diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp index 34d9d998..3b117803 100644 --- a/kolourpaint/kpmainwindow.cpp +++ b/kolourpaint/kpmainwindow.cpp @@ -64,7 +64,7 @@ kpMainWindow::kpMainWindow () - : KMainWindow (0/*tqparent*/, "mainWindow"), + : KMainWindow (0/*parent*/, "mainWindow"), m_isFullyConstructed (false) { init (); @@ -74,7 +74,7 @@ kpMainWindow::kpMainWindow () } kpMainWindow::kpMainWindow (const KURL &url) - : KMainWindow (0/*tqparent*/, "mainWindow"), + : KMainWindow (0/*parent*/, "mainWindow"), m_isFullyConstructed (false) { init (); @@ -84,7 +84,7 @@ kpMainWindow::kpMainWindow (const KURL &url) } kpMainWindow::kpMainWindow (kpDocument *newDoc) - : KMainWindow (0/*tqparent*/, "mainWindow"), + : KMainWindow (0/*parent*/, "mainWindow"), m_isFullyConstructed (false) { init (); diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp index 103b6e11..e5156148 100644 --- a/kolourpaint/kpmainwindow_edit.cpp +++ b/kolourpaint/kpmainwindow_edit.cpp @@ -72,7 +72,7 @@ kpPixmapFX::WarnAboutLossInfo kpMainWindow::pasteWarnAboutLossInfo () " contains translucency which is not fully" " supported. The translucency data will be" - " approximated with a 1-bit transparency tqmask."), + " approximated with a 1-bit transparency mask."), i18n ("The image to be pasted" " may have more colors than the current screen mode." " In order to display it, some colors may be changed." @@ -80,7 +80,7 @@ kpPixmapFX::WarnAboutLossInfo kpMainWindow::pasteWarnAboutLossInfo () i18n ("The image to be pasted" " contains translucency which is not fully" " supported. The translucency data will be" - " approximated with a 1-bit transparency tqmask."), + " approximated with a 1-bit transparency mask."), "paste", this); } @@ -215,7 +215,7 @@ void kpMainWindow::slotCopy () kpSelection sel = *m_document->selection (); // Transparency doesn't get sent across the aether so nuke it now - // so that transparency tqmask doesn't get needlessly recalculated + // so that transparency mask doesn't get needlessly recalculated // if we ever call sel.setPixmap(). sel.setTransparency (kpSelectionTransparency ()); @@ -256,12 +256,12 @@ void kpMainWindow::slotCopy () else rawPixmap = m_document->getSelectedPixmap (); - // Some apps, such as OpenOffice.org 2.0.4, ignore the image tqmask + // Some apps, such as OpenOffice.org 2.0.4, ignore the image mask // when pasting. For transparent pixels, the uninitialized RGB // values are used. Fix this by initializing those values to a // neutral color -- white. // - // Strangely enough, OpenOffice.org respects the tqmask when inserting + // Strangely enough, OpenOffice.org respects the mask when inserting // an image from a file, as opposed to pasting one from the clipboard. sel.setPixmap ( kpPixmapFX::pixmapWithDefinedTransparentPixels ( diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp index bcc1c1c4..5e57237b 100644 --- a/kolourpaint/kpmainwindow_file.cpp +++ b/kolourpaint/kpmainwindow_file.cpp @@ -1224,7 +1224,7 @@ void kpMainWindow::slotPrintPreview () // TODO: get it to reflect default printer's settings KPrinter printer (false/*separate settings from ordinary printer*/); - // TODO: pass "this" as tqparent + // TODO: pass "this" as parent printer.setPreviewOnly (true); sendPixmapToPrinter (&printer, false/*don't showPrinterSetupDialog*/); diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp index c9ce8b74..9fc82440 100644 --- a/kolourpaint/kpmainwindow_settings.cpp +++ b/kolourpaint/kpmainwindow_settings.cpp @@ -170,7 +170,7 @@ void kpMainWindow::slotConfigureToolBars () KEditToolbar dialog (actionCollection (), TQString()/*default ui.rc file*/, true/*global resource*/, - this/*tqparent*/); + this/*parent*/); // Clicking on OK after Apply brings up the dialog (below) again. // Bug with KEditToolBar. dialog.showButtonApply (false); diff --git a/kolourpaint/kpselection.cpp b/kolourpaint/kpselection.cpp index 65c2e0f3..43f81984 100644 --- a/kolourpaint/kpselection.cpp +++ b/kolourpaint/kpselection.cpp @@ -685,7 +685,7 @@ void kpSelection::paintOpaqueText (TQPixmap *destPixmap, const TQRect &docRect) TQBitmap destPixmapMask; TQPainter destPixmapPainter, destPixmapMaskPainter; - if (destPixmap->tqmask ()) + if (destPixmap->mask ()) { if (m_textStyle.effectiveBackgroundColor ().isTransparent ()) { @@ -701,7 +701,7 @@ void kpSelection::paintOpaqueText (TQPixmap *destPixmap, const TQRect &docRect) m_textStyle.foregroundColor ().toTQColor ())); } - destPixmapMask = *destPixmap->tqmask (); + destPixmapMask = *destPixmap->mask (); destPixmapMaskPainter.begin (&destPixmapMask); destPixmapMaskPainter.translate (-docRect.x (), -docRect.y ()); destPixmapMaskPainter.setPen (TQt::color1/*opaque*/); @@ -782,7 +782,7 @@ TQPixmap kpSelection::transparentForegroundTextPixmap () const // TQt::color0/*transparent*/ (but TQt::color1 seems Ok). // So we draw in a contrasting color to the background so that // we can identify the transparent pixels for manually creating - // the tqmask. + // the mask. pixmapPainter.setPen ( TQColor (mostContrastingRGB (m_textStyle.effectiveBackgroundColor ().toTQRgb () & TQRGB_MASK))); pixmapPainter.setFont (font); @@ -1252,7 +1252,7 @@ void kpSelection::calculateTransparencyMask () if (isText ()) { #if DEBUG_KP_SELECTION - kdDebug () << "\ttext - no need for transparency tqmask" << endl; + kdDebug () << "\ttext - no need for transparency mask" << endl; #endif m_transparencyMask.resize (0, 0); return; @@ -1261,7 +1261,7 @@ void kpSelection::calculateTransparencyMask () if (!m_pixmap) { #if DEBUG_KP_SELECTION - kdDebug () << "\tno pixmap - no need for transparency tqmask" << endl; + kdDebug () << "\tno pixmap - no need for transparency mask" << endl; #endif m_transparencyMask.resize (0, 0); return; @@ -1270,7 +1270,7 @@ void kpSelection::calculateTransparencyMask () if (m_transparency.isOpaque ()) { #if DEBUG_KP_SELECTION - kdDebug () << "\topaque - no need for transparency tqmask" << endl; + kdDebug () << "\topaque - no need for transparency mask" << endl; #endif m_transparencyMask.resize (0, 0); return; @@ -1433,7 +1433,7 @@ void kpSelection::flip (bool horiz, bool vert) if (!m_transparencyMask.isNull ()) { #if DEBUG_KP_SELECTION && 1 - kdDebug () << "\thave transparency tqmask - flipping that" << endl; + kdDebug () << "\thave transparency mask - flipping that" << endl; #endif kpPixmapFX::flip (TQT_TQPIXMAP(&m_transparencyMask), horiz, vert); } diff --git a/kolourpaint/kpsinglekeytriggersaction.cpp b/kolourpaint/kpsinglekeytriggersaction.cpp index 54e083c7..07573bf4 100644 --- a/kolourpaint/kpsinglekeytriggersaction.cpp +++ b/kolourpaint/kpsinglekeytriggersaction.cpp @@ -119,8 +119,8 @@ void kpSingleKeyTriggersActionInterface::enableSingleKeyTriggers (bool enable) kpSingleKeyTriggersAction::kpSingleKeyTriggersAction (const TQString &text, const KShortcut &shortcut, const TQObject *receiver, const char *slot, - KActionCollection *tqparent, const char *name) - : KAction (text, shortcut, receiver, slot, tqparent, name) + KActionCollection *parent, const char *name) + : KAction (text, shortcut, receiver, slot, parent, name) { } diff --git a/kolourpaint/kpsinglekeytriggersaction.h b/kolourpaint/kpsinglekeytriggersaction.h index 7b7001ff..495e336e 100644 --- a/kolourpaint/kpsinglekeytriggersaction.h +++ b/kolourpaint/kpsinglekeytriggersaction.h @@ -66,7 +66,7 @@ public: kpSingleKeyTriggersAction (const TQString &text, const KShortcut &shortcut, const TQObject *receiver, const char *slot, - KActionCollection *tqparent, const char *name); + KActionCollection *parent, const char *name); virtual ~kpSingleKeyTriggersAction (); diff --git a/kolourpaint/kptemppixmap.h b/kolourpaint/kptemppixmap.h index e66d622e..2bd9d7bc 100644 --- a/kolourpaint/kptemppixmap.h +++ b/kolourpaint/kptemppixmap.h @@ -69,7 +69,7 @@ public: int height () const; - // Returns whether a call to paint() may change <*destPixmap>'s tqmask + // Returns whether a call to paint() may change <*destPixmap>'s mask bool mayChangeDocumentMask () const; /* diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp index 58b0b48f..84923c1d 100644 --- a/kolourpaint/kpthumbnail.cpp +++ b/kolourpaint/kpthumbnail.cpp @@ -45,21 +45,21 @@ // TODO: get out of the Alt+Tab list -kpThumbnail::kpThumbnail (kpMainWindow *tqparent, const char *name) - : TQDockWindow (TQDockWindow::OutsideDock, tqparent, name), - m_mainWindow (tqparent), +kpThumbnail::kpThumbnail (kpMainWindow *parent, const char *name) + : TQDockWindow (TQDockWindow::OutsideDock, parent, name), + m_mainWindow (parent), m_view (0) { - if (!tqparent) - kdError () << "kpThumbnail::kpThumbnail() requires tqparent" << endl; + if (!parent) + kdError () << "kpThumbnail::kpThumbnail() requires parent" << endl; - if (tqparent) + if (parent) { // Prevent thumbnail from docking - it's _really_ irritating otherwise - tqparent->leftDock ()->setAcceptDockWindow (this, false); - tqparent->rightDock ()->setAcceptDockWindow (this, false); - tqparent->topDock ()->setAcceptDockWindow (this, false); - tqparent->bottomDock ()->setAcceptDockWindow (this, false); + parent->leftDock ()->setAcceptDockWindow (this, false); + parent->rightDock ()->setAcceptDockWindow (this, false); + parent->topDock ()->setAcceptDockWindow (this, false); + parent->bottomDock ()->setAcceptDockWindow (this, false); } diff --git a/kolourpaint/kpthumbnail.h b/kolourpaint/kpthumbnail.h index 1bb97ff3..5cb17d54 100644 --- a/kolourpaint/kpthumbnail.h +++ b/kolourpaint/kpthumbnail.h @@ -41,7 +41,7 @@ Q_OBJECT TQ_OBJECT public: - kpThumbnail (kpMainWindow *tqparent, const char *name = 0); + kpThumbnail (kpMainWindow *parent, const char *name = 0); virtual ~kpThumbnail (); public: diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp index 7c6a057b..da240492 100644 --- a/kolourpaint/kptool.cpp +++ b/kolourpaint/kptool.cpp @@ -1618,7 +1618,7 @@ bool kpTool::warnIfBigImageSize (int oldWidth, int oldHeight, const TQString &text, const TQString &caption, const TQString &continueButtonText, - TQWidget *tqparent) + TQWidget *parent) { #if DEBUG_KP_TOOL kdDebug () << "kpTool::warnIfBigImageSize()" @@ -1648,7 +1648,7 @@ bool kpTool::warnIfBigImageSize (int oldWidth, int oldHeight, if (kpPixmapFX::pixmapSize (newWidth, newHeight, TQPixmap::defaultDepth ()) >= KP_BIG_IMAGE_SIZE) { - int accept = KMessageBox::warningContinueCancel (tqparent, + int accept = KMessageBox::warningContinueCancel (parent, text, caption, continueButtonText, diff --git a/kolourpaint/kptool.h b/kolourpaint/kptool.h index 1094b8d1..03bedb0a 100644 --- a/kolourpaint/kptool.h +++ b/kolourpaint/kptool.h @@ -410,7 +410,7 @@ public: const TQString &text, const TQString &caption, const TQString &continueButtonText, - TQWidget *tqparent); + TQWidget *parent); protected: diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp index 12a39fb0..5b68a7b2 100644 --- a/kolourpaint/kpview.cpp +++ b/kolourpaint/kpview.cpp @@ -102,9 +102,9 @@ kpView::kpView (kpDocument *document, kpViewManager *viewManager, kpView *buddyView, kpViewScrollableContainer *scrollableContainer, - TQWidget *tqparent, const char *name) + TQWidget *parent, const char *name) - : TQWidget (tqparent, name, TQt::WNoAutoErase/*no flicker*/), + : TQWidget (parent, name, TQt::WNoAutoErase/*no flicker*/), d (new kpViewPrivate ()) { d->m_document = document; @@ -1348,9 +1348,9 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec TQBitmap maskBitmap; TQPainter maskBitmapPainter; - if (destPixmap->tqmask ()) + if (destPixmap->mask ()) { - maskBitmap = *destPixmap->tqmask (); + maskBitmap = *destPixmap->mask (); maskBitmapPainter.begin (&maskBitmap); maskBitmapPainter.setPen (TQt::color1/*opaque*/); } @@ -1483,9 +1483,9 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec TQBitmap maskBitmap; TQPainter destPixmapPainter, maskBitmapPainter; - if (destPixmap->tqmask ()) + if (destPixmap->mask ()) { - maskBitmap = *destPixmap->tqmask (); + maskBitmap = *destPixmap->mask (); maskBitmapPainter.begin (&maskBitmap); maskBitmapPainter.fillRect (rect, TQt::color1/*opaque*/); maskBitmapPainter.end (); @@ -1747,11 +1747,11 @@ void kpView::paintEventDrawRect (const TQRect &viewRect) #endif } - if (docPixmap.tqmask () || + if (docPixmap.mask () || (tempPixmapWillBeRendered && vm->tempPixmap ()->mayChangeDocumentMask ())) { #if DEBUG_KP_VIEW_RENDERER && 1 - kdDebug () << "\ttqmask=" << (bool) docPixmap.tqmask () + kdDebug () << "\tmask=" << (bool) docPixmap.mask () << endl; #endif paintEventDrawCheckerBoard (&backBufferPainter, viewRect); @@ -1759,7 +1759,7 @@ void kpView::paintEventDrawRect (const TQRect &viewRect) else { #if DEBUG_KP_VIEW_RENDERER && 1 - kdDebug () << "\tno tqmask" << endl; + kdDebug () << "\tno mask" << endl; #endif } diff --git a/kolourpaint/kpview.h b/kolourpaint/kpview.h index 613cafd2..4460a8ac 100644 --- a/kolourpaint/kpview.h +++ b/kolourpaint/kpview.h @@ -81,7 +81,7 @@ public: kpViewManager *viewManager, kpView *buddyView, kpViewScrollableContainer *scrollableContainer, - TQWidget *tqparent, const char *name); + TQWidget *parent, const char *name); /** * Destructs this view. Informs the viewManager() that the mouse @@ -344,7 +344,7 @@ protected: public: /** * Adds a region (in view coordinates) to the dirty area that is - * repainted when the tqparent @ref kpViewManager is set not to queue + * repainted when the parent @ref kpViewManager is set not to queue * updates. * * @param region Region (in view coordinates) that needs repainting. @@ -355,7 +355,7 @@ public: * Convenience function. Same as above. * * Adds a rectangle (in view coordinates) to the dirty area that is - * repainted when the tqparent @ref kpViewManager is set not to queue + * repainted when the parent @ref kpViewManager is set not to queue * updates. * * @param rect Rectangle (in view coordinates) that needs repainting. diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp index 7cfddb1a..e8ea5a5d 100644 --- a/kolourpaint/kpviewscrollablecontainer.cpp +++ b/kolourpaint/kpviewscrollablecontainer.cpp @@ -58,8 +58,8 @@ static const int GripHandleSize = 7; kpGrip::kpGrip (GripType type, - TQWidget *tqparent, const char *name) - : TQWidget (tqparent, name), + TQWidget *parent, const char *name) + : TQWidget (parent, name), m_type (type), m_startPoint (KP_INVALID_POINT), m_currentPoint (KP_INVALID_POINT), @@ -166,7 +166,7 @@ TQString kpGrip::userMessage () const void kpGrip::setUserMessage (const TQString &message) { // Don't do NOP checking here since another grip might have changed - // the message so an aptqparent NOP for this grip is not a NOP in the + // the message so an apparent NOP for this grip is not a NOP in the // global sense (kpViewScrollableContainer::slotGripStatusMessageChanged()). m_userMessage = message; @@ -194,8 +194,8 @@ void kpGrip::updatePixmap () kpPixmapFX::ensureOpaqueAt (&pixmap, hr); setBackgroundPixmap (pixmap); - if (pixmap.tqmask ()) - setMask (*pixmap.tqmask ()); + if (pixmap.mask ()) + setMask (*pixmap.mask ()); } @@ -390,10 +390,10 @@ void kpGrip::paintEvent (TQPaintEvent *e) // TODO: Are we checking for m_view == 0 often enough? -kpViewScrollableContainer::kpViewScrollableContainer (kpMainWindow *tqparent, +kpViewScrollableContainer::kpViewScrollableContainer (kpMainWindow *parent, const char *name) - : TQScrollView ((TQWidget *) tqparent, name, TQt::WStaticContents | TQt::WNoAutoErase), - m_mainWindow (tqparent), + : TQScrollView ((TQWidget *) parent, name, TQt::WStaticContents | TQt::WNoAutoErase), + m_mainWindow (parent), m_contentsXSoon (-1), m_contentsYSoon (-1), m_view (0), m_bottomGrip (new kpGrip (kpGrip::Bottom, viewport (), "Bottom Grip")), diff --git a/kolourpaint/kpviewscrollablecontainer.h b/kolourpaint/kpviewscrollablecontainer.h index a41b85dd..9b3a5f25 100644 --- a/kolourpaint/kpviewscrollablecontainer.h +++ b/kolourpaint/kpviewscrollablecontainer.h @@ -58,7 +58,7 @@ public: }; kpGrip (GripType type, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpGrip (); GripType type () const; @@ -119,7 +119,7 @@ Q_OBJECT TQ_OBJECT public: - kpViewScrollableContainer (kpMainWindow *tqparent, const char *name = 0); + kpViewScrollableContainer (kpMainWindow *parent, const char *name = 0); virtual ~kpViewScrollableContainer (); // Same as contentsX() and contentsY() except that after diff --git a/kolourpaint/pixmapfx/kpcoloreffect.cpp b/kolourpaint/pixmapfx/kpcoloreffect.cpp index 9b8262dd..85ba5927 100644 --- a/kolourpaint/pixmapfx/kpcoloreffect.cpp +++ b/kolourpaint/pixmapfx/kpcoloreffect.cpp @@ -133,8 +133,8 @@ void kpColorEffectCommand::unexecute () kpColorEffectWidget::kpColorEffectWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name) - : TQWidget (tqparent, name), + TQWidget *parent, const char *name) + : TQWidget (parent, name), m_actOnSelection (actOnSelection), m_mainWindow (mainWindow) { diff --git a/kolourpaint/pixmapfx/kpcoloreffect.h b/kolourpaint/pixmapfx/kpcoloreffect.h index 1286e794..5221757c 100644 --- a/kolourpaint/pixmapfx/kpcoloreffect.h +++ b/kolourpaint/pixmapfx/kpcoloreffect.h @@ -79,7 +79,7 @@ Q_OBJECT public: kpColorEffectWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpColorEffectWidget (); signals: diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp index 8f07a26e..946814d5 100644 --- a/kolourpaint/pixmapfx/kpeffectbalance.cpp +++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp @@ -253,8 +253,8 @@ TQPixmap kpEffectBalanceCommand::applyColorEffect (const TQPixmap &pixmap) kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + TQWidget *parent, const char *name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { TQGridLayout *lay = new TQGridLayout (this, 5, 5, marginHint (), spacingHint ()); diff --git a/kolourpaint/pixmapfx/kpeffectbalance.h b/kolourpaint/pixmapfx/kpeffectbalance.h index f44004a2..ec065ee3 100644 --- a/kolourpaint/pixmapfx/kpeffectbalance.h +++ b/kolourpaint/pixmapfx/kpeffectbalance.h @@ -79,7 +79,7 @@ Q_OBJECT public: kpEffectBalanceWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpEffectBalanceWidget (); virtual TQString caption () const; diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp index 145ed78c..e1feaaa3 100644 --- a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp +++ b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp @@ -88,7 +88,7 @@ TQPixmap kpEffectBlurSharpenCommand::apply (const TQPixmap &pixmap, << endl; #endif - // (KImageEffect::(blur|sharpen)() ignores tqmask) + // (KImageEffect::(blur|sharpen)() ignores mask) TQPixmap usePixmap = kpPixmapFX::pixmapWithDefinedTransparentPixels ( pixmap, TQt::white/*arbitrarily chosen*/); @@ -107,9 +107,9 @@ TQPixmap kpEffectBlurSharpenCommand::apply (const TQPixmap &pixmap, TQPixmap retPixmap = kpPixmapFX::convertToPixmap (image); - // KImageEffect::(blur|sharpen)() nukes tqmask - restore it - if (usePixmap.tqmask ()) - retPixmap.setMask (*usePixmap.tqmask ()); + // KImageEffect::(blur|sharpen)() nukes mask - restore it + if (usePixmap.mask ()) + retPixmap.setMask (*usePixmap.mask ()); return retPixmap; @@ -125,8 +125,8 @@ TQPixmap kpEffectBlurSharpenCommand::applyColorEffect (const TQPixmap &pixmap) kpEffectBlurSharpenWidget::kpEffectBlurSharpenWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + TQWidget *parent, const char *name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { TQGridLayout *lay = new TQGridLayout (this, 4, 2, marginHint (), spacingHint ()); diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.h b/kolourpaint/pixmapfx/kpeffectblursharpen.h index e4db5f86..09c5ee4c 100644 --- a/kolourpaint/pixmapfx/kpeffectblursharpen.h +++ b/kolourpaint/pixmapfx/kpeffectblursharpen.h @@ -79,7 +79,7 @@ Q_OBJECT public: kpEffectBlurSharpenWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpEffectBlurSharpenWidget (); virtual TQString caption () const; diff --git a/kolourpaint/pixmapfx/kpeffectemboss.cpp b/kolourpaint/pixmapfx/kpeffectemboss.cpp index 647794db..0783021d 100644 --- a/kolourpaint/pixmapfx/kpeffectemboss.cpp +++ b/kolourpaint/pixmapfx/kpeffectemboss.cpp @@ -75,7 +75,7 @@ TQPixmap kpEffectEmbossCommand::apply (const TQPixmap &pixmap, << endl; #endif - // (KImageEffect::emboss() ignores tqmask) + // (KImageEffect::emboss() ignores mask) TQPixmap usePixmap = kpPixmapFX::pixmapWithDefinedTransparentPixels ( pixmap, TQt::white/*arbitrarily chosen*/); @@ -91,9 +91,9 @@ TQPixmap kpEffectEmbossCommand::apply (const TQPixmap &pixmap, TQPixmap retPixmap = kpPixmapFX::convertToPixmap (image); - // KImageEffect::emboss() nukes tqmask - restore it - if (usePixmap.tqmask ()) - retPixmap.setMask (*usePixmap.tqmask ()); + // KImageEffect::emboss() nukes mask - restore it + if (usePixmap.mask ()) + retPixmap.setMask (*usePixmap.mask ()); return retPixmap; @@ -109,8 +109,8 @@ TQPixmap kpEffectEmbossCommand::applyColorEffect (const TQPixmap &pixmap) kpEffectEmbossWidget::kpEffectEmbossWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + TQWidget *parent, const char *name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { TQGridLayout *lay = new TQGridLayout (this, 4, 2, marginHint (), spacingHint ()); diff --git a/kolourpaint/pixmapfx/kpeffectemboss.h b/kolourpaint/pixmapfx/kpeffectemboss.h index 215a3cfa..18e4584a 100644 --- a/kolourpaint/pixmapfx/kpeffectemboss.h +++ b/kolourpaint/pixmapfx/kpeffectemboss.h @@ -71,7 +71,7 @@ Q_OBJECT public: kpEffectEmbossWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpEffectEmbossWidget (); virtual TQString caption () const; diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp index 4357e086..1768aa96 100644 --- a/kolourpaint/pixmapfx/kpeffectflatten.cpp +++ b/kolourpaint/pixmapfx/kpeffectflatten.cpp @@ -131,9 +131,9 @@ TQColor kpEffectFlattenWidget::s_lastColor2; kpEffectFlattenWidget::kpEffectFlattenWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { if (!s_lastColor1.isValid () || !s_lastColor2.isValid ()) { diff --git a/kolourpaint/pixmapfx/kpeffectflatten.h b/kolourpaint/pixmapfx/kpeffectflatten.h index 4bdf34d4..6eb6b07c 100644 --- a/kolourpaint/pixmapfx/kpeffectflatten.h +++ b/kolourpaint/pixmapfx/kpeffectflatten.h @@ -81,7 +81,7 @@ Q_OBJECT public: kpEffectFlattenWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpEffectFlattenWidget (); diff --git a/kolourpaint/pixmapfx/kpeffectinvert.cpp b/kolourpaint/pixmapfx/kpeffectinvert.cpp index aaf2c5d7..ad05d013 100644 --- a/kolourpaint/pixmapfx/kpeffectinvert.cpp +++ b/kolourpaint/pixmapfx/kpeffectinvert.cpp @@ -86,13 +86,13 @@ TQPixmap kpEffectInvertCommand::apply (const TQPixmap &pm, int channels) // public static void kpEffectInvertCommand::apply (TQImage *destImagePtr, int channels) { - TQRgb tqmask = tqRgba ((channels & Red) ? 0xFF : 0, + TQRgb mask = tqRgba ((channels & Red) ? 0xFF : 0, (channels & Green) ? 0xFF : 0, (channels & Blue) ? 0xFF : 0, 0/*don't invert alpha*/); #if DEBUG_KP_EFFECT_INVERT kdDebug () << "kpEffectInvertCommand::apply(channels=" << channels - << ") tqmask=" << (int *) tqmask + << ") mask=" << (int *) mask << endl; #endif @@ -109,7 +109,7 @@ void kpEffectInvertCommand::apply (TQImage *destImagePtr, int channels) { for (int x = 0; x < destImagePtr->width (); x++) { - destImagePtr->setPixel (x, y, destImagePtr->pixel (x, y) ^ tqmask); + destImagePtr->setPixel (x, y, destImagePtr->pixel (x, y) ^ mask); } } #endif @@ -118,7 +118,7 @@ void kpEffectInvertCommand::apply (TQImage *destImagePtr, int channels) { for (int i = 0; i < destImagePtr->numColors (); i++) { - destImagePtr->setColor (i, destImagePtr->color (i) ^ tqmask); + destImagePtr->setColor (i, destImagePtr->color (i) ^ mask); } } } @@ -149,9 +149,9 @@ TQPixmap kpEffectInvertCommand::applyColorEffect (const TQPixmap &pixmap) kpEffectInvertWidget::kpEffectInvertWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { TQVBoxLayout *topLevelLay = new TQVBoxLayout (this, marginHint (), spacingHint ()); diff --git a/kolourpaint/pixmapfx/kpeffectinvert.h b/kolourpaint/pixmapfx/kpeffectinvert.h index 67277ac3..91be0fae 100644 --- a/kolourpaint/pixmapfx/kpeffectinvert.h +++ b/kolourpaint/pixmapfx/kpeffectinvert.h @@ -96,7 +96,7 @@ Q_OBJECT public: kpEffectInvertWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpEffectInvertWidget (); diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp index c89685da..83dd997d 100644 --- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp +++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp @@ -242,10 +242,10 @@ void kpEffectReduceColorsCommand::apply (TQPixmap *destPixmapPtr, int depth, boo // (at least for monochrome). // tqpixmap.html says "alpha masks on monochrome images are ignored." // - // Put the tqmask back. + // Put the mask back. // - if (destPixmapPtr->tqmask ()) - pixmap.setMask (*destPixmapPtr->tqmask ()); + if (destPixmapPtr->mask ()) + pixmap.setMask (*destPixmapPtr->mask ()); *destPixmapPtr = pixmap; } @@ -276,9 +276,9 @@ TQPixmap kpEffectReduceColorsCommand::applyColorEffect (const TQPixmap &pixmap) kpEffectReduceColorsWidget::kpEffectReduceColorsWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { TQVBoxLayout *lay = new TQVBoxLayout (this, marginHint (), spacingHint ()); diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.h b/kolourpaint/pixmapfx/kpeffectreducecolors.h index df4c0bc0..2109c8ca 100644 --- a/kolourpaint/pixmapfx/kpeffectreducecolors.h +++ b/kolourpaint/pixmapfx/kpeffectreducecolors.h @@ -53,7 +53,7 @@ public: TQString commandName (int depth, int dither) const; - // (always preserves tqmask) + // (always preserves mask) static void apply (TQPixmap *destPixmapPtr, int depth, bool dither); static TQPixmap apply (const TQPixmap &pm, int depth, bool dither); @@ -78,7 +78,7 @@ Q_OBJECT public: kpEffectReduceColorsWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpEffectReduceColorsWidget (); diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp index 80a242c3..098e0396 100644 --- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp +++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp @@ -59,14 +59,14 @@ int kpEffectsDialog::s_lastHeight = 620; kpEffectsDialog::kpEffectsDialog (bool actOnSelection, - kpMainWindow *tqparent, + kpMainWindow *parent, const char *name) : kpToolPreviewDialog (kpToolPreviewDialog::Preview, true/*reserve top row*/, TQString()/*caption*/, TQString()/*afterActionText (no Dimensions Group Box)*/, actOnSelection, - tqparent, + parent, name), m_delayedUpdateTimer (new TQTimer (this)), m_effectsComboBox (0), diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.h b/kolourpaint/pixmapfx/kpeffectsdialog.h index ddb3f8c2..94c4ebdc 100644 --- a/kolourpaint/pixmapfx/kpeffectsdialog.h +++ b/kolourpaint/pixmapfx/kpeffectsdialog.h @@ -52,7 +52,7 @@ Q_OBJECT public: kpEffectsDialog (bool actOnSelection, - kpMainWindow *tqparent, + kpMainWindow *parent, const char *name = 0); virtual ~kpEffectsDialog (); diff --git a/kolourpaint/pixmapfx/kpfloodfill.cpp b/kolourpaint/pixmapfx/kpfloodfill.cpp index 2b509cb1..3eef76c3 100644 --- a/kolourpaint/pixmapfx/kpfloodfill.cpp +++ b/kolourpaint/pixmapfx/kpfloodfill.cpp @@ -100,7 +100,7 @@ bool kpFloodFill::fill () TQPainter painter, maskPainter; TQBitmap maskBitmap; - if (m_pixmapPtr->tqmask () || m_color.isTransparent ()) + if (m_pixmapPtr->mask () || m_color.isTransparent ()) { maskBitmap = kpPixmapFX::getNonNullMask (*m_pixmapPtr); maskPainter.begin (&maskBitmap); diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp index e46f91cb..5b281606 100644 --- a/kolourpaint/pixmapfx/kppixmapfx.cpp +++ b/kolourpaint/pixmapfx/kppixmapfx.cpp @@ -556,7 +556,7 @@ TQPixmap kpPixmapFX::convertToPixmapAsLosslessAsPossible (const TQImage &image, TQPixmap kpPixmapFX::pixmapWithDefinedTransparentPixels (const TQPixmap &pixmap, const TQColor &transparentColor) { - if (!pixmap.tqmask ()) + if (!pixmap.mask ()) return pixmap; TQPixmap retPixmap (pixmap.width (), pixmap.height ()); @@ -566,7 +566,7 @@ TQPixmap kpPixmapFX::pixmapWithDefinedTransparentPixels (const TQPixmap &pixmap, p.drawPixmap (TQPoint (0, 0), pixmap); p.end (); - retPixmap.setMask (*pixmap.tqmask ()); + retPixmap.setMask (*pixmap.mask ()); return retPixmap; } @@ -583,7 +583,7 @@ TQPixmap kpPixmapFX::getPixmapAt (const TQPixmap &pm, const TQRect &rect) #if DEBUG_KP_PIXMAP_FX && 0 kdDebug () << "kpPixmapFX::getPixmapAt(pm.hasMask=" - << (pm.tqmask () ? 1 : 0) + << (pm.mask () ? 1 : 0) << ",rect=" << rect << ")" @@ -614,14 +614,14 @@ TQPixmap kpPixmapFX::getPixmapAt (const TQPixmap &pm, const TQRect &rect) const TQPoint destTopLeft = validSrcRect.topLeft () - rect.topLeft (); - // copy data _and_ tqmask (if avail) + // copy data _and_ mask (if avail) copyBlt (&retPixmap, /* dest */ destTopLeft.x (), destTopLeft.y (), /* dest pt */ &pm, /* src */ validSrcRect.x (), validSrcRect.y (), /* src pt */ validSrcRect.width (), validSrcRect.height ()); - if (wouldHaveUndefinedPixels && retPixmap.tqmask () && !pm.tqmask ()) + if (wouldHaveUndefinedPixels && retPixmap.mask () && !pm.mask ()) { #if DEBUG_KP_PIXMAP_FX && 0 kdDebug () << "\tensure opaque in valid region" << endl; @@ -633,7 +633,7 @@ TQPixmap kpPixmapFX::getPixmapAt (const TQPixmap &pm, const TQRect &rect) #if DEBUG_KP_PIXMAP_FX && 0 kdDebug () << "\tretPixmap.hasMask=" - << (retPixmap.tqmask () ? 1 : 0) + << (retPixmap.mask () ? 1 : 0) << endl; #endif @@ -652,19 +652,19 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect, kdDebug () << "kpPixmapFX::setPixmapAt(destPixmap->rect=" << destPixmapPtr->rect () << ",destPixmap->hasMask=" - << (destPixmapPtr->tqmask () ? 1 : 0) + << (destPixmapPtr->mask () ? 1 : 0) << ",destRect=" << destRect << ",srcPixmap.rect=" << srcPixmap.rect () << ",srcPixmap.hasMask=" - << (srcPixmap.tqmask () ? 1 : 0) + << (srcPixmap.mask () ? 1 : 0) << ")" << endl; #endif #if DEBUG_KP_PIXMAP_FX && 0 - if (destPixmapPtr->tqmask ()) + if (destPixmapPtr->mask ()) { TQImage image = kpPixmapFX::convertToImage (*destPixmapPtr); int numTrans = 0; @@ -687,7 +687,7 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect, // result in a opaque image, except for that single transparent pixel??? // TQt bug on boundary case? - // copy data _and_ tqmask + // copy data _and_ mask copyBlt (destPixmapPtr, destAt.x (), destAt.y (), &srcPixmap, @@ -700,23 +700,23 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect, 0, 0, destRect.width (), destRect.height (), TQt::CopyROP, - true/*ignore tqmask*/); + true/*ignore mask*/); - if (srcPixmap.tqmask ()) + if (srcPixmap.mask ()) { - TQBitmap tqmask = getNonNullMask (*destPixmapPtr); - bitBlt (TQT_TQPAINTDEVICE(&tqmask), + TQBitmap mask = getNonNullMask (*destPixmapPtr); + bitBlt (TQT_TQPAINTDEVICE(&mask), destRect.x (), destRect.y (), - TQT_TQPAINTDEVICE(const_cast<TQBitmap*>(srcPixmap.tqmask ())), + TQT_TQPAINTDEVICE(const_cast<TQBitmap*>(srcPixmap.mask ())), 0, 0, destRect.width (), destRect.height (), TQt::CopyROP, - true/*ignore tqmask*/); - destPixmapPtr->setMask (tqmask); + true/*ignore mask*/); + destPixmapPtr->setMask (mask); } #endif - if (destPixmapPtr->tqmask () && !srcPixmap.tqmask ()) + if (destPixmapPtr->mask () && !srcPixmap.mask ()) { #if DEBUG_KP_PIXMAP_FX && 0 kdDebug () << "\t\topaque'ing dest rect" << endl; @@ -726,9 +726,9 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect, #if DEBUG_KP_PIXMAP_FX && 0 kdDebug () << "\tdestPixmap->hasMask=" - << (destPixmapPtr->tqmask () ? 1 : 0) + << (destPixmapPtr->mask () ? 1 : 0) << endl; - if (destPixmapPtr->tqmask ()) + if (destPixmapPtr->mask ()) { TQImage image = kpPixmapFX::convertToImage (*destPixmapPtr); int numTrans = 0; @@ -772,7 +772,7 @@ void kpPixmapFX::paintPixmapAt (TQPixmap *destPixmapPtr, const TQPoint &destAt, if (!destPixmapPtr) return; - // Copy src (masked by src's tqmask) on top of dest. + // Copy src (masked by src's mask) on top of dest. bitBlt (destPixmapPtr, /* dest */ destAt.x (), destAt.y (), /* dest pt */ &srcPixmap, /* src */ @@ -852,8 +852,8 @@ void kpPixmapFX::ensureNoAlphaChannel (TQPixmap *destPixmapPtr) // public static TQBitmap kpPixmapFX::getNonNullMask (const TQPixmap &pm) { - if (pm.tqmask ()) - return *pm.tqmask (); + if (pm.mask ()) + return *pm.mask (); else { TQBitmap maskBitmap (pm.width (), pm.height ()); @@ -934,10 +934,10 @@ void kpPixmapFX::paintMaskTransparentWithBrush (TQPixmap *destPixmapPtr, int des // public static void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQRect &destRect) { - if (!destPixmapPtr || !destPixmapPtr->tqmask ()/*already opaque*/) + if (!destPixmapPtr || !destPixmapPtr->mask ()/*already opaque*/) return; - TQBitmap maskBitmap = *destPixmapPtr->tqmask (); + TQBitmap maskBitmap = *destPixmapPtr->mask (); TQPainter p (&maskBitmap); @@ -955,16 +955,16 @@ void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQRect &destRect void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQPoint &destAt, const TQPixmap &srcPixmap) { - if (!destPixmapPtr || !destPixmapPtr->tqmask ()/*already opaque*/) + if (!destPixmapPtr || !destPixmapPtr->mask ()/*already opaque*/) return; - TQBitmap destMask = *destPixmapPtr->tqmask (); + TQBitmap destMask = *destPixmapPtr->mask (); - if (srcPixmap.tqmask ()) + if (srcPixmap.mask ()) { bitBlt (&destMask, /* dest */ destAt, /* dest pt */ - srcPixmap.tqmask (), /* src */ + srcPixmap.mask (), /* src */ TQRect (0, 0, srcPixmap.width (), srcPixmap.height ()), /* src rect */ TQt::OrROP/*if either is opaque, it's opaque*/); } @@ -1064,7 +1064,7 @@ void kpPixmapFX::fill (TQPixmap *destPixmapPtr, const kpColor &color) if (color.isOpaque ()) { - destPixmapPtr->setMask (TQBitmap ()); // no tqmask = opaque + destPixmapPtr->setMask (TQBitmap ()); // no mask = opaque destPixmapPtr->fill (color.toTQColor ()); } else @@ -1117,7 +1117,7 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h, painter.setBrush (backgroundColor.toTQColor ()); } - if (backgroundColor.isTransparent () || destPixmapPtr->tqmask ()) + if (backgroundColor.isTransparent () || destPixmapPtr->mask ()) { maskBitmap = kpPixmapFX::getNonNullMask (*destPixmapPtr); maskPainter.begin (&maskBitmap); @@ -1375,7 +1375,7 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_, if (backgroundColor.isOpaque ()) newPixmap.fill (backgroundColor.toTQColor ()); - if (backgroundColor.isTransparent () || pm.tqmask ()) + if (backgroundColor.isTransparent () || pm.mask ()) { newBitmapMask.resize (newPixmap.width (), newPixmap.height ()); newBitmapMask.fill (backgroundColor.maskColor ()); diff --git a/kolourpaint/pixmapfx/kppixmapfx.h b/kolourpaint/pixmapfx/kppixmapfx.h index 72882839..e8758fc7 100644 --- a/kolourpaint/pixmapfx/kppixmapfx.h +++ b/kolourpaint/pixmapfx/kppixmapfx.h @@ -128,7 +128,7 @@ public: // // " contains translucency which is not fully" // " supported. The translucency data will be" - // " approximated with a 1-bit transparency tqmask.") + // " approximated with a 1-bit transparency mask.") // // <moreColorsThanDisplayMessage>: // i18n ("The (image \"example.jpg\"|image from the clipboard)" @@ -140,21 +140,21 @@ public: // i18n ("The (image \"example.jpg\"|image from the clipboard)" // " contains translucency which is not fully" // " supported. The translucency data will be" - // " approximated with a 1-bit transparency tqmask.") + // " approximated with a 1-bit transparency mask.") // // <dontAskAgainPrefix>: // // Don'tAskAgain ID for dialog. // - // <tqparent>: + // <parent>: // - // Dialog tqparent + // Dialog parent // WarnAboutLossInfo (const TQString &moreColorsThanDisplayAndHasAlphaChannelMessage, const TQString &moreColorsThanDisplayMessage, const TQString &hasAlphaChannelMessage, const TQString &dontAskAgainPrefix, - TQWidget *tqparent) + TQWidget *parent) : m_moreColorsThanDisplayAndHasAlphaChannelMessage ( moreColorsThanDisplayAndHasAlphaChannelMessage), @@ -164,7 +164,7 @@ public: hasAlphaChannelMessage), m_dontAskAgainPrefix ( dontAskAgainPrefix), - m_parent (tqparent), + m_parent (parent), m_isValid (true) { } @@ -227,7 +227,7 @@ public: // Sets the RGB values of the pixels where <pixmap> is transparent to // <transparentColor>. This has visually no effect on the <pixmap> - // unless the tqmask is lost. + // unless the mask is lost. static TQPixmap pixmapWithDefinedTransparentPixels (const TQPixmap &pixmap, const TQColor &transparentColor); @@ -238,19 +238,19 @@ public: // - // Returns the pixel and tqmask data found at the <rect> in <pm>. + // Returns the pixel and mask data found at the <rect> in <pm>. // static TQPixmap getPixmapAt (const TQPixmap &pm, const TQRect &rect); // - // Sets the pixel and tqmask data at <destRect> in <*destPixmapPtr> + // Sets the pixel and mask data at <destRect> in <*destPixmapPtr> // to <srcPixmap>. // static void setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect, const TQPixmap &srcPixmap); // - // Sets the pixel and tqmask data at the rectangle in <*destPixmapPtr>, + // Sets the pixel and mask data at the rectangle in <*destPixmapPtr>, // with the top-left <destAt> and dimensions <srcPixmap.rect()>, // to <srcPixmap>. // @@ -261,7 +261,7 @@ public: // // Draws <srcPixmap> on top of <*destPixmapPtr> at <destAt>. - // The tqmask of <*destPixmapPtr> is adjusted so that all opaque + // The mask of <*destPixmapPtr> is adjusted so that all opaque // pixels in <srcPixmap> will be opaque in <*destPixmapPtr>. // static void paintPixmapAt (TQPixmap *destPixmapPtr, const TQPoint &destAt, @@ -293,7 +293,7 @@ public: // // Removes <*destPixmapPtr>'s Alpha Channel and attempts to convert it - // to a tqmask. KolourPaint - and TQPixmap to a great extent - does not + // to a mask. KolourPaint - and TQPixmap to a great extent - does not // support Alpha Channels - only masks. Call this whenever you get // a pixmap from a foreign source; else all KolourPaint code will // exhibit "undefined behaviour". @@ -301,8 +301,8 @@ public: static void ensureNoAlphaChannel (TQPixmap *destPixmapPtr); // - // Returns <pm>'s tqmask or a fully opaque tqmask (with <pm>'s dimensions) - // if <pm> does not have a tqmask. + // Returns <pm>'s mask or a fully opaque mask (with <pm>'s dimensions) + // if <pm> does not have a mask. // static TQBitmap getNonNullMask (const TQPixmap &pm); @@ -312,7 +312,7 @@ public: static void ensureTransparentAt (TQPixmap *destPixmapPtr, const TQRect &destRect); // - // Sets the tqmask of <*destPixmapPtr> at the rectangle, with the + // Sets the mask of <*destPixmapPtr> at the rectangle, with the // top-left <destAt> and dimensions <srcMaskBitmap.rect()>, // to transparent where <brushBitmap> is opaque. // diff --git a/kolourpaint/tools/kptoolaction.cpp b/kolourpaint/tools/kptoolaction.cpp index 269fd0d0..d45acb30 100644 --- a/kolourpaint/tools/kptoolaction.cpp +++ b/kolourpaint/tools/kptoolaction.cpp @@ -34,11 +34,11 @@ kpToolAction::kpToolAction (const TQString &text, const TQString &pic, const KShortcut &shortcut, const TQObject *receiver, const char *slot, - TQObject *tqparent, const char *name) + TQObject *parent, const char *name) : KToggleAction (text, pic, shortcut, receiver, slot, - tqparent, name) + parent, name) { updateToolTip (); } diff --git a/kolourpaint/tools/kptoolaction.h b/kolourpaint/tools/kptoolaction.h index c9af7d6d..c758de5c 100644 --- a/kolourpaint/tools/kptoolaction.h +++ b/kolourpaint/tools/kptoolaction.h @@ -44,7 +44,7 @@ public: kpToolAction (const TQString &text, const TQString &pic, const KShortcut &shortcut, const TQObject *receiver, const char *slot, - TQObject *tqparent, const char *name); + TQObject *parent, const char *name); virtual ~kpToolAction (); diff --git a/kolourpaint/tools/kptoolairspray.cpp b/kolourpaint/tools/kptoolairspray.cpp index f8aabce1..0bf50b12 100644 --- a/kolourpaint/tools/kptoolairspray.cpp +++ b/kolourpaint/tools/kptoolairspray.cpp @@ -312,7 +312,7 @@ void kpToolAirSprayCommand::addPoints (const TQPointArray &points) #endif TQPixmap pixmap = document ()->getPixmapAt (docRect); - TQBitmap tqmask; + TQBitmap mask; TQPainter painter, maskPainter; @@ -322,10 +322,10 @@ void kpToolAirSprayCommand::addPoints (const TQPointArray &points) painter.setPen (m_color.toTQColor ()); } - if (pixmap.tqmask () || m_color.isTransparent ()) + if (pixmap.mask () || m_color.isTransparent ()) { - tqmask = kpPixmapFX::getNonNullMask (pixmap); - maskPainter.begin (&tqmask); + mask = kpPixmapFX::getNonNullMask (pixmap); + maskPainter.begin (&mask); maskPainter.setPen (m_color.maskColor ()); } @@ -347,8 +347,8 @@ void kpToolAirSprayCommand::addPoints (const TQPointArray &points) if (painter.isActive ()) painter.end (); - if (!tqmask.isNull ()) - pixmap.setMask (tqmask); + if (!mask.isNull ()) + pixmap.setMask (mask); viewManager ()->setFastUpdates (); document ()->setPixmapAt (pixmap, docRect.topLeft ()); diff --git a/kolourpaint/tools/kptoolautocrop.cpp b/kolourpaint/tools/kptoolautocrop.cpp index 1f3bab0c..41aeb398 100644 --- a/kolourpaint/tools/kptoolautocrop.cpp +++ b/kolourpaint/tools/kptoolautocrop.cpp @@ -720,11 +720,11 @@ void kpToolAutoCropCommand::unexecute () // and the other branch would execute. if (*p) { - // TODO: We should really edit the tqmask here. Due to good + // TODO: We should really edit the mask here. Due to good // luck (if "maskBitmap" is initialized above, this region - // will be marked as opaque in the tqmask; if it's not + // will be marked as opaque in the mask; if it's not // initialized, we will be opaque by default), we - // don't actually have to edit the tqmask but this is + // don't actually have to edit the mask but this is // highly error-prone. painter.drawPixmap ((*b)->rect (), **p); } diff --git a/kolourpaint/tools/kptoolcrop.cpp b/kolourpaint/tools/kptoolcrop.cpp index e3916121..ac1967e5 100644 --- a/kolourpaint/tools/kptoolcrop.cpp +++ b/kolourpaint/tools/kptoolcrop.cpp @@ -132,7 +132,7 @@ void kpToolCropSetImageCommand::execute () // // The selection is deleted. // - // TODO: Do not introduce a tqmask if the result will not contain + // TODO: Do not introduce a mask if the result will not contain // any transparent pixels. // diff --git a/kolourpaint/tools/kptoolflip.cpp b/kolourpaint/tools/kptoolflip.cpp index 1d85dc46..88c81b8e 100644 --- a/kolourpaint/tools/kptoolflip.cpp +++ b/kolourpaint/tools/kptoolflip.cpp @@ -149,8 +149,8 @@ void kpToolFlipCommand::flip () bool kpToolFlipDialog::s_lastIsVerticalFlip = true; -kpToolFlipDialog::kpToolFlipDialog (bool actOnSelection, TQWidget *tqparent) - : KDialogBase (tqparent, 0/*name*/, true/*modal*/, +kpToolFlipDialog::kpToolFlipDialog (bool actOnSelection, TQWidget *parent) + : KDialogBase (parent, 0/*name*/, true/*modal*/, actOnSelection ? i18n ("Flip Selection") : i18n ("Flip Image"), KDialogBase::Ok | KDialogBase::Cancel) { diff --git a/kolourpaint/tools/kptoolflip.h b/kolourpaint/tools/kptoolflip.h index 279fcec7..e1c858d6 100644 --- a/kolourpaint/tools/kptoolflip.h +++ b/kolourpaint/tools/kptoolflip.h @@ -68,7 +68,7 @@ Q_OBJECT TQ_OBJECT public: - kpToolFlipDialog (bool actOnSelection, TQWidget *tqparent); + kpToolFlipDialog (bool actOnSelection, TQWidget *parent); ~kpToolFlipDialog (); private: diff --git a/kolourpaint/tools/kptoolpen.cpp b/kolourpaint/tools/kptoolpen.cpp index d87e3e39..5a601a83 100644 --- a/kolourpaint/tools/kptoolpen.cpp +++ b/kolourpaint/tools/kptoolpen.cpp @@ -398,7 +398,7 @@ void kpToolPen::globalDraw () } if (backgroundColor ().isTransparent () || - document ()->pixmap ()->tqmask ()) + document ()->pixmap ()->mask ()) { maskBitmap = kpPixmapFX::getNonNullMask (*document ()->pixmap ()); maskPainter.begin (&maskBitmap); @@ -475,10 +475,10 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const } else { - TQBitmap tqmask (1, 1); - tqmask.fill (TQt::color0/*transparent*/); + TQBitmap mask (1, 1); + mask.fill (TQt::color0/*transparent*/); - pixmap.setMask (tqmask); + pixmap.setMask (mask); } // draw onto doc @@ -529,7 +529,7 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const } if (color (m_mouseButton).isTransparent () || - pixmap.tqmask ()) + pixmap.mask ()) { maskBitmap = kpPixmapFX::getNonNullMask (pixmap); maskPainter.begin (&maskBitmap); @@ -606,7 +606,7 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const painter.setPen (c.toTQColor ()); } - if (transparent || pixmap.tqmask ()) + if (transparent || pixmap.mask ()) { maskBitmap = kpPixmapFX::getNonNullMask (pixmap); maskPainter.begin (&maskBitmap); @@ -966,7 +966,7 @@ void kpToolPen::slotEraserSizeChanged (int size) for (int i = 0; i < 2; i++) { // Note: No matter what, the eraser's brush pixmap is never given - // a tqmask. + // a mask. // // With a transparent color, since we don't fill anything, the // resize by itself will leave us with garbage pixels. This diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp index 5a074bb6..eade158b 100644 --- a/kolourpaint/tools/kptoolpolygon.cpp +++ b/kolourpaint/tools/kptoolpolygon.cpp @@ -164,7 +164,7 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap, TQPainter painter, maskPainter; - if (pixmap.tqmask () || + if (pixmap.mask () || (maskPen.style () != TQt::NoPen && maskPen.color () == TQt::color0/*transparent*/) || (maskBrush.style () != TQt::NoBrush && @@ -177,7 +177,7 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap, #if DEBUG_KP_TOOL_POLYGON && 0 kdDebug () << "\tmaskPainter begin because:" << endl - << "\t\tpixmap.tqmask=" << pixmap.tqmask () << endl + << "\t\tpixmap.mask=" << pixmap.mask () << endl << "\t\t(maskPenStyle!=NoPen)=" << (maskPen.style () != TQt::NoPen) << endl << "\t\t(maskPenColor==trans)=" << (maskPen.color () == TQt::color0) << endl << "\t\t(maskBrushStyle!=NoBrush)=" << (maskBrush.style () != TQt::NoBrush) << endl diff --git a/kolourpaint/tools/kptoolpreviewdialog.cpp b/kolourpaint/tools/kptoolpreviewdialog.cpp index a9542989..2136e02d 100644 --- a/kolourpaint/tools/kptoolpreviewdialog.cpp +++ b/kolourpaint/tools/kptoolpreviewdialog.cpp @@ -51,14 +51,14 @@ kpToolPreviewDialog::kpToolPreviewDialog (Features features, const TQString &caption, const TQString &afterActionText, bool actOnSelection, - kpMainWindow *tqparent, + kpMainWindow *parent, const char *name) - : KDialogBase (tqparent, name, true/*modal*/, + : KDialogBase (parent, name, true/*modal*/, caption, KDialogBase::Ok | KDialogBase::Cancel), m_afterActionText (afterActionText), m_actOnSelection (actOnSelection), - m_mainWindow (tqparent), + m_mainWindow (parent), m_dimensionsGroupBox (0), m_afterTransformDimensionsLabel (0), m_previewGroupBox (0), diff --git a/kolourpaint/tools/kptoolpreviewdialog.h b/kolourpaint/tools/kptoolpreviewdialog.h index 98cf28dc..5199a147 100644 --- a/kolourpaint/tools/kptoolpreviewdialog.h +++ b/kolourpaint/tools/kptoolpreviewdialog.h @@ -63,7 +63,7 @@ public: // (in the Dimensions Group Box) e.g. "After Skew:" const TQString &afterActionText, bool actOnSelection, - kpMainWindow *tqparent, + kpMainWindow *parent, const char *name = 0); virtual ~kpToolPreviewDialog (); @@ -77,7 +77,7 @@ public: protected: kpDocument *document () const; - // All widgets must have mainWidget() as their tqparent + // All widgets must have mainWidget() as their parent void addCustomWidgetToFront (TQWidget *w); // see <reserveTopRow> in ctor void addCustomWidget (TQWidget *w); void addCustomWidgetToBack (TQWidget *w) diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp index 491e0fae..df560ea2 100644 --- a/kolourpaint/tools/kptoolrectangle.cpp +++ b/kolourpaint/tools/kptoolrectangle.cpp @@ -76,7 +76,7 @@ static TQPixmap pixmap (const kpToolRectangle::Mode mode, << endl; #endif - if (pixmap.tqmask () || + if (pixmap.mask () || (maskPen.style () != TQt::NoPen && maskPen.color () == TQt::color0/*transparent*/) || (maskBrush.style () != TQt::NoBrush && diff --git a/kolourpaint/tools/kptoolrotate.h b/kolourpaint/tools/kptoolrotate.h index 618b29c0..7b24df89 100644 --- a/kolourpaint/tools/kptoolrotate.h +++ b/kolourpaint/tools/kptoolrotate.h @@ -85,7 +85,7 @@ Q_OBJECT public: kpToolRotateDialog (bool actOnSelection, - kpMainWindow *tqparent, + kpMainWindow *parent, const char *name = 0); virtual ~kpToolRotateDialog (); diff --git a/kolourpaint/tools/kptoolselection.cpp b/kolourpaint/tools/kptoolselection.cpp index 2d796ff0..5a4d7237 100644 --- a/kolourpaint/tools/kptoolselection.cpp +++ b/kolourpaint/tools/kptoolselection.cpp @@ -1307,7 +1307,7 @@ void kpToolSelection::selectionTransparencyChanged (const TQString & /*name*/) // Undo. // The rectangle is no longer invisible. // - //if (document ()->selection ()->setTransparency (st, true/*check harder for no change in tqmask*/)) + //if (document ()->selection ()->setTransparency (st, true/*check harder for no change in mask*/)) document ()->selection ()->setTransparency (st); if (true) diff --git a/kolourpaint/tools/kptoolskew.cpp b/kolourpaint/tools/kptoolskew.cpp index 7cc4aa7b..eec804d7 100644 --- a/kolourpaint/tools/kptoolskew.cpp +++ b/kolourpaint/tools/kptoolskew.cpp @@ -218,13 +218,13 @@ int kpToolSkewDialog::s_lastHorizontalAngle = 0, kpToolSkewDialog::s_lastVerticalAngle = 0; -kpToolSkewDialog::kpToolSkewDialog (bool actOnSelection, kpMainWindow *tqparent, +kpToolSkewDialog::kpToolSkewDialog (bool actOnSelection, kpMainWindow *parent, const char *name) : kpToolPreviewDialog (kpToolPreviewDialog::AllFeatures, false/*don't reserve top row*/, actOnSelection ? i18n ("Skew Selection") : i18n ("Skew Image"), i18n ("After Skew:"), - actOnSelection, tqparent, name) + actOnSelection, parent, name) { // Too confusing - disable for now s_lastHorizontalAngle = s_lastVerticalAngle = 0; diff --git a/kolourpaint/tools/kptoolskew.h b/kolourpaint/tools/kptoolskew.h index 63703c9b..6db5204b 100644 --- a/kolourpaint/tools/kptoolskew.h +++ b/kolourpaint/tools/kptoolskew.h @@ -79,7 +79,7 @@ Q_OBJECT TQ_OBJECT public: - kpToolSkewDialog (bool actOnSelection, kpMainWindow *tqparent, + kpToolSkewDialog (bool actOnSelection, kpMainWindow *parent, const char *name = 0); virtual ~kpToolSkewDialog (); diff --git a/kolourpaint/views/kpthumbnailview.cpp b/kolourpaint/views/kpthumbnailview.cpp index 7332433a..54281ba4 100644 --- a/kolourpaint/views/kpthumbnailview.cpp +++ b/kolourpaint/views/kpthumbnailview.cpp @@ -39,12 +39,12 @@ kpThumbnailView::kpThumbnailView (kpDocument *document, kpViewManager *viewManager, kpView *buddyView, kpViewScrollableContainer *scrollableContainer, - TQWidget *tqparent, const char *name) + TQWidget *parent, const char *name) : kpView (document, toolToolBar, viewManager, buddyView, scrollableContainer, - tqparent, name) + parent, name) { } diff --git a/kolourpaint/views/kpthumbnailview.h b/kolourpaint/views/kpthumbnailview.h index 5f2e1664..eab2f16c 100644 --- a/kolourpaint/views/kpthumbnailview.h +++ b/kolourpaint/views/kpthumbnailview.h @@ -54,7 +54,7 @@ public: kpViewManager *viewManager, kpView *buddyView, kpViewScrollableContainer *scrollableContainer, - TQWidget *tqparent, const char *name); + TQWidget *parent, const char *name); /** * Destructs this thumbnail view. @@ -70,7 +70,7 @@ public: protected: /** - * Sets the tqmask to cover the rectangle with top-left, origin() and + * Sets the mask to cover the rectangle with top-left, origin() and * dimensions equal to or slightly less than (in case of rounding * error) the size of the document in view coordinates. This ensures * that all pixels are initialised with either document pixels or the diff --git a/kolourpaint/views/kpunzoomedthumbnailview.cpp b/kolourpaint/views/kpunzoomedthumbnailview.cpp index dea4e089..de7dfa0f 100644 --- a/kolourpaint/views/kpunzoomedthumbnailview.cpp +++ b/kolourpaint/views/kpunzoomedthumbnailview.cpp @@ -50,12 +50,12 @@ kpUnzoomedThumbnailView::kpUnzoomedThumbnailView ( kpViewManager *viewManager, kpView *buddyView, kpViewScrollableContainer *scrollableContainer, - TQWidget *tqparent, const char *name) + TQWidget *parent, const char *name) : kpThumbnailView (document, toolToolBar, viewManager, buddyView, scrollableContainer, - tqparent, name), + parent, name), d (new kpUnzoomedThumbnailViewPrivate ()) { if (buddyViewScrollableContainer ()) diff --git a/kolourpaint/views/kpunzoomedthumbnailview.h b/kolourpaint/views/kpunzoomedthumbnailview.h index 7e81a5db..554d8037 100644 --- a/kolourpaint/views/kpunzoomedthumbnailview.h +++ b/kolourpaint/views/kpunzoomedthumbnailview.h @@ -66,7 +66,7 @@ public: kpViewManager *viewManager, kpView *buddyView, kpViewScrollableContainer *scrollableContainer, - TQWidget *tqparent, const char *name); + TQWidget *parent, const char *name); /** * Destructs an unzoomed thumbnail view. @@ -87,7 +87,7 @@ public slots: * container will be visible. * * It tries to maximise the used area of this view. Unused areas will - * be set to the widget background thanks to the tqmask. + * be set to the widget background thanks to the mask. * * Call this if the size of the document changes. * Already connected to buddyViewScrollableContainer()'s diff --git a/kolourpaint/views/kpzoomedthumbnailview.cpp b/kolourpaint/views/kpzoomedthumbnailview.cpp index adef47c0..b2315a9f 100644 --- a/kolourpaint/views/kpzoomedthumbnailview.cpp +++ b/kolourpaint/views/kpzoomedthumbnailview.cpp @@ -43,12 +43,12 @@ kpZoomedThumbnailView::kpZoomedThumbnailView (kpDocument *document, kpViewManager *viewManager, kpView *buddyView, kpViewScrollableContainer *scrollableContainer, - TQWidget *tqparent, const char *name) + TQWidget *parent, const char *name) : kpThumbnailView (document, toolToolBar, viewManager, buddyView, scrollableContainer, - tqparent, name) + parent, name) { // Call to virtual function - this is why the class is sealed adjustToEnvironment (); diff --git a/kolourpaint/views/kpzoomedthumbnailview.h b/kolourpaint/views/kpzoomedthumbnailview.h index c35c22bb..a3b8fd25 100644 --- a/kolourpaint/views/kpzoomedthumbnailview.h +++ b/kolourpaint/views/kpzoomedthumbnailview.h @@ -61,7 +61,7 @@ public: kpViewManager *viewManager, kpView *buddyView, kpViewScrollableContainer *scrollableContainer, - TQWidget *tqparent, const char *name); + TQWidget *parent, const char *name); /** * Destructs a zoomed thumbnail view. @@ -78,7 +78,7 @@ public: public slots: /** * Changes its zoom level to accommodate the display of entire document - * in the view. It maintains aspect by changing the origin and tqmask. + * in the view. It maintains aspect by changing the origin and mask. * * Call this if the size of the document changes. * Already called by @ref kpThumbnailView resizeEvent(). diff --git a/kolourpaint/views/kpzoomedview.cpp b/kolourpaint/views/kpzoomedview.cpp index 402b8e39..c2b1f47d 100644 --- a/kolourpaint/views/kpzoomedview.cpp +++ b/kolourpaint/views/kpzoomedview.cpp @@ -43,12 +43,12 @@ kpZoomedView::kpZoomedView (kpDocument *document, kpViewManager *viewManager, kpView *buddyView, kpViewScrollableContainer *scrollableContainer, - TQWidget *tqparent, const char *name) + TQWidget *parent, const char *name) : kpView (document, toolToolBar, viewManager, buddyView, scrollableContainer, - tqparent, name) + parent, name) { // Call to virtual function - this is why the class is sealed adjustToEnvironment (); diff --git a/kolourpaint/views/kpzoomedview.h b/kolourpaint/views/kpzoomedview.h index e0228fde..2581aeef 100644 --- a/kolourpaint/views/kpzoomedview.h +++ b/kolourpaint/views/kpzoomedview.h @@ -62,7 +62,7 @@ public: kpViewManager *viewManager, kpView *buddyView, kpViewScrollableContainer *scrollableContainer, - TQWidget *tqparent, const char *name); + TQWidget *parent, const char *name); /** * Destructs an unzoomed view. diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.cpp b/kolourpaint/widgets/kpcolorsimilaritycube.cpp index 07693130..b2f3441a 100644 --- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp +++ b/kolourpaint/widgets/kpcolorsimilaritycube.cpp @@ -49,9 +49,9 @@ const double kpColorSimilarityCube::colorCubeDiagonalDistance = kpColorSimilarityCube::kpColorSimilarityCube (int look, kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : TQFrame (tqparent, name, TQt::WNoAutoErase/*no flicker*/), + : TQFrame (parent, name, TQt::WNoAutoErase/*no flicker*/), m_mainWindow (mainWindow), m_colorSimilarity (-1) { diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.h b/kolourpaint/widgets/kpcolorsimilaritycube.h index d2fb85d2..0cf9f92a 100644 --- a/kolourpaint/widgets/kpcolorsimilaritycube.h +++ b/kolourpaint/widgets/kpcolorsimilaritycube.h @@ -46,7 +46,7 @@ public: kpColorSimilarityCube (int look, kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name = 0); virtual ~kpColorSimilarityCube (); diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp index ee4ff1b0..d71ac501 100644 --- a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp +++ b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp @@ -44,9 +44,9 @@ const double kpColorSimilarityDialog::maximumColorSimilarity = .30; kpColorSimilarityDialog::kpColorSimilarityDialog (kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : KDialogBase (tqparent, name, true/*modal*/, + : KDialogBase (parent, name, true/*modal*/, i18n ("Color Similarity"), KDialogBase::Ok | KDialogBase::Cancel), m_mainWindow (mainWindow) diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.h b/kolourpaint/widgets/kpcolorsimilaritydialog.h index df4e2445..b365819e 100644 --- a/kolourpaint/widgets/kpcolorsimilaritydialog.h +++ b/kolourpaint/widgets/kpcolorsimilaritydialog.h @@ -42,7 +42,7 @@ Q_OBJECT public: kpColorSimilarityDialog (kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name = 0); virtual ~kpColorSimilarityDialog (); diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp index 7fd520f7..cfdb6820 100644 --- a/kolourpaint/widgets/kpcolortoolbar.cpp +++ b/kolourpaint/widgets/kpcolortoolbar.cpp @@ -61,8 +61,8 @@ */ kpDualColorButton::kpDualColorButton (kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name) - : TQFrame (tqparent, name, TQt::WNoAutoErase/*no flicker*/), + TQWidget *parent, const char *name) + : TQFrame (parent, name, TQt::WNoAutoErase/*no flicker*/), m_mainWindow (mainWindow), m_backBuffer (0) { @@ -257,7 +257,7 @@ void kpDualColorButton::mouseDoubleClickEvent (TQMouseEvent *e) // to opaque colors. } - // TODO: tqparent + // TODO: parent if (KColorDialog::getColor (col/*ref*/)) setColor (whichColor, kpColor (col.rgb ())); } @@ -324,7 +324,7 @@ void kpDualColorButton::drawContents (TQPainter *p) TQPixmap swapPixmap = UserIcon ("colorbutton_swap_16x16"); if (!isEnabled ()) { - // swapPixmap has a tqmask after all + // swapPixmap has a mask after all swapPixmap.fill (tqcolorGroup ().color (TQColorGroup::Dark)); } backBufferPainter.drawPixmap (swapPixmapRect ().topLeft (), swapPixmap); @@ -461,10 +461,10 @@ static bool ownColorsInitialised = false; */ #define rows 2 #define cols 11 -kpColorCells::kpColorCells (TQWidget *tqparent, +kpColorCells::kpColorCells (TQWidget *parent, Qt::Orientation o, const char *name) - : KColorCells (tqparent, rows, cols), + : KColorCells (parent, rows, cols), m_mouseButton (-1) { setName (name); @@ -729,7 +729,7 @@ void kpColorCells::slotColorDoubleClicked (int cell) TQColor color = KColorCells::color (cell); - // TODO: tqparent + // TODO: parent if (KColorDialog::getColor (color/*ref*/)) KColorCells::setColor (cell, color); } @@ -739,8 +739,8 @@ void kpColorCells::slotColorDoubleClicked (int cell) * kpTransparentColorCell */ -kpTransparentColorCell::kpTransparentColorCell (TQWidget *tqparent, const char *name) - : TQFrame (tqparent, name) +kpTransparentColorCell::kpTransparentColorCell (TQWidget *parent, const char *name) + : TQFrame (parent, name) { #if DEBUG_KP_COLOR_TOOL_BAR kdDebug () << "kpTransparentColorCell::kpTransparentColorCell()" << endl; @@ -818,10 +818,10 @@ void kpTransparentColorCell::drawContents (TQPainter *p) * kpColorPalette */ -kpColorPalette::kpColorPalette (TQWidget *tqparent, +kpColorPalette::kpColorPalette (TQWidget *parent, Qt::Orientation o, const char *name) - : TQWidget (tqparent, name), + : TQWidget (parent, name), m_boxLayout (0) { #if DEBUG_KP_COLOR_TOOL_BAR @@ -882,11 +882,11 @@ void kpColorPalette::setOrientation (Qt::Orientation o) */ kpColorSimilarityToolBarItem::kpColorSimilarityToolBarItem (kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name) : kpColorSimilarityCube (kpColorSimilarityCube::Depressed | kpColorSimilarityCube::DoubleClickInstructions, - mainWindow, tqparent, name), + mainWindow, parent, name), m_mainWindow (mainWindow), m_processedColorSimilarity (kpColor::Exact) { diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h index b1e8faa8..59f13fb7 100644 --- a/kolourpaint/widgets/kpcolortoolbar.h +++ b/kolourpaint/widgets/kpcolortoolbar.h @@ -63,7 +63,7 @@ Q_OBJECT public: kpDualColorButton (kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpDualColorButton (); kpColor color (int which) const; @@ -122,7 +122,7 @@ Q_OBJECT TQ_OBJECT public: - kpColorCells (TQWidget *tqparent, + kpColorCells (TQWidget *parent, Qt::Orientation o = Qt::Horizontal, const char *name = 0); virtual ~kpColorCells (); @@ -160,7 +160,7 @@ Q_OBJECT TQ_OBJECT public: - kpTransparentColorCell (TQWidget *tqparent, const char *name = 0); + kpTransparentColorCell (TQWidget *parent, const char *name = 0); virtual ~kpTransparentColorCell (); virtual TQSize tqsizeHint () const; @@ -188,7 +188,7 @@ Q_OBJECT TQ_OBJECT public: - kpColorPalette (TQWidget *tqparent, + kpColorPalette (TQWidget *parent, Qt::Orientation o = Qt::Horizontal, const char *name = 0); virtual ~kpColorPalette (); @@ -216,7 +216,7 @@ Q_OBJECT public: kpColorSimilarityToolBarItem (kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name = 0); virtual ~kpColorSimilarityToolBarItem (); diff --git a/kolourpaint/widgets/kpresizesignallinglabel.cpp b/kolourpaint/widgets/kpresizesignallinglabel.cpp index b62f3679..19b276a9 100644 --- a/kolourpaint/widgets/kpresizesignallinglabel.cpp +++ b/kolourpaint/widgets/kpresizesignallinglabel.cpp @@ -34,15 +34,15 @@ kpResizeSignallingLabel::kpResizeSignallingLabel (const TQString &string, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : TQLabel (string, tqparent, name) + : TQLabel (string, parent, name) { } -kpResizeSignallingLabel::kpResizeSignallingLabel (TQWidget *tqparent, +kpResizeSignallingLabel::kpResizeSignallingLabel (TQWidget *parent, const char *name) - : TQLabel (tqparent, name) + : TQLabel (parent, name) { } diff --git a/kolourpaint/widgets/kpresizesignallinglabel.h b/kolourpaint/widgets/kpresizesignallinglabel.h index 88f4477c..a97fc037 100644 --- a/kolourpaint/widgets/kpresizesignallinglabel.h +++ b/kolourpaint/widgets/kpresizesignallinglabel.h @@ -38,8 +38,8 @@ Q_OBJECT TQ_OBJECT public: - kpResizeSignallingLabel (const TQString &string, TQWidget *tqparent, const char *name = 0); - kpResizeSignallingLabel (TQWidget *tqparent, const char *name = 0); + kpResizeSignallingLabel (const TQString &string, TQWidget *parent, const char *name = 0); + kpResizeSignallingLabel (TQWidget *parent, const char *name = 0); virtual ~kpResizeSignallingLabel (); signals: diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.cpp b/kolourpaint/widgets/kpsqueezedtextlabel.cpp index 8cd4dfbb..6e7386ec 100644 --- a/kolourpaint/widgets/kpsqueezedtextlabel.cpp +++ b/kolourpaint/widgets/kpsqueezedtextlabel.cpp @@ -38,14 +38,14 @@ #include <klocale.h> -kpSqueezedTextLabel::kpSqueezedTextLabel (TQWidget *tqparent, const char *name) - : TQLabel (tqparent, name), +kpSqueezedTextLabel::kpSqueezedTextLabel (TQWidget *parent, const char *name) + : TQLabel (parent, name), m_showEllipsis (true) { } -kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *tqparent, const char *name) - : TQLabel (tqparent, name), +kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name) + : TQLabel (parent, name), m_showEllipsis (true) { setText (text); diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.h b/kolourpaint/widgets/kpsqueezedtextlabel.h index 1169be63..4697af8a 100644 --- a/kolourpaint/widgets/kpsqueezedtextlabel.h +++ b/kolourpaint/widgets/kpsqueezedtextlabel.h @@ -40,8 +40,8 @@ Q_OBJECT TQ_OBJECT public: - kpSqueezedTextLabel (TQWidget *tqparent, const char *name = 0); - kpSqueezedTextLabel (const TQString &text, TQWidget *tqparent, const char *name = 0); + kpSqueezedTextLabel (TQWidget *parent, const char *name = 0); + kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name = 0); virtual TQSize tqminimumSizeHint () const; diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp index 163a7f49..ba048d5c 100644 --- a/kolourpaint/widgets/kptooltoolbar.cpp +++ b/kolourpaint/widgets/kptooltoolbar.cpp @@ -58,8 +58,8 @@ class kpToolButton : public TQToolButton { public: - kpToolButton (kpTool *tool, TQWidget *tqparent) - : TQToolButton (tqparent), + kpToolButton (kpTool *tool, TQWidget *parent) + : TQToolButton (parent), m_tool (tool) { } diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp index ef5f35c3..3d1d3cff 100644 --- a/kolourpaint/widgets/kptoolwidgetbase.cpp +++ b/kolourpaint/widgets/kptoolwidgetbase.cpp @@ -45,8 +45,8 @@ #include <kpeffectinvert.h> -kpToolWidgetBase::kpToolWidgetBase (TQWidget *tqparent, const char *name) - : TQFrame (tqparent, name), +kpToolWidgetBase::kpToolWidgetBase (TQWidget *parent, const char *name) + : TQFrame (parent, name), m_invertSelectedPixmap (true), m_selectedRow (-1), m_selectedCol (-1) { diff --git a/kolourpaint/widgets/kptoolwidgetbase.h b/kolourpaint/widgets/kptoolwidgetbase.h index 8bef2a67..4afb8d35 100644 --- a/kolourpaint/widgets/kptoolwidgetbase.h +++ b/kolourpaint/widgets/kptoolwidgetbase.h @@ -40,14 +40,14 @@ class TQPainter; -// TODO: frame becomes a combobox when its tqparent kpToolToolBar becomes too small +// TODO: frame becomes a combobox when its parent kpToolToolBar becomes too small class kpToolWidgetBase : public TQFrame { Q_OBJECT TQ_OBJECT public: - kpToolWidgetBase (TQWidget *tqparent, const char *name); // must provide a name for config to work + kpToolWidgetBase (TQWidget *parent, const char *name); // must provide a name for config to work virtual ~kpToolWidgetBase (); public: diff --git a/kolourpaint/widgets/kptoolwidgetbrush.cpp b/kolourpaint/widgets/kptoolwidgetbrush.cpp index 69445905..0c583126 100644 --- a/kolourpaint/widgets/kptoolwidgetbrush.cpp +++ b/kolourpaint/widgets/kptoolwidgetbrush.cpp @@ -52,8 +52,8 @@ static int brushSize [][3] = #define BRUSH_SIZE_NUM_COLS (int (sizeof (brushSize [0]) / sizeof (brushSize [0][0]))) #define BRUSH_SIZE_NUM_ROWS (int (sizeof (brushSize) / sizeof (brushSize [0]))) -kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *tqparent, const char *name) - : kpToolWidgetBase (tqparent, name) +kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name) + : kpToolWidgetBase (parent, name) { setInvertSelectedPixmap (); diff --git a/kolourpaint/widgets/kptoolwidgetbrush.h b/kolourpaint/widgets/kptoolwidgetbrush.h index 7fc2ffe0..0fd2f46a 100644 --- a/kolourpaint/widgets/kptoolwidgetbrush.h +++ b/kolourpaint/widgets/kptoolwidgetbrush.h @@ -39,7 +39,7 @@ Q_OBJECT TQ_OBJECT public: - kpToolWidgetBrush (TQWidget *tqparent, const char *name); + kpToolWidgetBrush (TQWidget *parent, const char *name); virtual ~kpToolWidgetBrush (); private: diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.cpp b/kolourpaint/widgets/kptoolwidgeterasersize.cpp index c4354dea..d27965a6 100644 --- a/kolourpaint/widgets/kptoolwidgeterasersize.cpp +++ b/kolourpaint/widgets/kptoolwidgeterasersize.cpp @@ -44,8 +44,8 @@ static int eraserSizes [] = {2, 3, 5, 9, 17, 29}; static const int numEraserSizes = int (sizeof (eraserSizes) / sizeof (eraserSizes [0])); -kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *tqparent, const char *name) - : kpToolWidgetBase (tqparent, name) +kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *parent, const char *name) + : kpToolWidgetBase (parent, name) { setInvertSelectedPixmap (); @@ -75,14 +75,14 @@ kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *tqparent, const char * painter.fillRect (rect, TQt::black); painter.end (); - TQBitmap tqmask (previewPixmap.width (), previewPixmap.height ()); - tqmask.fill (TQt::color0/*transparent*/); + TQBitmap mask (previewPixmap.width (), previewPixmap.height ()); + mask.fill (TQt::color0/*transparent*/); - TQPainter maskPainter (&tqmask); + TQPainter maskPainter (&mask); maskPainter.fillRect (rect, TQt::color1/*opaque*/); maskPainter.end (); - previewPixmap.setMask (tqmask); + previewPixmap.setMask (mask); addOption (previewPixmap, i18n ("%1x%2").arg (s).arg (s)/*tooltip*/); diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.h b/kolourpaint/widgets/kptoolwidgeterasersize.h index 1568088d..2f7c0be0 100644 --- a/kolourpaint/widgets/kptoolwidgeterasersize.h +++ b/kolourpaint/widgets/kptoolwidgeterasersize.h @@ -41,7 +41,7 @@ Q_OBJECT TQ_OBJECT public: - kpToolWidgetEraserSize (TQWidget *tqparent, const char *name); + kpToolWidgetEraserSize (TQWidget *parent, const char *name); virtual ~kpToolWidgetEraserSize (); int eraserSize () const; diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp index e2a1afce..a87714c5 100644 --- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp +++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp @@ -42,8 +42,8 @@ #include <kptool.h> -kpToolWidgetFillStyle::kpToolWidgetFillStyle (TQWidget *tqparent, const char *name) - : kpToolWidgetBase (tqparent, name) +kpToolWidgetFillStyle::kpToolWidgetFillStyle (TQWidget *parent, const char *name) + : kpToolWidgetBase (parent, name) { setInvertSelectedPixmap (); @@ -85,10 +85,10 @@ TQPixmap kpToolWidgetFillStyle::fillStylePixmap (FillStyle fs, int w, int h) painter.end (); - TQBitmap tqmask (pixmap.width (), pixmap.height ()); - tqmask.fill (TQt::color0); + TQBitmap mask (pixmap.width (), pixmap.height ()); + mask.fill (TQt::color0); - painter.begin (&tqmask); + painter.begin (&mask); painter.setPen (TQPen (TQt::color1, 2)); if (fs == FillWithBackground || fs == FillWithForeground) @@ -98,7 +98,7 @@ TQPixmap kpToolWidgetFillStyle::fillStylePixmap (FillStyle fs, int w, int h) painter.end (); - pixmap.setMask (tqmask); + pixmap.setMask (mask); return pixmap; } diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.h b/kolourpaint/widgets/kptoolwidgetfillstyle.h index 82ee1357..c32b3b65 100644 --- a/kolourpaint/widgets/kptoolwidgetfillstyle.h +++ b/kolourpaint/widgets/kptoolwidgetfillstyle.h @@ -41,7 +41,7 @@ Q_OBJECT TQ_OBJECT public: - kpToolWidgetFillStyle (TQWidget *tqparent, const char *name); + kpToolWidgetFillStyle (TQWidget *parent, const char *name); virtual ~kpToolWidgetFillStyle (); enum FillStyle diff --git a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp index 0d419333..2ac9e39c 100644 --- a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp +++ b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp @@ -36,8 +36,8 @@ static int lineWidths [] = {1, 2, 3, 5, 8}; -kpToolWidgetLineWidth::kpToolWidgetLineWidth (TQWidget *tqparent, const char *name) - : kpToolWidgetBase (tqparent, name) +kpToolWidgetLineWidth::kpToolWidgetLineWidth (TQWidget *parent, const char *name) + : kpToolWidgetBase (parent, name) { setInvertSelectedPixmap (); diff --git a/kolourpaint/widgets/kptoolwidgetlinewidth.h b/kolourpaint/widgets/kptoolwidgetlinewidth.h index 8ac76909..6cc82d26 100644 --- a/kolourpaint/widgets/kptoolwidgetlinewidth.h +++ b/kolourpaint/widgets/kptoolwidgetlinewidth.h @@ -37,7 +37,7 @@ Q_OBJECT TQ_OBJECT public: - kpToolWidgetLineWidth (TQWidget *tqparent, const char *name); + kpToolWidgetLineWidth (TQWidget *parent, const char *name); virtual ~kpToolWidgetLineWidth (); int lineWidth () const; diff --git a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp index 6479d891..4cd5b6f6 100644 --- a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp +++ b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp @@ -35,8 +35,8 @@ #include <klocale.h> -kpToolWidgetOpaqueOrTransparent::kpToolWidgetOpaqueOrTransparent (TQWidget *tqparent, const char *name) - : kpToolWidgetBase (tqparent, name) +kpToolWidgetOpaqueOrTransparent::kpToolWidgetOpaqueOrTransparent (TQWidget *parent, const char *name) + : kpToolWidgetBase (parent, name) { setInvertSelectedPixmap (false); diff --git a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h index 45e49a2f..613841f2 100644 --- a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h +++ b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - kpToolWidgetOpaqueOrTransparent (TQWidget *tqparent, const char *name); + kpToolWidgetOpaqueOrTransparent (TQWidget *parent, const char *name); virtual ~kpToolWidgetOpaqueOrTransparent (); bool isOpaque () const; diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp index cce8f1b5..503cecd2 100644 --- a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp +++ b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp @@ -44,8 +44,8 @@ static int spraycanSizes [] = {9, 17, 29}; -kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *tqparent, const char *name) - : kpToolWidgetBase (tqparent, name) +kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *parent, const char *name) + : kpToolWidgetBase (parent, name) { #if DEBUG_KP_TOOL_WIDGET_SPRAYCAN_SIZE kdDebug () << "kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize() CALLED!" << endl; @@ -69,10 +69,10 @@ kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *tqparent, const ch TQImage image = kpPixmapFX::convertToImage (pixmap); - TQBitmap tqmask (pixmap.width (), pixmap.height ()); - tqmask.fill (TQt::color0); + TQBitmap mask (pixmap.width (), pixmap.height ()); + mask.fill (TQt::color0); - painter.begin (&tqmask); + painter.begin (&mask); painter.setPen (TQt::color1); for (int y = 0; y < image.height (); y++) @@ -86,7 +86,7 @@ kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *tqparent, const ch painter.end (); - pixmap.setMask (tqmask); + pixmap.setMask (mask); addOption (pixmap, i18n ("%1x%2").arg (s).arg (s)/*tooltip*/); if (i == 1) diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.h b/kolourpaint/widgets/kptoolwidgetspraycansize.h index ef86891f..dc10ac1b 100644 --- a/kolourpaint/widgets/kptoolwidgetspraycansize.h +++ b/kolourpaint/widgets/kptoolwidgetspraycansize.h @@ -37,7 +37,7 @@ Q_OBJECT TQ_OBJECT public: - kpToolWidgetSpraycanSize (TQWidget *tqparent, const char *name); + kpToolWidgetSpraycanSize (TQWidget *parent, const char *name); virtual ~kpToolWidgetSpraycanSize (); int spraycanSize () const; |