summaryrefslogtreecommitdiffstats
path: root/kolourpaint/tools
diff options
context:
space:
mode:
Diffstat (limited to 'kolourpaint/tools')
-rw-r--r--kolourpaint/tools/kptoolaction.cpp4
-rw-r--r--kolourpaint/tools/kptoolaction.h2
-rw-r--r--kolourpaint/tools/kptoolairspray.cpp12
-rw-r--r--kolourpaint/tools/kptoolautocrop.cpp6
-rw-r--r--kolourpaint/tools/kptoolcrop.cpp2
-rw-r--r--kolourpaint/tools/kptoolflip.cpp4
-rw-r--r--kolourpaint/tools/kptoolflip.h2
-rw-r--r--kolourpaint/tools/kptoolpen.cpp14
-rw-r--r--kolourpaint/tools/kptoolpolygon.cpp4
-rw-r--r--kolourpaint/tools/kptoolpreviewdialog.cpp6
-rw-r--r--kolourpaint/tools/kptoolpreviewdialog.h4
-rw-r--r--kolourpaint/tools/kptoolrectangle.cpp2
-rw-r--r--kolourpaint/tools/kptoolrotate.h2
-rw-r--r--kolourpaint/tools/kptoolselection.cpp2
-rw-r--r--kolourpaint/tools/kptoolskew.cpp4
-rw-r--r--kolourpaint/tools/kptoolskew.h2
16 files changed, 36 insertions, 36 deletions
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 ();
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-16 10:38:58 +0000