TDE
/
rosegarden
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/rosegarden
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove the tq in front of these incorrectly TQt4-converted methods/data members:

Browse Source 
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 05768569bc
commit 1905a36716
88 changed files with 443 additions and 443 deletions
Show Stats Download Patch File Download Diff File

2
src/base/AnalysisTypes.cpp
Unescape View File

@ -234,7 +234,7 @@ ChordLabel::checkMap()
// a pitch class (pitch%12) in a chord. C major has three pitch
// classes, C, E, and G natural; if you take the MIDI pitches
// of those notes modulo 12, you get 0, 4, and 7, so the tqmask for
// major triads is (1<<0)+(1<<4)+(1<<7). All the tqmasks are for chords
// major triads is (1<<0)+(1<<4)+(1<<7). All the masks are for chords
// built on C.
const int basicChordMasks[8] =

4
src/base/AnalysisTypes.h
Unescape View File

@ -62,8 +62,8 @@ NoChord = "no-chord",
///////////////////////////////////////////////////////////////////////////
/**
* ChordLabel names chords and identifies them from their tqmasks. See
* ChordLabel::checkMap() for details on what the tqmasks are and
* ChordLabel names chords and identifies them from their masks. See
* ChordLabel::checkMap() for details on what the masks are and
* AnalysisHelper::labelChords() for an example.
*/

2
src/base/Configuration.cpp
Unescape View File

@ -171,7 +171,7 @@ const PropertyName DocumentConfiguration::TransportMode = "transportmode
DocumentConfiguration::DocumentConfiguration()
{
set<Int>(ZoomLevel, 0);
set<String>(TransportMode, ""); // aptqparently generates an exception if not initialized
set<String>(TransportMode, ""); // apparently generates an exception if not initialized
}
DocumentConfiguration::DocumentConfiguration(const DocumentConfiguration &conf):

4
src/base/SegmentNotationHelper.h
Unescape View File

@ -188,7 +188,7 @@ public:
*
* @return iterator pointing at the last inserted event. Also
* modifies from to point at the first split event (the original
* iterator would have been tqinvalidated).
* iterator would have been invalidated).
*/
iterator splitIntoTie(iterator &from, iterator to, timeT baseDuration);
@ -205,7 +205,7 @@ public:
*
* @return iterator pointing at the last inserted event. Also
* modifies i to point at the first split event (the original
* iterator would have been tqinvalidated).
* iterator would have been invalidated).
*/
iterator splitIntoTie(iterator &i, timeT baseDuration);

4
src/base/ViewElement.cpp
Unescape View File

@ -29,8 +29,8 @@ namespace Rosegarden
extern const int MIN_SUBORDERING;
ViewElement::ViewElement(Event *e) :
m_tqlayoutX(0.0),
m_tqlayoutY(0.0),
m_layoutX(0.0),
m_layoutY(0.0),
m_event(e)
{
// nothing

12
src/base/ViewElement.h
Unescape View File

@ -58,7 +58,7 @@ public:
*
* @see getCanvasX()
*/
virtual double getLayoutX() const { return m_tqlayoutX; }
virtual double getLayoutX() const { return m_layoutX; }
/**
* Returns the Y coordinate of the element, as computed by the
@ -67,19 +67,19 @@ public:
*
* @see getCanvasY()
*/
virtual double getLayoutY() const { return m_tqlayoutY; }
virtual double getLayoutY() const { return m_layoutY; }
/**
* Sets the X coordinate which was computed by the tqlayout engine
* @see getLayoutX()
*/
virtual void setLayoutX(double x) { m_tqlayoutX = x; }
virtual void setLayoutX(double x) { m_layoutX = x; }
/**
* Sets the Y coordinate which was computed by the tqlayout engine
* @see getLayoutY()
*/
virtual void setLayoutY(double y) { m_tqlayoutY = y; }
virtual void setLayoutY(double y) { m_layoutY = y; }
void dump(std::ostream&) const;
@ -88,8 +88,8 @@ public:
protected:
ViewElement(Event *);
double m_tqlayoutX;
double m_tqlayoutY;
double m_layoutX;
double m_layoutY;
Event *m_event;
};

8
src/commands/edit/EraseCommand.cpp
Unescape View File

@ -38,7 +38,7 @@ namespace Rosegarden
EraseCommand::EraseCommand(EventSelection &selection) :
BasicSelectionCommand(getGlobalName(), selection, true),
m_selection(&selection),
m_retqlayoutEndTime(getEndTime())
m_relayoutEndTime(getEndTime())
{
// nothing else
}
@ -56,7 +56,7 @@ EraseCommand::modifySegment()
if ((*i)->isa(Clef::EventType) ||
(*i)->isa(Key ::EventType)) {
m_retqlayoutEndTime = getSegment().getEndTime();
m_relayoutEndTime = getSegment().getEndTime();
}
// We used to do this by calling SegmentNotationHelper::deleteEvent
@ -78,9 +78,9 @@ EraseCommand::modifySegment()
}
timeT
EraseCommand::getRetqlayoutEndTime()
EraseCommand::getRelayoutEndTime()
{
return m_retqlayoutEndTime;
return m_relayoutEndTime;
}
}

4
src/commands/edit/EraseCommand.h
Unescape View File

@ -49,14 +49,14 @@ public:
static TQString getGlobalName() { return i18n("&Erase"); }
virtual timeT getRetqlayoutEndTime();
virtual timeT getRelayoutEndTime();
protected:
virtual void modifySegment();
private:
EventSelection *m_selection;// only used on 1st execute (cf bruteForceRedo)
timeT m_retqlayoutEndTime;
timeT m_relayoutEndTime;
};

10
src/commands/edit/PasteEventsCommand.cpp
Unescape View File

@ -47,7 +47,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment,
PasteType pasteType) :
BasicCommand(getGlobalName(), segment, pasteTime,
getEffectiveEndTime(segment, clipboard, pasteTime)),
m_retqlayoutEndTime(getEndTime()),
m_relayoutEndTime(getEndTime()),
m_clipboard(new Clipboard(*clipboard)),
m_pasteType(pasteType),
m_pastedEvents(segment)
@ -62,7 +62,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment,
for (Segment::iterator i = s->begin(); i != s->end(); ++i) {
if ((*i)->isa(Clef::EventType) ||
(*i)->isa(Key::EventType)) {
m_retqlayoutEndTime = s->getEndTime();
m_relayoutEndTime = s->getEndTime();
break;
}
}
@ -76,7 +76,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment,
timeT pasteEndTime,
PasteType pasteType) :
BasicCommand(getGlobalName(), segment, pasteTime, pasteEndTime),
m_retqlayoutEndTime(getEndTime()),
m_relayoutEndTime(getEndTime()),
m_clipboard(new Clipboard(*clipboard)),
m_pasteType(pasteType),
m_pastedEvents(segment)
@ -138,9 +138,9 @@ PasteEventsCommand::getEffectiveEndTime(Segment &segment,
}
timeT
PasteEventsCommand::getRetqlayoutEndTime()
PasteEventsCommand::getRelayoutEndTime()
{
return m_retqlayoutEndTime;
return m_relayoutEndTime;
}
bool

4
src/commands/edit/PasteEventsCommand.h
Unescape View File

@ -92,14 +92,14 @@ public:
/// Determine whether this paste will succeed (without executing it yet)
bool isPossible();
virtual timeT getRetqlayoutEndTime();
virtual timeT getRelayoutEndTime();
protected:
virtual void modifySegment();
timeT getEffectiveEndTime(Segment &,
Clipboard *,
timeT);
timeT m_retqlayoutEndTime;
timeT m_relayoutEndTime;
Clipboard *m_clipboard;
PasteType m_pasteType;
EventSelection m_pastedEvents;

6
src/commands/matrix/MatrixEraseCommand.cpp
Unescape View File

@ -44,14 +44,14 @@ MatrixEraseCommand::MatrixEraseCommand(Segment &segment,
event->getAbsoluteTime() + event->getDuration(),
true),
m_event(event),
m_retqlayoutEndTime(getEndTime())
m_relayoutEndTime(getEndTime())
{
// nothing
}
timeT MatrixEraseCommand::getRetqlayoutEndTime()
timeT MatrixEraseCommand::getRelayoutEndTime()
{
return m_retqlayoutEndTime;
return m_relayoutEndTime;
}
void MatrixEraseCommand::modifySegment()

4
src/commands/matrix/MatrixEraseCommand.h
Unescape View File

@ -45,13 +45,13 @@ public:
MatrixEraseCommand(Segment &segment,
Event *event);
virtual timeT getRetqlayoutEndTime();
virtual timeT getRelayoutEndTime();
protected:
virtual void modifySegment();
Event *m_event; // only used on 1st execute (cf bruteForceRedo)
timeT m_retqlayoutEndTime;
timeT m_relayoutEndTime;
};
//------------------------------

2
src/commands/notation/AddIndicationCommand.h
Unescape View File

@ -55,7 +55,7 @@ public:
Event *getLastInsertedEvent() {
return m_lastInsertedEvent;
}
virtual timeT getRetqlayoutEndTime() {
virtual timeT getRelayoutEndTime() {
return getStartTime() + m_indicationDuration;
}

2
src/commands/notation/ClefInsertionCommand.cpp
Unescape View File

@ -78,7 +78,7 @@ ClefInsertionCommand::getGlobalName(Clef *)
}
timeT
ClefInsertionCommand::getRetqlayoutEndTime()
ClefInsertionCommand::getRelayoutEndTime()
{
// Inserting a clef can change the y-coord of every subsequent note
return getSegment().getEndTime();

2
src/commands/notation/ClefInsertionCommand.h
Unescape View File

@ -52,7 +52,7 @@ public:
virtual ~ClefInsertionCommand();
static TQString getGlobalName(Clef *clef = 0);
virtual timeT getRetqlayoutEndTime();
virtual timeT getRelayoutEndTime();
Event *getLastInsertedEvent() { return m_lastInsertedEvent; }

8
src/commands/notation/EraseEventCommand.cpp
Unescape View File

@ -47,7 +47,7 @@ EraseEventCommand::EraseEventCommand(Segment &segment,
true),
m_collapseRest(collapseRest),
m_event(event),
m_retqlayoutEndTime(getEndTime())
m_relayoutEndTime(getEndTime())
{
// nothing
}
@ -67,9 +67,9 @@ EraseEventCommand::makeName(std::string e)
}
timeT
EraseEventCommand::getRetqlayoutEndTime()
EraseEventCommand::getRelayoutEndTime()
{
return m_retqlayoutEndTime;
return m_relayoutEndTime;
}
void
@ -80,7 +80,7 @@ EraseEventCommand::modifySegment()
if (m_event->isa(Clef::EventType) ||
m_event->isa(Key ::EventType)) {
m_retqlayoutEndTime = helper.segment().getEndTime();
m_relayoutEndTime = helper.segment().getEndTime();
} else if (m_event->isa(Indication::EventType)) {

4
src/commands/notation/EraseEventCommand.h
Unescape View File

@ -48,7 +48,7 @@ public:
bool collapseRest);
virtual ~EraseEventCommand();
virtual timeT getRetqlayoutEndTime();
virtual timeT getRelayoutEndTime();
protected:
virtual void modifySegment();
@ -56,7 +56,7 @@ protected:
bool m_collapseRest;
Event *m_event; // only used on 1st execute (cf bruteForceRedo)
timeT m_retqlayoutEndTime;
timeT m_relayoutEndTime;
std::string makeName(std::string);
};

2
src/commands/notation/InterpretCommand.h
Unescape View File

@ -48,7 +48,7 @@ class Event;
class InterpretCommand : public BasicSelectionCommand
{
public:
// bit tqmasks: pass an OR of these to the constructor
// bit masks: pass an OR of these to the constructor
static const int NoInterpretation;
static const int GuessDirections; // allegro, rit, pause &c: kinda bogus
static const int ApplyTextDynamics; // mp, ff

8
src/document/BasicCommand.cpp
Unescape View File

@ -90,7 +90,7 @@ Rosegarden::Segment& BasicCommand::getSegment()
return m_segment;
}
Rosegarden::timeT BasicCommand::getRetqlayoutEndTime()
Rosegarden::timeT BasicCommand::getRelayoutEndTime()
{
return getEndTime();
}
@ -114,9 +114,9 @@ BasicCommand::execute()
copyFrom(m_redoEvents);
}
m_segment.updateRefreshStatuses(getStartTime(), getRetqlayoutEndTime());
m_segment.updateRefreshStatuses(getStartTime(), getRelayoutEndTime());
RG_DEBUG << "BasicCommand(" << name() << "): updated refresh statuses "
<< getStartTime() << " -> " << getRetqlayoutEndTime() << endl;
<< getStartTime() << " -> " << getRelayoutEndTime() << endl;
}
void
@ -129,7 +129,7 @@ BasicCommand::unexecute()
copyFrom(&m_savedEvents);
m_segment.updateRefreshStatuses(getStartTime(), getRetqlayoutEndTime());
m_segment.updateRefreshStatuses(getStartTime(), getRelayoutEndTime());
}
void

2
src/document/BasicCommand.h
Unescape View File

@ -59,7 +59,7 @@ public:
timeT getStartTime() { return m_startTime; }
timeT getEndTime() { return m_endTime; }
virtual timeT getRetqlayoutEndTime();
virtual timeT getRelayoutEndTime();
protected:
/**

8
src/document/RosegardenGUIDoc.cpp
Unescape View File

@ -1556,13 +1556,13 @@ void RosegardenGUIDoc::saveSegment(TQTextStream& outStream, Segment *segment,
bool RosegardenGUIDoc::isSequencerRunning()
{
RosegardenGUIApp* tqparentApp = dynamic_cast<RosegardenGUIApp*>(tqparent());
if (!tqparentApp) {
RG_DEBUG << "RosegardenGUIDoc::isSequencerRunning() : tqparentApp == 0\n";
RosegardenGUIApp* parentApp = dynamic_cast<RosegardenGUIApp*>(tqparent());
if (!parentApp) {
RG_DEBUG << "RosegardenGUIDoc::isSequencerRunning() : parentApp == 0\n";
return false;
}
return tqparentApp->isSequencerRunning();
return parentApp->isSequencerRunning();
}
bool

2
src/gui/application/RosegardenGUIApp.cpp
Unescape View File

@ -360,7 +360,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
TQT_TQOBJECT(this), TQT_SLOT(slotParametersClosed()));
connect(m_dockLeft, TQT_SIGNAL(hasUndocked()),
TQT_TQOBJECT(this), TQT_SLOT(slotParametersClosed()));
// Aptqparently, hasUndocked() is emitted when the dock widget's
// Apparently, hasUndocked() is emitted when the dock widget's
// 'close' button on the dock handle is clicked.
connect(m_mainDockWidget, TQT_SIGNAL(docking(KDockWidget*, KDockWidget::DockPosition)),
TQT_TQOBJECT(this), TQT_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition)));

2
src/gui/application/RosegardenGUIApp.cpp.orig
Unescape View File

@ -360,7 +360,7 @@ RosegardenGUIApp::RosegardenGUIApp(bool useSequencer,
this, TQT_SLOT(slotParametersClosed()));
connect(m_dockLeft, TQT_SIGNAL(hasUndocked()),
this, TQT_SLOT(slotParametersClosed()));
// Aptqparently, hasUndocked() is emitted when the dock widget's
// Apparently, hasUndocked() is emitted when the dock widget's
// 'close' button on the dock handle is clicked.
connect(m_mainDockWidget, TQT_SIGNAL(docking(KDockWidget*, KDockWidget::DockPosition)),
this, TQT_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition)));

2
src/gui/application/RosegardenGUIView.cpp
Unescape View File

@ -98,7 +98,7 @@ namespace Rosegarden
// Use this to define the basic unit of the main TQCanvas size.
//
// This aptqparently arbitrary figure is what we think is an
// This apparently arbitrary figure is what we think is an
// appropriate width in pixels for a 4/4 bar. Beware of making it
// too narrow, as shorter bars will be proportionally smaller --
// the visual difference between 2/4 and 4/4 is perhaps greater

14
src/gui/configuration/HeadersConfigurationPage.cpp
Unescape View File

@ -63,7 +63,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *tqparent,
(1, Qt::Horizontal,
i18n("Printable headers"), this);
TQFrame *frameHeaders = new TQFrame(headersBox);
TQGridLayout *tqlayoutHeaders = new TQGridLayout(frameHeaders, 10, 6, 10, 5);
TQGridLayout *layoutHeaders = new TQGridLayout(frameHeaders, 10, 6, 10, 5);
// grab user headers from metadata
Configuration metadata = (&m_doc->getComposition())->getMetadata();
@ -143,7 +143,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *tqparent,
// editHeader->setReadOnly( true );
editHeader->tqsetAlignment( (col == 0 ? TQt::AlignLeft : (col >= 3 ? TQt::AlignRight : TQt::AlignCenter) ));
tqlayoutHeaders->addMultiCellWidget(editHeader, row, row, col, col+(width-1) );
layoutHeaders->addMultiCellWidget(editHeader, row, row, col, col+(width-1) );
//
// ToolTips
@ -154,7 +154,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *tqparent,
}
TQLabel *separator = new TQLabel(i18n("The composition comes here."), frameHeaders);
separator->tqsetAlignment( TQt::AlignCenter );
tqlayoutHeaders->addMultiCellWidget(separator, 7, 7, 1, 4 );
layoutHeaders->addMultiCellWidget(separator, 7, 7, 1, 4 );
//
// LilyPond export: Non-printable headers
@ -177,7 +177,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *tqparent,
otherHeadersBox->setFont(font);
otherHeadersBox->setWidget(frameOtherHeaders);
TQGridLayout *tqlayoutOtherHeaders = new TQGridLayout(frameOtherHeaders, 2, 2, 10, 5);
TQGridLayout *layoutOtherHeaders = new TQGridLayout(frameOtherHeaders, 2, 2, 10, 5);
m_metadata = new KListView(frameOtherHeaders);
m_metadata->addColumn(i18n("Name"));
@ -208,15 +208,15 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *tqparent,
shown.insert(names[i]);
}
tqlayoutOtherHeaders->addMultiCellWidget(m_metadata, 0, 0, 0, 1);
layoutOtherHeaders->addMultiCellWidget(m_metadata, 0, 0, 0, 1);
TQPushButton* addPropButton = new TQPushButton(i18n("Add New Property"),
frameOtherHeaders);
tqlayoutOtherHeaders->addWidget(addPropButton, 1, 0, TQt::AlignHCenter);
layoutOtherHeaders->addWidget(addPropButton, 1, 0, TQt::AlignHCenter);
TQPushButton* deletePropButton = new TQPushButton(i18n("Delete Property"),
frameOtherHeaders);
tqlayoutOtherHeaders->addWidget(deletePropButton, 1, 1, TQt::AlignHCenter);
layoutOtherHeaders->addWidget(deletePropButton, 1, 1, TQt::AlignHCenter);
connect(addPropButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotAddNewProperty()));

18
src/gui/configuration/NotationConfigurationPage.cpp
Unescape View File

@ -86,16 +86,16 @@ NotationConfigurationPage::NotationConfigurationPage(KConfig *cfg,
tqlayout->addWidget(new TQLabel(i18n("Default tqlayout mode"), frame), row, 0);
m_tqlayoutMode = new KComboBox(frame);
m_tqlayoutMode->setEditable(false);
m_tqlayoutMode->insertItem(i18n("Linear tqlayout"));
m_tqlayoutMode->insertItem(i18n("Continuous page tqlayout"));
m_tqlayoutMode->insertItem(i18n("Multiple page tqlayout"));
int defaultLayoutMode = m_cfg->readNumEntry("tqlayoutmode", 0);
m_layoutMode = new KComboBox(frame);
m_layoutMode->setEditable(false);
m_layoutMode->insertItem(i18n("Linear tqlayout"));
m_layoutMode->insertItem(i18n("Continuous page tqlayout"));
m_layoutMode->insertItem(i18n("Multiple page tqlayout"));
int defaultLayoutMode = m_cfg->readNumEntry("layoutmode", 0);
if (defaultLayoutMode >= 0 && defaultLayoutMode <= 2) {
m_tqlayoutMode->setCurrentItem(defaultLayoutMode);
m_layoutMode->setCurrentItem(defaultLayoutMode);
}
tqlayout->addMultiCellWidget(m_tqlayoutMode, row, row, 1, 2);
tqlayout->addMultiCellWidget(m_layoutMode, row, row, 1, 2);
++row;
tqlayout->addWidget(new TQLabel(i18n("Default spacing"), frame), row, 0);
@ -715,7 +715,7 @@ NotationConfigurationPage::apply()
s = NotationHLayout::getAvailableProportions();
m_cfg->writeEntry("proportion", s[m_proportion->currentItem()]);
m_cfg->writeEntry("tqlayoutmode", m_tqlayoutMode->currentItem());
m_cfg->writeEntry("layoutmode", m_layoutMode->currentItem());
m_cfg->writeEntry("colourquantize", m_colourQuantize->isChecked());
m_cfg->writeEntry("showunknowns", m_showUnknowns->isChecked());
m_cfg->writeEntry("showinvisibles", m_showInvisibles->isChecked());

2
src/gui/configuration/NotationConfigurationPage.h
Unescape View File

@ -87,7 +87,7 @@ protected:
TQLabel *m_fontCopyrightLabel;
TQLabel *m_fontMappedByLabel;
TQLabel *m_fontTypeLabel;
TQComboBox *m_tqlayoutMode;
TQComboBox *m_layoutMode;
TQComboBox *m_spacing;
TQComboBox *m_proportion;
TQCheckBox *m_colourQuantize;

52
src/gui/dialogs/LilyPondOptionsDialog.cpp
Unescape View File

@ -107,9 +107,9 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
generalGrid->addWidget(basicOptionsBox, 0, 0);
TQFrame *frameBasic = new TQFrame(basicOptionsBox);
TQGridLayout *tqlayoutBasic = new TQGridLayout(frameBasic, 3, 2, 10, 5);
TQGridLayout *layoutBasic = new TQGridLayout(frameBasic, 3, 2, 10, 5);
tqlayoutBasic->addWidget(new TQLabel(
layoutBasic->addWidget(new TQLabel(
i18n("Compatibility level"), frameBasic), 0, 0);
m_lilyLanguage = new KComboBox(frameBasic);
@ -119,9 +119,9 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.10"));
m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.12"));
m_lilyLanguage->setCurrentItem(config->readUnsignedNumEntry("lilylanguage", 0));
tqlayoutBasic->addWidget(m_lilyLanguage, 0, 1);
layoutBasic->addWidget(m_lilyLanguage, 0, 1);
tqlayoutBasic->addWidget(new TQLabel(
layoutBasic->addWidget(new TQLabel(
i18n("Paper size"), frameBasic), 1, 0);
TQHBoxLayout *hboxPaper = new TQHBoxLayout( frameBasic );
@ -146,9 +146,9 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
hboxPaper->addWidget( m_lilyPaperSize );
hboxPaper->addWidget( new TQLabel( " ", frameBasic ) ); // fixed-size spacer
hboxPaper->addWidget( m_lilyPaperLandscape );
tqlayoutBasic->addLayout(hboxPaper, 1, 1);
layoutBasic->addLayout(hboxPaper, 1, 1);
tqlayoutBasic->addWidget(new TQLabel(
layoutBasic->addWidget(new TQLabel(
i18n("Font size"), frameBasic), 2, 0);
m_lilyFontSize = new KComboBox(frameBasic);
@ -158,7 +158,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
}
m_lilyFontSize->setCurrentItem(config->readUnsignedNumEntry
("lilyfontsize", 4));
tqlayoutBasic->addWidget(m_lilyFontSize, 2, 1);
layoutBasic->addWidget(m_lilyFontSize, 2, 1);
//
// LilyPond export: Staff level options
@ -170,9 +170,9 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
generalGrid->addWidget(staffOptionsBox, 1, 0);
TQFrame *frameStaff = new TQFrame(staffOptionsBox);
TQGridLayout *tqlayoutStaff = new TQGridLayout(frameStaff, 2, 2, 10, 5);
TQGridLayout *layoutStaff = new TQGridLayout(frameStaff, 2, 2, 10, 5);
tqlayoutStaff->addWidget(new TQLabel(
layoutStaff->addWidget(new TQLabel(
i18n("Export content"), frameStaff), 0, 0);
m_lilyExportSelection = new KComboBox(frameStaff);
@ -182,12 +182,12 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
m_lilyExportSelection->insertItem(i18n("Selected segments"));
m_lilyExportSelection->setCurrentItem(config->readUnsignedNumEntry("lilyexportselection", 1));
tqlayoutStaff->addWidget(m_lilyExportSelection, 0, 1);
layoutStaff->addWidget(m_lilyExportSelection, 0, 1);
m_lilyExportStaffMerge = new TQCheckBox(
i18n("Merge tracks that have the same name"), frameStaff);
m_lilyExportStaffMerge->setChecked(config->readBoolEntry("lilyexportstaffmerge", false));
tqlayoutStaff->addMultiCellWidget(m_lilyExportStaffMerge, 1, 1, 0, 1);
layoutStaff->addMultiCellWidget(m_lilyExportStaffMerge, 1, 1, 0, 1);
//
// LilyPond export: Notation options
@ -199,7 +199,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
generalGrid->addWidget(notationOptionsBox, 2, 0);
TQFrame *frameNotation = new TQFrame(notationOptionsBox);
TQGridLayout *tqlayoutNotation = new TQGridLayout(frameNotation, 4, 2, 10, 5);
TQGridLayout *layoutNotation = new TQGridLayout(frameNotation, 4, 2, 10, 5);
m_lilyTempoMarks = new KComboBox( frameNotation );
m_lilyTempoMarks->insertItem(i18n("None"));
@ -207,9 +207,9 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
m_lilyTempoMarks->insertItem(i18n("All"));
m_lilyTempoMarks->setCurrentItem(config->readUnsignedNumEntry("lilyexporttempomarks", 0));
tqlayoutNotation->addWidget( new TQLabel(
layoutNotation->addWidget( new TQLabel(
i18n("Export tempo marks "), frameNotation), 0, 0 );
tqlayoutNotation->addWidget(m_lilyTempoMarks, 0, 1);
layoutNotation->addWidget(m_lilyTempoMarks, 0, 1);
m_lilyExportLyrics = new TQCheckBox(
i18n("Export lyrics"), frameNotation);
@ -219,19 +219,19 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
// fixed, no "- - -" lyrics are generated for an empty lyrics
// default again into lyrics - HJJ
m_lilyExportLyrics->setChecked(config->readBoolEntry("lilyexportlyrics", true));
tqlayoutNotation->addMultiCellWidget(m_lilyExportLyrics, 1, 1, 0, 1);
layoutNotation->addMultiCellWidget(m_lilyExportLyrics, 1, 1, 0, 1);
m_lilyExportBeams = new TQCheckBox(
i18n("Export beamings"), frameNotation);
m_lilyExportBeams->setChecked(config->readBoolEntry("lilyexportbeamings", false));
tqlayoutNotation->addMultiCellWidget(m_lilyExportBeams, 2, 2, 0, 1);
layoutNotation->addMultiCellWidget(m_lilyExportBeams, 2, 2, 0, 1);
// recycle this for a new option to ignore the track brackets (so it is less
// obnoxious to print single parts where brackets are in place)
m_lilyExportStaffGroup = new TQCheckBox(
i18n("Export track staff brackets"), frameNotation);
m_lilyExportStaffGroup->setChecked(config->readBoolEntry("lilyexportstaffbrackets", true));
tqlayoutNotation->addMultiCellWidget(m_lilyExportStaffGroup, 3, 3, 0, 1);
layoutNotation->addMultiCellWidget(m_lilyExportStaffGroup, 3, 3, 0, 1);
generalGrid->setRowStretch(4, 10);
@ -245,7 +245,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
advancedGrid->addWidget(advancedLayoutOptionsBox, 0, 0);
TQFrame *frameAdvancedLayout = new TQFrame(advancedLayoutOptionsBox);
TQGridLayout *tqlayoutAdvancedLayout = new TQGridLayout(frameAdvancedLayout, 2, 2, 10, 5);
TQGridLayout *layoutAdvancedLayout = new TQGridLayout(frameAdvancedLayout, 2, 2, 10, 5);
m_lilyLyricsHAlignment = new KComboBox( frameAdvancedLayout );
m_lilyLyricsHAlignment->insertItem(i18n("Left"));
@ -253,14 +253,14 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
m_lilyLyricsHAlignment->insertItem(i18n("Right"));
m_lilyLyricsHAlignment->setCurrentItem(config->readUnsignedNumEntry("lilylyricshtqalignment", 0));
tqlayoutAdvancedLayout->addWidget(new TQLabel(
layoutAdvancedLayout->addWidget(new TQLabel(
i18n("Lyrics tqalignment"), frameAdvancedLayout), 0, 0);
tqlayoutAdvancedLayout->addWidget(m_lilyLyricsHAlignment, 0, 1);
layoutAdvancedLayout->addWidget(m_lilyLyricsHAlignment, 0, 1);
m_lilyRaggedBottom = new TQCheckBox(
i18n("Ragged bottom (systems will not be spread vertically across the page)"), frameAdvancedLayout);
m_lilyRaggedBottom->setChecked(config->readBoolEntry("lilyraggedbottom", false));
tqlayoutAdvancedLayout->addMultiCellWidget(m_lilyRaggedBottom, 1, 2, 0, 1);
layoutAdvancedLayout->addMultiCellWidget(m_lilyRaggedBottom, 1, 2, 0, 1);
TQGroupBox *miscOptionsBox = new TQGroupBox
(1, Qt::Horizontal,
@ -268,17 +268,17 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
advancedGrid->addWidget(miscOptionsBox, 1, 0);
TQFrame *frameMisc = new TQFrame(miscOptionsBox);
TQGridLayout *tqlayoutMisc = new TQGridLayout(frameMisc, 2, 2, 10, 5);
TQGridLayout *layoutMisc = new TQGridLayout(frameMisc, 2, 2, 10, 5);
m_lilyExportPointAndClick = new TQCheckBox(
i18n("Enable \"point and click\" debugging"), frameMisc);
m_lilyExportPointAndClick->setChecked(config->readBoolEntry("lilyexportpointandclick", false));
tqlayoutMisc->addMultiCellWidget(m_lilyExportPointAndClick, 0, 0, 0, 1);
layoutMisc->addMultiCellWidget(m_lilyExportPointAndClick, 0, 0, 0, 1);
m_lilyExportMidi = new TQCheckBox(
i18n("Export \\midi block"), frameMisc);
m_lilyExportMidi->setChecked(config->readBoolEntry("lilyexportmidi", false));
tqlayoutMisc->addMultiCellWidget(m_lilyExportMidi, 1, 1, 0, 1);
layoutMisc->addMultiCellWidget(m_lilyExportMidi, 1, 1, 0, 1);
m_lilyMarkerMode = new KComboBox(frameMisc);
m_lilyMarkerMode->insertItem(i18n("No markers"));
@ -286,9 +286,9 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent,
m_lilyMarkerMode->insertItem(i18n("Marker text"));
m_lilyMarkerMode->setCurrentItem(config->readUnsignedNumEntry("lilyexportmarkermode", 0));
tqlayoutMisc->addWidget( new TQLabel(
layoutMisc->addWidget( new TQLabel(
i18n("Export markers"), frameMisc),2, 0 );
tqlayoutMisc->addWidget(m_lilyMarkerMode, 2, 1);
layoutMisc->addWidget(m_lilyMarkerMode, 2, 1);
advancedGrid->setRowStretch(2, 10);

8
src/gui/editors/matrix/MatrixMover.cpp
Unescape View File

@ -420,7 +420,7 @@ void MatrixMover::handleMouseRelease(timeT newTime,
void MatrixMover::ready()
{
connect(m_tqparentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
connect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
this, TQT_SLOT(slotMatrixScrolled(int, int)));
connect(this, TQT_SIGNAL(hoveredOverNoteChanged(int, bool, timeT)),
m_mParentView, TQT_SLOT(slotHoveredOverNoteChanged(int, bool, timeT)));
@ -430,7 +430,7 @@ void MatrixMover::ready()
void MatrixMover::stow()
{
disconnect(m_tqparentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
disconnect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
this, TQT_SLOT(slotMatrixScrolled(int, int)));
disconnect(this, TQT_SIGNAL(hoveredOverNoteChanged(int, bool, timeT)),
m_mParentView, TQT_SLOT(slotHoveredOverNoteChanged(int, bool, timeT)));
@ -441,8 +441,8 @@ void MatrixMover::slotMatrixScrolled(int newX, int newY)
if (!m_currentElement)
return ;
TQPoint newP1(newX, newY), oldP1(m_tqparentView->getCanvasView()->contentsX(),
m_tqparentView->getCanvasView()->contentsY());
TQPoint newP1(newX, newY), oldP1(m_parentView->getCanvasView()->contentsX(),
m_parentView->getCanvasView()->contentsY());
TQPoint offset = newP1 - oldP1;

8
src/gui/editors/matrix/MatrixPainter.cpp
Unescape View File

@ -320,7 +320,7 @@ void MatrixPainter::handleMouseRelease(timeT endTime,
void MatrixPainter::ready()
{
connect(m_tqparentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
connect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
this, TQT_SLOT(slotMatrixScrolled(int, int)));
m_mParentView->setCanvasCursor(TQt::crossCursor);
@ -330,7 +330,7 @@ void MatrixPainter::ready()
void MatrixPainter::stow()
{
disconnect(m_tqparentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
disconnect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
this, TQT_SLOT(slotMatrixScrolled(int, int)));
}
@ -339,8 +339,8 @@ void MatrixPainter::slotMatrixScrolled(int newX, int newY)
if (!m_currentElement)
return ;
TQPoint newP1(newX, newY), oldP1(m_tqparentView->getCanvasView()->contentsX(),
m_tqparentView->getCanvasView()->contentsY());
TQPoint newP1(newX, newY), oldP1(m_parentView->getCanvasView()->contentsX(),
m_parentView->getCanvasView()->contentsY());
TQPoint offset = newP1 - oldP1;

10
src/gui/editors/matrix/MatrixResizer.cpp
Unescape View File

@ -289,7 +289,7 @@ void MatrixResizer::handleMouseRelease(timeT newTime,
void MatrixResizer::ready()
{
connect(m_tqparentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
connect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
this, TQT_SLOT(slotMatrixScrolled(int, int)));
m_mParentView->setCanvasCursor(TQt::sizeHorCursor);
setBasicContextHelp();
@ -297,19 +297,19 @@ void MatrixResizer::ready()
void MatrixResizer::stow()
{
disconnect(m_tqparentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
disconnect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
this, TQT_SLOT(slotMatrixScrolled(int, int)));
}
void MatrixResizer::slotMatrixScrolled(int newX, int newY)
{
TQPoint newP1(newX, newY), oldP1(m_tqparentView->getCanvasView()->contentsX(),
m_tqparentView->getCanvasView()->contentsY());
TQPoint newP1(newX, newY), oldP1(m_parentView->getCanvasView()->contentsX(),
m_parentView->getCanvasView()->contentsY());
TQPoint p(newX, newY);
if (newP1.x() > oldP1.x()) {
p.setX(newX + m_tqparentView->getCanvasView()->visibleWidth());
p.setX(newX + m_parentView->getCanvasView()->visibleWidth());
}
p = m_mParentView->inverseMapPoint(p);

18
src/gui/editors/matrix/MatrixSelector.cpp
Unescape View File

@ -71,7 +71,7 @@ MatrixSelector::MatrixSelector(MatrixView* view)
m_matrixView(view),
m_selectionToMerge(0)
{
connect(m_tqparentView, TQT_SIGNAL(usedSelection()),
connect(m_parentView, TQT_SIGNAL(usedSelection()),
this, TQT_SLOT(slotHideSelection()));
new KAction(i18n("Switch to Draw Tool"), "pencil", 0, this,
@ -153,10 +153,10 @@ void MatrixSelector::handleLeftButtonPress(timeT time,
resizeStart = x + width - 10;
if (p.x() > resizeStart) {
m_dispatchTool = m_tqparentView->
m_dispatchTool = m_parentView->
getToolBox()->getTool(MatrixResizer::ToolName);
} else {
m_dispatchTool = m_tqparentView->
m_dispatchTool = m_parentView->
getToolBox()->getTool(MatrixMover::ToolName);
}
@ -214,7 +214,7 @@ void MatrixSelector::handleLeftButtonPress(timeT time,
}
}
//m_tqparentView->setCursorPosition(p.x());
//m_parentView->setCursorPosition(p.x());
}
void MatrixSelector::handleMidButtonPress(timeT time,
@ -229,7 +229,7 @@ void MatrixSelector::handleMidButtonPress(timeT time,
if (dynamic_cast<MatrixElement*>(element))
return ;
m_dispatchTool = m_tqparentView->
m_dispatchTool = m_parentView->
getToolBox()->getTool(MatrixPainter::ToolName);
m_dispatchTool->ready();
@ -447,7 +447,7 @@ void MatrixSelector::ready()
//m_mParentView->setPositionTracking(false);
}
connect(m_tqparentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
connect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
this, TQT_SLOT(slotMatrixScrolled(int, int)));
setContextHelp(i18n("Click and drag to select; middle-click and drag to draw new note"));
@ -461,7 +461,7 @@ void MatrixSelector::stow()
m_mParentView->canvas()->update();
}
disconnect(m_tqparentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
disconnect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
this, TQT_SLOT(slotMatrixScrolled(int, int)));
}
@ -478,8 +478,8 @@ void MatrixSelector::slotHideSelection()
void MatrixSelector::slotMatrixScrolled(int newX, int newY)
{
if (m_updateRect) {
int offsetX = newX - m_tqparentView->getCanvasView()->contentsX();
int offsetY = newY - m_tqparentView->getCanvasView()->contentsY();
int offsetX = newX - m_parentView->getCanvasView()->contentsX();
int offsetY = newY - m_parentView->getCanvasView()->contentsY();
int w = int(m_selectionRect->width() + offsetX);
int h = int(m_selectionRect->height() + offsetY);

10
src/gui/editors/matrix/MatrixTool.cpp
Unescape View File

@ -42,31 +42,31 @@ MatrixTool::MatrixTool(const TQString& menuName, MatrixView* tqparent)
void
MatrixTool::slotSelectSelected()
{
m_tqparentView->actionCollection()->action("select")->activate();
m_parentView->actionCollection()->action("select")->activate();
}
void
MatrixTool::slotMoveSelected()
{
m_tqparentView->actionCollection()->action("move")->activate();
m_parentView->actionCollection()->action("move")->activate();
}
void
MatrixTool::slotEraseSelected()
{
m_tqparentView->actionCollection()->action("erase")->activate();
m_parentView->actionCollection()->action("erase")->activate();
}
void
MatrixTool::slotResizeSelected()
{
m_tqparentView->actionCollection()->action("resize")->activate();
m_parentView->actionCollection()->action("resize")->activate();
}
void
MatrixTool::slotDrawSelected()
{
m_tqparentView->actionCollection()->action("draw")->activate();
m_parentView->actionCollection()->action("draw")->activate();
}
const SnapGrid &

14
src/gui/editors/matrix/MatrixView.cpp
Unescape View File

@ -179,7 +179,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
TQT_TQOBJECT(this), TQT_SLOT(slotParametersClosed()));
connect(m_dockLeft, TQT_SIGNAL(hasUndocked()),
TQT_TQOBJECT(this), TQT_SLOT(slotParametersClosed()));
// Aptqparently, hasUndocked() is emitted when the dock widget's
// Apparently, hasUndocked() is emitted when the dock widget's
// 'close' button on the dock handle is clicked.
connect(m_mainDockWidget, TQT_SIGNAL(docking(KDockWidget*, KDockWidget::DockPosition)),
TQT_TQOBJECT(this), TQT_SLOT(slotParametersDockedBack(KDockWidget*, KDockWidget::DockPosition)));
@ -432,8 +432,8 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc,
MATRIX_DEBUG << "MatrixView : applying tqlayout\n";
bool tqlayoutApplied = applyLayout();
if (!tqlayoutApplied)
bool layoutApplied = applyLayout();
if (!layoutApplied)
KMessageBox::sorry(0, i18n("Couldn't apply piano roll tqlayout"));
else {
MATRIX_DEBUG << "MatrixView : rendering elements\n";
@ -2314,8 +2314,8 @@ MatrixView::slotZoomOut()
void
MatrixView::scrollToTime(timeT t)
{
double tqlayoutCoord = m_htqlayout.getXForTime(t);
getCanvasView()->slotScrollHoriz(int(tqlayoutCoord));
double layoutCoord = m_htqlayout.getXForTime(t);
getCanvasView()->slotScrollHoriz(int(layoutCoord));
}
int
@ -3048,8 +3048,8 @@ MatrixView::slotPercussionSetChanged(Instrument * newInstr)
// Update matrix canvas
readjustCanvasSize();
bool tqlayoutApplied = applyLayout();
if (!tqlayoutApplied)
bool layoutApplied = applyLayout();
if (!layoutApplied)
KMessageBox::sorry(0, i18n("Couldn't apply piano roll tqlayout"));
else {
MATRIX_DEBUG << "MatrixView : rendering elements\n";

4
src/gui/editors/notation/ClefInserter.cpp
Unescape View File

@ -75,12 +75,12 @@ void ClefInserter::slotNotesSelected()
void ClefInserter::slotEraseSelected()
{
m_tqparentView->actionCollection()->action("erase")->activate();
m_parentView->actionCollection()->action("erase")->activate();
}
void ClefInserter::slotSelectSelected()
{
m_tqparentView->actionCollection()->action("select")->activate();
m_parentView->actionCollection()->action("select")->activate();
}
void ClefInserter::ready()

4
src/gui/editors/notation/GuitarChordInserter.cpp
Unescape View File

@ -85,12 +85,12 @@ void GuitarChordInserter::slotGuitarChordSelected()
void GuitarChordInserter::slotEraseSelected()
{
m_tqparentView->actionCollection()->action("erase")->activate();
m_parentView->actionCollection()->action("erase")->activate();
}
void GuitarChordInserter::slotSelectSelected()
{
m_tqparentView->actionCollection()->action("select")->activate();
m_parentView->actionCollection()->action("select")->activate();
}
void GuitarChordInserter::handleLeftButtonPress(timeT,

2
src/gui/editors/notation/NotationChord.cpp
Unescape View File

@ -110,7 +110,7 @@ NotationChord::hasStemUp() const
NotationRules rules;
// believe anything found in any of the notes, if in a persistent
// property or a property aptqparently set by the beaming algorithm
// property or a property apparently set by the beaming algorithm
Iterator i(getInitialNote());

2
src/gui/editors/notation/NotationEraser.cpp
Unescape View File

@ -106,7 +106,7 @@ void NotationEraser::slotInsertSelected()
void NotationEraser::slotSelectSelected()
{
m_tqparentView->actionCollection()->action("select")->activate();
m_parentView->actionCollection()->action("select")->activate();
}
const TQString NotationEraser::ToolName = "notationeraser";

38
src/gui/editors/notation/NotationHLayout.cpp
Unescape View File

@ -324,7 +324,7 @@ NotationHLayout::scanStaff(Staff &staff, timeT startTime, timeT endTime)
setBarBasicData(staff, barNo, from, barCorrect, timeSignature, newTimeSig);
BarDataList::iterator bdli(barList.find(barNo));
bdli->second.tqlayoutData.needsLayout = true;
bdli->second.layoutData.needsLayout = true;
ChunkList &chunks = bdli->second.chunks;
chunks.clear();
@ -655,10 +655,10 @@ NotationHLayout::scanChord(NotationElementList *notes,
extraWidth += e;
}
float tqlayoutExtra = 0;
float layoutExtra = 0;
if (chord.hasNoteHeadShifted()) {
if (chord.hasStemUp()) {
tqlayoutExtra += npf->getNoteBodyWidth();
layoutExtra += npf->getNoteBodyWidth();
} else {
extraWidth = std::max(extraWidth, float(npf->getNoteBodyWidth()));
}
@ -686,13 +686,13 @@ NotationHLayout::scanChord(NotationElementList *notes,
if (grace) {
chunks.push_back(Chunk(d, chord.getSubOrdering(),
extraWidth + tqlayoutExtra
extraWidth + layoutExtra
+ getLayoutWidth(**myLongest, npf, key)
- npf->getNoteBodyWidth(), // tighten up
0));
} else {
chunks.push_back(Chunk(d, 0, extraWidth,
std::max(tqlayoutExtra +
std::max(layoutExtra +
getLayoutWidth(**myLongest, npf, key),
lyricWidth)));
lyricWidth = 0;
@ -847,7 +847,7 @@ NotationHLayout::preSquishBar(int barNo)
bdli->second.sizeData.reconciledWidth =
bdli->second.sizeData.idealWidth;
bdli->second.tqlayoutData.needsLayout = true;
bdli->second.layoutData.needsLayout = true;
}
}
}
@ -987,7 +987,7 @@ NotationHLayout::reconcileBarsLinear()
double diff = maxWidth - bd.reconciledWidth;
if (diff < -0.1 || diff > 0.1) {
NOTATION_DEBUG << "(So needsLayout becomes true)" << endl;
bdli->second.tqlayoutData.needsLayout = true;
bdli->second.layoutData.needsLayout = true;
}
bd.reconciledWidth = maxWidth;
}
@ -1181,7 +1181,7 @@ NotationHLayout::reconcileBarsPage()
BarData::SizeData &bd(bdli->second.sizeData);
double diff = maxWidth - bd.reconciledWidth;
if (diff < -0.1 || diff > 0.1) {
bdli->second.tqlayoutData.needsLayout = true;
bdli->second.layoutData.needsLayout = true;
}
bd.reconciledWidth = maxWidth;
}
@ -1247,7 +1247,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
bool isFullLayout = (startTime == endTime);
// these two are for partial tqlayouts:
// these two are for partial layouts:
// bool haveSimpleOffset = false;
// double simpleOffset = 0;
@ -1303,9 +1303,9 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
NOTATION_DEBUG << "Start is to" << endl;
}
if (!bdi->second.tqlayoutData.needsLayout) {
if (!bdi->second.layoutData.needsLayout) {
double offset = barX - bdi->second.tqlayoutData.x;
double offset = barX - bdi->second.layoutData.x;
NOTATION_DEBUG << "NotationHLayout::tqlayout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl;
@ -1314,10 +1314,10 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
continue;
}
bdi->second.tqlayoutData.x += offset;
bdi->second.layoutData.x += offset;
if (bdi->second.basicData.newTimeSig)
bdi->second.tqlayoutData.timeSigX += (int)offset;
bdi->second.layoutData.timeSigX += (int)offset;
for (NotationElementList::iterator it = from;
it != to && it != notes->end(); ++it) {
@ -1333,7 +1333,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
continue;
}
bdi->second.tqlayoutData.x = barX;
bdi->second.layoutData.x = barX;
// x = barX + getPostBarMargin();
bool timeSigToPlace = false;
@ -1446,9 +1446,9 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
}
// NOTATION_DEBUG << "Placing timesig at " << (x - fixed) << endl;
// bdi->second.tqlayoutData.timeSigX = (int)(x - fixed);
// bdi->second.layoutData.timeSigX = (int)(x - fixed);
NOTATION_DEBUG << "Placing timesig at " << sigx << " (would previously have been " << int(x-fixed) << "?)" << endl;
bdi->second.tqlayoutData.timeSigX = (int)sigx;
bdi->second.layoutData.timeSigX = (int)sigx;
double shift = getFixedItemSpacing() +
m_npf->getTimeSigWidth(timeSignature);
offset += shift;
@ -1571,7 +1571,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
// no other events in this bar, so we never managed to place it
x = barX + offset;
NOTATION_DEBUG << "Placing timesig reluctantly at " << x << endl;
bdi->second.tqlayoutData.timeSigX = (int)(x);
bdi->second.layoutData.timeSigX = (int)(x);
timeSigToPlace = false;
}
@ -1583,7 +1583,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
}
m_groupsExtant.clear();
bdi->second.tqlayoutData.needsLayout = false;
bdi->second.layoutData.needsLayout = false;
}
}
@ -2024,7 +2024,7 @@ bool NotationHLayout::getTimeSignaturePosition(Staff &staff,
BarDataList::iterator bdli(bdl.find(i));
if (bdli != bdl.end()) {
timeSig = bdli->second.basicData.timeSignature;
timeSigX = (double)(bdli->second.tqlayoutData.timeSigX);
timeSigX = (double)(bdli->second.layoutData.timeSigX);
return bdli->second.basicData.newTimeSig;
} else
return 0;

8
src/gui/editors/notation/NotationHLayout.h
Unescape View File

@ -291,7 +291,7 @@ protected:
double x; // coordinate for display of barline
int timeSigX;
} tqlayoutData;
} layoutData;
BarData(NotationElementList::iterator i,
bool correct, TimeSignature timeSig, bool newTimeSig) {
@ -304,9 +304,9 @@ protected:
sizeData.fixedWidth = 0;
sizeData.clefKeyWidth = 0;
sizeData.actualDuration = 0;
tqlayoutData.needsLayout = true;
tqlayoutData.x = -1;
tqlayoutData.timeSigX = -1;
layoutData.needsLayout = true;
layoutData.x = -1;
layoutData.timeSigX = -1;
}
};

8
src/gui/editors/notation/NotationSelectionPaster.cpp
Unescape View File

@ -75,14 +75,14 @@ void NotationSelectionPaster::handleLeftButtonPress(timeT,
Segment& segment = staff->getSegment();
PasteEventsCommand *command = new PasteEventsCommand
(segment, m_tqparentView->getDocument()->getClipboard(), time,
(segment, m_parentView->getDocument()->getClipboard(), time,
PasteEventsCommand::Restricted);
if (!command->isPossible()) {
m_tqparentView->slotStatusHelpMsg(i18n("Couldn't paste at this point"));
m_parentView->slotStatusHelpMsg(i18n("Couldn't paste at this point"));
} else {
m_tqparentView->addCommandToHistory(command);
m_tqparentView->slotStatusHelpMsg(i18n("Ready."));
m_parentView->addCommandToHistory(command);
m_parentView->slotStatusHelpMsg(i18n("Ready."));
}
}

36
src/gui/editors/notation/NotationSelector.cpp
Unescape View File

@ -71,11 +71,11 @@ NotationSelector::NotationSelector(NotationView* view)
m_justSelectedBar(false),
m_wholeStaffSelectionComplete(false)
{
connect(m_tqparentView, TQT_SIGNAL(usedSelection()),
connect(m_parentView, TQT_SIGNAL(usedSelection()),
this, TQT_SLOT(slotHideSelection()));
connect(this, TQT_SIGNAL(editElement(NotationStaff *, NotationElement *, bool)),
m_tqparentView, TQT_SLOT(slotEditElement(NotationStaff *, NotationElement *, bool)));
m_parentView, TQT_SLOT(slotEditElement(NotationStaff *, NotationElement *, bool)));
TQIconSet icon
(NotePixmapFactory::toTQPixmap(NotePixmapFactory::
@ -188,7 +188,7 @@ void NotationSelector::handleLeftButtonPress(timeT t,
m_updateRect = true;
m_startedFineDrag = false;
//m_tqparentView->setCursorPosition(p.x());
//m_parentView->setCursorPosition(p.x());
}
void NotationSelector::handleRightButtonPress(timeT t,
@ -460,7 +460,7 @@ void NotationSelector::drag(int x, int y, bool final)
::Rosegarden::Key key;
timeT dragTime = clickedTime;
double tqlayoutX = m_clickedElement->getLayoutX();
double layoutX = m_clickedElement->getLayoutX();
timeT duration = m_clickedElement->getViewDuration();
NotationElementList::iterator itr =
@ -470,7 +470,7 @@ void NotationSelector::drag(int x, int y, bool final)
NotationElement *elt = dynamic_cast<NotationElement *>(*itr);
dragTime = elt->getViewAbsoluteTime();
tqlayoutX = elt->getLayoutX();
layoutX = elt->getLayoutX();
if (elt->isRest() && duration > 0 && elt->getCanvasItem()) {
@ -490,7 +490,7 @@ void NotationSelector::drag(int x, int y, bool final)
part = parts - 1;
dragTime += part * restDuration / parts;
tqlayoutX += part * restWidth / parts +
layoutX += part * restWidth / parts +
(restX - elt->getCanvasX());
}
}
@ -532,7 +532,7 @@ void NotationSelector::drag(int x, int y, bool final)
m_clickedElement->isNote()) {
m_nParentView->showPreviewNote(targetStaff->getId(),
tqlayoutX, pitch, height,
layoutX, pitch, height,
Note::getNearestNote(duration),
m_clickedElement->isGrace());
m_lastDragPitch = pitch;
@ -738,57 +738,57 @@ void NotationSelector::slotInsertSelected()
void NotationSelector::slotEraseSelected()
{
m_tqparentView->actionCollection()->action("erase")->activate();
m_parentView->actionCollection()->action("erase")->activate();
}
void NotationSelector::slotCollapseRestsHard()
{
m_tqparentView->actionCollection()->action("collapse_rests_aggressively")->activate();
m_parentView->actionCollection()->action("collapse_rests_aggressively")->activate();
}
void NotationSelector::slotRespellFlat()
{
m_tqparentView->actionCollection()->action("respell_flat")->activate();
m_parentView->actionCollection()->action("respell_flat")->activate();
}
void NotationSelector::slotRespellSharp()
{
m_tqparentView->actionCollection()->action("respell_sharp")->activate();
m_parentView->actionCollection()->action("respell_sharp")->activate();
}
void NotationSelector::slotRespellNatural()
{
m_tqparentView->actionCollection()->action("respell_natural")->activate();
m_parentView->actionCollection()->action("respell_natural")->activate();
}
void NotationSelector::slotCollapseNotes()
{
m_tqparentView->actionCollection()->action("collapse_notes")->activate();
m_parentView->actionCollection()->action("collapse_notes")->activate();
}
void NotationSelector::slotInterpret()
{
m_tqparentView->actionCollection()->action("interpret")->activate();
m_parentView->actionCollection()->action("interpret")->activate();
}
void NotationSelector::slotStaffAbove()
{
m_tqparentView->actionCollection()->action("move_events_up_staff")->activate();
m_parentView->actionCollection()->action("move_events_up_staff")->activate();
}
void NotationSelector::slotStaffBelow()
{
m_tqparentView->actionCollection()->action("move_events_down_staff")->activate();
m_parentView->actionCollection()->action("move_events_down_staff")->activate();
}
void NotationSelector::slotMakeInvisible()
{
m_tqparentView->actionCollection()->action("make_invisible")->activate();
m_parentView->actionCollection()->action("make_invisible")->activate();
}
void NotationSelector::slotMakeVisible()
{
m_tqparentView->actionCollection()->action("make_visible")->activate();
m_parentView->actionCollection()->action("make_visible")->activate();
}
void NotationSelector::setViewCurrentSelection(bool preview)

54
src/gui/editors/notation/NotationStaff.cpp
Unescape View File

@ -141,7 +141,7 @@ NotationStaff::changeFont(std::string fontName, int size)
}
void
NotationStaff::insertTimeSignature(double tqlayoutX,
NotationStaff::insertTimeSignature(double layoutX,
const TimeSignature &timeSig)
{
if (timeSig.isHidden())
@ -150,10 +150,10 @@ NotationStaff::insertTimeSignature(double tqlayoutX,
m_notePixmapFactory->setSelected(false);
TQCanvasPixmap *pixmap = m_notePixmapFactory->makeTimeSigPixmap(timeSig);
TQCanvasTimeSigSprite *sprite =
new TQCanvasTimeSigSprite(tqlayoutX, pixmap, m_canvas);
new TQCanvasTimeSigSprite(layoutX, pixmap, m_canvas);
LinedStaffCoords sigCoords =
getCanvasCoordsForLayoutCoords(tqlayoutX, getLayoutYForHeight(4));
getCanvasCoordsForLayoutCoords(layoutX, getLayoutYForHeight(4));
sprite->move(sigCoords.first, (double)sigCoords.second);
sprite->show();
@ -174,7 +174,7 @@ NotationStaff::deleteTimeSignatures()
}
void
NotationStaff::insertRepeatedClefAndKey(double tqlayoutX, int barNo)
NotationStaff::insertRepeatedClefAndKey(double layoutX, int barNo)
{
bool needClef = false, needKey = false;
timeT t;
@ -196,10 +196,10 @@ NotationStaff::insertRepeatedClefAndKey(double tqlayoutX, int barNo)
if (needClef) {
int tqlayoutY = getLayoutYForHeight(clef.getAxisHeight());
int layoutY = getLayoutYForHeight(clef.getAxisHeight());
LinedStaffCoords coords =
getCanvasCoordsForLayoutCoords(tqlayoutX + dx, tqlayoutY);
getCanvasCoordsForLayoutCoords(layoutX + dx, layoutY);
TQCanvasPixmap *pixmap = m_notePixmapFactory->makeClefPixmap(clef);
@ -215,10 +215,10 @@ NotationStaff::insertRepeatedClefAndKey(double tqlayoutX, int barNo)
if (needKey) {
int tqlayoutY = getLayoutYForHeight(12);
int layoutY = getLayoutYForHeight(12);
LinedStaffCoords coords =
getCanvasCoordsForLayoutCoords(tqlayoutX + dx, tqlayoutY);
getCanvasCoordsForLayoutCoords(layoutX + dx, layoutY);
TQCanvasPixmap *pixmap = m_notePixmapFactory->makeKeyPixmap(key, clef);
@ -236,11 +236,11 @@ NotationStaff::insertRepeatedClefAndKey(double tqlayoutX, int barNo)
if (m_notationView->isInPrintMode() && (needClef || needKey)) {
int tqlayoutY = getLayoutYForHeight(14);
int h = getLayoutYForHeight(-8) - tqlayoutY;
int layoutY = getLayoutYForHeight(14);
int h = getLayoutYForHeight(-8) - layoutY;
LinedStaffCoords coords =
getCanvasCoordsForLayoutCoords(tqlayoutX, tqlayoutY);
getCanvasCoordsForLayoutCoords(layoutX, layoutY);
TQCanvasRectangle *rect = new TQCanvasRectangle(coords.first, coords.second,
dx, h, m_canvas);
@ -282,8 +282,8 @@ NotationStaff::drawStaffName()
m_staffName = new QCanvasStaffNameSprite(map, m_canvas);
int tqlayoutY = getLayoutYForHeight(3);
LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(0, tqlayoutY);
int layoutY = getLayoutYForHeight(3);
LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(0, layoutY);
m_staffName->move(getX() + getMargin() + m_notePixmapFactory->getNoteBodyWidth(),
coords.second - map->height() / 2);
m_staffName->show();
@ -300,9 +300,9 @@ NotationStaff::isStaffNameUpToDate()
timeT
NotationStaff::getTimeAtCanvasCoords(double cx, int cy) const
{
LinedStaffCoords tqlayoutCoords = getLayoutCoordsForCanvasCoords(cx, cy);
LinedStaffCoords layoutCoords = getLayoutCoordsForCanvasCoords(cx, cy);
RulerScale * rs = m_notationView->getHLayout();
return rs->getTimeForX(tqlayoutCoords.first);
return rs->getTimeForX(layoutCoords.first);
}
void
@ -310,17 +310,17 @@ NotationStaff::getClefAndKeyAtCanvasCoords(double cx, int cy,
Clef &clef,
::Rosegarden::Key &key) const
{
LinedStaffCoords tqlayoutCoords = getLayoutCoordsForCanvasCoords(cx, cy);
LinedStaffCoords layoutCoords = getLayoutCoordsForCanvasCoords(cx, cy);
int i;
for (i = 0; i < m_clefChanges.size(); ++i) {
if (m_clefChanges[i].first > tqlayoutCoords.first)
if (m_clefChanges[i].first > layoutCoords.first)
break;
clef = m_clefChanges[i].second;
}
for (i = 0; i < m_keyChanges.size(); ++i) {
if (m_keyChanges[i].first > tqlayoutCoords.first)
if (m_keyChanges[i].first > layoutCoords.first)
break;
key = m_keyChanges[i].second;
}
@ -1395,15 +1395,15 @@ void
NotationStaff::setPixmap(NotationElement *elt, TQCanvasPixmap *pixmap, int z,
FitPolicy policy)
{
double tqlayoutX = elt->getLayoutX();
int tqlayoutY = (int)elt->getLayoutY();
double layoutX = elt->getLayoutX();
int layoutY = (int)elt->getLayoutY();
elt->removeCanvasItem();
while (1) {
LinedStaffCoords coords =
getCanvasCoordsForLayoutCoords(tqlayoutX, tqlayoutY);
getCanvasCoordsForLayoutCoords(layoutX, layoutY);
double canvasX = coords.first;
int canvasY = coords.second;
@ -1416,7 +1416,7 @@ NotationStaff::setPixmap(NotationElement *elt, TQCanvasPixmap *pixmap, int z,
} else {
int row = getRowForLayoutX(tqlayoutX);
int row = getRowForLayoutX(layoutX);
double rightMargin = getCanvasXForRightOfRow(row);
double extent = canvasX + pixmap->width();
@ -1452,7 +1452,7 @@ NotationStaff::setPixmap(NotationElement *elt, TQCanvasPixmap *pixmap, int z,
delete pixmap;
pixmap = rightCanvasPixmap;
tqlayoutX += rightMargin - canvasX + 0.01; // ensure flip to next row
layoutX += rightMargin - canvasX + 0.01; // ensure flip to next row
continue;
@ -1460,7 +1460,7 @@ NotationStaff::setPixmap(NotationElement *elt, TQCanvasPixmap *pixmap, int z,
item = new TQCanvasNotationSprite(*elt, pixmap, m_canvas);
elt->setLayoutX(elt->getLayoutX() - (extent - rightMargin));
coords = getCanvasCoordsForLayoutCoords(tqlayoutX, tqlayoutY);
coords = getCanvasCoordsForLayoutCoords(layoutX, layoutY);
canvasX = coords.first;
}
} else {
@ -1823,7 +1823,7 @@ NotationStaff::isSelected(NotationElementList::iterator it)
}
void
NotationStaff::showPreviewNote(double tqlayoutX, int heightOnStaff,
NotationStaff::showPreviewNote(double layoutX, int heightOnStaff,
const Note &note, bool grace)
{
NotePixmapFactory *npf = m_notePixmapFactory;
@ -1851,8 +1851,8 @@ NotationStaff::showPreviewNote(double tqlayoutX, int heightOnStaff,
m_previewSprite = new QCanvasSimpleSprite
(npf->makeNotePixmap(params), m_canvas);
int tqlayoutY = getLayoutYForHeight(heightOnStaff);
LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(tqlayoutX, tqlayoutY);
int layoutY = getLayoutYForHeight(heightOnStaff);
LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(layoutX, layoutY);
m_previewSprite->move(coords.first, (double)coords.second);
m_previewSprite->setZ(4);

8
src/gui/editors/notation/NotationStaff.h
Unescape View File

@ -223,7 +223,7 @@ public:
/**
* Insert time signature at x-coordinate \a x.
*/
virtual void insertTimeSignature(double tqlayoutX,
virtual void insertTimeSignature(double layoutX,
const TimeSignature &timeSig);
/**
@ -234,7 +234,7 @@ public:
/**
* Insert repeated clef and key at start of new line, at x-coordinate \a x.
*/
virtual void insertRepeatedClefAndKey(double tqlayoutX, int barNo);
virtual void insertRepeatedClefAndKey(double layoutX, int barNo);
/**
* Delete all repeated clefs and keys.
@ -301,7 +301,7 @@ public:
* Draw a note on the staff to show an insert position prior to
* an insert.
*/
virtual void showPreviewNote(double tqlayoutX, int heightOnStaff,
virtual void showPreviewNote(double layoutX, int heightOnStaff,
const Note &note, bool grace);
/**
@ -423,7 +423,7 @@ protected:
* This function calls painter.save(), and the caller must call
* painter.restore() after use.
*/
virtual double setPainterClipping(TQPainter *, double tqlayoutX, int tqlayoutY,
virtual double setPainterClipping(TQPainter *, double layoutX, int layoutY,
double dx, double w, LinedStaffCoords &coords,
FitPolicy policy);

2
src/gui/editors/notation/NotationTool.cpp
Unescape View File

@ -44,7 +44,7 @@ NotationTool::~NotationTool()
NOTATION_DEBUG << "NotationTool::~NotationTool()" << endl;
// delete m_menu;
// m_tqparentView->factory()->removeClient(this);
// m_parentView->factory()->removeClient(this);
// m_instance = 0;
}

70
src/gui/editors/notation/NotationView.cpp
Unescape View File

@ -571,15 +571,15 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
m_staffs[0]->setCurrent(true);
m_config->setGroup(NotationViewConfigGroup);
int tqlayoutMode = m_config->readNumEntry("tqlayoutmode", 0);
int layoutMode = m_config->readNumEntry("layoutmode", 0);
try
{
LinedStaff::PageMode mode = LinedStaff::LinearMode;
if (tqlayoutMode == 1)
if (layoutMode == 1)
mode = LinedStaff::ContinuousPageMode;
else if (tqlayoutMode == 2)
else if (layoutMode == 2)
mode = LinedStaff::MultiPageMode;
setPageMode(mode);
@ -1458,7 +1458,7 @@ void NotationView::readOptions()
setOneToolbar("show_clefs_toolbar", "Clefs Toolbar");
setOneToolbar("show_group_toolbar", "Group Toolbar");
setOneToolbar("show_marks_toolbar", "Marks Toolbar");
setOneToolbar("show_tqlayout_toolbar", "Layout Toolbar");
setOneToolbar("show_layout_toolbar", "Layout Toolbar");
setOneToolbar("show_transport_toolbar", "Transport Toolbar");
setOneToolbar("show_accidentals_toolbar", "Accidentals Toolbar");
setOneToolbar("show_meta_toolbar", "Meta Toolbar");
@ -1816,7 +1816,7 @@ void NotationView::setupActions()
//
// Settings menu
//
int tqlayoutMode = m_config->readNumEntry("tqlayoutmode", 0);
int layoutMode = m_config->readNumEntry("layoutmode", 0);
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
@ -1825,8 +1825,8 @@ void NotationView::setupActions()
KRadioAction *linearModeAction = new KRadioAction
(i18n("&Linear Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotLinearMode()),
actionCollection(), "linear_mode");
linearModeAction->setExclusiveGroup("tqlayoutMode");
if (tqlayoutMode == 0)
linearModeAction->setExclusiveGroup("layoutMode");
if (layoutMode == 0)
linearModeAction->setChecked(true);
pixmap.load(pixmapDir + "/toolbar/continuous-page-mode.xpm");
@ -1834,8 +1834,8 @@ void NotationView::setupActions()
KRadioAction *continuousPageModeAction = new KRadioAction
(i18n("&Continuous Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinuousPageMode()),
actionCollection(), "continuous_page_mode");
continuousPageModeAction->setExclusiveGroup("tqlayoutMode");
if (tqlayoutMode == 1)
continuousPageModeAction->setExclusiveGroup("layoutMode");
if (layoutMode == 1)
continuousPageModeAction->setChecked(true);
pixmap.load(pixmapDir + "/toolbar/multi-page-mode.xpm");
@ -1843,8 +1843,8 @@ void NotationView::setupActions()
KRadioAction *multiPageModeAction = new KRadioAction
(i18n("&Multiple Page Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotMultiPageMode()),
actionCollection(), "multi_page_mode");
multiPageModeAction->setExclusiveGroup("tqlayoutMode");
if (tqlayoutMode == 2)
multiPageModeAction->setExclusiveGroup("layoutMode");
if (layoutMode == 2)
multiPageModeAction->setChecked(true);
new KToggleAction(i18n("Show Ch&ord Name Ruler"), 0, TQT_TQOBJECT(this),
@ -2304,7 +2304,7 @@ void NotationView::setupActions()
"palette-marks" },
{ i18n("Show &Group Toolbar"), "1slotToggleGroupToolBar()", "show_group_toolbar",
"palette-group" },
{ i18n("Show &Layout Toolbar"), "1slotToggleLayoutToolBar()", "show_tqlayout_toolbar",
{ i18n("Show &Layout Toolbar"), "1slotToggleLayoutToolBar()", "show_layout_toolbar",
"palette-font" },
{ i18n("Show Trans&port Toolbar"), "1slotToggleTransportToolBar()", "show_transport_toolbar",
"palette-transport" },
@ -2607,21 +2607,21 @@ bool NotationView::isCurrentStaff(int i)
void NotationView::initLayoutToolbar()
{
KToolBar *tqlayoutToolbar = toolBar("Layout Toolbar");
KToolBar *layoutToolbar = toolBar("Layout Toolbar");
if (!tqlayoutToolbar) {
if (!layoutToolbar) {
std::cerr
<< "NotationView::initLayoutToolbar() : tqlayout toolbar not found"
<< std::endl;
return ;
}
new TQLabel(i18n(" Font: "), tqlayoutToolbar, "font label");
new TQLabel(i18n(" Font: "), layoutToolbar, "font label");
//
// font combo
//
m_fontCombo = new KComboBox(tqlayoutToolbar);
m_fontCombo = new KComboBox(layoutToolbar);
m_fontCombo->setEditable(false);
std::set
@ -2652,7 +2652,7 @@ void NotationView::initLayoutToolbar()
connect(m_fontCombo, TQT_SIGNAL(activated(const TQString &)),
this, TQT_SLOT(slotChangeFont(const TQString &)));
new TQLabel(i18n(" Size: "), tqlayoutToolbar, "size label");
new TQLabel(i18n(" Size: "), layoutToolbar, "size label");
TQString value;
@ -2660,7 +2660,7 @@ void NotationView::initLayoutToolbar()
// font size combo
//
std::vector<int> sizes = NoteFontFactory::getScreenSizes(m_fontName);
m_fontSizeCombo = new KComboBox(tqlayoutToolbar, "font size combo");
m_fontSizeCombo = new KComboBox(layoutToolbar, "font size combo");
for (std::vector<int>::iterator i = sizes.begin(); i != sizes.end(); ++i) {
@ -2674,7 +2674,7 @@ void NotationView::initLayoutToolbar()
connect(m_fontSizeCombo, TQT_SIGNAL(activated(const TQString&)),
this, TQT_SLOT(slotChangeFontSizeFromStringValue(const TQString&)));
new TQLabel(i18n(" Spacing: "), tqlayoutToolbar, "spacing label");
new TQLabel(i18n(" Spacing: "), layoutToolbar, "spacing label");
//
// spacing combo
@ -2682,7 +2682,7 @@ void NotationView::initLayoutToolbar()
int defaultSpacing = m_htqlayout->getSpacing();
std::vector<int> spacings = NotationHLayout::getAvailableSpacings();
m_spacingCombo = new KComboBox(tqlayoutToolbar, "spacing combo");
m_spacingCombo = new KComboBox(layoutToolbar, "spacing combo");
for (std::vector<int>::iterator i = spacings.begin(); i != spacings.end(); ++i) {
value.setNum(*i);
@ -2794,8 +2794,8 @@ NotationView::setPageMode(LinedStaff::PageMode pageMode)
positionStaffs();
bool tqlayoutApplied = applyLayout();
if (!tqlayoutApplied)
bool layoutApplied = applyLayout();
if (!layoutApplied)
KMessageBox::sorry(0, "Couldn't apply tqlayout");
else {
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
@ -3329,12 +3329,12 @@ void NotationView::playNote(Segment &s, int pitch, int velocity)
StudioControl::sendMappedEvent(mE);
}
void NotationView::showPreviewNote(int staffNo, double tqlayoutX,
void NotationView::showPreviewNote(int staffNo, double layoutX,
int pitch, int height,
const Note &note, bool grace,
int velocity)
{
m_staffs[staffNo]->showPreviewNote(tqlayoutX, height, note, grace);
m_staffs[staffNo]->showPreviewNote(layoutX, height, note, grace);
playNote(m_staffs[staffNo]->getSegment(), pitch, velocity);
}
@ -3446,10 +3446,10 @@ NotationView::getInsertionTime(Clef &clef,
// the segment but the staff has a more efficient lookup
LinedStaff *staff = m_staffs[m_currentStaff];
double tqlayoutX = staff->getLayoutXOfInsertCursor();
if (tqlayoutX < 0) tqlayoutX = 0;
double layoutX = staff->getLayoutXOfInsertCursor();
if (layoutX < 0) layoutX = 0;
Event *clefEvt = 0, *keyEvt = 0;
(void)staff->getElementUnderLayoutX(tqlayoutX, clefEvt, keyEvt);
(void)staff->getElementUnderLayoutX(layoutX, clefEvt, keyEvt);
if (clefEvt) clef = Clef(*clefEvt);
else clef = Clef();
@ -3599,7 +3599,7 @@ void NotationView::print(bool previewOnly)
// Supplying doublebuffer==true to this method appears to
// slow down printing considerably but without it we get
// all sorts of horrible artifacts (possibly related to
// mishandling of pixmap tqmasks?) in qt-3.0. Let's permit
// mishandling of pixmap masks?) in qt-3.0. Let's permit
// it as a "hidden" option.
m_config->setGroup(NotationViewConfigGroup);
@ -4592,8 +4592,8 @@ NotationView::slotChangeFont(std::string newName, int newSize)
positionStaffs();
bool tqlayoutApplied = applyLayout();
if (!tqlayoutApplied)
bool layoutApplied = applyLayout();
if (!layoutApplied)
KMessageBox::sorry(0, "Couldn't apply tqlayout");
else {
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
@ -6438,7 +6438,7 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll)
for (unsigned int i = 0; i < m_staffs.size(); ++i) {
double tqlayoutX = m_htqlayout->getXForTimeByEvent(time);
double layoutX = m_htqlayout->getXForTimeByEvent(time);
Segment &seg = m_staffs[i]->getSegment();
bool good = true;
@ -6449,7 +6449,7 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll)
seg.getStartTime() +
((time - seg.getStartTime()) %
(seg.getEndMarkerTime() - seg.getStartTime()));
tqlayoutX = m_htqlayout->getXForTimeByEvent(mappedTime);
layoutX = m_htqlayout->getXForTimeByEvent(mappedTime);
} else {
good = false;
}
@ -6463,7 +6463,7 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll)
} else {
m_staffs[i]->setPointerPosition(tqlayoutX);
m_staffs[i]->setPointerPosition(layoutX);
int cy;
m_staffs[i]->getPointerPosition(cx, cy);
@ -7115,8 +7115,8 @@ void NotationView::slotNonNotationItemPressed(TQMouseEvent *e, TQCanvasItem *it)
} else if (dynamic_cast<TQCanvasTimeSigSprite *>(it)) {
double tqlayoutX = (dynamic_cast<TQCanvasTimeSigSprite *>(it))->getLayoutX();
emit editTimeSignature(m_htqlayout->getTimeForX(tqlayoutX));
double layoutX = (dynamic_cast<TQCanvasTimeSigSprite *>(it))->getLayoutX();
emit editTimeSignature(m_htqlayout->getTimeForX(layoutX));
}
}

2
src/gui/editors/notation/NotationView.h
Unescape View File

@ -262,7 +262,7 @@ public:
* the pitch for performance, so the two need not correspond (e.g.
* under ottava there may be octave differences).
*/
void showPreviewNote(int staffNo, double tqlayoutX,
void showPreviewNote(int staffNo, double layoutX,
int pitch, int height,
const Note &note,
bool grace,

26
src/gui/editors/notation/NoteInserter.cpp
Unescape View File

@ -123,7 +123,7 @@ NoteInserter::NoteInserter(NotationView* view)
createMenu("noteinserter.rc");
connect(m_tqparentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
connect(m_parentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
this, TQT_SLOT(slotSetAccidental(Accidental, bool)));
}
@ -137,7 +137,7 @@ NoteInserter::NoteInserter(const TQString& menuName, NotationView* view)
m_lastAccidental(Accidentals::NoAccidental),
m_followAccidental(false)
{
connect(m_tqparentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
connect(m_parentView, TQT_SIGNAL(changeAccidental(Accidental, bool)),
this, TQT_SLOT(slotSetAccidental(Accidental, bool)));
}
@ -623,37 +623,37 @@ void NoteInserter::slotSetAccidental(Accidental accidental,
void NoteInserter::slotNoAccidental()
{
m_tqparentView->actionCollection()->action("no_accidental")->activate();
m_parentView->actionCollection()->action("no_accidental")->activate();
}
void NoteInserter::slotFollowAccidental()
{
m_tqparentView->actionCollection()->action("follow_accidental")->activate();
m_parentView->actionCollection()->action("follow_accidental")->activate();
}
void NoteInserter::slotSharp()
{
m_tqparentView->actionCollection()->action("sharp_accidental")->activate();
m_parentView->actionCollection()->action("sharp_accidental")->activate();
}
void NoteInserter::slotFlat()
{
m_tqparentView->actionCollection()->action("flat_accidental")->activate();
m_parentView->actionCollection()->action("flat_accidental")->activate();
}
void NoteInserter::slotNatural()
{
m_tqparentView->actionCollection()->action("natural_accidental")->activate();
m_parentView->actionCollection()->action("natural_accidental")->activate();
}
void NoteInserter::slotDoubleSharp()
{
m_tqparentView->actionCollection()->action("double_sharp_accidental")->activate();
m_parentView->actionCollection()->action("double_sharp_accidental")->activate();
}
void NoteInserter::slotDoubleFlat()
{
m_tqparentView->actionCollection()->action("double_flat_accidental")->activate();
m_parentView->actionCollection()->action("double_flat_accidental")->activate();
}
void NoteInserter::slotToggleDot()
@ -662,7 +662,7 @@ void NoteInserter::slotToggleDot()
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note));
actionName.tqreplace(TQRegExp("-"), "_");
KAction *action = m_tqparentView->actionCollection()->action(actionName);
KAction *action = m_parentView->actionCollection()->action(actionName);
if (!action) {
std::cerr << "WARNING: No such action as " << actionName << std::endl;
} else {
@ -677,12 +677,12 @@ void NoteInserter::slotToggleAutoBeam()
void NoteInserter::slotEraseSelected()
{
m_tqparentView->actionCollection()->action("erase")->activate();
m_parentView->actionCollection()->action("erase")->activate();
}
void NoteInserter::slotSelectSelected()
{
m_tqparentView->actionCollection()->action("select")->activate();
m_parentView->actionCollection()->action("select")->activate();
}
void NoteInserter::slotRestsSelected()
@ -690,7 +690,7 @@ void NoteInserter::slotRestsSelected()
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note, true));
actionName.tqreplace(TQRegExp("-"), "_");
KAction *action = m_tqparentView->actionCollection()->action(actionName);
KAction *action = m_parentView->actionCollection()->action(actionName);
if (!action) {
std::cerr << "WARNING: No such action as " << actionName << std::endl;
} else {

58
src/gui/editors/notation/NotePixmapFactory.cpp
Unescape View File

@ -893,7 +893,7 @@ NotePixmapFactory::drawMarks(bool isStemmed,
m_p->painter().setFont(m_textMarkFont);
if (!m_inPrinterMethod)
m_p->tqmaskPainter().setFont(m_textMarkFont);
m_p->maskPainter().setFont(m_textMarkFont);
int x = m_left + m_noteBodyWidth / 2 - bounds.width() / 2;
int y = (normalMarksAreAbove ?
@ -978,7 +978,7 @@ NotePixmapFactory::drawMarks(bool isStemmed,
m_p->painter().setFont(m_fingeringFont);
if (!m_inPrinterMethod)
m_p->tqmaskPainter().setFont(m_fingeringFont);
m_p->maskPainter().setFont(m_fingeringFont);
int x = m_left + m_noteBodyWidth / 2 - bounds.width() / 2;
int y = m_above - dy - 3;
@ -1630,7 +1630,7 @@ NotePixmapFactory::drawTuplingLine(const NotePixmapParameters &params)
m_p->painter().setFont(m_tupletCountFont);
if (!m_inPrinterMethod)
m_p->tqmaskPainter().setFont(m_tupletCountFont);
m_p->maskPainter().setFont(m_tupletCountFont);
int textX = endX + countSpace;
int textY = endY + cr.height() / 2;
@ -1894,7 +1894,7 @@ NotePixmapFactory::makeClefPixmap(const Clef &clef)
m_p->painter().setFont(m_clefOttavaFont);
if (!m_inPrinterMethod)
m_p->tqmaskPainter().setFont(m_clefOttavaFont);
m_p->maskPainter().setFont(m_clefOttavaFont);
m_p->drawText(plain.getWidth() / 2 - rect.width() / 2,
oct < 0 ? plain.getHeight() + rect.height() - 1 :
@ -2234,7 +2234,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
m_p->painter().setPen(colour);
m_p->painter().setFont(m_clefOttavaFont);
// m_p->tqmaskPainter().setFont(m_clefOttavaFont);
// m_p->maskPainter().setFont(m_clefOttavaFont);
int xpos = maxDelta + clefChar.getWidth() / 2 - rect.width() / 2;
int ypos = y - clefChar.getHotspot().y() + offset
+ (oct < 0 ? clefChar.getHeight() + rect.height() - 1 : - rect.height() / 3);
@ -2273,7 +2273,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
}
m_p->painter().setFont(m_trackHeaderFont);
// m_p->tqmaskPainter().setFont(m_trackHeaderFont);
// m_p->maskPainter().setFont(m_trackHeaderFont);
TQString text;
TQString textLine;
@ -2315,7 +2315,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
// TODO : use colours from GUIPalette
colour = header->isTransposeInconsistent() ? TQt::red : TQt::black;
m_p->painter().setFont(m_trackHeaderBoldFont);
// m_p->tqmaskPainter().setFont(m_trackHeaderBoldFont);
// m_p->maskPainter().setFont(m_trackHeaderBoldFont);
m_p->painter().setPen(colour);
m_p->drawText(width - transposeWidth - charWidth / 4,
@ -2329,7 +2329,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
// TODO : use colours from GUIPalette
colour = header->isLabelInconsistent() ? TQt::red : TQt::black;
m_p->painter().setFont(m_trackHeaderFont);
// m_p->tqmaskPainter().setFont(m_trackHeaderFont);
// m_p->maskPainter().setFont(m_trackHeaderFont);
m_p->painter().setPen(colour);
text = header->getLowerText();
@ -2759,12 +2759,12 @@ NotePixmapFactory::drawSlurAux(int length, int dy, bool above,
painter->rotate(theta);
} else {
m_p->painter().save();
m_p->tqmaskPainter().save();
m_p->maskPainter().save();
m_p->painter().translate(x, y);
m_p->tqmaskPainter().translate(x, y);
m_p->maskPainter().translate(x, y);
if (rotate) {
m_p->painter().rotate(theta);
m_p->tqmaskPainter().rotate(theta);
m_p->maskPainter().rotate(theta);
}
}
@ -2780,7 +2780,7 @@ NotePixmapFactory::drawSlurAux(int length, int dy, bool above,
m.translate(hotspot.x(), hotspot.y());
m.rotate(theta);
m_p->painter().setWorldMatrix(m);
m_p->tqmaskPainter().setWorldMatrix(m);
m_p->maskPainter().setWorldMatrix(m);
}
if (m_selected)
@ -2843,7 +2843,7 @@ NotePixmapFactory::drawSlurAux(int length, int dy, bool above,
if (painter) {
painter->restore();
if (!m_inPrinterMethod)
m_p->tqmaskPainter().restore();
m_p->maskPainter().restore();
}
}
@ -2907,12 +2907,12 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
m_p->painter().setFont(m_ottavaFont);
if (!m_inPrinterMethod)
m_p->tqmaskPainter().setFont(m_ottavaFont);
m_p->maskPainter().setFont(m_ottavaFont);
m_p->drawText(0, m_ottavaFontMetrics.ascent(), label);
m_p->painter().setPen(pen);
// if (!m_inPrinterMethod) m_p->tqmaskPainter().setPen(pen);
// if (!m_inPrinterMethod) m_p->maskPainter().setPen(pen);
int x0 = m_ottavaFontMetrics.width(label) + thickness;
int x1 = width - thickness;
@ -2925,7 +2925,7 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
pen.setStyle(Qt::SolidLine);
m_p->painter().setPen(pen);
// if (!m_inPrinterMethod) m_p->tqmaskPainter().setPen(pen);
// if (!m_inPrinterMethod) m_p->maskPainter().setPen(pen);
NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: drawing " << x1 << "," << y0 << " to " << x1 << "," << y1 << ", thickness " << thickness << endl;
@ -2933,7 +2933,7 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
m_p->painter().setPen(TQPen());
if (!m_inPrinterMethod)
m_p->tqmaskPainter().setPen(TQPen());
m_p->maskPainter().setPen(TQPen());
if (painter) {
painter->restore();
@ -3043,7 +3043,7 @@ NotePixmapFactory::makeTimeSigPixmap(const TimeSignature& sig)
m_p->painter().setFont(m_bigTimeSigFont);
if (!m_inPrinterMethod)
m_p->tqmaskPainter().setFont(m_bigTimeSigFont);
m_p->maskPainter().setFont(m_bigTimeSigFont);
m_p->drawText(0, r.height() + dy, c);
@ -3122,7 +3122,7 @@ NotePixmapFactory::makeTimeSigPixmap(const TimeSignature& sig)
m_p->painter().setFont(m_timeSigFont);
if (!m_inPrinterMethod)
m_p->tqmaskPainter().setFont(m_timeSigFont);
m_p->maskPainter().setFont(m_timeSigFont);
x = (width - numR.width()) / 2 - 1;
m_p->drawText(x, denomR.height(), numS);
@ -3353,7 +3353,7 @@ NotePixmapFactory::drawTextAux(const Text &text,
m_p->painter().setFont(textFont);
if (!m_inPrinterMethod)
m_p->tqmaskPainter().setFont(textFont);
m_p->maskPainter().setFont(textFont);
m_p->drawText(offset, textMetrics.ascent() + offset, s);
@ -3400,7 +3400,7 @@ NotePixmapFactory::makeAnnotationPixmap(const Text &text, const bool isLilyPondD
m_p->painter().setFont(textFont);
if (!m_inPrinterMethod)
m_p->tqmaskPainter().setFont(textFont);
m_p->maskPainter().setFont(textFont);
if (isLilyPondDirective) {
m_p->painter().setBrush(GUIPalette::getColour(GUIPalette::TextLilyPondDirectiveBackground));
@ -3427,17 +3427,17 @@ NotePixmapFactory::makeAnnotationPixmap(const Text &text, const bool isLilyPondD
void
NotePixmapFactory::createPixmapAndMask(int width, int height,
int tqmaskWidth, int tqmaskHeight)
int maskWidth, int maskHeight)
{
if (tqmaskWidth < 0)
tqmaskWidth = width;
if (tqmaskHeight < 0)
tqmaskHeight = height;
if (maskWidth < 0)
maskWidth = width;
if (maskHeight < 0)
maskHeight = height;
m_generatedWidth = width;
m_generatedHeight = height;
m_generatedPixmap = new TQPixmap(width, height);
m_generatedMask = new TQBitmap(tqmaskWidth, tqmaskHeight);
m_generatedMask = new TQBitmap(maskWidth, maskHeight);
static unsigned long total = 0;
total += width * height;
@ -3452,8 +3452,8 @@ NotePixmapFactory::createPixmapAndMask(int width, int height,
m_p->painter().setPen(TQt::black);
m_p->painter().setBrush(TQt::black);
m_p->tqmaskPainter().setPen(TQt::white);
m_p->tqmaskPainter().setBrush(TQt::white);
m_p->maskPainter().setPen(TQt::white);
m_p->maskPainter().setBrush(TQt::white);
}
TQCanvasPixmap*

4
src/gui/editors/notation/NotePixmapFactory.h
Unescape View File

@ -276,8 +276,8 @@ protected:
TQCanvasPixmap* makeAnnotationPixmap(const Text &text, const bool isLilyPondDirective);
void createPixmapAndMask(int width, int height,
int tqmaskWidth = -1,
int tqmaskHeight = -1);
int maskWidth = -1,
int maskHeight = -1);
TQCanvasPixmap* makeCanvasPixmap(TQPoint hotspot, bool generateMask = false);
enum ColourType {

30
src/gui/editors/notation/NotePixmapPainter.h
Unescape View File

@ -61,7 +61,7 @@ public:
if (tqmask) {
m_useMask = true;
m_tqmaskPainter.tqbegin(tqmask, unclipped);
m_maskPainter.tqbegin(tqmask, unclipped);
} else {
m_useMask = false;
}
@ -71,7 +71,7 @@ public:
}
bool end() {
if (m_useMask) m_tqmaskPainter.end();
if (m_useMask) m_maskPainter.end();
return m_painter->end();
}
@ -79,66 +79,66 @@ public:
return *m_painter;
}
TQPainter &tqmaskPainter() {
return m_tqmaskPainter;
TQPainter &maskPainter() {
return m_maskPainter;
}
void drawPoint(int x, int y) {
m_painter->drawPoint(x, y);
if (m_useMask) m_tqmaskPainter.drawPoint(x, y);
if (m_useMask) m_maskPainter.drawPoint(x, y);
}
void drawLine(int x1, int y1, int x2, int y2) {
m_painter->drawLine(x1, y1, x2, y2);
if (m_useMask) m_tqmaskPainter.drawLine(x1, y1, x2, y2);
if (m_useMask) m_maskPainter.drawLine(x1, y1, x2, y2);
}
void drawRect(int x, int y, int w, int h) {
m_painter->drawRect(x, y, w, h);
if (m_useMask) m_tqmaskPainter.drawRect(x, y, w, h);
if (m_useMask) m_maskPainter.drawRect(x, y, w, h);
}
void drawArc(int x, int y, int w, int h, int a, int alen) {
m_painter->drawArc(x, y, w, h, a, alen);
if (m_useMask) m_tqmaskPainter.drawArc(x, y, w, h, a, alen);
if (m_useMask) m_maskPainter.drawArc(x, y, w, h, a, alen);
}
void drawPolygon(const TQPointArray &a, bool winding = false,
int index = 0, int n = -1) {
m_painter->tqdrawPolygon(a, winding, index, n);
if (m_useMask) m_tqmaskPainter.tqdrawPolygon(a, winding, index, n);
if (m_useMask) m_maskPainter.tqdrawPolygon(a, winding, index, n);
}
void drawPolyline(const TQPointArray &a, int index = 0, int n = -1) {
m_painter->tqdrawPolyline(a, index, n);
if (m_useMask) m_tqmaskPainter.tqdrawPolyline(a, index, n);
if (m_useMask) m_maskPainter.tqdrawPolyline(a, index, n);
}
void drawPixmap(int x, int y, const TQPixmap &pm,
int sx = 0, int sy = 0, int sw = -1, int sh = -1) {
m_painter->tqdrawPixmap(x, y, pm, sx, sy, sw, sh);
if (m_useMask) m_tqmaskPainter.tqdrawPixmap(x, y, *(pm.tqmask()), sx, sy, sw, sh);
if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.tqmask()), sx, sy, sw, sh);
}
void drawText(int x, int y, const TQString &string) {
m_painter->drawText(x, y, string);
if (m_useMask) m_tqmaskPainter.drawText(x, y, string);
if (m_useMask) m_maskPainter.drawText(x, y, string);
}
void drawNoteCharacter(int x, int y, const NoteCharacter &character) {
character.draw(m_painter, x, y);
if (m_useMask) character.drawMask(&m_tqmaskPainter, x, y);
if (m_useMask) character.drawMask(&m_maskPainter, x, y);
}
void drawEllipse(int x, int y, int w, int h) {
m_painter->drawEllipse(x, y, w, h);
if (m_useMask) m_tqmaskPainter.drawEllipse(x, y, w, h);
if (m_useMask) m_maskPainter.drawEllipse(x, y, w, h);
}
private:
bool m_useMask;
TQPainter m_myPainter;
TQPainter m_tqmaskPainter;
TQPainter m_maskPainter;
TQPainter *m_externalPainter;
TQPainter *m_painter;
};

4
src/gui/editors/notation/RestInserter.cpp
Unescape View File

@ -128,7 +128,7 @@ void RestInserter::slotToggleDot()
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note, true));
actionName.tqreplace(TQRegExp("-"), "_");
KAction *action = m_tqparentView->actionCollection()->action(actionName);
KAction *action = m_parentView->actionCollection()->action(actionName);
if (!action) {
std::cerr << "WARNING: No such action as " << actionName << std::endl;
} else {
@ -141,7 +141,7 @@ void RestInserter::slotNotesSelected()
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note));
actionName.tqreplace(TQRegExp(" "), "_");
m_tqparentView->actionCollection()->action(actionName)->activate();
m_parentView->actionCollection()->action(actionName)->activate();
}
const TQString RestInserter::ToolName = "restinserter";

4
src/gui/editors/notation/TextInserter.cpp
Unescape View File

@ -79,12 +79,12 @@ void TextInserter::slotNotesSelected()
void TextInserter::slotEraseSelected()
{
m_tqparentView->actionCollection()->action("erase")->activate();
m_parentView->actionCollection()->action("erase")->activate();
}
void TextInserter::slotSelectSelected()
{
m_tqparentView->actionCollection()->action("select")->activate();
m_parentView->actionCollection()->action("select")->activate();
}
void TextInserter::ready()

2
src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
Unescape View File

@ -1164,7 +1164,7 @@ MIDIInstrumentParameterPanel::showAdditionalControls(bool showThem)
m_instrumentLabel->setShown(showThem);
int index = 0;
for (RotaryMap::iterator it = m_rotaries.begin(); it != m_rotaries.end(); ++it) {
it->second.first->tqparentWidget()->setShown(showThem || (index < 8));
it->second.first->parentWidget()->setShown(showThem || (index < 8));
//it->second.first->setShown(showThem || (index < 8));
//it->second.second->setShown(showThem || (index < 8));
index++;

2
src/gui/editors/parameters/RosegardenParameterArea.cpp
Unescape View File

@ -88,7 +88,7 @@ void RosegardenParameterArea::addRosegardenParameterBox(
m_scrollView->setMinimumWidth(std::max(m_scrollView->minimumWidth(),
b->tqsizeHint().width()) + 8);
// Create a titled group box for the parameter box, tqparented by the
// Create a titled group box for the parameter box, parented by the
// classic tqlayout widget, so that it can be used to provide a title
// and outline, in classic mode. Add this container to an array that
// parallels the above array of parameter boxes.

6
src/gui/editors/parameters/TrackParameterBox.cpp
Unescape View File

@ -527,12 +527,12 @@ TrackParameterBox::populateRecordingDeviceList()
m_recChannel->setEnabled(false);
// hide these for audio instruments
m_defaultsGroup->tqparentWidget()->setShown(false);
m_defaultsGroup->parentWidget()->setShown(false);
} else { // InstrumentType::Midi and InstrumentType::SoftSynth
// show these if not audio instrument
m_defaultsGroup->tqparentWidget()->setShown(true);
m_defaultsGroup->parentWidget()->setShown(true);
m_recDeviceIds.push_back(Device::ALL_DEVICES);
m_recDevice->insertItem(i18n("All"));
@ -792,7 +792,7 @@ TrackParameterBox::slotInstrumentLabelChanged(InstrumentId id, TQString label)
void
TrackParameterBox::showAdditionalControls(bool showThem)
{
// m_defaultsGroup->tqparentWidget()->setShown(showThem);
// m_defaultsGroup->parentWidget()->setShown(showThem);
}
void

2
src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
Unescape View File

@ -91,7 +91,7 @@ SegmentTool::createMenu()
if (app) {
m_menu = static_cast<TQPopupMenu*>
//(app->factory()->container("segment_tool_menu", app));
(m_tqparentFactory->container("segment_tool_menu", app));
(m_parentFactory->container("segment_tool_menu", app));
if (!m_menu) {
RG_DEBUG << "SegmentTool::createMenu() failed\n";

8
src/gui/general/BarLine.h
Unescape View File

@ -34,24 +34,24 @@ namespace Rosegarden {
class BarLine : public TQCanvasPolygonalItem
{
public:
BarLine(TQCanvas *canvas, double tqlayoutX,
BarLine(TQCanvas *canvas, double layoutX,
int barLineHeight, int baseBarThickness, int lineSpacing,
int inset, LinedStaff::BarStyle style) :
TQCanvasPolygonalItem(canvas),
m_tqlayoutX(tqlayoutX),
m_layoutX(layoutX),
m_barLineHeight(barLineHeight),
m_baseBarThickness(baseBarThickness),
m_lineSpacing(lineSpacing),
m_inset(inset),
m_style(style) { }
double getLayoutX() const { return m_tqlayoutX; }
double getLayoutX() const { return m_layoutX; }
virtual TQPointArray areaPoints() const;
virtual void drawShape(TQPainter &);
protected:
double m_tqlayoutX;
double m_layoutX;
int m_barLineHeight;
int m_baseBarThickness;
int m_lineSpacing;

4
src/gui/general/BaseTool.cpp
Unescape View File

@ -40,7 +40,7 @@ BaseTool::BaseTool(const TQString& menuName, KXMLGUIFactory* factory, TQObject*
: TQObject(tqparent),
m_menuName(menuName),
m_menu(0),
m_tqparentFactory(factory)
m_parentFactory(factory)
{}
BaseTool::~BaseTool()
@ -48,7 +48,7 @@ BaseTool::~BaseTool()
RG_DEBUG << "BaseTool::~BaseTool()\n";
// delete m_menu;
// m_tqparentView->factory()->removeClient(this);
// m_parentView->factory()->removeClient(this);
// m_instance = 0;
}

2
src/gui/general/BaseTool.h
Unescape View File

@ -101,7 +101,7 @@ protected:
TQString m_menuName;
TQPopupMenu* m_menu;
KXMLGUIFactory* m_tqparentFactory;
KXMLGUIFactory* m_parentFactory;
TQString m_contextHelp;
};

6
src/gui/general/EditTool.cpp
Unescape View File

@ -42,7 +42,7 @@ namespace Rosegarden
EditTool::EditTool(const TQString& menuName, EditView* view)
: BaseTool(menuName, view->factory(), TQT_TQOBJECT(view)),
m_tqparentView(view)
m_parentView(view)
{}
void EditTool::handleMousePress(timeT time,
@ -123,9 +123,9 @@ void EditTool::createMenu()
RG_DEBUG << "BaseTool::createMenu() " << m_rcFileName << " - " << m_menuName << endl;
setXMLFile(m_rcFileName);
m_tqparentFactory->addClient(this);
m_parentFactory->addClient(this);
TQWidget* tmp = m_tqparentFactory->container(m_menuName, this);
TQWidget* tmp = m_parentFactory->container(m_menuName, this);
if (!tmp)
RG_DEBUG << "BaseTool::createMenu(" << m_rcFileName

2
src/gui/general/EditTool.h
Unescape View File

@ -157,7 +157,7 @@ protected:
//--------------- Data members ---------------------------------
TQString m_rcFileName;
EditView* m_tqparentView;
EditView* m_parentView;
};

2
src/gui/general/EditToolBox.cpp
Unescape View File

@ -37,7 +37,7 @@ namespace Rosegarden
EditToolBox::EditToolBox(EditView *tqparent)
: BaseToolBox(tqparent),
m_tqparentView(tqparent)
m_parentView(tqparent)
{
}

2
src/gui/general/EditToolBox.h
Unescape View File

@ -57,7 +57,7 @@ protected:
//--------------- Data members ---------------------------------
EditView* m_tqparentView;
EditView* m_parentView;
};

2
src/gui/general/EditView.cpp
Unescape View File

@ -112,7 +112,7 @@ const unsigned int EditView::TOPBARBUTTONS_ROW = RULERS_ROW + 1;
const unsigned int EditView::CANVASVIEW_ROW = TOPBARBUTTONS_ROW + 1;
const unsigned int EditView::CONTROLRULER_ROW = CANVASVIEW_ROW + 1;
// Just some simple features we might want to show - make them bit tqmaskable
// Just some simple features we might want to show - make them bit maskable
//
static int FeatureShowVelocity = 0x00001; // show the velocity ruler

40
src/gui/general/LinedStaff.cpp
Unescape View File

@ -443,8 +443,8 @@ LinedStaff::getBarExtents(double x, int y) const
for (int i = 1; i < m_barLines.size(); ++i) {
double tqlayoutX = m_barLines[i]->getLayoutX();
int barRow = getRowForLayoutX(tqlayoutX);
double layoutX = m_barLines[i]->getLayoutX();
int barRow = getRowForLayoutX(layoutX);
if (m_pageMode != LinearMode && (barRow < row))
continue;
@ -667,41 +667,41 @@ LinedStaff::deleteBars()
}
void
LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
LinedStaff::insertBar(double layoutX, double width, bool isCorrect,
const TimeSignature &timeSig,
int barNo, bool showBarNo)
{
// RG_DEBUG << "insertBar: " << tqlayoutX << ", " << width
// RG_DEBUG << "insertBar: " << layoutX << ", " << width
// << ", " << isCorrect << endl;
int barThickness = m_lineThickness * 5 / 4;
// hack to ensure the bar line appears on the correct row in
// notation page tqlayouts, with a conditional to prevent us from
// notation page layouts, with a conditional to prevent us from
// moving the bar and beat lines in the matrix
if (!showBeatLines()) {
if (width > 0.01) { // not final bar in staff
tqlayoutX += 1;
layoutX += 1;
} else {
tqlayoutX -= 1;
layoutX -= 1;
}
}
int row = getRowForLayoutX(tqlayoutX);
double x = getCanvasXForLayoutX(tqlayoutX);
int row = getRowForLayoutX(layoutX);
double x = getCanvasXForLayoutX(layoutX);
int y = getCanvasYForTopLine(row);
bool firstBarInRow = false, lastBarInRow = false;
if (m_pageMode != LinearMode &&
(getRowForLayoutX(tqlayoutX) >
getRowForLayoutX(tqlayoutX - getMargin() - 2)))
(getRowForLayoutX(layoutX) >
getRowForLayoutX(layoutX - getMargin() - 2)))
firstBarInRow = true;
if (m_pageMode != LinearMode &&
width > 0.01 && // width == 0 for final bar in staff
(getRowForLayoutX(tqlayoutX) <
getRowForLayoutX(tqlayoutX + width + getMargin() + 2)))
(getRowForLayoutX(layoutX) <
getRowForLayoutX(layoutX + width + getMargin() + 2)))
lastBarInRow = true;
BarStyle style = getBarStyle(barNo);
@ -710,7 +710,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
style = RepeatStartBar;
if (firstBarInRow)
insertRepeatedClefAndKey(tqlayoutX, barNo);
insertRepeatedClefAndKey(layoutX, barNo);
// If we're supposed to be hiding bar lines, we do just that --
// create them as normal, then hide them. We can't simply not
@ -725,7 +725,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
inset = getBarInset(barNo, firstBarInRow);
}
BarLine *line = new BarLine(m_canvas, tqlayoutX,
BarLine *line = new BarLine(m_canvas, layoutX,
getBarLineHeight(), barThickness, getLineSpacing(),
(int)inset, style);
@ -758,7 +758,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
if (style == RepeatBothBar)
style = RepeatEndBar;
BarLine *eline = new BarLine(m_canvas, tqlayoutX,
BarLine *eline = new BarLine(m_canvas, layoutX,
getBarLineHeight(), barThickness, getLineSpacing(),
0, style);
eline->moveBy(xe, y);
@ -834,7 +834,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
rect->setZ( -1);
rect->show(); // show beat lines even if the bar lines are hidden
LineRec beatLine(tqlayoutX + gridLine * dx, rect);
LineRec beatLine(layoutX + gridLine * dx, rect);
m_beatLines.push_back(beatLine);
}
}
@ -854,7 +854,7 @@ LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect,
else
rect->show();
LineRec connectingLine(tqlayoutX, rect);
LineRec connectingLine(layoutX, rect);
m_barConnectingLines.push_back(connectingLine);
}
}
@ -1148,9 +1148,9 @@ LinedStaff::setPointerPosition(HorizontalLayoutEngine &tqlayout,
}
void
LinedStaff::setPointerPosition(double tqlayoutX)
LinedStaff::setPointerPosition(double layoutX)
{
LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(tqlayoutX, 0);
LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(layoutX, 0);
setPointerPosition(coords.first, coords.second);
}

14
src/gui/general/LinedStaff.h
Unescape View File

@ -525,9 +525,9 @@ public:
(double x, int y,
Event *&clef, Event *&key,
bool notesAndRestsOnly = false, int proximityThreshold = 10) {
LinedStaffCoords tqlayoutCoords = getLayoutCoordsForCanvasCoords(x, y);
LinedStaffCoords layoutCoords = getLayoutCoordsForCanvasCoords(x, y);
return getClosestElementToLayoutX
(tqlayoutCoords.first, clef, key,
(layoutCoords.first, clef, key,
notesAndRestsOnly, proximityThreshold);
}
@ -568,8 +568,8 @@ public:
*/
virtual ViewElementList::iterator getElementUnderCanvasCoords
(double x, int y, Event *&clef, Event *&key) {
LinedStaffCoords tqlayoutCoords = getLayoutCoordsForCanvasCoords(x, y);
return getElementUnderLayoutX(tqlayoutCoords.first, clef, key);
LinedStaffCoords layoutCoords = getLayoutCoordsForCanvasCoords(x, y);
return getElementUnderLayoutX(layoutCoords.first, clef, key);
}
/**
@ -690,18 +690,18 @@ protected:
virtual void resizeStaffLineRow(int row, double offset, double length);
virtual void deleteBars();
virtual void insertBar(double tqlayoutX, double width, bool isCorrect,
virtual void insertBar(double layoutX, double width, bool isCorrect,
const TimeSignature &,
int barNo, bool showBarNo);
// The default implementations of the following two are empty.
virtual void deleteTimeSignatures();
virtual void insertTimeSignature(double tqlayoutX,
virtual void insertTimeSignature(double layoutX,
const TimeSignature &);
// The default implementations of the following two are empty.
virtual void deleteRepeatedClefsAndKeys();
virtual void insertRepeatedClefAndKey(double tqlayoutX, int barNo);
virtual void insertRepeatedClefAndKey(double layoutX, int barNo);
void initCursors();

6
src/gui/general/PixmapFunctions.h
Unescape View File

@ -42,7 +42,7 @@ public:
/**
* Generate a heuristic tqmask for the given pixmap. Unlike
* TQPixmap::createHeuristicMask, this removes from the tqmask all
* pixels that are aptqparently "background" even if they appear in
* 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.
*
@ -55,7 +55,7 @@ public:
/**
* Generate a heuristic tqmask for the given pixmap. Unlike
* TQPixmap::createHeuristicMask, this removes from the tqmask all
* pixels that are aptqparently "background" even if they appear in
* 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.
*
@ -91,7 +91,7 @@ public:
* Using TQPainter::drawPixmap to draw one pixmap on another does
* not appear to take the tqmask into account properly. Background
* pixels in the second pixmap erase foreground pixels in the
* first one, regardless of whether they're tqmasked or not. This
* 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.

8
src/gui/kdeext/QCanvasSimpleSprite.cpp
Unescape View File

@ -151,18 +151,18 @@ TQCanvasNonElementSprite::TQCanvasNonElementSprite(TQCanvasPixmap *pixmap,
TQCanvasNonElementSprite::~TQCanvasNonElementSprite()
{}
TQCanvasTimeSigSprite::TQCanvasTimeSigSprite(double tqlayoutX,
TQCanvasTimeSigSprite::TQCanvasTimeSigSprite(double layoutX,
TQPixmap *pixmap,
TQCanvas *canvas) :
TQCanvasNonElementSprite(pixmap, canvas),
m_tqlayoutX(tqlayoutX)
m_layoutX(layoutX)
{}
TQCanvasTimeSigSprite::TQCanvasTimeSigSprite(double tqlayoutX,
TQCanvasTimeSigSprite::TQCanvasTimeSigSprite(double layoutX,
TQCanvasPixmap *pixmap,
TQCanvas *canvas) :
TQCanvasNonElementSprite(pixmap, canvas),
m_tqlayoutX(tqlayoutX)
m_layoutX(layoutX)
{}
TQCanvasTimeSigSprite::~TQCanvasTimeSigSprite()

10
src/gui/kdeext/QCanvasSimpleSprite.h
Unescape View File

@ -91,15 +91,15 @@ public:
class TQCanvasTimeSigSprite : public TQCanvasNonElementSprite
{
public:
TQCanvasTimeSigSprite(double tqlayoutX, TQPixmap *, TQCanvas *);
TQCanvasTimeSigSprite(double tqlayoutX, TQCanvasPixmap *, TQCanvas *);
TQCanvasTimeSigSprite(double layoutX, TQPixmap *, TQCanvas *);
TQCanvasTimeSigSprite(double layoutX, TQCanvasPixmap *, TQCanvas *);
virtual ~TQCanvasTimeSigSprite();
void setLayoutX(double tqlayoutX) { m_tqlayoutX = tqlayoutX; }
double getLayoutX() const { return m_tqlayoutX; }
void setLayoutX(double layoutX) { m_layoutX = layoutX; }
double getLayoutX() const { return m_layoutX; }
protected:
double m_tqlayoutX;
double m_layoutX;
};
/**

26
src/gui/kdeext/klearlook.cpp
Unescape View File

@ -170,17 +170,17 @@ inline TQColor midColor( const TQColor &a, const TQColor &b, double factor = 1.0
static bool isFormWidget( const TQWidget *widget ) {
//Form widgets are in the KHTMLView, but that has 2 further inner levels
//of widgets - TQClipperWidget, and outside of that, TQViewportWidget
TQWidget * potentialClipPort = widget->tqparentWidget();
TQWidget * potentialClipPort = widget->parentWidget();
if ( !potentialClipPort || potentialClipPort->isTopLevel() )
return false;
TQWidget *potentialViewPort = potentialClipPort->tqparentWidget();
TQWidget *potentialViewPort = potentialClipPort->parentWidget();
if ( !potentialViewPort || potentialViewPort->isTopLevel() || qstrcmp( potentialViewPort->name(), "qt_viewport" ) )
return false;
TQWidget *potentialKHTML = potentialViewPort->tqparentWidget();
TQWidget *potentialKHTML = potentialViewPort->parentWidget();
if ( !potentialKHTML || potentialKHTML->isTopLevel() || qstrcmp( potentialKHTML->className(), "KHTMLView" ) )
return false;
@ -3088,14 +3088,14 @@ void KlearlookStyle::tqdrawComplexControl(
}
bool onControlButtons = false,
onToolbar = widget->tqparentWidget() && ::tqqt_cast<TQToolBar *>( widget->tqparentWidget() ),
onToolbar = widget->parentWidget() && ::tqqt_cast<TQToolBar *>( widget->parentWidget() ),
onExtender = !onToolbar &&
widget->tqparentWidget() &&
widget->tqparentWidget() ->inherits( "TQToolBarExtensionWidget" ) &&
::tqqt_cast<TQToolBar *>( widget->tqparentWidget() ->tqparentWidget() );
widget->parentWidget() &&
widget->parentWidget() ->inherits( "TQToolBarExtensionWidget" ) &&
::tqqt_cast<TQToolBar *>( widget->parentWidget() ->parentWidget() );
if ( !onToolbar && !onExtender && widget->tqparentWidget() &&
!qstrcmp( widget->tqparentWidget() ->name(), "qt_maxcontrols" ) )
if ( !onToolbar && !onExtender && widget->parentWidget() &&
!qstrcmp( widget->parentWidget() ->name(), "qt_maxcontrols" ) )
onControlButtons = true;
if ( active & SC_ToolButton )
@ -3122,11 +3122,11 @@ void KlearlookStyle::tqdrawComplexControl(
}
// Check whether to draw a background pixmap
else if ( toolbutton->tqparentWidget() &&
toolbutton->tqparentWidget() ->backgroundPixmap() &&
!toolbutton->tqparentWidget() ->backgroundPixmap() ->isNull() ) {
else if ( toolbutton->parentWidget() &&
toolbutton->parentWidget() ->backgroundPixmap() &&
!toolbutton->parentWidget() ->backgroundPixmap() ->isNull() ) {
p->drawTiledPixmap( r,
*( toolbutton->tqparentWidget() ->backgroundPixmap() ), toolbutton->pos() );
*( toolbutton->parentWidget() ->backgroundPixmap() ), toolbutton->pos() );
} else if ( widget->tqparent() ) {
if ( ::tqqt_cast<const TQToolBar *>( widget->tqparent() ) ) {
TQToolBar * tqparent = ( TQToolBar* ) widget->tqparent();

22
src/gui/rulers/ControlRuler.cpp
Unescape View File

@ -62,11 +62,11 @@ const int ControlRuler::ItemHeightRange = 64;
ControlRuler::ControlRuler(Segment *segment,
RulerScale* rulerScale,
EditViewBase* tqparentView,
EditViewBase* parentView,
TQCanvas* c, TQWidget* tqparent,
const char* name, WFlags f) :
RosegardenCanvasView(c, tqparent, name, f),
m_tqparentEditView(tqparentView),
m_parentEditView(parentView),
m_mainHorizontalScrollBar(0),
m_rulerScale(rulerScale),
m_eventSelection(new EventSelection(*segment)),
@ -89,7 +89,7 @@ ControlRuler::ControlRuler(Segment *segment,
setFixedHeight(tqsizeHint().height());
connect(this, TQT_SIGNAL(stateChange(const TQString&, bool)),
m_tqparentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool)));
m_parentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool)));
m_numberFloat = new TextFloat(this);
m_numberFloat->hide();
@ -127,13 +127,13 @@ void ControlRuler::slotUpdateElementsHPos()
ControlItem* item = dynamic_cast<ControlItem*>(*it);
if (!item)
continue;
tqlayoutItem(item);
layoutItem(item);
}
canvas()->update();
}
void ControlRuler::tqlayoutItem(ControlItem* item)
void ControlRuler::layoutItem(ControlItem* item)
{
timeT itemTime = item->getElementAdapter()->getTime();
@ -146,7 +146,7 @@ void ControlRuler::tqlayoutItem(ControlItem* item)
item->setWidth(width);
// RG_DEBUG << "ControlRuler::tqlayoutItem ControlItem x = " << x << " - width = " << width << endl;
// RG_DEBUG << "ControlRuler::layoutItem ControlItem x = " << x << " - width = " << width << endl;
}
void ControlRuler::setControlTool(ControlTool* tool)
@ -281,7 +281,7 @@ void ControlRuler::contentsMouseReleaseEvent(TQMouseEvent* e)
m_eventSelection->getEndTime());
RG_DEBUG << "ControlRuler::contentsMouseReleaseEvent : adding command\n";
m_tqparentEditView->addCommandToHistory(command);
m_parentEditView->addCommandToHistory(command);
m_itemMoved = false;
}
@ -310,7 +310,7 @@ void ControlRuler::contentsMouseMoveEvent(TQMouseEvent* e)
//
TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0));
int scrollX = dynamic_cast<EditView*>(m_tqparentEditView)->getRawCanvasView()->
int scrollX = dynamic_cast<EditView*>(m_parentEditView)->getRawCanvasView()->
horizontalScrollBar()->value();
/*
@ -393,10 +393,10 @@ void ControlRuler::createMenu()
{
RG_DEBUG << "ControlRuler::createMenu()\n";
KMainWindow* tqparentMainWindow = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
KMainWindow* parentMainWindow = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
if (tqparentMainWindow && tqparentMainWindow->factory()) {
m_menu = static_cast<TQPopupMenu*>(tqparentMainWindow->factory()->container(m_menuName, tqparentMainWindow));
if (parentMainWindow && parentMainWindow->factory()) {
m_menu = static_cast<TQPopupMenu*>(parentMainWindow->factory()->container(m_menuName, parentMainWindow));
if (!m_menu) {
RG_DEBUG << "ControlRuler::createMenu() failed\n";

6
src/gui/rulers/ControlRuler.h
Unescape View File

@ -70,7 +70,7 @@ class ControlRuler : public RosegardenCanvasView, public SegmentObserver
public:
ControlRuler(Segment*,
RulerScale*,
EditViewBase* tqparentView,
EditViewBase* parentView,
TQCanvas*,
TQWidget* tqparent=0, const char* name=0, WFlags f=0);
virtual ~ControlRuler();
@ -122,7 +122,7 @@ protected:
virtual void computeStaffOffset() {};
virtual void tqlayoutItem(ControlItem*);
virtual void layoutItem(ControlItem*);
@ -145,7 +145,7 @@ protected:
//--------------- Data members ---------------------------------
EditViewBase* m_tqparentEditView;
EditViewBase* m_parentEditView;
TQScrollBar* m_mainHorizontalScrollBar;
RulerScale* m_rulerScale;
EventSelection* m_eventSelection;

16
src/gui/rulers/ControllerEventsRuler.cpp
Unescape View File

@ -57,12 +57,12 @@ namespace Rosegarden
ControllerEventsRuler::ControllerEventsRuler(Segment *segment,
RulerScale* rulerScale,
EditViewBase* tqparentView,
EditViewBase* parentView,
TQCanvas* c,
TQWidget* tqparent,
const ControlParameter *controller,
const char* name, WFlags f)
: ControlRuler(segment, rulerScale, tqparentView, c, tqparent, name, f),
: ControlRuler(segment, rulerScale, parentView, c, tqparent, name, f),
m_defaultItemWidth(20),
m_controlLine(new TQCanvasLine(canvas())),
m_controlLineShowing(false),
@ -286,7 +286,7 @@ void ControllerEventsRuler::insertControllerEvent()
insertTime, number,
initialValue, *m_segment);
m_tqparentEditView->addCommandToHistory(command);
m_parentEditView->addCommandToHistory(command);
}
void ControllerEventsRuler::eraseControllerEvent()
@ -298,7 +298,7 @@ void ControllerEventsRuler::eraseControllerEvent()
*m_segment,
m_eventSelection->getStartTime(),
m_eventSelection->getEndTime());
m_tqparentEditView->addCommandToHistory(command);
m_parentEditView->addCommandToHistory(command);
updateSelection();
}
@ -329,7 +329,7 @@ void ControllerEventsRuler::clearControllerEvents()
}
EraseCommand *command = new EraseCommand(*es);
m_tqparentEditView->addCommandToHistory(command);
m_parentEditView->addCommandToHistory(command);
}
@ -425,7 +425,7 @@ void ControllerEventsRuler::contentsMouseMoveEvent(TQMouseEvent *e)
}
void ControllerEventsRuler::tqlayoutItem(ControlItem* item)
void ControllerEventsRuler::layoutItem(ControlItem* item)
{
timeT itemTime = item->getElementAdapter()->getTime();
@ -440,7 +440,7 @@ void ControllerEventsRuler::tqlayoutItem(ControlItem* item)
item->setWidth(width);
//RG_DEBUG << "ControllerEventsRuler::tqlayoutItem ControlItem x = " << x
//RG_DEBUG << "ControllerEventsRuler::layoutItem ControlItem x = " << x
//<< " - width = " << width << endl;
}
@ -493,7 +493,7 @@ ControllerEventsRuler::tqdrawControlLine(timeT startTime,
time += quantDur;
}
m_tqparentEditView->addCommandToHistory(macro);
m_parentEditView->addCommandToHistory(macro);
}
}

4
src/gui/rulers/ControllerEventsRuler.h
Unescape View File

@ -56,7 +56,7 @@ class ControllerEventsRuler : public ControlRuler
public:
ControllerEventsRuler(Segment*,
RulerScale*,
EditViewBase* tqparentView,
EditViewBase* parentView,
TQCanvas*,
TQWidget* tqparent=0,
const ControlParameter *controller = 0,
@ -94,7 +94,7 @@ protected:
virtual void contentsMouseReleaseEvent(TQMouseEvent*);
virtual void contentsMouseMoveEvent(TQMouseEvent*);
virtual void tqlayoutItem(ControlItem*);
virtual void layoutItem(ControlItem*);
void tqdrawControlLine(timeT startTime,
timeT endTime,

2
src/gui/rulers/LoopRuler.cpp
Unescape View File

@ -71,7 +71,7 @@ LoopRuler::LoopRuler(RosegardenGUIDoc *doc,
{
/*
* I need to understand if this ruler is being built for the main
* window (Track Editor) or for any of the segment editors. Aptqparently
* window (Track Editor) or for any of the segment editors. Apparently
* the name parameter is supplied (non-NULL) only for the main window.
* I can't find of any other (more decent) way to do this. Sorry.
*/

8
src/gui/rulers/MarkerRuler.cpp
Unescape View File

@ -73,7 +73,7 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
m_menu(0),
m_doc(doc),
m_rulerScale(rulerScale),
m_tqparentMainWindow(dynamic_cast<KMainWindow*>(doc->tqparent()))
m_parentMainWindow(dynamic_cast<KMainWindow*>(doc->tqparent()))
{
// If the tqparent window has a main window above it, we need to use
// that as the tqparent main window, not the document's tqparent.
@ -82,7 +82,7 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
// we're in.
TQObject *probe = TQT_TQOBJECT(tqparent);
while (probe && !dynamic_cast<KMainWindow *>(probe)) probe = probe->tqparent();
if (probe) m_tqparentMainWindow = dynamic_cast<KMainWindow *>(probe);
if (probe) m_parentMainWindow = dynamic_cast<KMainWindow *>(probe);
// m_barFont = new TQFont("helvetica", 12);
// m_barFont->setPixelSize(12);
@ -124,7 +124,7 @@ MarkerRuler::~MarkerRuler()
delete m_barFont;
// we have to do this so that the menu is re-created properly
// when the main window is itself recreated (on a File->New for instance)
KXMLGUIFactory* factory = m_tqparentMainWindow->factory();
KXMLGUIFactory* factory = m_parentMainWindow->factory();
if (factory)
factory->removeClient(this);
}
@ -134,7 +134,7 @@ MarkerRuler::createMenu()
{
setXMLFile("markerruler.rc");
KXMLGUIFactory* factory = m_tqparentMainWindow->factory();
KXMLGUIFactory* factory = m_parentMainWindow->factory();
factory->addClient(this);
TQWidget* tmp = factory->container("marker_ruler_menu", this);

2
src/gui/rulers/MarkerRuler.h
Unescape View File

@ -112,7 +112,7 @@ protected:
RosegardenGUIDoc *m_doc;
RulerScale *m_rulerScale;
KMainWindow* m_tqparentMainWindow;
KMainWindow* m_parentMainWindow;
};

6
src/gui/rulers/PropertyControlRuler.cpp
Unescape View File

@ -54,11 +54,11 @@ namespace Rosegarden
PropertyControlRuler::PropertyControlRuler(PropertyName propertyName,
Staff* staff,
RulerScale* rulerScale,
EditViewBase* tqparentView,
EditViewBase* parentView,
TQCanvas* c, TQWidget* tqparent,
const char* name, WFlags f) :
ControlRuler(&(staff->getSegment()), rulerScale,
tqparentView, c, tqparent, name, f),
parentView, c, tqparent, name, f),
m_propertyName(propertyName),
m_staff(staff),
m_propertyLine(new TQCanvasLine(canvas())),
@ -391,7 +391,7 @@ PropertyControlRuler::drawPropertyLine(timeT startTime,
startValue,
endValue);
m_tqparentEditView->addCommandToHistory(command);
m_parentEditView->addCommandToHistory(command);
} else {

2
src/gui/rulers/PropertyControlRuler.h
Unescape View File

@ -60,7 +60,7 @@ public:
PropertyControlRuler(PropertyName propertyName,
Staff*,
RulerScale*,
EditViewBase* tqparentView,
EditViewBase* parentView,
TQCanvas*,
TQWidget* tqparent=0, const char* name=0, WFlags f=0);

14
src/gui/rulers/TempoRuler.cpp
Unescape View File

@ -66,7 +66,7 @@ namespace Rosegarden
TempoRuler::TempoRuler(RulerScale *rulerScale,
RosegardenGUIDoc *doc,
KMainWindow *tqparentMainWindow,
KMainWindow *parentMainWindow,
double xorigin,
int height,
bool small,
@ -96,7 +96,7 @@ TempoRuler::TempoRuler(RulerScale *rulerScale,
m_composition(&doc->getComposition()),
m_rulerScale(rulerScale),
m_menu(0),
m_tqparentMainWindow(tqparentMainWindow),
m_parentMainWindow(parentMainWindow),
m_fontMetrics(m_boldFont)
{
// m_font.setPointSize(m_small ? 9 : 11);
@ -165,7 +165,7 @@ TempoRuler::~TempoRuler()
{
// we have to do this so that the menu is re-created properly
// when the main window is itself recreated (on a File->New for instance)
KXMLGUIFactory* factory = m_tqparentMainWindow->factory();
KXMLGUIFactory* factory = m_parentMainWindow->factory();
if (factory)
factory->removeClient(this);
}
@ -614,12 +614,12 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
// std::cerr << "cp = " << cp.x() << "," << cp.y() << ", tempo = " << qpm << std::endl;
TQPoint mp = cp + pos();
TQWidget *tqparent = tqparentWidget();
while (tqparent->tqparentWidget() &&
TQWidget *tqparent = parentWidget();
while (tqparent->parentWidget() &&
!tqparent->isTopLevel() &&
!tqparent->isDialog()) {
mp += tqparent->pos();
tqparent = tqparent->tqparentWidget();
tqparent = tqparent->parentWidget();
}
int yoff = cp.y() + m_textFloat->height() + 3;
@ -1074,7 +1074,7 @@ TempoRuler::createMenu()
{
setXMLFile("temporuler.rc");
KXMLGUIFactory* factory = m_tqparentMainWindow->factory();
KXMLGUIFactory* factory = m_parentMainWindow->factory();
factory->addClient(this);
TQWidget* tmp = factory->container("tempo_ruler_menu", this);

4
src/gui/rulers/TempoRuler.h
Unescape View File

@ -73,7 +73,7 @@ public:
*/
TempoRuler(RulerScale *rulerScale,
RosegardenGUIDoc *doc,
KMainWindow *tqparentMainWindow,
KMainWindow *parentMainWindow,
double xorigin = 0.0,
int height = 0,
bool small = false,
@ -167,7 +167,7 @@ private:
RulerScale *m_rulerScale;
TextFloat *m_textFloat;
TQPopupMenu *m_menu;
KMainWindow *m_tqparentMainWindow;
KMainWindow *m_parentMainWindow;
TQFont m_font;
TQFont m_boldFont;

12
src/gui/seqmanager/SequenceManager.cpp
Unescape View File

@ -114,7 +114,7 @@ SequenceManager::SequenceManager(RosegardenGUIDoc *doc,
// m_compositionMmapper->cleanup();
m_countdownDialog = new CountdownDialog(dynamic_cast<TQWidget*>
(m_doc->tqparent())->tqparentWidget());
(m_doc->tqparent())->parentWidget());
// Connect these for use later
//
connect(m_countdownTimer, TQT_SIGNAL(timeout()),
@ -180,7 +180,7 @@ void SequenceManager::setDocument(RosegardenGUIDoc* doc)
delete m_compositionMmapperResetTimer;
m_countdownDialog = new CountdownDialog(dynamic_cast<TQWidget*>
(m_doc->tqparent())->tqparentWidget());
(m_doc->tqparent())->parentWidget());
// Bug 933041: no longer connect the CountdownDialog from
// SequenceManager; instead let the RosegardenGUIApp connect it to
@ -1010,13 +1010,13 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
} else if ((*i)->getData1() == MappedEvent::FailureJackRestartFailed) {
KMessageBox::error(
dynamic_cast<TQWidget*>(m_doc->tqparent())->tqparentWidget(),
dynamic_cast<TQWidget*>(m_doc->tqparent())->parentWidget(),
i18n("The JACK Audio subsystem has failed or it has stopped Rosegarden from processing audio.\nPlease restart Rosegarden to continue working with audio.\nQuitting other running applications may improve Rosegarden's performance."));
} else if ((*i)->getData1() == MappedEvent::FailureJackRestart) {
KMessageBox::error(
dynamic_cast<TQWidget*>(m_doc->tqparent())->tqparentWidget(),
dynamic_cast<TQWidget*>(m_doc->tqparent())->parentWidget(),
i18n("The JACK Audio subsystem has stopped Rosegarden from processing audio, probably because of a processing overload.\nAn attempt to restart the audio service has been made, but some problems may remain.\nQuitting other running applications may improve Rosegarden's performance."));
} else if ((*i)->getData1() == MappedEvent::FailureCPUOverload) {
@ -1027,7 +1027,7 @@ SequenceManager::processAsynchronousMidi(const MappedComposition &mC,
stopping();
KMessageBox::error(
dynamic_cast<TQWidget*>(m_doc->tqparent())->tqparentWidget(),
dynamic_cast<TQWidget*>(m_doc->tqparent())->parentWidget(),
i18n("Run out of processor power for real-time audio processing. Cannot continue."));
#endif
@ -1238,7 +1238,7 @@ void
SequenceManager::setLoop(const timeT &lhs, const timeT &rhs)
{
// do not set a loop if JACK transport sync is enabled, because this is
// completely broken, and aptqparently broken due to a limitation of JACK
// completely broken, and apparently broken due to a limitation of JACK
// transport itself. #1240039 - DMM
// KConfig* config = kapp->config();
// config->setGroup(SequencerOptionsConfigGroup);

2
src/gui/ui/RosegardenTransport.ui
Unescape View File

@ -4357,5 +4357,5 @@
<tabstop>FfwdButton</tabstop>
<tabstop>FfwdEndButton</tabstop>
</tabstops>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

6
src/gui/widgets/Fader.cpp
Unescape View File

@ -415,12 +415,12 @@ Fader::showFloatText()
// Reposition - we need to sum the relative positions up to the
// topLevel or dialog to please move().
//
TQWidget *par = tqparentWidget();
TQWidget *par = parentWidget();
TQPoint totalPos = this->pos();
while (par->tqparentWidget() && !par->isTopLevel() && !par->isDialog()) {
while (par->parentWidget() && !par->isTopLevel() && !par->isDialog()) {
totalPos += par->pos();
par = par->tqparentWidget();
par = par->parentWidget();
}
// Move just top/right

6
src/gui/widgets/TextFloat.cpp
Unescape View File

@ -44,7 +44,7 @@ TextFloat::TextFloat(TQWidget *tqparent):
WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop),
m_text("")
{
reparent(tqparentWidget());
reparent(parentWidget());
resize(20, 20);
}
@ -55,9 +55,9 @@ TextFloat::reparent(TQWidget *newParent)
// Get position and reparent to either top level or dialog
//
while (newParent->tqparentWidget() && !newParent->isTopLevel()
while (newParent->parentWidget() && !newParent->isTopLevel()
&& !newParent->isDialog()) {
newParent = newParent->tqparentWidget();
newParent = newParent->parentWidget();
position += newParent->pos();
}

2
src/sound/AlsaDriver.cpp
Unescape View File

@ -353,7 +353,7 @@ AlsaDriver::getAutoTimer(bool &wantTimerChecks)
return "";
// The system RTC timer ought to be good, but it doesn't look like
// a very safe choice -- we've seen some system lockups aptqparently
// a very safe choice -- we've seen some system lockups apparently
// connected with use of this timer on 2.6 kernels. So we avoid
// using that as an auto option.

2
src/sound/MidiFile.h
Unescape View File

@ -38,7 +38,7 @@
// from MIDI Files. Despite the fact you can reuse this
// object it's probably safer just to create it for a
// single way conversion and then throw it away (MIDI
// to Composition conversion tqinvalidates the internal
// to Composition conversion invalidates the internal
// MIDI model).
//
// Derived from SoundFile but still had some features

Write Preview
Loading…
Cancel
Save