summaryrefslogtreecommitdiffstats
path: root/src/gui/general
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/general')
-rw-r--r--src/gui/general/BaseTool.cpp4
-rw-r--r--src/gui/general/BaseTool.h6
-rw-r--r--src/gui/general/BaseToolBox.cpp4
-rw-r--r--src/gui/general/BaseToolBox.h2
-rw-r--r--src/gui/general/EditToolBox.cpp6
-rw-r--r--src/gui/general/EditToolBox.h2
-rw-r--r--src/gui/general/EditView.cpp4
-rw-r--r--src/gui/general/EditView.h2
-rw-r--r--src/gui/general/EditViewBase.cpp4
-rw-r--r--src/gui/general/EditViewBase.h2
-rw-r--r--src/gui/general/PixmapFunctions.cpp22
-rw-r--r--src/gui/general/PixmapFunctions.h16
-rw-r--r--src/gui/general/PresetHandlerDialog.cpp4
-rw-r--r--src/gui/general/PresetHandlerDialog.h2
-rw-r--r--src/gui/general/ProgressReporter.cpp4
-rw-r--r--src/gui/general/ProgressReporter.h2
-rw-r--r--src/gui/general/RosegardenCanvasView.cpp4
-rw-r--r--src/gui/general/RosegardenCanvasView.h4
-rw-r--r--src/gui/general/RosegardenScrollView.cpp4
-rw-r--r--src/gui/general/RosegardenScrollView.h2
20 files changed, 50 insertions, 50 deletions
diff --git a/src/gui/general/BaseTool.cpp b/src/gui/general/BaseTool.cpp
index 76dc608..75202ac 100644
--- a/src/gui/general/BaseTool.cpp
+++ b/src/gui/general/BaseTool.cpp
@@ -36,8 +36,8 @@
namespace Rosegarden
{
-BaseTool::BaseTool(const TQString& menuName, KXMLGUIFactory* factory, TQObject* tqparent)
- : TQObject(tqparent),
+BaseTool::BaseTool(const TQString& menuName, KXMLGUIFactory* factory, TQObject* parent)
+ : TQObject(parent),
m_menuName(menuName),
m_menu(0),
m_parentFactory(factory)
diff --git a/src/gui/general/BaseTool.h b/src/gui/general/BaseTool.h
index c750679..2c1eab1 100644
--- a/src/gui/general/BaseTool.h
+++ b/src/gui/general/BaseTool.h
@@ -56,14 +56,14 @@ public:
virtual ~BaseTool();
/**
- * Is called by the tqparent View (EditView or SegmentCanvas) when
+ * Is called by the parent View (EditView or SegmentCanvas) when
* the tool is set as current.
* Add any setup here (e.g. setting the mouse cursor tqshape)
*/
virtual void ready();
/**
- * Is called by the tqparent View (EditView or SegmentCanvas) after
+ * Is called by the parent View (EditView or SegmentCanvas) after
* the tool is put away.
* Add any cleanup here
*/
@@ -88,7 +88,7 @@ protected:
*
* \a menuName : the name of the menu defined in the XML rc file
*/
- BaseTool(const TQString& menuName, KXMLGUIFactory*, TQObject* tqparent);
+ BaseTool(const TQString& menuName, KXMLGUIFactory*, TQObject* parent);
virtual void createMenu() = 0;
virtual bool hasMenu() { return false; }
diff --git a/src/gui/general/BaseToolBox.cpp b/src/gui/general/BaseToolBox.cpp
index 70cf3bd..1a018fd 100644
--- a/src/gui/general/BaseToolBox.cpp
+++ b/src/gui/general/BaseToolBox.cpp
@@ -34,8 +34,8 @@
namespace Rosegarden
{
-BaseToolBox::BaseToolBox(TQWidget* tqparent)
- : TQObject(tqparent),
+BaseToolBox::BaseToolBox(TQWidget* parent)
+ : TQObject(parent),
m_tools(17, // default size, from the TQt docs
false) // but we want it to be case insensitive
{
diff --git a/src/gui/general/BaseToolBox.h b/src/gui/general/BaseToolBox.h
index faf2b3a..63fbe51 100644
--- a/src/gui/general/BaseToolBox.h
+++ b/src/gui/general/BaseToolBox.h
@@ -51,7 +51,7 @@ class BaseToolBox : public TQObject
TQ_OBJECT
public:
- BaseToolBox(TQWidget* tqparent);
+ BaseToolBox(TQWidget* parent);
virtual BaseTool* getTool(const TQString& toolName);
diff --git a/src/gui/general/EditToolBox.cpp b/src/gui/general/EditToolBox.cpp
index c96f8af..48fa7e4 100644
--- a/src/gui/general/EditToolBox.cpp
+++ b/src/gui/general/EditToolBox.cpp
@@ -35,9 +35,9 @@
namespace Rosegarden
{
-EditToolBox::EditToolBox(EditView *tqparent)
- : BaseToolBox(tqparent),
- m_parentView(tqparent)
+EditToolBox::EditToolBox(EditView *parent)
+ : BaseToolBox(parent),
+ m_parentView(parent)
{
}
diff --git a/src/gui/general/EditToolBox.h b/src/gui/general/EditToolBox.h
index becb023..b9b5a01 100644
--- a/src/gui/general/EditToolBox.h
+++ b/src/gui/general/EditToolBox.h
@@ -48,7 +48,7 @@ class EditToolBox : public BaseToolBox
Q_OBJECT
TQ_OBJECT
public:
- EditToolBox(EditView* tqparent);
+ EditToolBox(EditView* parent);
virtual EditTool* getTool(const TQString& toolName);
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp
index 8566b7e..2fc60b7 100644
--- a/src/gui/general/EditView.cpp
+++ b/src/gui/general/EditView.cpp
@@ -119,8 +119,8 @@ static int FeatureShowVelocity = 0x00001; // show the velocity ruler
EditView::EditView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
unsigned int cols,
- TQWidget *tqparent, const char *name) :
- EditViewBase(doc, segments, cols, tqparent, name),
+ TQWidget *parent, const char *name) :
+ EditViewBase(doc, segments, cols, parent, name),
m_currentEventSelection(0),
m_activeItem(0),
m_canvasView(0),
diff --git a/src/gui/general/EditView.h b/src/gui/general/EditView.h
index ecbfb6a..57ac833 100644
--- a/src/gui/general/EditView.h
+++ b/src/gui/general/EditView.h
@@ -82,7 +82,7 @@ public:
EditView(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
unsigned int cols,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name = 0);
virtual ~EditView();
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index 15852c8..2cb3518 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -77,8 +77,8 @@ const unsigned int EditViewBase::NbLayoutRows = 6;
EditViewBase::EditViewBase(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
unsigned int cols,
- TQWidget *tqparent, const char *name) :
- KDockMainWindow(tqparent, name),
+ TQWidget *parent, const char *name) :
+ KDockMainWindow(parent, name),
m_viewNumber( -1),
m_viewLocalPropertyPrefix(makeViewLocalPropertyPrefix()),
m_config(kapp->config()),
diff --git a/src/gui/general/EditViewBase.h b/src/gui/general/EditViewBase.h
index 9d18d3b..aaf6dbe 100644
--- a/src/gui/general/EditViewBase.h
+++ b/src/gui/general/EditViewBase.h
@@ -73,7 +73,7 @@ public:
EditViewBase(RosegardenGUIDoc *doc,
std::vector<Segment *> segments,
unsigned int cols,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name = 0);
virtual ~EditViewBase();
diff --git a/src/gui/general/PixmapFunctions.cpp b/src/gui/general/PixmapFunctions.cpp
index 50dff1a..7bd8b2f 100644
--- a/src/gui/general/PixmapFunctions.cpp
+++ b/src/gui/general/PixmapFunctions.cpp
@@ -127,8 +127,8 @@ PixmapFunctions::colourPixmap(const TQPixmap &map, int hue, int minValue)
TQPixmap rmap;
rmap.convertFromImage(image);
- if (map.tqmask())
- rmap.setMask(*map.tqmask());
+ if (map.mask())
+ rmap.setMask(*map.mask());
return rmap;
}
@@ -156,8 +156,8 @@ PixmapFunctions::shadePixmap(const TQPixmap &map)
TQPixmap rmap;
rmap.convertFromImage(image);
- if (map.tqmask())
- rmap.setMask(*map.tqmask());
+ if (map.mask())
+ rmap.setMask(*map.mask());
return rmap;
}
@@ -168,8 +168,8 @@ PixmapFunctions::flipVertical(const TQPixmap &map)
TQImage i(map.convertToImage());
rmap.convertFromImage(i.mirror(false, true));
- if (map.tqmask()) {
- TQImage im(map.tqmask()->convertToImage());
+ if (map.mask()) {
+ TQImage im(map.mask()->convertToImage());
TQBitmap newMask;
newMask.convertFromImage(im.mirror(false, true));
rmap.setMask(newMask);
@@ -185,8 +185,8 @@ PixmapFunctions::flipHorizontal(const TQPixmap &map)
TQImage i(map.convertToImage());
rmap.convertFromImage(i.mirror(true, false));
- if (map.tqmask()) {
- TQImage im(map.tqmask()->convertToImage());
+ if (map.mask()) {
+ TQImage im(map.mask()->convertToImage());
TQBitmap newMask;
newMask.convertFromImage(im.mirror(true, false));
rmap.setMask(newMask);
@@ -211,7 +211,7 @@ PixmapFunctions::splitPixmap(const TQPixmap &pixmap, int x)
paint.end();
paint.begin(&leftMask);
- paint.drawPixmap(0, 0, *pixmap.tqmask(), 0, 0, left.width(), left.height());
+ paint.drawPixmap(0, 0, *pixmap.mask(), 0, 0, left.width(), left.height());
paint.end();
left.setMask(leftMask);
@@ -221,7 +221,7 @@ PixmapFunctions::splitPixmap(const TQPixmap &pixmap, int x)
paint.end();
paint.begin(&rightMask);
- paint.drawPixmap(0, 0, *pixmap.tqmask(), left.width(), 0, right.width(), right.height());
+ paint.drawPixmap(0, 0, *pixmap.mask(), left.width(), 0, right.width(), right.height());
paint.end();
right.setMask(rightMask);
@@ -237,7 +237,7 @@ PixmapFunctions::drawPixmapMasked(TQPixmap &dest, TQBitmap &destMask,
TQImage idp(dest.convertToImage());
TQImage idm(destMask.convertToImage());
TQImage isp(src.convertToImage());
- TQImage ism(src.tqmask()->convertToImage());
+ TQImage ism(src.mask()->convertToImage());
for (int y = 0; y < isp.height(); ++y) {
for (int x = 0; x < isp.width(); ++x) {
diff --git a/src/gui/general/PixmapFunctions.h b/src/gui/general/PixmapFunctions.h
index 8a84813..4564573 100644
--- a/src/gui/general/PixmapFunctions.h
+++ b/src/gui/general/PixmapFunctions.h
@@ -40,8 +40,8 @@ class PixmapFunctions
{
public:
/**
- * Generate a heuristic tqmask for the given pixmap. Unlike
- * TQPixmap::createHeuristicMask, this removes from the tqmask all
+ * Generate a heuristic mask for the given pixmap. Unlike
+ * TQPixmap::createHeuristicMask, this removes from the mask all
* pixels that are apparently "background" even if they appear in
* holes in the middle of the image. This is more usually what we
* want than the default behaviour of createHeuristicMask.
@@ -53,8 +53,8 @@ public:
static TQBitmap generateMask(const TQPixmap &map, const TQRgb &rgb);
/**
- * Generate a heuristic tqmask for the given pixmap. Unlike
- * TQPixmap::createHeuristicMask, this removes from the tqmask all
+ * Generate a heuristic mask for the given pixmap. Unlike
+ * TQPixmap::createHeuristicMask, this removes from the mask all
* pixels that are apparently "background" even if they appear in
* holes in the middle of the image. This is more usually what we
* want than the default behaviour of createHeuristicMask.
@@ -78,10 +78,10 @@ public:
*/
static TQPixmap shadePixmap(const TQPixmap &map);
- /// Return a TQPixmap that is a mirror image of map (including tqmask)
+ /// Return a TQPixmap that is a mirror image of map (including mask)
static TQPixmap flipVertical(const TQPixmap &map);
- /// Return a TQPixmap that is a mirror image of map (including tqmask)
+ /// Return a TQPixmap that is a mirror image of map (including mask)
static TQPixmap flipHorizontal(const TQPixmap &map);
/// Return left and right parts of the TQPixmap
@@ -89,12 +89,12 @@ public:
/**
* Using TQPainter::drawPixmap to draw one pixmap on another does
- * not appear to take the tqmask into account properly. Background
+ * not appear to take the mask into account properly. Background
* pixels in the second pixmap erase foreground pixels in the
* first one, regardless of whether they're masked or not. This
* function does what I expect.
*
- * Note that the source pixmap _must_ have a tqmask.
+ * Note that the source pixmap _must_ have a mask.
*/
static void drawPixmapMasked(TQPixmap &dest, TQBitmap &destMask,
int x, int y,
diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp
index a4144f0..9d9c897 100644
--- a/src/gui/general/PresetHandlerDialog.cpp
+++ b/src/gui/general/PresetHandlerDialog.cpp
@@ -52,8 +52,8 @@
namespace Rosegarden
{
-PresetHandlerDialog::PresetHandlerDialog(TQWidget *tqparent, bool fromNotation)
- : KDialogBase(tqparent, "presethandlerdialog", true, i18n("Load track parameters preset"), Ok | Cancel, Ok),
+PresetHandlerDialog::PresetHandlerDialog(TQWidget *parent, bool fromNotation)
+ : KDialogBase(parent, "presethandlerdialog", true, i18n("Load track parameters preset"), Ok | Cancel, Ok),
m_config(kapp->config()),
m_fromNotation(fromNotation)
{
diff --git a/src/gui/general/PresetHandlerDialog.h b/src/gui/general/PresetHandlerDialog.h
index c28e85a..685f980 100644
--- a/src/gui/general/PresetHandlerDialog.h
+++ b/src/gui/general/PresetHandlerDialog.h
@@ -52,7 +52,7 @@ class PresetHandlerDialog : public KDialogBase
public:
- PresetHandlerDialog(TQWidget* tqparent, bool fromNotation = false);
+ PresetHandlerDialog(TQWidget* parent, bool fromNotation = false);
~PresetHandlerDialog();
PresetGroup *m_presets;
diff --git a/src/gui/general/ProgressReporter.cpp b/src/gui/general/ProgressReporter.cpp
index 94fbb40..3fdfacc 100644
--- a/src/gui/general/ProgressReporter.cpp
+++ b/src/gui/general/ProgressReporter.cpp
@@ -31,8 +31,8 @@
namespace Rosegarden
{
-ProgressReporter::ProgressReporter(TQObject* tqparent, const char* name)
- : TQObject(tqparent, name), m_isCancelled(false)
+ProgressReporter::ProgressReporter(TQObject* parent, const char* name)
+ : TQObject(parent, name), m_isCancelled(false)
{}
diff --git a/src/gui/general/ProgressReporter.h b/src/gui/general/ProgressReporter.h
index 7039e92..6d2f18f 100644
--- a/src/gui/general/ProgressReporter.h
+++ b/src/gui/general/ProgressReporter.h
@@ -41,7 +41,7 @@ class ProgressReporter : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- ProgressReporter(TQObject* tqparent, const char* name = 0);
+ ProgressReporter(TQObject* parent, const char* name = 0);
// exception class for cancellations
class Cancelled { };
diff --git a/src/gui/general/RosegardenCanvasView.cpp b/src/gui/general/RosegardenCanvasView.cpp
index 0798140..a806e8a 100644
--- a/src/gui/general/RosegardenCanvasView.cpp
+++ b/src/gui/general/RosegardenCanvasView.cpp
@@ -42,9 +42,9 @@ namespace Rosegarden
{
RosegardenCanvasView::RosegardenCanvasView(TQCanvas* canvas,
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name, WFlags f)
- : TQCanvasView(canvas, tqparent, name, f),
+ : TQCanvasView(canvas, parent, name, f),
m_bottomWidget(0),
m_currentBottomWidgetHeight( -1),
m_leftWidget(0),
diff --git a/src/gui/general/RosegardenCanvasView.h b/src/gui/general/RosegardenCanvasView.h
index 02faef2..01bca28 100644
--- a/src/gui/general/RosegardenCanvasView.h
+++ b/src/gui/general/RosegardenCanvasView.h
@@ -43,7 +43,7 @@ namespace Rosegarden
/**
* A TQCanvasView with an auxiliary horiz. scrollbar
- * That scrollbar should be provided by the tqparent widget
+ * That scrollbar should be provided by the parent widget
* (typically an EditView). The RosegardenCanvasView keeps
* the auxilliary horiz. scrollbar range in sync with the
* one of its own scrollbar with slotUpdate().
@@ -55,7 +55,7 @@ class RosegardenCanvasView : public TQCanvasView
TQ_OBJECT
public:
RosegardenCanvasView(TQCanvas*,
- TQWidget* tqparent=0, const char* name=0, WFlags f=0);
+ TQWidget* parent=0, const char* name=0, WFlags f=0);
/**
* EditTool::handleMouseMove() returns a OR-ed combination of these
diff --git a/src/gui/general/RosegardenScrollView.cpp b/src/gui/general/RosegardenScrollView.cpp
index cc73afb..815ab6b 100644
--- a/src/gui/general/RosegardenScrollView.cpp
+++ b/src/gui/general/RosegardenScrollView.cpp
@@ -49,9 +49,9 @@ const int RosegardenScrollView::InitialScrollAccel = 5;
const int RosegardenScrollView::MaxScrollDelta = 100; // max a.scroll speed
const double RosegardenScrollView::ScrollAccelValue = 1.04;// acceleration rate
-RosegardenScrollView::RosegardenScrollView(TQWidget* tqparent,
+RosegardenScrollView::RosegardenScrollView(TQWidget* parent,
const char* name, WFlags f)
- : TQScrollView(tqparent, name, f),
+ : TQScrollView(parent, name, f),
m_bottomWidget(0),
m_currentBottomWidgetHeight( -1),
m_smoothScroll(true),
diff --git a/src/gui/general/RosegardenScrollView.h b/src/gui/general/RosegardenScrollView.h
index 14744ee..e9fbf70 100644
--- a/src/gui/general/RosegardenScrollView.h
+++ b/src/gui/general/RosegardenScrollView.h
@@ -53,7 +53,7 @@ class RosegardenScrollView : public TQScrollView
Q_OBJECT
TQ_OBJECT
public:
- RosegardenScrollView(TQWidget* tqparent=0, const char* name=0, WFlags f=0);
+ RosegardenScrollView(TQWidget* parent=0, const char* name=0, WFlags f=0);
/**
* EditTool::handleMouseMove() returns a OR-ed combination of these
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 07:17:15 +0000