summaryrefslogtreecommitdiffstats
path: root/src/gui/application
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/application')
-rw-r--r--src/gui/application/RosegardenApplication.cpp4
-rw-r--r--src/gui/application/RosegardenGUIApp.cpp84
-rw-r--r--src/gui/application/RosegardenGUIApp.cpp.orig86
-rw-r--r--src/gui/application/RosegardenGUIApp.h2
-rw-r--r--src/gui/application/RosegardenGUIView.cpp8
-rw-r--r--src/gui/application/SetWaitCursor.cpp2
-rw-r--r--src/gui/application/main.cpp6
7 files changed, 96 insertions, 96 deletions
diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp
index 263397e..0168ae6 100644
--- a/src/gui/application/RosegardenApplication.cpp
+++ b/src/gui/application/RosegardenApplication.cpp
@@ -101,7 +101,7 @@ void RosegardenApplication::sfxLoadExited(KProcess *proc)
config()->setGroup(configGroup);
KMessageBox::error(mainWidget(),
- i18n("Failed to load soundfont %1").tqarg(soundFontPath));
+ i18n("Failed to load soundfont %1").arg(soundFontPath));
} else {
RG_DEBUG << "RosegardenApplication::sfxLoadExited() : sfxload exited normally\n";
}
@@ -114,7 +114,7 @@ void RosegardenApplication::slotSetStatusMessage(TQString msg)
if (mainWindow) {
if (msg.isEmpty())
msg = KTmpStatusMsg::getDefaultMsg();
- mainWindow->statusBar()->changeItem(TQString(" %1").tqarg(msg), KTmpStatusMsg::getDefaultId());
+ mainWindow->statusBar()->changeItem(TQString(" %1").arg(msg), KTmpStatusMsg::getDefaultId());
}
}
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 53e262e..61544bf 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -1293,8 +1293,8 @@ void RosegardenGUIApp::initZoomToolbar()
}
// zoom labels
- TQString minZoom = TQString("%1%").tqarg(factors[0] * 100.0);
- TQString maxZoom = TQString("%1%").tqarg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
+ TQString minZoom = TQString("%1%").arg(factors[0] * 100.0);
+ TQString maxZoom = TQString("%1%").arg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
m_zoomSlider = new ZoomSlider<double>
(zoomSizes, -1, Qt::Horizontal, zoomToolbar, "kde toolbar widget");
@@ -1716,7 +1716,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
if (!info.exists()) {
// can happen with command-line arg, so...
KStartupLogo::hideIfStillThere();
- KMessageBox::sorry(this, i18n("File \"%1\" does not exist").tqarg(filePath));
+ KMessageBox::sorry(this, i18n("File \"%1\" does not exist").arg(filePath));
return 0;
}
@@ -1731,7 +1731,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
if (!file.open(IO_ReadOnly)) {
KStartupLogo::hideIfStillThere();
TQString errStr =
- i18n("You do not have read permission for \"%1\"").tqarg(filePath);
+ i18n("You do not have read permission for \"%1\"").arg(filePath);
KMessageBox::sorry(this, errStr);
return 0;
@@ -1850,8 +1850,8 @@ void RosegardenGUIApp::slotSaveOptions()
#ifdef SETTING_LOG_DEBUG
- _settingLog(TQString("SETTING 2 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
- _settingLog(TQString("SETTING 2 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+ _settingLog(TQString("SETTING 2 : transport flap extended = %1").arg(getTransport()->isExpanded()));
+ _settingLog(TQString("SETTING 2 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
#endif
kapp->config()->setGroup(GeneralOptionsConfigGroup);
@@ -1893,13 +1893,13 @@ void RosegardenGUIApp::setupFileDialogSpeedbar()
unsigned int n = config->readUnsignedNumEntry("Number of Entries", 0);
- config->writeEntry(TQString("Description_%1").tqarg(n), i18n("Example Files"));
- config->writeEntry(TQString("IconGroup_%1").tqarg(n), 4);
- config->writeEntry(TQString("Icon_%1").tqarg(n), "folder");
- config->writeEntry(TQString("URL_%1").tqarg(n),
+ config->writeEntry(TQString("Description_%1").arg(n), i18n("Example Files"));
+ config->writeEntry(TQString("IconGroup_%1").arg(n), 4);
+ config->writeEntry(TQString("Icon_%1").arg(n), "folder");
+ config->writeEntry(TQString("URL_%1").arg(n),
KGlobal::dirs()->findResource("appdata", "examples/"));
- RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").tqarg(n)) << endl;
+ RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").arg(n)) << endl;
config->writeEntry("Examples Set", true);
config->writeEntry("Number of Entries", n + 1);
@@ -1936,7 +1936,7 @@ void RosegardenGUIApp::readOptions()
#ifdef SETTING_LOG_DEBUG
- _settingLog(TQString("SETTING 3 : transport flap extended = %1").tqarg(opt));
+ _settingLog(TQString("SETTING 3 : transport flap extended = %1").arg(opt));
#endif
if (opt)
@@ -1948,7 +1948,7 @@ void RosegardenGUIApp::readOptions()
#ifdef SETTING_LOG_DEBUG
- _settingLog(TQString("SETTING 3 : show track labels = %1").tqarg(opt));
+ _settingLog(TQString("SETTING 3 : show track labels = %1").arg(opt));
#endif
m_viewTrackLabels->setChecked(opt);
@@ -2010,10 +2010,10 @@ void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg)
if (!res) {
if (!errMsg.isNull())
KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
- .tqarg(tempname).tqarg(errMsg).ascii()));
+ .arg(tempname).arg(errMsg).ascii()));
else
KMessageBox::error(this, i18n(TQString("Could not save document at %1")
- .tqarg(tempname).ascii()));
+ .arg(tempname).ascii()));
}
}
}
@@ -2061,8 +2061,8 @@ bool RosegardenGUIApp::queryClose()
RG_DEBUG << "RosegardenGUIApp::queryClose" << endl;
#ifdef SETTING_LOG_DEBUG
- _settingLog(TQString("SETTING 1 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
- _settingLog(TQString("SETTING 1 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+ _settingLog(TQString("SETTING 1 : transport flap extended = %1").arg(getTransport()->isExpanded()));
+ _settingLog(TQString("SETTING 1 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
#endif
TQString errMsg;
@@ -2151,7 +2151,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
if (!url.isValid()) {
TQString string;
- string = i18n( "Malformed URL\n%1").tqarg(netFile);
+ string = i18n( "Malformed URL\n%1").arg(netFile);
KMessageBox::sorry(this, string);
return ;
@@ -2160,7 +2160,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
TQString target, caption(url.path());
if (KIO::NetAccess::download(url, target, this) == false) {
- KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+ KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
return ;
}
@@ -2192,7 +2192,7 @@ void RosegardenGUIApp::slotFileOpen()
kapp->config()->setGroup("Recent Dirs");
TQString recentString = kapp->config()->readEntry("ROSEGARDEN", "");
kapp->config()->writeEntry
- ("ROSEGARDEN", TQString("file:%1,%2").tqarg(examplesDir).tqarg(recentString));
+ ("ROSEGARDEN", TQString("file:%1,%2").arg(examplesDir).arg(recentString));
}
KURL url = KFileDialog::getOpenURL
@@ -2226,7 +2226,7 @@ void RosegardenGUIApp::slotMerge()
TQString target;
if (KIO::NetAccess::download(url, target, this) == false) {
- KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+ KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
return ;
}
@@ -2273,10 +2273,10 @@ void RosegardenGUIApp::slotFileSave()
if (!res) {
if (!errMsg.isNull())
KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
- .tqarg(docFilePath).tqarg(errMsg).ascii()));
+ .arg(docFilePath).arg(errMsg).ascii()));
else
KMessageBox::error(this, i18n(TQString("Could not save document at %1")
- .tqarg(docFilePath).ascii()));
+ .arg(docFilePath).ascii()));
}
}
}
@@ -2376,10 +2376,10 @@ bool RosegardenGUIApp::slotFileSaveAs()
if (!res) {
if (!errMsg.isNull())
KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
- .tqarg(newName).tqarg(errMsg).ascii()));
+ .arg(newName).arg(errMsg).ascii()));
else
KMessageBox::error(this, i18n(TQString("Could not save document at %1")
- .tqarg(newName).ascii()));
+ .arg(newName).ascii()));
} else {
@@ -2764,7 +2764,7 @@ RosegardenGUIApp::testAudioPath(TQString op)
} catch (AudioFileManager::BadAudioPathException) {
if (KMessageBox::warningContinueCancel
(this,
- i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").tqarg(op),
+ i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").arg(op),
i18n("Warning"),
i18n("Set audio file path")) == KMessageBox::Continue) {
slotOpenAudioPathSettings();
@@ -3714,7 +3714,7 @@ void RosegardenGUIApp::importProject(TQString filePath)
if (!proc->normalExit() || proc->exitStatus()) {
CurrentProgressDialog::freeze();
- KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").tqarg(filePath));
+ KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").arg(filePath));
CurrentProgressDialog::thaw();
delete proc;
return ;
@@ -4530,7 +4530,7 @@ void RosegardenGUIApp::slotTestStartupTester()
} else {
for (int i = 0; i < missing.count(); ++i) {
// if (missingFeatures.count() > 1) {
- allMissing.push_back(i18n("%1 - for project file support").tqarg(missing[i]));
+ allMissing.push_back(i18n("%1 - for project file support").arg(missing[i]));
// } else {
// allMissing.push_back(missing[i]);
// }
@@ -4551,7 +4551,7 @@ void RosegardenGUIApp::slotTestStartupTester()
} else {
for (int i = 0; i < missing.count(); ++i) {
if (missingFeatures.count() > 1) {
- allMissing.push_back(i18n("%1 - for LilyPond preview support").tqarg(missing[i]));
+ allMissing.push_back(i18n("%1 - for LilyPond preview support").arg(missing[i]));
} else {
allMissing.push_back(missing[i]);
}
@@ -4571,7 +4571,7 @@ void RosegardenGUIApp::slotTestStartupTester()
} else {
for (int i = 0; i < missing.count(); ++i) {
if (missingFeatures.count() > 1) {
- allMissing.push_back(i18n("%1 - for audio file import").tqarg(missing[i]));
+ allMissing.push_back(i18n("%1 - for audio file import").arg(missing[i]));
} else {
allMissing.push_back(missing[i]);
}
@@ -4585,13 +4585,13 @@ void RosegardenGUIApp::slotTestStartupTester()
TQString message = i18n("<h3>Helper programs not found</h3><p>Rosegarden could not find one or more helper programs which it needs to provide some features. The following features will not be available:</p>");
message += i18n("<ul>");
for (int i = 0; i < missingFeatures.count(); ++i) {
- message += i18n("<li>%1</li>").tqarg(missingFeatures[i]);
+ message += i18n("<li>%1</li>").arg(missingFeatures[i]);
}
message += i18n("</ul>");
message += i18n("<p>To fix this, you should install the following additional programs:</p>");
message += i18n("<ul>");
for (int i = 0; i < allMissing.count(); ++i) {
- message += i18n("<li>%1</li>").tqarg(allMissing[i]);
+ message += i18n("<li>%1</li>").arg(allMissing[i]);
}
message += i18n("</ul>");
@@ -4872,7 +4872,7 @@ void RosegardenGUIApp::slotExportProject()
TQString errMsg;
if (!m_doc->saveDocument(rgFile, errMsg,
true)) { // pretend it's autosave
- KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").tqarg(errMsg));
+ KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").arg(errMsg));
CurrentProgressDialog::thaw();
return ;
}
@@ -4886,7 +4886,7 @@ void RosegardenGUIApp::slotExportProject()
proc->start(KProcess::Block, KProcess::All);
if (!proc->normalExit() || proc->exitStatus()) {
- KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").tqarg(fileName));
+ KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName));
CurrentProgressDialog::thaw();
delete proc;
return ;
@@ -5790,7 +5790,7 @@ void RosegardenGUIApp::slotChangeZoom(int)
{
double duration44 = TimeSignature(4, 4).getBarDuration();
double value = double(m_zoomSlider->getCurrentSize());
- m_zoomLabel->setText(i18n("%1%").tqarg(duration44 / value));
+ m_zoomLabel->setText(i18n("%1%").arg(duration44 / value));
RG_DEBUG << "RosegardenGUIApp::slotChangeZoom : zoom size = "
<< m_zoomSlider->getCurrentSize() << endl;
@@ -5858,7 +5858,7 @@ RosegardenGUIApp::slotChangeTempo(timeT time,
timeT prevTime = comp.getTempoChange(index).first;
KMacroCommand *macro =
- new KMacroCommand(i18n("Replace Tempo Change at %1").tqarg(time));
+ new KMacroCommand(i18n("Replace Tempo Change at %1").arg(time));
macro->addCommand(new RemoveTempoChangeCommand(&comp, index));
macro->addCommand(new AddTempoChangeCommand(&comp, prevTime, value,
@@ -6360,7 +6360,7 @@ RosegardenGUIApp::slotAddAudioFile(unsigned int id)
int result;
streamIn >> result;
if (!result) {
- KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").tqarg(aF->getFilename().c_str()));
+ KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").arg(aF->getFilename().c_str()));
}
}
}
@@ -6385,7 +6385,7 @@ RosegardenGUIApp::slotDeleteAudioFile(unsigned int id)
int result;
streamIn >> result;
if (!result) {
- KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").tqarg(id));
+ KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").arg(id));
}
}
}
@@ -7753,10 +7753,10 @@ RosegardenGUIApp::slotSaveDefaultStudio()
if (!res) {
if (!errMsg.isNull())
KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1\nError was : %2")
- .tqarg(autoloadFile).tqarg(errMsg).ascii()));
+ .arg(autoloadFile).arg(errMsg).ascii()));
else
KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1")
- .tqarg(autoloadFile).ascii()));
+ .arg(autoloadFile).ascii()));
}
}
@@ -7808,7 +7808,7 @@ RosegardenGUIApp::slotImportStudio()
TQString target;
if (KIO::NetAccess::download(url, target, this) == false) {
KMessageBox::error(this, i18n("Cannot download file %1")
- .tqarg(url.prettyURL()));
+ .arg(url.prettyURL()));
return ;
}
@@ -8044,7 +8044,7 @@ RosegardenGUIApp::slotNewerVersionAvailable(TQString v)
(this,
i18n("<h3>Newer version available</h3><p>A newer version of Rosegarden may be available.<br>Please consult the <a href=\"http://www.rosegardenmusic.com/getting/\">Rosegarden website</a> for more information.</p>"),
i18n("Newer version available"),
- TQString("version-%1-available-show").tqarg(v),
+ TQString("version-%1-available-show").arg(v),
KMessageBox::AllowLink);
CurrentProgressDialog::thaw();
}
diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig
index 331096d..45fa853 100644
--- a/src/gui/application/RosegardenGUIApp.cpp.orig
+++ b/src/gui/application/RosegardenGUIApp.cpp.orig
@@ -1293,8 +1293,8 @@ void RosegardenGUIApp::initZoomToolbar()
}
// zoom labels
- TQString minZoom = TQString("%1%").tqarg(factors[0] * 100.0);
- TQString maxZoom = TQString("%1%").tqarg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
+ TQString minZoom = TQString("%1%").arg(factors[0] * 100.0);
+ TQString maxZoom = TQString("%1%").arg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0);
m_zoomSlider = new ZoomSlider<double>
(zoomSizes, -1, TQSlider::Horizontal, zoomToolbar, "kde toolbar widget");
@@ -1716,7 +1716,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
if (!info.exists()) {
// can happen with command-line arg, so...
KStartupLogo::hideIfStillThere();
- KMessageBox::sorry(this, i18n("File \"%1\" does not exist").tqarg(filePath));
+ KMessageBox::sorry(this, i18n("File \"%1\" does not exist").arg(filePath));
return 0;
}
@@ -1731,7 +1731,7 @@ RosegardenGUIApp::createDocument(TQString filePath, ImportType importType)
if (!file.open(IO_ReadOnly)) {
KStartupLogo::hideIfStillThere();
TQString errStr =
- i18n("You do not have read permission for \"%1\"").tqarg(filePath);
+ i18n("You do not have read permission for \"%1\"").arg(filePath);
KMessageBox::sorry(this, errStr);
return 0;
@@ -1850,8 +1850,8 @@ void RosegardenGUIApp::slotSaveOptions()
#ifdef SETTING_LOG_DEBUG
- _settingLog(TQString("SETTING 2 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
- _settingLog(TQString("SETTING 2 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+ _settingLog(TQString("SETTING 2 : transport flap extended = %1").arg(getTransport()->isExpanded()));
+ _settingLog(TQString("SETTING 2 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
#endif
kapp->config()->setGroup(GeneralOptionsConfigGroup);
@@ -1893,13 +1893,13 @@ void RosegardenGUIApp::setupFileDialogSpeedbar()
unsigned int n = config->readUnsignedNumEntry("Number of Entries", 0);
- config->writeEntry(TQString("Description_%1").tqarg(n), i18n("Example Files"));
- config->writeEntry(TQString("IconGroup_%1").tqarg(n), 4);
- config->writeEntry(TQString("Icon_%1").tqarg(n), "folder");
- config->writeEntry(TQString("URL_%1").tqarg(n),
+ config->writeEntry(TQString("Description_%1").arg(n), i18n("Example Files"));
+ config->writeEntry(TQString("IconGroup_%1").arg(n), 4);
+ config->writeEntry(TQString("Icon_%1").arg(n), "folder");
+ config->writeEntry(TQString("URL_%1").arg(n),
KGlobal::dirs()->findResource("appdata", "examples/"));
- RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").tqarg(n)) << endl;
+ RG_DEBUG << "wrote url " << config->readEntry(TQString("URL_%1").arg(n)) << endl;
config->writeEntry("Examples Set", true);
config->writeEntry("Number of Entries", n + 1);
@@ -1936,7 +1936,7 @@ void RosegardenGUIApp::readOptions()
#ifdef SETTING_LOG_DEBUG
- _settingLog(TQString("SETTING 3 : transport flap extended = %1").tqarg(opt));
+ _settingLog(TQString("SETTING 3 : transport flap extended = %1").arg(opt));
#endif
if (opt)
@@ -1948,7 +1948,7 @@ void RosegardenGUIApp::readOptions()
#ifdef SETTING_LOG_DEBUG
- _settingLog(TQString("SETTING 3 : show track labels = %1").tqarg(opt));
+ _settingLog(TQString("SETTING 3 : show track labels = %1").arg(opt));
#endif
m_viewTrackLabels->setChecked(opt);
@@ -2010,10 +2010,10 @@ void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg)
if (!res) {
if (errMsg)
KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
- .tqarg(tempname).tqarg(errMsg)));
+ .arg(tempname).arg(errMsg)));
else
KMessageBox::error(this, i18n(TQString("Could not save document at %1")
- .tqarg(tempname)));
+ .arg(tempname)));
}
}
}
@@ -2061,8 +2061,8 @@ bool RosegardenGUIApp::queryClose()
RG_DEBUG << "RosegardenGUIApp::queryClose" << endl;
#ifdef SETTING_LOG_DEBUG
- _settingLog(TQString("SETTING 1 : transport flap extended = %1").tqarg(getTransport()->isExpanded()));
- _settingLog(TQString("SETTING 1 : show track labels = %1").tqarg(m_viewTrackLabels->isChecked()));
+ _settingLog(TQString("SETTING 1 : transport flap extended = %1").arg(getTransport()->isExpanded()));
+ _settingLog(TQString("SETTING 1 : show track labels = %1").arg(m_viewTrackLabels->isChecked()));
#endif
TQString errMsg;
@@ -2151,7 +2151,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
if (!url.isValid()) {
TQString string;
- string = i18n( "Malformed URL\n%1").tqarg(netFile);
+ string = i18n( "Malformed URL\n%1").arg(netFile);
KMessageBox::sorry(this, string);
return ;
@@ -2160,7 +2160,7 @@ void RosegardenGUIApp::openURL(const KURL& url)
TQString target, caption(url.path());
if (KIO::NetAccess::download(url, target, this) == false) {
- KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+ KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
return ;
}
@@ -2192,7 +2192,7 @@ void RosegardenGUIApp::slotFileOpen()
kapp->config()->setGroup("Recent Dirs");
TQString recentString = kapp->config()->readEntry("ROSEGARDEN", "");
kapp->config()->writeEntry
- ("ROSEGARDEN", TQString("file:%1,%2").tqarg(examplesDir).tqarg(recentString));
+ ("ROSEGARDEN", TQString("file:%1,%2").arg(examplesDir).arg(recentString));
}
KURL url = KFileDialog::getOpenURL
@@ -2226,7 +2226,7 @@ void RosegardenGUIApp::slotMerge()
TQString target;
if (KIO::NetAccess::download(url, target, this) == false) {
- KMessageBox::error(this, i18n("Cannot download file %1").tqarg(url.prettyURL()));
+ KMessageBox::error(this, i18n("Cannot download file %1").arg(url.prettyURL()));
return ;
}
@@ -2273,10 +2273,10 @@ void RosegardenGUIApp::slotFileSave()
if (!res) {
if (errMsg)
KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
- .tqarg(docFilePath).tqarg(errMsg)));
+ .arg(docFilePath).arg(errMsg)));
else
KMessageBox::error(this, i18n(TQString("Could not save document at %1")
- .tqarg(docFilePath)));
+ .arg(docFilePath)));
}
}
}
@@ -2376,10 +2376,10 @@ bool RosegardenGUIApp::slotFileSaveAs()
if (!res) {
if (errMsg)
KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
- .tqarg(newName).tqarg(errMsg)));
+ .arg(newName).arg(errMsg)));
else
KMessageBox::error(this, i18n(TQString("Could not save document at %1")
- .tqarg(newName)));
+ .arg(newName)));
} else {
@@ -2764,7 +2764,7 @@ RosegardenGUIApp::testAudioPath(TQString op)
} catch (AudioFileManager::BadAudioPathException) {
if (KMessageBox::warningContinueCancel
(this,
- i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").tqarg(op),
+ i18n("The audio file path does not exist or is not writable.\nYou must set the audio file path to a valid directory in Document Properties before %1.\nWould you like to set it now?").arg(op),
i18n("Warning"),
i18n("Set audio file path")) == KMessageBox::Continue) {
slotOpenAudioPathSettings();
@@ -3714,7 +3714,7 @@ void RosegardenGUIApp::importProject(TQString filePath)
if (!proc->normalExit() || proc->exitStatus()) {
CurrentProgressDialog::freeze();
- KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").tqarg(filePath));
+ KMessageBox::sorry(this, i18n("Failed to import project file \"%1\"").arg(filePath));
CurrentProgressDialog::thaw();
delete proc;
return ;
@@ -4530,7 +4530,7 @@ void RosegardenGUIApp::slotTestStartupTester()
} else {
for (int i = 0; i < missing.count(); ++i) {
// if (missingFeatures.count() > 1) {
- allMissing.push_back(i18n("%1 - for project file support").tqarg(missing[i]));
+ allMissing.push_back(i18n("%1 - for project file support").arg(missing[i]));
// } else {
// allMissing.push_back(missing[i]);
// }
@@ -4551,7 +4551,7 @@ void RosegardenGUIApp::slotTestStartupTester()
} else {
for (int i = 0; i < missing.count(); ++i) {
if (missingFeatures.count() > 1) {
- allMissing.push_back(i18n("%1 - for LilyPond preview support").tqarg(missing[i]));
+ allMissing.push_back(i18n("%1 - for LilyPond preview support").arg(missing[i]));
} else {
allMissing.push_back(missing[i]);
}
@@ -4571,7 +4571,7 @@ void RosegardenGUIApp::slotTestStartupTester()
} else {
for (int i = 0; i < missing.count(); ++i) {
if (missingFeatures.count() > 1) {
- allMissing.push_back(i18n("%1 - for audio file import").tqarg(missing[i]));
+ allMissing.push_back(i18n("%1 - for audio file import").arg(missing[i]));
} else {
allMissing.push_back(missing[i]);
}
@@ -4585,13 +4585,13 @@ void RosegardenGUIApp::slotTestStartupTester()
TQString message = i18n("<h3>Helper programs not found</h3><p>Rosegarden could not find one or more helper programs which it needs to provide some features. The following features will not be available:</p>");
message += i18n("<ul>");
for (int i = 0; i < missingFeatures.count(); ++i) {
- message += i18n("<li>%1</li>").tqarg(missingFeatures[i]);
+ message += i18n("<li>%1</li>").arg(missingFeatures[i]);
}
message += i18n("</ul>");
message += i18n("<p>To fix this, you should install the following additional programs:</p>");
message += i18n("<ul>");
for (int i = 0; i < allMissing.count(); ++i) {
- message += i18n("<li>%1</li>").tqarg(allMissing[i]);
+ message += i18n("<li>%1</li>").arg(allMissing[i]);
}
message += i18n("</ul>");
@@ -4872,7 +4872,7 @@ void RosegardenGUIApp::slotExportProject()
TQString errMsg;
if (!m_doc->saveDocument(rgFile, errMsg,
true)) { // pretend it's autosave
- KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").tqarg(errMsg));
+ KMessageBox::sorry(this, i18n("Saving Rosegarden file to package failed: %1").arg(errMsg));
CurrentProgressDialog::thaw();
return ;
}
@@ -4886,7 +4886,7 @@ void RosegardenGUIApp::slotExportProject()
proc->start(KProcess::Block, KProcess::All);
if (!proc->normalExit() || proc->exitStatus()) {
- KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").tqarg(fileName));
+ KMessageBox::sorry(this, i18n("Failed to export to project file \"%1\"").arg(fileName));
CurrentProgressDialog::thaw();
delete proc;
return ;
@@ -5790,7 +5790,7 @@ void RosegardenGUIApp::slotChangeZoom(int)
{
double duration44 = TimeSignature(4, 4).getBarDuration();
double value = double(m_zoomSlider->getCurrentSize());
- m_zoomLabel->setText(i18n("%1%").tqarg(duration44 / value));
+ m_zoomLabel->setText(i18n("%1%").arg(duration44 / value));
RG_DEBUG << "RosegardenGUIApp::slotChangeZoom : zoom size = "
<< m_zoomSlider->getCurrentSize() << endl;
@@ -5858,7 +5858,7 @@ RosegardenGUIApp::slotChangeTempo(timeT time,
timeT prevTime = comp.getTempoChange(index).first;
KMacroCommand *macro =
- new KMacroCommand(i18n("Replace Tempo Change at %1").tqarg(time));
+ new KMacroCommand(i18n("Replace Tempo Change at %1").arg(time));
macro->addCommand(new RemoveTempoChangeCommand(&comp, index));
macro->addCommand(new AddTempoChangeCommand(&comp, prevTime, value,
@@ -6360,7 +6360,7 @@ RosegardenGUIApp::slotAddAudioFile(unsigned int id)
int result;
streamIn >> result;
if (!result) {
- KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").tqarg(aF->getFilename().c_str()));
+ KMessageBox::error(this, i18n("Sequencer failed to add audio file %1").arg(aF->getFilename().c_str()));
}
}
}
@@ -6385,7 +6385,7 @@ RosegardenGUIApp::slotDeleteAudioFile(unsigned int id)
int result;
streamIn >> result;
if (!result) {
- KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").tqarg(id));
+ KMessageBox::error(this, i18n("Sequencer failed to remove audio file id %1").arg(id));
}
}
}
@@ -7723,10 +7723,10 @@ RosegardenGUIApp::slotSaveDefaultStudio()
if (!res) {
if (errMsg)
KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1\nError was : %2")
- .tqarg(autoloadFile).tqarg(errMsg)));
+ .arg(autoloadFile).arg(errMsg)));
else
KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1")
- .tqarg(autoloadFile)));
+ .arg(autoloadFile)));
}
}
@@ -7778,7 +7778,7 @@ RosegardenGUIApp::slotImportStudio()
TQString target;
if (KIO::NetAccess::download(url, target, this) == false) {
KMessageBox::error(this, i18n("Cannot download file %1")
- .tqarg(url.prettyURL()));
+ .arg(url.prettyURL()));
return ;
}
@@ -7982,7 +7982,7 @@ RosegardenGUIApp::awaitDialogClearance()
while (haveDialog) {
- const TQObjectList *c = tqchildren();
+ const TQObjectList *c = children();
if (!c) return;
haveDialog = false;
@@ -8014,7 +8014,7 @@ RosegardenGUIApp::slotNewerVersionAvailable(TQString v)
(this,
i18n("<h3>Newer version available</h3><p>A newer version of Rosegarden may be available.<br>Please consult the <a href=\"http://www.rosegardenmusic.com/getting/\">Rosegarden website</a> for more information.</p>"),
i18n("Newer version available"),
- TQString("version-%1-available-show").tqarg(v),
+ TQString("version-%1-available-show").arg(v),
KMessageBox::AllowLink);
CurrentProgressDialog::thaw();
}
diff --git a/src/gui/application/RosegardenGUIApp.h b/src/gui/application/RosegardenGUIApp.h
index a8c2a3f..0349f8b 100644
--- a/src/gui/application/RosegardenGUIApp.h
+++ b/src/gui/application/RosegardenGUIApp.h
@@ -1240,7 +1240,7 @@ public slots:
/**
* save general Options like all bar positions and status as well
- * as the tqgeometry and the recent file list to the configuration
+ * as the geometry and the recent file list to the configuration
* file
*/
void slotSaveOptions();
diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp
index f736ff9..8bda485 100644
--- a/src/gui/application/RosegardenGUIView.cpp
+++ b/src/gui/application/RosegardenGUIView.cpp
@@ -907,19 +907,19 @@ void RosegardenGUIView::setZoomSize(double size)
m_trackEditor->getSegmentCanvas()->slotUpdateSegmentsDrawBuffer();
if (m_trackEditor->getTempoRuler()) {
- m_trackEditor->getTempoRuler()->tqrepaint();
+ m_trackEditor->getTempoRuler()->repaint();
}
if (m_trackEditor->getChordNameRuler()) {
- m_trackEditor->getChordNameRuler()->tqrepaint();
+ m_trackEditor->getChordNameRuler()->repaint();
}
if (m_trackEditor->getTopStandardRuler()) {
- m_trackEditor->getTopStandardRuler()->tqrepaint();
+ m_trackEditor->getTopStandardRuler()->repaint();
}
if (m_trackEditor->getBottomStandardRuler()) {
- m_trackEditor->getBottomStandardRuler()->tqrepaint();
+ m_trackEditor->getBottomStandardRuler()->repaint();
}
}
diff --git a/src/gui/application/SetWaitCursor.cpp b/src/gui/application/SetWaitCursor.cpp
index 19ef147..9d4472d 100644
--- a/src/gui/application/SetWaitCursor.cpp
+++ b/src/gui/application/SetWaitCursor.cpp
@@ -79,7 +79,7 @@ SetWaitCursor::~SetWaitCursor()
m_guiApp->setCursor(m_saveCursor);
if (viewport) {
- if (currentSegmentCanvasCursor.tqshape() == KCursor::waitCursor().tqshape()) {
+ if (currentSegmentCanvasCursor.shape() == KCursor::waitCursor().shape()) {
viewport->setCursor(m_saveSegmentCanvasCursor);
} else {
viewport->setCursor(currentSegmentCanvasCursor); // because m_guiApp->setCursor() has replaced it
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index 3b42d7b..b2111a8 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -379,7 +379,7 @@ void testInstalledVersion()
" 2. The upgrade was installed in a non-standard directory,\n"
" and an old version was found in a standard directory. If so,\n"
" you will need to add the correct directory to your TDEDIRS\n"
- " environment variable before you can run it.").tqarg(VERSION).tqarg(installedVersion),
+ " environment variable before you can run it.").arg(VERSION).arg(installedVersion),
i18n("Installation problem"));
} else {
@@ -531,8 +531,8 @@ int main(int argc, char *argv[])
startupSize = TQSize((desktopRect.width() * 4) / 5,
(desktopRect.height() * 4) / 5);
}
- TQString widthKey = TQString("Width %1").tqarg(totalRect.width());
- TQString heightKey = TQString("Height %1").tqarg(totalRect.height());
+ TQString widthKey = TQString("Width %1").arg(totalRect.width());
+ TQString heightKey = TQString("Height %1").arg(totalRect.height());
windowWidth = config->readUnsignedNumEntry
(widthKey, startupSize.width());
windowHeight = config->readUnsignedNumEntry
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 17:24:53 +0000