diff options
Diffstat (limited to 'src/gui/application')
| -rw-r--r-- | src/gui/application/RosegardenGUIApp.cpp | 14 | ||||
| -rw-r--r-- | src/gui/application/RosegardenGUIApp.cpp.orig | 14 | ||||
| -rw-r--r-- | src/gui/application/main.cpp | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp index 69cf83b..520d363 100644 --- a/src/gui/application/RosegardenGUIApp.cpp +++ b/src/gui/application/RosegardenGUIApp.cpp @@ -2288,7 +2288,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension, // extract first extension listed in descriptiveExtension, for instance, // ".rg" from "*.rg|Rosegarden files", or ".mid" from "*.mid *.midi|MIDI Files" // - TQString extension = descriptiveExtension.left(descriptiveExtension.tqfind('|')).mid(1).section(' ', 0, 0); + TQString extension = descriptiveExtension.left(descriptiveExtension.find('|')).mid(1).section(' ', 0, 0); RG_DEBUG << "RosegardenGUIApp::getValidWriteFile() : extension = " << extension << endl; @@ -2299,7 +2299,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension, if (m_doc) { TQString saveFileName = m_doc->getAbsFilePath(); // Show filename without the old extension - int dotLoc = saveFileName.tqfindRev('.'); + int dotLoc = saveFileName.findRev('.'); if (dotLoc >= int(saveFileName.length() - 4)) { saveFileName = saveFileName.left(dotLoc); } @@ -3134,7 +3134,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent) int beats = 0; - // Get user to tell us how many beats or bars the segment tqcontains + // Get user to tell us how many beats or bars the segment contains BeatsBarsDialog dialog(tqparent); if (dialog.exec() == TQDialog::Accepted) { beats = dialog.getQuantity(); // beats (or bars) @@ -3723,8 +3723,8 @@ void RosegardenGUIApp::importProject(TQString filePath) delete proc; TQString rgFile = filePath; - rgFile.tqreplace(TQRegExp(".rg.rgp$"), ".rg"); - rgFile.tqreplace(TQRegExp(".rgp$"), ".rg"); + rgFile.replace(TQRegExp(".rg.rgp$"), ".rg"); + rgFile.replace(TQRegExp(".rgp$"), ".rg"); openURL(rgFile); } @@ -4864,8 +4864,8 @@ void RosegardenGUIApp::slotExportProject() return ; TQString rgFile = fileName; - rgFile.tqreplace(TQRegExp(".rg.rgp$"), ".rg"); - rgFile.tqreplace(TQRegExp(".rgp$"), ".rg"); + rgFile.replace(TQRegExp(".rg.rgp$"), ".rg"); + rgFile.replace(TQRegExp(".rgp$"), ".rg"); CurrentProgressDialog::freeze(); diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig index 26ee1ed..a5bf4bb 100644 --- a/src/gui/application/RosegardenGUIApp.cpp.orig +++ b/src/gui/application/RosegardenGUIApp.cpp.orig @@ -2288,7 +2288,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension, // extract first extension listed in descriptiveExtension, for instance, // ".rg" from "*.rg|Rosegarden files", or ".mid" from "*.mid *.midi|MIDI Files" // - TQString extension = descriptiveExtension.left(descriptiveExtension.tqfind('|')).mid(1).section(' ', 0, 0); + TQString extension = descriptiveExtension.left(descriptiveExtension.find('|')).mid(1).section(' ', 0, 0); RG_DEBUG << "RosegardenGUIApp::getValidWriteFile() : extension = " << extension << endl; @@ -2299,7 +2299,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension, if (m_doc) { TQString saveFileName = m_doc->getAbsFilePath(); // Show filename without the old extension - int dotLoc = saveFileName.tqfindRev('.'); + int dotLoc = saveFileName.findRev('.'); if (dotLoc >= int(saveFileName.length() - 4)) { saveFileName = saveFileName.left(dotLoc); } @@ -3134,7 +3134,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent) int beats = 0; - // Get user to tell us how many beats or bars the segment tqcontains + // Get user to tell us how many beats or bars the segment contains BeatsBarsDialog dialog(tqparent); if (dialog.exec() == TQDialog::Accepted) { beats = dialog.getQuantity(); // beats (or bars) @@ -3723,8 +3723,8 @@ void RosegardenGUIApp::importProject(TQString filePath) delete proc; TQString rgFile = filePath; - rgFile.tqreplace(TQRegExp(".rg.rgp$"), ".rg"); - rgFile.tqreplace(TQRegExp(".rgp$"), ".rg"); + rgFile.replace(TQRegExp(".rg.rgp$"), ".rg"); + rgFile.replace(TQRegExp(".rgp$"), ".rg"); openURL(rgFile); } @@ -4864,8 +4864,8 @@ void RosegardenGUIApp::slotExportProject() return ; TQString rgFile = fileName; - rgFile.tqreplace(TQRegExp(".rg.rgp$"), ".rg"); - rgFile.tqreplace(TQRegExp(".rgp$"), ".rg"); + rgFile.replace(TQRegExp(".rg.rgp$"), ".rg"); + rgFile.replace(TQRegExp(".rgp$"), ".rg"); CurrentProgressDialog::freeze(); diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp index 8c5a5a9..c9ade00 100644 --- a/src/gui/application/main.cpp +++ b/src/gui/application/main.cpp @@ -98,7 +98,7 @@ disastrous side-effects. automatically ordered by their absolute time. It's the usual container for Events. A Segment has a starting time that can be changed, and a duration that is based solely on the end time of - the last Event it tqcontains. Note that in order to facilitate + the last Event it contains. Note that in order to facilitate musical notation editing, we explicitly store silences as series of rest Events; thus a Segment really should contain no gaps between its Events. (This isn't checked anywhere and nothing will @@ -153,7 +153,7 @@ The base directory also contains various music-related helper classes: The NotationTypes classes also define important constants for the names of common properties in Events. For example, the Note class contains Note::EventType, which is the type of a note Event, and - Note::EventRestType, the type of a rest Event; and Key tqcontains + Note::EventRestType, the type of a rest Event; and Key contains Key::EventType, the type of a key change Event, KeyPropertyName, the name of the property that defines the key change, and a set of the valid strings for key changes. |