summaryrefslogtreecommitdiffstats
path: root/src/gui/application
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/application')
-rw-r--r--src/gui/application/RosegardenGUIApp.cpp32
-rw-r--r--src/gui/application/RosegardenGUIApp.cpp.orig32
-rw-r--r--src/gui/application/RosegardenGUIApp.h14
-rw-r--r--src/gui/application/RosegardenGUIView.cpp8
-rw-r--r--src/gui/application/RosegardenGUIView.h4
-rw-r--r--src/gui/application/main.cpp2
6 files changed, 46 insertions, 46 deletions
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 520d363..7bfdfb1 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -3105,7 +3105,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength()
slotTempoToSegmentLength(this);
}
-void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
+void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* parent)
{
RG_DEBUG << "RosegardenGUIApp::slotTempoToSegmentLength" << endl;
@@ -3135,7 +3135,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
int beats = 0;
// Get user to tell us how many beats or bars the segment contains
- BeatsBarsDialog dialog(tqparent);
+ BeatsBarsDialog dialog(parent);
if (dialog.exec() == TQDialog::Accepted) {
beats = dialog.getQuantity(); // beats (or bars)
if (dialog.getMode() == 1) // bars (multiply by time sig)
@@ -5705,16 +5705,16 @@ void RosegardenGUIApp::slotEditTempo(timeT atTime)
slotEditTempo(this, atTime);
}
-void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTempo(TQWidget *parent)
{
- slotEditTempo(tqparent, m_doc->getComposition().getPosition());
+ slotEditTempo(parent, m_doc->getComposition().getPosition());
}
-void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent, timeT atTime)
+void RosegardenGUIApp::slotEditTempo(TQWidget *parent, timeT atTime)
{
RG_DEBUG << "RosegardenGUIApp::slotEditTempo\n";
- TempoDialog tempoDialog(tqparent, m_doc);
+ TempoDialog tempoDialog(parent, m_doc);
connect(&tempoDialog,
TQT_SIGNAL(changeTempo(timeT,
@@ -5740,19 +5740,19 @@ void RosegardenGUIApp::slotEditTimeSignature(timeT atTime)
slotEditTimeSignature(this, atTime);
}
-void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent)
{
- slotEditTimeSignature(tqparent, m_doc->getComposition().getPosition());
+ slotEditTimeSignature(parent, m_doc->getComposition().getPosition());
}
-void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent,
+void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent,
timeT time)
{
Composition &composition(m_doc->getComposition());
TimeSignature sig = composition.getTimeSignatureAt(time);
- TimeSignatureDialog dialog(tqparent, &composition, time, sig);
+ TimeSignatureDialog dialog(parent, &composition, time, sig);
if (dialog.exec() == TQDialog::Accepted) {
@@ -5775,9 +5775,9 @@ void RosegardenGUIApp::slotEditTransportTime()
slotEditTransportTime(this);
}
-void RosegardenGUIApp::slotEditTransportTime(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTransportTime(TQWidget *parent)
{
- TimeDialog dialog(tqparent, i18n("Move playback pointer to time"),
+ TimeDialog dialog(parent, i18n("Move playback pointer to time"),
&m_doc->getComposition(),
m_doc->getComposition().getPosition(),
true);
@@ -6915,12 +6915,12 @@ RosegardenGUIApp::slotControlEditorClosed()
}
void
-RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent,
+RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent,
InstrumentId instrumentId,
int index)
{
- if (!tqparent)
- tqparent = this;
+ if (!parent)
+ parent = this;
int key = (index << 16) + instrumentId;
@@ -6954,7 +6954,7 @@ RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent,
// Create the plugin dialog
//
AudioPluginDialog *dialog =
- new AudioPluginDialog(tqparent,
+ new AudioPluginDialog(parent,
m_doc->getPluginManager(),
#ifdef HAVE_LIBLO
m_pluginGUIManager,
diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig
index a5bf4bb..0b6e768 100644
--- a/src/gui/application/RosegardenGUIApp.cpp.orig
+++ b/src/gui/application/RosegardenGUIApp.cpp.orig
@@ -3105,7 +3105,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength()
slotTempoToSegmentLength(this);
}
-void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
+void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* parent)
{
RG_DEBUG << "RosegardenGUIApp::slotTempoToSegmentLength" << endl;
@@ -3135,7 +3135,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
int beats = 0;
// Get user to tell us how many beats or bars the segment contains
- BeatsBarsDialog dialog(tqparent);
+ BeatsBarsDialog dialog(parent);
if (dialog.exec() == TQDialog::Accepted) {
beats = dialog.getQuantity(); // beats (or bars)
if (dialog.getMode() == 1) // bars (multiply by time sig)
@@ -5705,16 +5705,16 @@ void RosegardenGUIApp::slotEditTempo(timeT atTime)
slotEditTempo(this, atTime);
}
-void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTempo(TQWidget *parent)
{
- slotEditTempo(tqparent, m_doc->getComposition().getPosition());
+ slotEditTempo(parent, m_doc->getComposition().getPosition());
}
-void RosegardenGUIApp::slotEditTempo(TQWidget *tqparent, timeT atTime)
+void RosegardenGUIApp::slotEditTempo(TQWidget *parent, timeT atTime)
{
RG_DEBUG << "RosegardenGUIApp::slotEditTempo\n";
- TempoDialog tempoDialog(tqparent, m_doc);
+ TempoDialog tempoDialog(parent, m_doc);
connect(&tempoDialog,
TQT_SIGNAL(changeTempo(timeT,
@@ -5740,19 +5740,19 @@ void RosegardenGUIApp::slotEditTimeSignature(timeT atTime)
slotEditTimeSignature(this, atTime);
}
-void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent)
{
- slotEditTimeSignature(tqparent, m_doc->getComposition().getPosition());
+ slotEditTimeSignature(parent, m_doc->getComposition().getPosition());
}
-void RosegardenGUIApp::slotEditTimeSignature(TQWidget *tqparent,
+void RosegardenGUIApp::slotEditTimeSignature(TQWidget *parent,
timeT time)
{
Composition &composition(m_doc->getComposition());
TimeSignature sig = composition.getTimeSignatureAt(time);
- TimeSignatureDialog dialog(tqparent, &composition, time, sig);
+ TimeSignatureDialog dialog(parent, &composition, time, sig);
if (dialog.exec() == TQDialog::Accepted) {
@@ -5775,9 +5775,9 @@ void RosegardenGUIApp::slotEditTransportTime()
slotEditTransportTime(this);
}
-void RosegardenGUIApp::slotEditTransportTime(TQWidget *tqparent)
+void RosegardenGUIApp::slotEditTransportTime(TQWidget *parent)
{
- TimeDialog dialog(tqparent, i18n("Move playback pointer to time"),
+ TimeDialog dialog(parent, i18n("Move playback pointer to time"),
&m_doc->getComposition(),
m_doc->getComposition().getPosition(),
true);
@@ -6915,12 +6915,12 @@ RosegardenGUIApp::slotControlEditorClosed()
}
void
-RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent,
+RosegardenGUIApp::slotShowPluginDialog(TQWidget *parent,
InstrumentId instrumentId,
int index)
{
- if (!tqparent)
- tqparent = this;
+ if (!parent)
+ parent = this;
int key = (index << 16) + instrumentId;
@@ -6954,7 +6954,7 @@ RosegardenGUIApp::slotShowPluginDialog(TQWidget *tqparent,
// Create the plugin dialog
//
AudioPluginDialog *dialog =
- new AudioPluginDialog(tqparent,
+ new AudioPluginDialog(parent,
m_doc->getPluginManager(),
#ifdef HAVE_LIBLO
m_pluginGUIManager,
diff --git a/src/gui/application/RosegardenGUIApp.h b/src/gui/application/RosegardenGUIApp.h
index 3221ded..6aeeb7a 100644
--- a/src/gui/application/RosegardenGUIApp.h
+++ b/src/gui/application/RosegardenGUIApp.h
@@ -813,7 +813,7 @@ public slots:
* Tempo to Segment length
*/
void slotTempoToSegmentLength();
- void slotTempoToSegmentLength(TQWidget* tqparent);
+ void slotTempoToSegmentLength(TQWidget* parent);
/**
* toggle segment labels
@@ -856,22 +856,22 @@ public slots:
*/
void slotEditTempo();
void slotEditTempo(timeT atTime);
- void slotEditTempo(TQWidget *tqparent);
- void slotEditTempo(TQWidget *tqparent, timeT atTime);
+ void slotEditTempo(TQWidget *parent);
+ void slotEditTempo(TQWidget *parent, timeT atTime);
/**
* Edit the time signature - called from a Transport signal
*/
void slotEditTimeSignature();
void slotEditTimeSignature(timeT atTime);
- void slotEditTimeSignature(TQWidget *tqparent);
- void slotEditTimeSignature(TQWidget *tqparent, timeT atTime);
+ void slotEditTimeSignature(TQWidget *parent);
+ void slotEditTimeSignature(TQWidget *parent, timeT atTime);
/**
* Edit the playback pointer position - called from a Transport signal
*/
void slotEditTransportTime();
- void slotEditTransportTime(TQWidget *tqparent);
+ void slotEditTransportTime(TQWidget *parent);
/**
* Change the length of the composition
@@ -1465,7 +1465,7 @@ public slots:
* Create a plugin dialog for a given instrument and slot, or
* raise an exising one.
*/
- void slotShowPluginDialog(TQWidget *tqparent,
+ void slotShowPluginDialog(TQWidget *parent,
InstrumentId instrument,
int index);
diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp
index 90b3b09..83784f2 100644
--- a/src/gui/application/RosegardenGUIView.cpp
+++ b/src/gui/application/RosegardenGUIView.cpp
@@ -118,9 +118,9 @@ RosegardenGUIView::RosegardenGUIView(bool showTrackLabels,
SegmentParameterBox* segmentParameterBox,
InstrumentParameterBox* instrumentParameterBox,
TrackParameterBox* trackParameterBox,
- TQWidget *tqparent,
+ TQWidget *parent,
const char* /*name*/)
- : TQVBox(tqparent),
+ : TQVBox(parent),
m_rulerScale(0),
m_trackEditor(0),
m_segmentParameterBox(segmentParameterBox),
@@ -174,7 +174,7 @@ RosegardenGUIView::RosegardenGUIView(bool showTrackLabels,
connect(m_trackEditor,
TQT_SIGNAL(droppedDocument(TQString)),
- tqparent,
+ parent,
TQT_SLOT(slotOpenDroppedURL(TQString)));
connect(m_trackEditor,
@@ -2028,7 +2028,7 @@ RosegardenGUIView::createEventView(std::vector<Segment *> segmentsToEdit)
// create keyboard accelerators on view
//
- RosegardenGUIApp *par = dynamic_cast<RosegardenGUIApp*>(tqparent());
+ RosegardenGUIApp *par = dynamic_cast<RosegardenGUIApp*>(parent());
if (par) {
par->plugAccelerators(eventView, eventView->getAccelerators());
diff --git a/src/gui/application/RosegardenGUIView.h b/src/gui/application/RosegardenGUIView.h
index 44bf12b..da52c9f 100644
--- a/src/gui/application/RosegardenGUIView.h
+++ b/src/gui/application/RosegardenGUIView.h
@@ -87,7 +87,7 @@ public:
SegmentParameterBox*,
InstrumentParameterBox*,
TrackParameterBox*,
- TQWidget *tqparent = 0,
+ TQWidget *parent = 0,
const char *name=0);
/**
@@ -98,7 +98,7 @@ public:
/**
* returns a pointer to the document connected to the view
* instance. Mind that this method requires a RosegardenGUIApp
- * instance as a tqparent widget to get to the window document
+ * instance as a parent widget to get to the window document
* pointer by calling the RosegardenGUIApp::getDocument() method.
*
* @see RosegardenGUIApp#getDocument
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index c9ade00..863c085 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -248,7 +248,7 @@ and Events (our basic music element). To help lift the ambiguity,
between coordinates and staff lines: the former is especially
complicated because of its support for page tqlayout.)\n
-# The canvas view transmits this kind of info as a signal, which is
- connected to a slot in the tqparent EditView.
+ connected to a slot in the parent EditView.
-# The EditView delegates action to the current tool.\n
-# The tool performs the actual job (inserting or deleting a note,
etc...).
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-21 05:27:51 +0000