summaryrefslogtreecommitdiffstats
path: root/src/document
diff options
context:
space:
mode:
Diffstat (limited to 'src/document')
-rw-r--r--src/document/BasicCommand.cpp8
-rw-r--r--src/document/BasicCommand.h2
-rw-r--r--src/document/MultiViewCommandHistory.cpp16
-rw-r--r--src/document/MultiViewCommandHistory.h5
-rw-r--r--src/document/RoseXmlHandler.cpp48
-rw-r--r--src/document/RoseXmlHandler.h2
-rw-r--r--src/document/RosegardenGUIDoc.cpp100
-rw-r--r--src/document/RosegardenGUIDoc.h23
-rw-r--r--src/document/io/CsoundExporter.cpp4
-rw-r--r--src/document/io/CsoundExporter.h2
-rw-r--r--src/document/io/HydrogenLoader.cpp4
-rw-r--r--src/document/io/HydrogenLoader.h2
-rw-r--r--src/document/io/HydrogenXMLHandler.cpp6
-rw-r--r--src/document/io/HydrogenXMLHandler.h2
-rw-r--r--src/document/io/LilyPondExporter.cpp86
-rw-r--r--src/document/io/LilyPondExporter.h6
-rw-r--r--src/document/io/MupExporter.cpp4
-rw-r--r--src/document/io/MupExporter.h2
-rw-r--r--src/document/io/MusicXmlExporter.cpp4
-rw-r--r--src/document/io/MusicXmlExporter.h2
-rw-r--r--src/document/io/RG21Loader.cpp30
-rw-r--r--src/document/io/RG21Loader.h4
22 files changed, 182 insertions, 180 deletions
diff --git a/src/document/BasicCommand.cpp b/src/document/BasicCommand.cpp
index b17d79d..31498e4 100644
--- a/src/document/BasicCommand.cpp
+++ b/src/document/BasicCommand.cpp
@@ -90,7 +90,7 @@ Rosegarden::Segment& BasicCommand::getSegment()
return m_segment;
}
-Rosegarden::timeT BasicCommand::getRelayoutEndTime()
+Rosegarden::timeT BasicCommand::getRetqlayoutEndTime()
{
return getEndTime();
}
@@ -114,9 +114,9 @@ BasicCommand::execute()
copyFrom(m_redoEvents);
}
- m_segment.updateRefreshStatuses(getStartTime(), getRelayoutEndTime());
+ m_segment.updateRefreshStatuses(getStartTime(), getRetqlayoutEndTime());
RG_DEBUG << "BasicCommand(" << name() << "): updated refresh statuses "
- << getStartTime() << " -> " << getRelayoutEndTime() << endl;
+ << getStartTime() << " -> " << getRetqlayoutEndTime() << endl;
}
void
@@ -129,7 +129,7 @@ BasicCommand::unexecute()
copyFrom(&m_savedEvents);
- m_segment.updateRefreshStatuses(getStartTime(), getRelayoutEndTime());
+ m_segment.updateRefreshStatuses(getStartTime(), getRetqlayoutEndTime());
}
void
diff --git a/src/document/BasicCommand.h b/src/document/BasicCommand.h
index 1189547..bd88329 100644
--- a/src/document/BasicCommand.h
+++ b/src/document/BasicCommand.h
@@ -59,7 +59,7 @@ public:
timeT getStartTime() { return m_startTime; }
timeT getEndTime() { return m_endTime; }
- virtual timeT getRelayoutEndTime();
+ virtual timeT getRetqlayoutEndTime();
protected:
/**
diff --git a/src/document/MultiViewCommandHistory.cpp b/src/document/MultiViewCommandHistory.cpp
index 58f0b55..04f1aa4 100644
--- a/src/document/MultiViewCommandHistory.cpp
+++ b/src/document/MultiViewCommandHistory.cpp
@@ -322,12 +322,12 @@ MultiViewCommandHistory::updateButton(bool undo,
} else {
action->setEnabled(true);
TQString commandName = stack.top()->name();
- commandName.replace(TQRegExp("&"), "");
- commandName.replace(TQRegExp("\\.\\.\\.$"), "");
+ commandName.tqreplace(TQRegExp("&"), "");
+ commandName.tqreplace(TQRegExp("\\.\\.\\.$"), "");
if (undo)
- text = i18n("Und&o %1").arg(commandName);
+ text = i18n("Und&o %1").tqarg(commandName);
else
- text = i18n("Re&do %1").arg(commandName);
+ text = i18n("Re&do %1").tqarg(commandName);
action->setText(text);
}
}
@@ -364,14 +364,14 @@ MultiViewCommandHistory::updateMenu(bool undo,
stack.pop();
TQString commandName = command->name();
- commandName.replace(TQRegExp("&"), "");
- commandName.replace(TQRegExp("\\.\\.\\.$"), "");
+ commandName.tqreplace(TQRegExp("&"), "");
+ commandName.tqreplace(TQRegExp("\\.\\.\\.$"), "");
TQString text;
if (undo)
- text = i18n("Und&o %1").arg(commandName);
+ text = i18n("Und&o %1").tqarg(commandName);
else
- text = i18n("Re&do %1").arg(commandName);
+ text = i18n("Re&do %1").tqarg(commandName);
menu->insertItem(text, j++);
}
diff --git a/src/document/MultiViewCommandHistory.h b/src/document/MultiViewCommandHistory.h
index 469c2c9..e3c902e 100644
--- a/src/document/MultiViewCommandHistory.h
+++ b/src/document/MultiViewCommandHistory.h
@@ -53,9 +53,10 @@ namespace Rosegarden
* data at once.
*/
-class MultiViewCommandHistory : public QObject
+class MultiViewCommandHistory : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
MultiViewCommandHistory();
@@ -112,7 +113,7 @@ signals:
* (whether by addCommand, undo or redo).
*
* It should be connected to the update() slot of widgets
- * which need to repaint after a command
+ * which need to tqrepaint after a command
*/
void commandExecuted();
diff --git a/src/document/RoseXmlHandler.cpp b/src/document/RoseXmlHandler.cpp
index bd1ad0e..fe99128 100644
--- a/src/document/RoseXmlHandler.cpp
+++ b/src/document/RoseXmlHandler.cpp
@@ -148,7 +148,7 @@ bool ConfigurationXmlSubHandler::characters(const TQString& chars)
if (m_propertyType == "RealTime") {
Rosegarden::RealTime rt;
- int sepIdx = ch.find(',');
+ int sepIdx = ch.tqfind(',');
rt.sec = ch.left(sepIdx).toInt();
rt.nsec = ch.mid(sepIdx + 1).toInt();
@@ -298,8 +298,8 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
// dialog
//
if (isOperationCancelled()) {
- // Ideally, we'd throw here, but at this point Qt is in the stack
- // and Qt is very often compiled without exception support.
+ // Ideally, we'd throw here, but at this point TQt is in the stack
+ // and TQt is very often compiled without exception support.
//
m_cancelled = true;
return false;
@@ -439,7 +439,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
int minor = sminor.toInt();
if (major > RosegardenGUIDoc::FILE_FORMAT_VERSION_MAJOR) {
- m_errorString = i18n("This file was written by Rosegarden %1, and it uses\na different file format that cannot be read by this version.").arg(version);
+ m_errorString = i18n("This file was written by Rosegarden %1, and it uses\na different file format that cannot be read by this version.").tqarg(version);
return false;
}
@@ -449,7 +449,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
CurrentProgressDialog::freeze();
KStartupLogo::hideIfStillThere();
- KMessageBox::information(0, i18n("This file was written by Rosegarden %1, which is more recent than this version.\nThere may be some incompatibilities with the file format.").arg(version));
+ KMessageBox::information(0, i18n("This file was written by Rosegarden %1, which is more recent than this version.\nThere may be some incompatibilities with the file format.").tqarg(version));
CurrentProgressDialog::thaw();
}
@@ -755,7 +755,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
TQString presetLabelStr = atts.value("defaultLabel");
if (labelStr) {
- track->setPresetLabel(presetLabelStr);
+ track->setPresetLabel(presetLabelStr.ascii());
}
TQString clefStr = atts.value("defaultClef");
@@ -1046,7 +1046,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
do {
- FileLocateDialog fL((RosegardenGUIApp *)m_doc->parent(),
+ FileLocateDialog fL((RosegardenGUIApp *)m_doc->tqparent(),
file,
TQString(getAudioFileManager().getAudioPath().c_str()));
int result = fL.exec();
@@ -1740,7 +1740,7 @@ RoseXmlHandler::startElement(const TQString& namespaceURI,
} else {
m_plugin->setAssigned(true);
m_plugin->setBypass(bypassed);
- m_plugin->setIdentifier(plugin->getIdentifier().data());
+ m_plugin->setIdentifier(plugin->getIdentifier().ascii());
// std::cerr << "set identifier to plugin at position " << position << std::endl;
if (program != "") {
m_plugin->setProgram(program);
@@ -2190,7 +2190,7 @@ RoseXmlHandler::characters(const TQString& s)
return true;
}
-QString
+TQString
RoseXmlHandler::errorString()
{
return m_errorString;
@@ -2200,9 +2200,9 @@ bool
RoseXmlHandler::error(const TQXmlParseException& exception)
{
m_errorString = TQString("%1 at line %2, column %3")
- .arg(exception.message())
- .arg(exception.lineNumber())
- .arg(exception.columnNumber());
+ .tqarg(exception.message())
+ .tqarg(exception.lineNumber())
+ .tqarg(exception.columnNumber());
return TQXmlDefaultHandler::error( exception );
}
@@ -2210,9 +2210,9 @@ bool
RoseXmlHandler::fatalError(const TQXmlParseException& exception)
{
m_errorString = TQString("%1 at line %2, column %3")
- .arg(exception.message())
- .arg(exception.lineNumber())
- .arg(exception.columnNumber());
+ .tqarg(exception.message())
+ .tqarg(exception.lineNumber())
+ .tqarg(exception.columnNumber());
return TQXmlDefaultHandler::fatalError( exception );
}
@@ -2250,7 +2250,7 @@ RoseXmlHandler::addMIDIDevice(TQString name, bool createAtSequencer)
arg << (unsigned int)MidiDevice::Play;
if (!rgapp->sequencerCall("addDevice(int, unsigned int)", replyType, replyData, data)) {
- SEQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - "
+ SETQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - "
<< "can't call sequencer addDevice" << endl;
return ;
}
@@ -2259,18 +2259,18 @@ RoseXmlHandler::addMIDIDevice(TQString name, bool createAtSequencer)
TQDataStream reply(replyData, IO_ReadOnly);
reply >> deviceId;
} else {
- SEQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - "
+ SETQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - "
<< "got unknown returntype from addDevice()" << endl;
return ;
}
if (deviceId == Device::NO_DEVICE) {
- SEQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - "
+ SETQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - "
<< "sequencer addDevice failed" << endl;
return ;
}
- SEQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - "
+ SETQMAN_DEBUG << "RoseXmlHandler::addMIDIDevice - "
<< " added device " << deviceId << endl;
} else {
@@ -2298,7 +2298,7 @@ RoseXmlHandler::addMIDIDevice(TQString name, bool createAtSequencer)
void
RoseXmlHandler::skipToNextPlayDevice()
{
- SEQMAN_DEBUG << "RoseXmlHandler::skipToNextPlayDevice; m_deviceRunningId is " << m_deviceRunningId << endl;
+ SETQMAN_DEBUG << "RoseXmlHandler::skipToNextPlayDevice; m_deviceRunningId is " << m_deviceRunningId << endl;
for (DeviceList::iterator i = getStudio().getDevices()->begin();
i != getStudio().getDevices()->end(); ++i) {
@@ -2310,7 +2310,7 @@ RoseXmlHandler::skipToNextPlayDevice()
if (m_deviceRunningId == Device::NO_DEVICE ||
md->getId() > m_deviceRunningId) {
- SEQMAN_DEBUG << "RoseXmlHandler::skipToNextPlayDevice: found next device: id " << md->getId() << endl;
+ SETQMAN_DEBUG << "RoseXmlHandler::skipToNextPlayDevice: found next device: id " << md->getId() << endl;
m_device = md;
m_deviceRunningId = md->getId();
@@ -2319,7 +2319,7 @@ RoseXmlHandler::skipToNextPlayDevice()
}
}
- SEQMAN_DEBUG << "RoseXmlHandler::skipToNextPlayDevice: fresh out of devices" << endl;
+ SETQMAN_DEBUG << "RoseXmlHandler::skipToNextPlayDevice: fresh out of devices" << endl;
m_device = 0;
}
@@ -2327,7 +2327,7 @@ RoseXmlHandler::skipToNextPlayDevice()
void
RoseXmlHandler::setMIDIDeviceConnection(TQString connection)
{
- SEQMAN_DEBUG << "RoseXmlHandler::setMIDIDeviceConnection(" << connection << ")" << endl;
+ SETQMAN_DEBUG << "RoseXmlHandler::setMIDIDeviceConnection(" << connection << ")" << endl;
MidiDevice *md = dynamic_cast<MidiDevice *>(m_device);
if (!md)
@@ -2347,7 +2347,7 @@ RoseXmlHandler::setMIDIDeviceConnection(TQString connection)
void
RoseXmlHandler::setMIDIDeviceName(TQString name)
{
- SEQMAN_DEBUG << "RoseXmlHandler::setMIDIDeviceName(" << name << ")" << endl;
+ SETQMAN_DEBUG << "RoseXmlHandler::setMIDIDeviceName(" << name << ")" << endl;
MidiDevice *md = dynamic_cast<MidiDevice *>(m_device);
if (!md)
diff --git a/src/document/RoseXmlHandler.h b/src/document/RoseXmlHandler.h
index e93408f..86d7eb2 100644
--- a/src/document/RoseXmlHandler.h
+++ b/src/document/RoseXmlHandler.h
@@ -62,7 +62,7 @@ class AudioFileManager;
/**
* Handler for the Rosegarden XML format
*/
-class RoseXmlHandler : public ProgressReporter, public QXmlDefaultHandler
+class RoseXmlHandler : public ProgressReporter, public TQXmlDefaultHandler
{
public:
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index 99cead1..a48907f 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -117,11 +117,11 @@ namespace Rosegarden
using namespace BaseProperties;
-RosegardenGUIDoc::RosegardenGUIDoc(TQWidget *parent,
+RosegardenGUIDoc::RosegardenGUIDoc(TQWidget *tqparent,
AudioPluginManager *pluginManager,
bool skipAutoload,
const char *name)
- : TQObject(parent, name),
+ : TQObject(tqparent, name),
m_modified(false),
m_autoSaved(false),
m_audioPreviewThread(&m_audioFileManager),
@@ -229,7 +229,7 @@ void RosegardenGUIDoc::slotUpdateAllViews(RosegardenGUIView *sender)
for (w = m_viewList.first(); w != 0; w = m_viewList.next()) {
if (w != sender)
- w->repaint();
+ w->tqrepaint();
}
}
@@ -239,7 +239,7 @@ void RosegardenGUIDoc::setModified(bool m)
RG_DEBUG << "RosegardenGUIDoc[" << this << "]::setModified(" << m << ")\n";
}
-void RosegardenGUIDoc::clearModifiedStatus()
+void RosegardenGUIDoc::clearModifiedtqStatus()
{
setModified(false);
setAutoSaved(true);
@@ -321,7 +321,7 @@ bool RosegardenGUIDoc::saveIfModified()
return completed;
- RosegardenGUIApp *win = (RosegardenGUIApp *)parent();
+ RosegardenGUIApp *win = (RosegardenGUIApp *)tqparent();
int wantSave = KMessageBox::warningYesNoCancel
(win,
@@ -349,10 +349,10 @@ bool RosegardenGUIDoc::saveIfModified()
if (!completed) {
if (errMsg) {
KMessageBox::error(0, i18n(TQString("Could not save document at %1\n(%2)")
- .arg(getAbsFilePath()).arg(errMsg)));
+ .tqarg(getAbsFilePath()).tqarg(errMsg)));
} else {
KMessageBox::error(0, i18n(TQString("Could not save document at %1")
- .arg(getAbsFilePath())));
+ .tqarg(getAbsFilePath())));
}
}
}
@@ -463,7 +463,7 @@ RosegardenGUIDoc::deleteOrphanedAudioFiles(bool documentWillNotBeSaved)
if (!file.remove()) {
std::cerr << "WARNING: Failed to remove orphaned derived audio file \"" << derivedOrphans[i] << std::endl;
}
- TQFile peakFile(TQString("%1.pk").arg(derivedOrphans[i]));
+ TQFile peakFile(TQString("%1.pk").tqarg(derivedOrphans[i]));
peakFile.remove();
}
@@ -523,10 +523,10 @@ RosegardenGUIDoc::deleteOrphanedAudioFiles(bool documentWillNotBeSaved)
TQFile file(recordedOrphans[i]);
if (!file.remove()) {
KMessageBox::error(0, i18n("File %1 could not be deleted.")
- .arg(recordedOrphans[i]));
+ .tqarg(recordedOrphans[i]));
}
- TQFile peakFile(TQString("%1.pk").arg(recordedOrphans[i]));
+ TQFile peakFile(TQString("%1.pk").tqarg(recordedOrphans[i]));
peakFile.remove();
}
}
@@ -537,7 +537,7 @@ RosegardenGUIDoc::deleteOrphanedAudioFiles(bool documentWillNotBeSaved)
void RosegardenGUIDoc::newDocument()
{
setModified(false);
- setAbsFilePath(TQString::null);
+ setAbsFilePath(TQString());
setTitle(i18n("Untitled"));
m_commandHistory->clear();
}
@@ -577,14 +577,14 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename,
// Check if file readable with fileInfo ?
if (!fileInfo.isReadable() || fileInfo.isDir()) {
KStartupLogo::hideIfStillThere();
- TQString msg(i18n("Can't open file '%1'").arg(filename));
+ TQString msg(i18n("Can't open file '%1'").tqarg(filename));
KMessageBox::sorry(0, msg);
return false;
}
ProgressDialog progressDlg(i18n("Reading file..."),
100,
- (TQWidget*)parent());
+ (TQWidget*)tqparent());
connect(&progressDlg, TQT_SIGNAL(cancelClicked()),
&m_audioFileManager, TQT_SLOT(slotStopPreview()));
@@ -639,8 +639,8 @@ bool RosegardenGUIDoc::openDocument(const TQString& filename,
if (!okay) {
KStartupLogo::hideIfStillThere();
TQString msg(i18n("Error when parsing file '%1': \"%2\"")
- .arg(filename)
- .arg(errMsg));
+ .tqarg(filename)
+ .tqarg(errMsg));
CurrentProgressDialog::freeze();
KMessageBox::sorry(0, msg);
@@ -1152,7 +1152,7 @@ bool RosegardenGUIDoc::saveDocument(const TQString& filename,
int status = temp.status();
if (status != 0) {
- errMsg = i18n(TQString("Could not create temporary file in directory of '%1': %2").arg(filename).arg(strerror(status)));
+ errMsg = i18n(TQString("Could not create temporary file in directory of '%1': %2").tqarg(filename).tqarg(strerror(status)));
return false;
}
@@ -1164,7 +1164,7 @@ bool RosegardenGUIDoc::saveDocument(const TQString& filename,
if (!temp.close()) {
status = temp.status();
errMsg = i18n(TQString("Failure in temporary file handling for file '%1': %2")
- .arg(tempFileName).arg(strerror(status)));
+ .tqarg(tempFileName).tqarg(strerror(status)));
return false;
}
@@ -1177,7 +1177,7 @@ bool RosegardenGUIDoc::saveDocument(const TQString& filename,
TQDir dir(TQFileInfo(tempFileName).dir());
if (!dir.rename(tempFileName, filename)) {
- errMsg = i18n(TQString("Failed to rename temporary output file '%1' to desired output file '%2'").arg(tempFileName).arg(filename));
+ errMsg = i18n(TQString("Failed to rename temporary output file '%1' to desired output file '%2'").tqarg(tempFileName).tqarg(filename));
return false;
}
@@ -1198,7 +1198,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
if (!rc) {
// do some error report
- errMsg = i18n(TQString("Could not open file '%1' for writing").arg(filename));
+ errMsg = i18n(TQString("Could not open file '%1' for writing").tqarg(filename));
delete fileCompressedDevice;
return false; // couldn't open file
}
@@ -1224,7 +1224,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
progressDlg = new ProgressDialog(i18n("Saving file..."),
100,
- (TQWidget*)parent());
+ (TQWidget*)tqparent());
progress = progressDlg->progressBar();
progressDlg->setMinimumDuration(500);
@@ -1232,7 +1232,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
} else {
- progress = ((RosegardenGUIApp *)parent())->getProgressBar();
+ progress = ((RosegardenGUIApp *)tqparent())->getProgressBar();
}
// Send out Composition (this includes Tracks, Instruments, Tempo
@@ -1281,13 +1281,13 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
m_composition.getTriggerSegments().begin();
ci != m_composition.getTriggerSegments().end(); ++ci) {
- TQString triggerAtts = QString
+ TQString triggerAtts = TQString
("triggerid=\"%1\" triggerbasepitch=\"%2\" triggerbasevelocity=\"%3\" triggerretune=\"%4\" triggeradjusttimes=\"%5\" ")
- .arg((*ci)->getId())
- .arg((*ci)->getBasePitch())
- .arg((*ci)->getBaseVelocity())
- .arg((*ci)->getDefaultRetune())
- .arg(strtoqstr((*ci)->getDefaultTimeAdjust()));
+ .tqarg((*ci)->getId())
+ .tqarg((*ci)->getBasePitch())
+ .tqarg((*ci)->getBaseVelocity())
+ .tqarg((*ci)->getDefaultRetune())
+ .tqarg(strtoqstr((*ci)->getDefaultTimeAdjust()));
Segment *segment = (*ci)->getSegment();
saveSegment(outStream, segment, progress, totalEvents, eventCount, triggerAtts);
@@ -1315,7 +1315,7 @@ bool RosegardenGUIDoc::saveDocumentActual(const TQString& filename,
// check that all went ok
//
if (fileCompressedDevice->status() != IO_Ok) {
- errMsg = i18n(TQString("Error while writing on '%1'").arg(filename));
+ errMsg = i18n(TQString("Error while writing on '%1'").tqarg(filename));
delete fileCompressedDevice;
return false;
}
@@ -1380,8 +1380,8 @@ void RosegardenGUIDoc::saveSegment(TQTextStream& outStream, Segment *segment,
TQString time;
outStream << TQString("<segment track=\"%1\" start=\"%2\" ")
- .arg(segment->getTrack())
- .arg(segment->getStartTime());
+ .tqarg(segment->getTrack())
+ .tqarg(segment->getStartTime());
if (extraAttributes)
outStream << extraAttributes << " ";
@@ -1556,13 +1556,13 @@ void RosegardenGUIDoc::saveSegment(TQTextStream& outStream, Segment *segment,
bool RosegardenGUIDoc::isSequencerRunning()
{
- RosegardenGUIApp* parentApp = dynamic_cast<RosegardenGUIApp*>(parent());
- if (!parentApp) {
- RG_DEBUG << "RosegardenGUIDoc::isSequencerRunning() : parentApp == 0\n";
+ RosegardenGUIApp* tqparentApp = dynamic_cast<RosegardenGUIApp*>(tqparent());
+ if (!tqparentApp) {
+ RG_DEBUG << "RosegardenGUIDoc::isSequencerRunning() : tqparentApp == 0\n";
return false;
}
- return parentApp->isSequencerRunning();
+ return tqparentApp->isSequencerRunning();
}
bool
@@ -1612,7 +1612,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
} else {
if (getSequenceManager() &&
- !(getSequenceManager()->getSoundDriverStatus() & AUDIO_OK)) {
+ !(getSequenceManager()->getSoundDrivertqStatus() & AUDIO_OK)) {
KStartupLogo::hideIfStillThere();
CurrentProgressDialog::freeze();
@@ -1662,7 +1662,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
KStartupLogo::hideIfStillThere();
CurrentProgressDialog::freeze();
- KMessageBox::information(0, i18n("<h3>Incorrect audio sample rate</h3><p>This composition contains audio files that were recorded or imported with the audio server running at a different sample rate (%1 Hz) from the current JACK server sample rate (%2 Hz).</p><p>Rosegarden will play this composition at the correct speed, but any audio files in it will probably sound awful.</p><p>Please consider re-starting the JACK server at the correct rate (%3 Hz) and re-loading this composition before you do any more work with it.</p>").arg(er).arg(sr).arg(er));
+ KMessageBox::information(0, i18n("<h3>Incorrect audio sample rate</h3><p>This composition contains audio files that were recorded or imported with the audio server running at a different sample rate (%1 Hz) from the current JACK server sample rate (%2 Hz).</p><p>Rosegarden will play this composition at the correct speed, but any audio files in it will probably sound awful.</p><p>Please consider re-starting the JACK server at the correct rate (%3 Hz) and re-loading this composition before you do any more work with it.</p>").tqarg(er).tqarg(sr).tqarg(er));
CurrentProgressDialog::thaw();
shownWarning = true;
@@ -1672,7 +1672,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
KStartupLogo::hideIfStillThere();
CurrentProgressDialog::freeze();
- KMessageBox::information(0, i18n("<h3>Inconsistent audio sample rates</h3><p>This composition contains audio files at more than one sample rate.</p><p>Rosegarden will play them at the correct speed, but any audio files that were recorded or imported at rates different from the current JACK server sample rate (%1 Hz) will probably sound awful.</p><p>Please see the audio file manager dialog for more details, and consider resampling any files that are at the wrong rate.</p>").arg(sr),
+ KMessageBox::information(0, i18n("<h3>Inconsistent audio sample rates</h3><p>This composition contains audio files at more than one sample rate.</p><p>Rosegarden will play them at the correct speed, but any audio files that were recorded or imported at rates different from the current JACK server sample rate (%1 Hz) will probably sound awful.</p><p>Please see the audio file manager dialog for more details, and consider resampling any files that are at the wrong rate.</p>").tqarg(sr),
i18n("Inconsistent sample rates"),
"file-load-inconsistent-samplerates");
@@ -1695,7 +1695,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
TQString type, soName, label;
PluginIdentifier::parseIdentifier(ident, type, soName, label);
TQString pluginFileName = TQFileInfo(soName).fileName();
- msg += i18n("<li>%1 (from %2)</li>").arg(label).arg(pluginFileName);
+ msg += i18n("<li>%1 (from %2)</li>").tqarg(label).tqarg(pluginFileName);
}
msg += "</ul>";
@@ -1834,7 +1834,7 @@ RosegardenGUIDoc::insertRecordedMidi(const MappedComposition &mC)
// it's a note-off
- //NoteOnMap::iterator mi = m_noteOnEvents.find((*i)->getPitch());
+ //NoteOnMap::iterator mi = m_noteOnEvents.tqfind((*i)->getPitch());
PitchMap *pm = &m_noteOnEvents[device][channel];
PitchMap::iterator mi = pm->find(pitch);
@@ -2247,7 +2247,7 @@ RosegardenGUIDoc::prepareAudio()
TQByteArray data;
TQDataStream streamOut(data, IO_WriteOnly);
- // We have to pass the filename as a QString
+ // We have to pass the filename as a TQString
//
streamOut << TQString(strtoqstr((*it)->getFilename()));
streamOut << (int)(*it)->getId();
@@ -2317,7 +2317,7 @@ RosegardenGUIDoc::syncDevices()
}
delete proc;
- RosegardenGUIApp *app = (RosegardenGUIApp*)parent();
+ RosegardenGUIApp *app = (RosegardenGUIApp*)tqparent();
app->slotSequencerExited(0);
return ;
}
@@ -2557,7 +2557,7 @@ RosegardenGUIDoc::addRecordMIDISegment(TrackId tid)
} else {
label = track->getLabel();
}
- label = qstrtostr(i18n("%1 (recorded)").arg(strtoqstr(label)));
+ label = qstrtostr(i18n("%1 (recorded)").tqarg(strtoqstr(label)));
}
recordMIDISegment->setLabel(label);
@@ -2786,7 +2786,7 @@ RosegardenGUIDoc::finalizeAudioFile(InstrumentId iid)
// Create a progress dialog
//
ProgressDialog *progressDlg = new ProgressDialog
- (i18n("Generating audio preview..."), 100, (TQWidget*)parent());
+ (i18n("Generating audio preview..."), 100, (TQWidget*)tqparent());
progressDlg->setAutoClose(false);
progressDlg->setAutoReset(false);
progressDlg->show();
@@ -2887,7 +2887,7 @@ RosegardenGUIDoc::updateAudioRecordLatency()
m_audioRecordLatency = getAudioRecordLatency();
}
-QStringList
+TQStringList
RosegardenGUIDoc::getTimers()
{
TQStringList list;
@@ -2925,7 +2925,7 @@ RosegardenGUIDoc::getTimers()
return list;
}
- if (replyType != "TQString") {
+ if (replyType != TQSTRING_OBJECT_NAME_STRING) {
RG_DEBUG << "RosegardenGUIDoc::getTimers - "
<< "wrong reply type (" << replyType << ") from sequencer" << endl;
return list;
@@ -2941,7 +2941,7 @@ RosegardenGUIDoc::getTimers()
return list;
}
-QString
+TQString
RosegardenGUIDoc::getCurrentTimer()
{
TQCString replyType;
@@ -2953,7 +2953,7 @@ RosegardenGUIDoc::getCurrentTimer()
return "";
}
- if (replyType != "TQString") {
+ if (replyType != TQSTRING_OBJECT_NAME_STRING) {
RG_DEBUG << "RosegardenGUIDoc::getCurrentTimer - "
<< "wrong reply type (" << replyType << ") from sequencer" << endl;
return "";
@@ -3070,7 +3070,7 @@ RosegardenGUIDoc::clearAllPlugins()
Clipboard*
RosegardenGUIDoc::getClipboard()
{
- RosegardenGUIApp *app = (RosegardenGUIApp*)parent();
+ RosegardenGUIApp *app = (RosegardenGUIApp*)tqparent();
return app->getClipboard();
}
@@ -3102,13 +3102,13 @@ RosegardenGUIDoc::notifyAudioFileRemoval(AudioFileId id)
if (m_audioFileManager.wasAudioFileRecentlyRecorded(id)) {
file = m_audioFileManager.getAudioFile(id);
- if (file) addOrphanedRecordedAudioFile(file->getFilename());
+ if (file) addOrphanedRecordedAudioFile(file->getFilename().c_str());
return;
}
if (m_audioFileManager.wasAudioFileRecentlyDerived(id)) {
file = m_audioFileManager.getAudioFile(id);
- if (file) addOrphanedDerivedAudioFile(file->getFilename());
+ if (file) addOrphanedDerivedAudioFile(file->getFilename().c_str());
return;
}
}
diff --git a/src/document/RosegardenGUIDoc.h b/src/document/RosegardenGUIDoc.h
index 46eb805..282e8c0 100644
--- a/src/document/RosegardenGUIDoc.h
+++ b/src/document/RosegardenGUIDoc.h
@@ -87,15 +87,16 @@ static const int MERGE_KEEP_NEW_TIMINGS = (1 << 3);
* RosegardenGUIDoc owns the Composition in the document.
*/
-class RosegardenGUIDoc : public QObject
+class RosegardenGUIDoc : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constructor for the fileclass of the application
*/
- RosegardenGUIDoc(TQWidget *parent,
+ RosegardenGUIDoc(TQWidget *tqparent,
AudioPluginManager *audioPluginManager = 0,
bool skipAutoload = false,
const char *name=0);
@@ -146,7 +147,7 @@ protected:
* action on the view connected to the document.
*
* this is just an accessor, other components should call
- * slotDocumentModified() and clearModifiedStatus() instead of
+ * slotDocumentModified() and clearModifiedtqStatus() instead of
* this method, which perform all the related housework.
*
*/
@@ -163,7 +164,7 @@ public:
* clears the 'modified' status of the document (sets it back to false).
*
*/
- void clearModifiedStatus();
+ void clearModifiedtqStatus();
/**
* "save modified" - asks the user for saving if the document is
@@ -425,7 +426,7 @@ public:
// Get the sequence manager from the app
//
SequenceManager* getSequenceManager()
- { return (dynamic_cast<RosegardenGUIApp*>(parent()))
+ { return (dynamic_cast<RosegardenGUIApp*>(tqparent()))
->getSequenceManager(); }
//Obsolete: multitrack MIDI recording. plcl 06/2006.
@@ -438,7 +439,7 @@ public:
/**
* return the list of the views currently connected to the document
*/
- QList<RosegardenGUIView>& getViewList() { return m_viewList; }
+ TQList<RosegardenGUIView>& getViewList() { return m_viewList; }
bool isBeingDestroyed() { return m_beingDestroyed; }
@@ -446,9 +447,9 @@ public:
public slots:
/**
- * calls repaint() on all views connected to the document object
+ * calls tqrepaint() on all views connected to the document object
* and is called by the view by which the document has been
- * changed. As this view normally repaints itself, it is excluded
+ * changed. As this view normally tqrepaints itself, it is excluded
* from the paintEvent.
*/
void slotUpdateAllViews(RosegardenGUIView *sender);
@@ -574,7 +575,7 @@ protected:
*/
void saveSegment(TQTextStream&, Segment*, KProgress*,
long totalNbOfEvents, long &count,
- TQString extraAttributes = TQString::null);
+ TQString extraAttributes = TQString());
bool deleteOrphanedAudioFiles(bool documentWillNotBeSaved);
@@ -616,12 +617,12 @@ protected:
/**
* the list of the views currently connected to the document
*/
- QList<RosegardenGUIView> m_viewList;
+ TQList<RosegardenGUIView> m_viewList;
/**
* the list of the edit views currently editing a part of this document
*/
- QList<EditViewBase> m_editViewList;
+ TQList<EditViewBase> m_editViewList;
/**
* the modified flag of the current document
diff --git a/src/document/io/CsoundExporter.cpp b/src/document/io/CsoundExporter.cpp
index 70f1e51..9316de6 100644
--- a/src/document/io/CsoundExporter.cpp
+++ b/src/document/io/CsoundExporter.cpp
@@ -40,10 +40,10 @@
namespace Rosegarden
{
-CsoundExporter::CsoundExporter(TQObject *parent,
+CsoundExporter::CsoundExporter(TQObject *tqparent,
Composition *composition,
std::string fileName) :
- ProgressReporter(parent, "csoundExporter"),
+ ProgressReporter(tqparent, "csoundExporter"),
m_composition(composition),
m_fileName(fileName)
{
diff --git a/src/document/io/CsoundExporter.h b/src/document/io/CsoundExporter.h
index f179fb6..a2476e0 100644
--- a/src/document/io/CsoundExporter.h
+++ b/src/document/io/CsoundExporter.h
@@ -46,7 +46,7 @@ class Composition;
class CsoundExporter : public ProgressReporter
{
public:
- CsoundExporter(TQObject *parent, Composition *, std::string fileName);
+ CsoundExporter(TQObject *tqparent, Composition *, std::string fileName);
~CsoundExporter();
bool write();
diff --git a/src/document/io/HydrogenLoader.cpp b/src/document/io/HydrogenLoader.cpp
index 984527d..4a4876c 100644
--- a/src/document/io/HydrogenLoader.cpp
+++ b/src/document/io/HydrogenLoader.cpp
@@ -41,8 +41,8 @@ namespace Rosegarden
{
HydrogenLoader::HydrogenLoader(Studio *studio,
- TQObject *parent, const char *name):
- ProgressReporter(parent, name),
+ TQObject *tqparent, const char *name):
+ ProgressReporter(tqparent, name),
m_studio(studio)
{}
diff --git a/src/document/io/HydrogenLoader.h b/src/document/io/HydrogenLoader.h
index bd3cffb..e4975ad 100644
--- a/src/document/io/HydrogenLoader.h
+++ b/src/document/io/HydrogenLoader.h
@@ -54,7 +54,7 @@ class HydrogenLoader : public ProgressReporter
{
public:
HydrogenLoader(Studio *,
- TQObject *parent = 0, const char *name = 0);
+ TQObject *tqparent = 0, const char *name = 0);
/**
* Load and parse the Hydrogen file \a fileName, and write it into the
diff --git a/src/document/io/HydrogenXMLHandler.cpp b/src/document/io/HydrogenXMLHandler.cpp
index 9854648..565fe6d 100644
--- a/src/document/io/HydrogenXMLHandler.cpp
+++ b/src/document/io/HydrogenXMLHandler.cpp
@@ -272,9 +272,9 @@ HydrogenXMLHandler::endElement(const TQString& /*namespaceURI*/,
// whole bar unit segment.
//
m_segment->setEndMarkerTime(m_composition->getBarEnd(m_currentBar));
- TQString label = TQString("%1 - %2 %3 %4").arg(strtoqstr(m_patternName))
- .arg(strtoqstr(m_sequenceName))
- .arg(i18n(" imported from Hydrogen ")).arg(strtoqstr(m_version));
+ TQString label = TQString("%1 - %2 %3 %4").tqarg(strtoqstr(m_patternName))
+ .tqarg(strtoqstr(m_sequenceName))
+ .tqarg(i18n(" imported from Hydrogen ")).tqarg(strtoqstr(m_version));
m_segment->setLabel(qstrtostr(label));
m_composition->addTrack(track);
diff --git a/src/document/io/HydrogenXMLHandler.h b/src/document/io/HydrogenXMLHandler.h
index e5ec4fe..f315824 100644
--- a/src/document/io/HydrogenXMLHandler.h
+++ b/src/document/io/HydrogenXMLHandler.h
@@ -45,7 +45,7 @@ class Segment;
class Composition;
-class HydrogenXMLHandler : public QXmlDefaultHandler
+class HydrogenXMLHandler : public TQXmlDefaultHandler
{
public:
HydrogenXMLHandler(Composition *comp,
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp
index cd29b60..f5e5ff9 100644
--- a/src/document/io/LilyPondExporter.cpp
+++ b/src/document/io/LilyPondExporter.cpp
@@ -85,26 +85,26 @@ using namespace BaseProperties;
const PropertyName LilyPondExporter::SKIP_PROPERTY
= "LilyPondExportSkipThisEvent";
-LilyPondExporter::LilyPondExporter(RosegardenGUIApp *parent,
+LilyPondExporter::LilyPondExporter(RosegardenGUIApp *tqparent,
RosegardenGUIDoc *doc,
std::string fileName) :
- ProgressReporter((TQObject *)parent, "lilypondExporter"),
+ ProgressReporter((TQObject *)tqparent, "lilypondExporter"),
m_doc(doc),
m_fileName(fileName),
m_lastClefFound(Clef::Treble)
{
m_composition = &m_doc->getComposition();
m_studio = &m_doc->getStudio();
- m_view = ((RosegardenGUIApp *)parent)->getView();
+ m_view = ((RosegardenGUIApp *)tqparent)->getView();
m_notationView = NULL;
readConfigVariables();
}
-LilyPondExporter::LilyPondExporter(NotationView *parent,
+LilyPondExporter::LilyPondExporter(NotationView *tqparent,
RosegardenGUIDoc *doc,
std::string fileName) :
- ProgressReporter((TQObject *)parent, "lilypondExporter"),
+ ProgressReporter((TQObject *)tqparent, "lilypondExporter"),
m_doc(doc),
m_fileName(fileName),
m_lastClefFound(Clef::Treble)
@@ -113,7 +113,7 @@ LilyPondExporter::LilyPondExporter(NotationView *parent,
m_composition = &m_doc->getComposition();
m_studio = &m_doc->getStudio();
m_view = NULL;
- m_notationView = ((NotationView *)parent);
+ m_notationView = ((NotationView *)tqparent);
readConfigVariables();
}
@@ -137,7 +137,7 @@ LilyPondExporter::readConfigVariables(void)
m_exportBeams = cfg->readBoolEntry("lilyexportbeamings", false);
m_exportStaffMerge = cfg->readBoolEntry("lilyexportstaffmerge", false);
m_exportStaffGroup = cfg->readBoolEntry("lilyexportstaffbrackets", true);
- m_lyricsHAlignment = cfg->readBoolEntry("lilylyricshalignment", LEFT_ALIGN);
+ m_lyricsHAlignment = cfg->readBoolEntry("lilylyricshtqalignment", LEFT_ALIGN);
m_languageLevel = cfg->readUnsignedNumEntry("lilylanguage", LILYPOND_VERSION_2_6);
m_exportMarkerMode = cfg->readUnsignedNumEntry("lilyexportmarkermode", EXPORT_NO_MARKERS );
@@ -351,15 +351,15 @@ LilyPondExporter::protectIllegalChars(std::string inStr)
TQString tmpStr = strtoqstr(inStr);
- tmpStr.replace(TQRegExp("&"), "\\&");
- tmpStr.replace(TQRegExp("\\^"), "\\^");
- tmpStr.replace(TQRegExp("%"), "\\%");
- tmpStr.replace(TQRegExp("<"), "\\<");
- tmpStr.replace(TQRegExp(">"), "\\>");
- tmpStr.replace(TQRegExp("\\["), "");
- tmpStr.replace(TQRegExp("\\]"), "");
- tmpStr.replace(TQRegExp("\\{"), "");
- tmpStr.replace(TQRegExp("\\}"), "");
+ tmpStr.tqreplace(TQRegExp("&"), "\\&");
+ tmpStr.tqreplace(TQRegExp("\\^"), "\\^");
+ tmpStr.tqreplace(TQRegExp("%"), "\\%");
+ tmpStr.tqreplace(TQRegExp("<"), "\\<");
+ tmpStr.tqreplace(TQRegExp(">"), "\\>");
+ tmpStr.tqreplace(TQRegExp("\\["), "");
+ tmpStr.tqreplace(TQRegExp("\\]"), "");
+ tmpStr.tqreplace(TQRegExp("\\{"), "");
+ tmpStr.tqreplace(TQRegExp("\\}"), "");
//
// LilyPond uses utf8 encoding.
@@ -389,11 +389,11 @@ LilyPondExporter::write()
TQString baseName = nfo.fileName();
// sed LilyPond-choking chars out of the filename proper
- bool illegalFilename = (baseName.contains(' ') || baseName.contains("\\"));
- baseName.replace(TQRegExp(" "), "");
- baseName.replace(TQRegExp("\\\\"), "");
- baseName.replace(TQRegExp("'"), "");
- baseName.replace(TQRegExp("\""), "");
+ bool illegalFilename = (baseName.tqcontains(' ') || baseName.tqcontains("\\"));
+ baseName.tqreplace(TQRegExp(" "), "");
+ baseName.tqreplace(TQRegExp("\\\\"), "");
+ baseName.tqreplace(TQRegExp("'"), "");
+ baseName.tqreplace(TQRegExp("\""), "");
// cat back together
tmpName = dirName + '/' + baseName;
@@ -402,7 +402,7 @@ LilyPondExporter::write()
CurrentProgressDialog::freeze();
int reply = KMessageBox::warningContinueCancel(
0, i18n("LilyPond does not allow spaces or backslashes in filenames.\n\n"
- "Would you like to use\n\n %1\n\n instead?").arg(baseName));
+ "Would you like to use\n\n %1\n\n instead?").tqarg(baseName));
if (reply != KMessageBox::Continue)
return false;
}
@@ -452,7 +452,7 @@ LilyPondExporter::write()
// LilyPond \header block
- // set indention level to make future changes to horizontal layout less
+ // set indention level to make future changes to horizontal tqlayout less
// tedious, ++col to indent a new level, --col to de-indent
int col = 0;
@@ -583,7 +583,7 @@ LilyPondExporter::write()
// bind staffs with or without staff group bracket
str << indent(col) // indent
<< "<<" << " s4 " << ">>" << std::endl;
- str << indent(col) << "\\layout { }" << std::endl;
+ str << indent(col) << "\\tqlayout { }" << std::endl;
str << indent(--col) << "}" << std::endl;
return true;
}
@@ -1181,7 +1181,7 @@ LilyPondExporter::write()
text += " ";
TQString syllable(strtoqstr(ssyllable));
- syllable.replace(TQRegExp("\\s+"), "");
+ syllable.tqreplace(TQRegExp("\\s+"), "");
text += "\"" + syllable + "\"";
haveLyric = true;
} else if (verse > lastVerse) {
@@ -1190,8 +1190,8 @@ LilyPondExporter::write()
}
}
- text.replace( TQRegExp(" _+([^ ])") , " \\1" );
- text.replace( "\"_\"" , " " );
+ text.tqreplace( TQRegExp(" _+([^ ])") , " \\1" );
+ text.tqreplace( "\"_\"" , " " );
// Do not create empty context for lyrics.
// Does this save some vertical space, as was written
@@ -1202,17 +1202,17 @@ LilyPondExporter::write()
str << indent(col) << "\\lyricsto \"" << voiceNumber.str() << "\""
<< " \\new Lyrics \\lyricmode {" << std::endl;
if (m_lyricsHAlignment == RIGHT_ALIGN) {
- str << indent(++col) << "\\override LyricText #'self-alignment-X = #RIGHT"
+ str << indent(++col) << "\\override LyricText #'self-tqalignment-X = #RIGHT"
<< std::endl;
} else if (m_lyricsHAlignment == CENTER_ALIGN) {
- str << indent(++col) << "\\override LyricText #'self-alignment-X = #CENTER"
+ str << indent(++col) << "\\override LyricText #'self-tqalignment-X = #CENTER"
<< std::endl;
} else {
- str << indent(++col) << "\\override LyricText #'self-alignment-X = #LEFT"
+ str << indent(++col) << "\\override LyricText #'self-tqalignment-X = #LEFT"
<< std::endl;
}
str << indent(col) << "\\set ignoreMelismata = ##t" << std::endl;
- str << indent(col) << text.utf8() << " " << std::endl;
+ str << indent(col) << text.utf8().data() << " " << std::endl;
str << indent(col) << "\\unset ignoreMelismata" << std::endl;
str << indent(--col) << "} % Lyrics " << (currentVerse+1) << std::endl;
// close the Lyrics context
@@ -1253,8 +1253,8 @@ LilyPondExporter::write()
str << std::endl << indent(--col) << ">> % notes" << std::endl << std::endl; // indent-
// str << std::endl << indent(col) << ">> % global wrapper" << std::endl;
- // write \layout block
- str << indent(col) << "\\layout { }" << std::endl;
+ // write \tqlayout block
+ str << indent(col) << "\\tqlayout { }" << std::endl;
// write initial tempo in Midi block, if user wishes (added per user request...
// makes debugging the .ly file easier because fewer "noisy" errors are
@@ -1430,7 +1430,7 @@ LilyPondExporter::writeBar(Segment *s,
writtenDuration += note.getDuration();
durationRatio = writeSkip(timeSignature, 0, note.getDuration(), true, str);
durationRatioSum = fractionSum(durationRatioSum,durationRatio);
- // str << qstrtostr(TQString(" %{ %1/%2 %} ").arg(durationRatio.first).arg(durationRatio.second)); // DEBUG
+ // str << qstrtostr(TQString(" %{ %1/%2 %} ").tqarg(durationRatio.first).tqarg(durationRatio.second)); // DEBUG
}
timeT prevDuration = -1;
@@ -1496,7 +1496,7 @@ LilyPondExporter::writeBar(Segment *s,
groupId = -1;
groupType = "";
} else {
- startGroupBeamingsStr += TQString("\\times %1/%2 { ").arg(numerator).arg(denominator);
+ startGroupBeamingsStr += TQString("\\times %1/%2 { ").tqarg(numerator).tqarg(denominator);
tupletRatio = std::pair<int, int>(numerator, denominator);
// Require explicit beamed groups,
// fixes bug #1683205.
@@ -1534,7 +1534,7 @@ LilyPondExporter::writeBar(Segment *s,
// Test whether the next note is grace note or not.
// The start or end of beamed grouping should be put in proper places.
- str << endGroupBeamingsStr.utf8();
+ str << endGroupBeamingsStr.utf8().data();
if ((*i)->has(IS_GRACE_NOTE) && (*i)->get<Bool>(IS_GRACE_NOTE)) {
if (isGrace == 0) {
isGrace = 1;
@@ -1546,7 +1546,7 @@ LilyPondExporter::writeBar(Segment *s,
// str << "%{ grace ends %} "; // DEBUG
str << "} ";
}
- str << startGroupBeamingsStr.utf8();
+ str << startGroupBeamingsStr.utf8().data();
timeT soundingDuration = -1;
timeT duration = calculateDuration
@@ -1688,7 +1688,7 @@ LilyPondExporter::writeBar(Segment *s,
writtenDuration += soundingDuration;
std::pair<int,int> ratio = fractionProduct(durationRatio,tupletRatio);
durationRatioSum = fractionSum(durationRatioSum, ratio);
- // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").arg(durationRatio.first).arg(durationRatio.second).arg(tupletRatio.first).arg(tupletRatio.second).arg(ratio.first).arg(ratio.second)); // DEBUG
+ // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").tqarg(durationRatio.first).tqarg(durationRatio.second).tqarg(tupletRatio.first).tqarg(tupletRatio.second).tqarg(ratio.first).tqarg(ratio.second)); // DEBUG
std::vector<Mark> marks(chord.getMarksForChord());
// problem here: stem direction unavailable (it's a view-local property)
@@ -1869,7 +1869,7 @@ LilyPondExporter::writeBar(Segment *s,
writtenDuration += soundingDuration;
std::pair<int,int> ratio = fractionProduct(durationRatio,tupletRatio);
durationRatioSum = fractionSum(durationRatioSum, ratio);
- // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").arg(durationRatio.first).arg(durationRatio.second).arg(tupletRatio.first).arg(tupletRatio.second).arg(ratio.first).arg(ratio.second)); // DEBUG
+ // str << qstrtostr(TQString(" %{ %1/%2 * %3/%4 = %5/%6 %} ").tqarg(durationRatio.first).tqarg(durationRatio.second).tqarg(tupletRatio.first).tqarg(tupletRatio.second).tqarg(ratio.first).tqarg(ratio.second)); // DEBUG
} else if ((*i)->isa(Clef::EventType)) {
try {
@@ -1992,16 +1992,16 @@ LilyPondExporter::writeBar(Segment *s,
str << "c:" << barreStart << "-" << barreEnd << "-" << barreFret << ";";
}
- if (fingering.getStringStatus( 6-stringNum ) == Guitar::Fingering::MUTED) {
+ if (fingering.getStringtqStatus( 6-stringNum ) == Guitar::Fingering::MUTED) {
str << stringNum << "-x;";
- } else if (fingering.getStringStatus( 6-stringNum ) == Guitar::Fingering::OPEN) {
+ } else if (fingering.getStringtqStatus( 6-stringNum ) == Guitar::Fingering::OPEN) {
str << stringNum << "-o;";
} else {
- int stringStatus = fingering.getStringStatus(6-stringNum);
+ int stringtqStatus = fingering.getStringtqStatus(6-stringNum);
if ((stringNum <= barreStart) && (stringNum >= barreEnd)) {
str << stringNum << "-" << barreFret << ";";
} else {
- str << stringNum << "-" << stringStatus << ";";
+ str << stringNum << "-" << stringtqStatus << ";";
}
}
}
diff --git a/src/document/io/LilyPondExporter.h b/src/document/io/LilyPondExporter.h
index 6ba3a21..a106243 100644
--- a/src/document/io/LilyPondExporter.h
+++ b/src/document/io/LilyPondExporter.h
@@ -87,8 +87,8 @@ public:
typedef std::multiset<Event*, Event::EventEndCmp> eventendlist;
public:
- LilyPondExporter(RosegardenGUIApp *parent, RosegardenGUIDoc *, std::string fileName);
- LilyPondExporter(NotationView *parent, RosegardenGUIDoc *, std::string fileName);
+ LilyPondExporter(RosegardenGUIApp *tqparent, RosegardenGUIDoc *, std::string fileName);
+ LilyPondExporter(NotationView *tqparent, RosegardenGUIDoc *, std::string fileName);
~LilyPondExporter();
bool write();
@@ -129,7 +129,7 @@ protected:
// compose an appropriate LilyPond representation for various Marks
std::string composeLilyMark(std::string eventMark, bool stemUp);
- // find/protect illegal characters in user-supplied strings
+ // tqfind/protect illegal characters in user-supplied strings
std::string protectIllegalChars(std::string inStr);
// return a string full of column tabs
diff --git a/src/document/io/MupExporter.cpp b/src/document/io/MupExporter.cpp
index 6207512..f17a8a3 100644
--- a/src/document/io/MupExporter.cpp
+++ b/src/document/io/MupExporter.cpp
@@ -45,10 +45,10 @@ namespace Rosegarden
{
using namespace BaseProperties;
-MupExporter::MupExporter(TQObject *parent,
+MupExporter::MupExporter(TQObject *tqparent,
Composition *composition,
string fileName) :
- ProgressReporter(parent, "mupExporter"),
+ ProgressReporter(tqparent, "mupExporter"),
m_composition(composition),
m_fileName(fileName)
{
diff --git a/src/document/io/MupExporter.h b/src/document/io/MupExporter.h
index 1ba8d5d..781080d 100644
--- a/src/document/io/MupExporter.h
+++ b/src/document/io/MupExporter.h
@@ -55,7 +55,7 @@ class Composition;
class MupExporter : public ProgressReporter
{
public:
- MupExporter(TQObject *parent, Composition *, std::string fileName);
+ MupExporter(TQObject *tqparent, Composition *, std::string fileName);
~MupExporter();
bool write();
diff --git a/src/document/io/MusicXmlExporter.cpp b/src/document/io/MusicXmlExporter.cpp
index 365a792..febd911 100644
--- a/src/document/io/MusicXmlExporter.cpp
+++ b/src/document/io/MusicXmlExporter.cpp
@@ -46,10 +46,10 @@ namespace Rosegarden
using namespace BaseProperties;
-MusicXmlExporter::MusicXmlExporter(TQObject *parent,
+MusicXmlExporter::MusicXmlExporter(TQObject *tqparent,
RosegardenGUIDoc *doc,
std::string fileName) :
- ProgressReporter(parent, "musicXmlExporter"),
+ ProgressReporter(tqparent, "musicXmlExporter"),
m_doc(doc),
m_fileName(fileName)
{
diff --git a/src/document/io/MusicXmlExporter.h b/src/document/io/MusicXmlExporter.h
index 7d8287d..f2da943 100644
--- a/src/document/io/MusicXmlExporter.h
+++ b/src/document/io/MusicXmlExporter.h
@@ -60,7 +60,7 @@ public:
typedef std::multiset<Event*, Event::EventCmp> eventstartlist;
typedef std::multiset<Event*, Event::EventEndCmp> eventendlist;
public:
- MusicXmlExporter(TQObject *parent, RosegardenGUIDoc *, std::string fileName);
+ MusicXmlExporter(TQObject *tqparent, RosegardenGUIDoc *, std::string fileName);
~MusicXmlExporter();
bool write();
diff --git a/src/document/io/RG21Loader.cpp b/src/document/io/RG21Loader.cpp
index d5df36d..78950de 100644
--- a/src/document/io/RG21Loader.cpp
+++ b/src/document/io/RG21Loader.cpp
@@ -58,8 +58,8 @@ using namespace Accidentals;
using namespace Marks;
RG21Loader::RG21Loader(Studio *studio,
- TQObject *parent, const char* name)
- : ProgressReporter(parent, name),
+ TQObject *tqparent, const char* name)
+ : ProgressReporter(tqparent, name),
m_stream(0),
m_studio(studio),
m_composition(0),
@@ -69,7 +69,7 @@ RG21Loader::RG21Loader(Studio *studio,
m_currentClef(Clef::Treble),
m_currentInstrumentId(MidiInstrumentBase),
m_inGroup(false),
- m_tieStatus(0),
+ m_tietqStatus(0),
m_nbStaves(0)
{}
@@ -106,8 +106,8 @@ bool RG21Loader::parseKey()
}
TQString keyName = TQString("%1 %2or")
- .arg(keyBase)
- .arg(m_tokens[3].lower());
+ .tqarg(keyBase)
+ .tqarg(m_tokens[3].lower());
m_currentKey = Rosegarden::Key(qstrtostr(keyName));
Event *keyEvent = m_currentKey.getAsEvent(m_currentSegmentTime);
@@ -173,10 +173,10 @@ bool RG21Loader::parseChordItem()
noteEvent->set
<Int>(PITCH, pitch);
- if (m_tieStatus == 1) {
+ if (m_tietqStatus == 1) {
noteEvent->set
<Bool>(TIED_FORWARD, true);
- } else if (m_tieStatus == 2) {
+ } else if (m_tietqStatus == 2) {
noteEvent->set
<Bool>(TIED_BACKWARD, true);
}
@@ -199,10 +199,10 @@ bool RG21Loader::parseChordItem()
}
m_currentSegmentTime += duration;
- if (m_tieStatus == 2)
- m_tieStatus = 0;
- else if (m_tieStatus == 1)
- m_tieStatus = 2;
+ if (m_tietqStatus == 2)
+ m_tietqStatus = 0;
+ else if (m_tietqStatus == 1)
+ m_tietqStatus = 2;
return true;
}
@@ -348,13 +348,13 @@ bool RG21Loader::parseIndicationStart()
if (indicationType == "tie") {
- if (m_tieStatus != 0) {
+ if (m_tietqStatus != 0) {
RG_DEBUG
<< "RG21Loader:: parseIndicationStart: WARNING: Found tie within "
<< "tie, ignoring" << endl;
return true;
}
- // m_tieStatus = 1;
+ // m_tietqStatus = 1;
Segment::iterator i = m_currentSegment->end();
if (i != m_currentSegment->begin()) {
@@ -368,7 +368,7 @@ bool RG21Loader::parseIndicationStart()
--i;
}
}
- m_tieStatus = 2;
+ m_tietqStatus = 2;
RG_DEBUG << "rg21io: Indication start: it's a tie" << endl;
@@ -484,7 +484,7 @@ void RG21Loader::closeGroup()
// To change the time of an event, we need to erase &
// re-insert it. But erasure will delete the event, and
- // if it's an indication event that will invalidate our
+ // if it's an indication event that will tqinvalidate our
// indicationsExtant entry. Hence this unpleasantness:
if ((*i)->isa(Indication::EventType)) {
diff --git a/src/document/io/RG21Loader.h b/src/document/io/RG21Loader.h
index 583367c..51e663b 100644
--- a/src/document/io/RG21Loader.h
+++ b/src/document/io/RG21Loader.h
@@ -58,7 +58,7 @@ class RG21Loader : public ProgressReporter
{
public:
RG21Loader(Studio *,
- TQObject *parent = 0, const char *name = 0);
+ TQObject *tqparent = 0, const char *name = 0);
~RG21Loader();
/**
@@ -145,7 +145,7 @@ protected:
int m_groupUntupledLength;
int m_groupUntupledCount;
- int m_tieStatus; // 0 -> none, 1 -> tie started, 2 -> seen one note
+ int m_tietqStatus; // 0 -> none, 1 -> tie started, 2 -> seen one note
TQString m_currentLine;
TQString m_currentStaffName;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 14:54:02 +0000