Index: src/main.cpp
===================================================================
--- src/main.cpp
+++ src/main.cpp 2009-05-27 14:14:03.000000000 +0200
@@ -85,14 +85,14 @@
lock.l_type = F_RDLCK;
if (fcntl(fd, F_SETLK, &lock) == -1) {
qWarning(QObject::tr("Ooops in %1 at %2")
- .arg(__FUNCTION__).arg(__LINE__).toUtf8());
+ .arg(__FUNCTION__).arg(__LINE__).toUtf8());
return -1;
}
name = amsSynthName(name, index);
return fd;
}
}
- qWarning(QObject::tr("Client name '%1' occupied.").arg(name).toUtf8());
+ qWarning("%s", QObject::tr("Client name '%1' occupied.").arg(name).toUtf8());
return -1;
}
Index: src/mainwindow.cpp
===================================================================
--- src/mainwindow.cpp
+++ src/mainwindow.cpp 2009-05-27 14:17:50.000000000 +0200
@@ -171,14 +171,14 @@
updateWindowTitle();
if (mso.havePresetPath) {
- qWarning(QObject::tr("Preset path now %1").arg(mso.presetPath).toUtf8());
+ qWarning("%s", QObject::tr("Preset path now %1").arg(mso.presetPath).toUtf8());
modularSynth->setLoadPath(mso.presetPath);
}
modularSynth->go(mso.forceJack, mso.forceAlsa);
// autoload patch file
if (mso.havePreset) {
- qWarning(QObject::tr("Loading preset %1").arg(mso.presetName).toUtf8());
+ qWarning("%s", QObject::tr("Loading preset %1").arg(mso.presetName).toUtf8());
openFile(mso.presetName);
}
@@ -191,13 +191,13 @@
MainWindow::~MainWindow()
{
- qWarning(QObject::tr("Closing synthesizer...").toUtf8());
+ qWarning("%s", QObject::tr("Closing synthesizer...").toUtf8());
writeConfig();
// remove file lock
struct flock lock = {F_WRLCK, SEEK_SET, 0, 0, 0};
if (fcntl(rcFd, F_UNLCK, &lock) == -1) {
- qWarning(QObject::tr("Could not unlock preferences file.").toUtf8());
+ qWarning("%s", QObject::tr("Could not unlock preferences file.").toUtf8());
}
}
@@ -303,7 +303,7 @@
QFile f(fn);
if (!f.open(QIODevice::ReadOnly)) {
- qWarning(tr("Could not read file '%1'").arg(fn).toUtf8());
+ qWarning("%s", tr("Could not read file '%1'").arg(fn).toUtf8());
return;
}
@@ -334,7 +334,7 @@
QFile f(fileName);
if (!f.open(QIODevice::WriteOnly)) {
- qWarning(tr("Could not open file '%1'").arg(fileName).toUtf8());
+ qWarning("%s", tr("Could not open file '%1'").arg(fileName).toUtf8());
return false;
}
@@ -365,7 +365,7 @@
saveFile();
}
else
- qWarning(tr("Saving aborted").toUtf8());
+ qWarning("%s", tr("Saving aborted").toUtf8());
}
Index: src/modularsynth.cpp
===================================================================
--- src/modularsynth.cpp
+++ src/modularsynth.cpp 2009-05-27 14:24:21.000000000 +0200
@@ -280,7 +280,7 @@
if ((synthdata->seq_handle = open_seq()))
initSeqNotifier();
else
- qWarning(QObject::tr("Alsa MIDI wont work!").toUtf8());
+ qWarning("%s", QObject::tr("Alsa MIDI wont work!").toUtf8());
midiWidget->setActiveMidiControllers();
@@ -370,7 +370,7 @@
if (snd_seq_open(&seq_handle, "hw", SND_SEQ_OPEN_DUPLEX,
SND_SEQ_NONBLOCK) < 0) {
- qWarning(QObject::tr("Error opening ALSA sequencer.").toUtf8());
+ qWarning("%s", QObject::tr("Error opening ALSA sequencer.").toUtf8());
return NULL;
}
@@ -380,7 +380,7 @@
if (snd_seq_create_simple_port(seq_handle, "ams in",
SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE,
SND_SEQ_PORT_TYPE_APPLICATION) < 0) {
- qWarning(QObject::tr("Error creating sequencer write port.").toUtf8());
+ qWarning("%s", QObject::tr("Error creating sequencer write port.").toUtf8());
snd_seq_close(seq_handle);
return NULL;
}
@@ -389,7 +389,7 @@
snd_seq_create_simple_port(seq_handle, "ams out",
SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ,
SND_SEQ_PORT_TYPE_APPLICATION)) < 0) {
- qWarning(QObject::tr("Error creating sequencer read port.").toUtf8());
+ qWarning("%s", QObject::tr("Error creating sequencer read port.").toUtf8());
snd_seq_close(seq_handle);
return NULL;
}
@@ -949,7 +949,7 @@
}
}
else
- qWarning(QObject::tr("All available output ports are in use").toUtf8());
+ qWarning("%s", QObject::tr("All available output ports are in use").toUtf8());
}
void ModularSynth::newM_pcmin()
@@ -967,7 +967,7 @@
}
}
else
- qWarning(QObject::tr("All available input ports are in use").toUtf8());
+ qWarning("%s", QObject::tr("All available input ports are in use").toUtf8());
}
void ModularSynth::newM_scope() {
@@ -1800,7 +1800,7 @@
numbers = numbers.trimmed();
tokens = numbers.split(' ');
if (tokens.isEmpty()) {
- qWarning(QObject::tr("No parameter values found.").toUtf8());
+ qWarning("%s", QObject::tr("No parameter values found.").toUtf8());
continue;
}
Index: src/synthdata.cpp
===================================================================
--- src/synthdata.cpp
+++ src/synthdata.cpp 2009-05-27 14:26:11.000000000 +0200
@@ -395,13 +395,13 @@
pthread_attr_setinheritsched (&attr, PTHREAD_EXPLICIT_SCHED);
if (pthread_create (&alsa_thread, &attr, alsa_static_thr_main, this))
{
- qWarning(QObject::tr("Can't create ALSA thread with RT priority").toUtf8());
+ qWarning("%s", QObject::tr("Can't create ALSA thread with RT priority").toUtf8());
pthread_attr_setschedpolicy (&attr, SCHED_OTHER);
parm.sched_priority = sched_get_priority_max (SCHED_OTHER);
pthread_attr_setschedparam (&attr, &parm);
if (pthread_create (&alsa_thread, &attr, alsa_static_thr_main, this))
{
- qWarning(QObject::tr("Can't create ALSA thread").toUtf8());
+ qWarning("%s", QObject::tr("Can't create ALSA thread").toUtf8());
exit (1);
}
}
@@ -410,7 +410,7 @@
int SynthData::closeAlsa ()
{
- qWarning(QObject::tr("Closing ALSA...").toUtf8());
+ qWarning("%s", QObject::tr("Closing ALSA...").toUtf8());
withAlsa = false;
sleep (1);
delete alsa_handle;
@@ -503,7 +503,7 @@
jack_handle = jack_client_open(name.toLatin1().constData(),
JackNullOption, NULL);
if (!jack_handle) {
- qWarning(QObject::tr("Can't connect to JACK").toUtf8());
+ qWarning("%s", QObject::tr("Can't connect to JACK").toUtf8());
return -ENODEV;
}
@@ -526,7 +526,7 @@
if (jack_activate (jack_handle))
{
- qWarning(QObject::tr("Can't activate JACK").toUtf8());
+ qWarning("%s", QObject::tr("Can't activate JACK").toUtf8());
exit (1);
}
@@ -538,7 +538,7 @@
int SynthData::closeJack ()
{
- qWarning(QObject::tr("Closing JACK...").toUtf8());
+ qWarning("%s", QObject::tr("Closing JACK...").toUtf8());
jack_deactivate (jack_handle);
for (int i = 0; i < play_ports; i++)
jack_port_unregister(jack_handle, jack_out[i]);
--- src/main.cpp~ 2009-05-27 15:03:12.000000000 +0200
+++ src/main.cpp 2009-05-27 15:06:46.000000000 +0200
@@ -61,7 +61,7 @@
QDir amshome = QDir(QDir::homePath());
if (!amshome.exists(AMSDIR)) {
if (!amshome.mkdir(AMSDIR)) {
- qWarning(QObject::tr("Could not create ams home "
+ qWarning("%s", QObject::tr("Could not create ams home "
"directory.").toUtf8());
return -1;
}
@@ -72,7 +72,7 @@
//StdOut << "Resource file path: " << rcPath << endl;
fd = open(rcPath.toLatin1().data(), O_CREAT|O_RDWR, 0666);
if (fd == -1) {
- qWarning(QObject::tr("Failed to open file '%1'")
+ qWarning("%s", QObject::tr("Failed to open file '%1'")
.arg(rcPath).toUtf8());
return -1;
}
@@ -84,7 +84,7 @@
} else {
lock.l_type = F_RDLCK;
if (fcntl(fd, F_SETLK, &lock) == -1) {
- qWarning(QObject::tr("Ooops in %1 at %2")
+ qWarning("%s", QObject::tr("Ooops in %1 at %2")
.arg(__FUNCTION__).arg(__LINE__).toUtf8());
return -1;
}
--- src/modularsynth.cpp~ 2009-05-27 15:07:22.000000000 +0200
+++ src/modularsynth.cpp 2009-05-27 15:13:18.000000000 +0200
@@ -1253,7 +1253,7 @@
newLadspaPolyFlag = tokens[5].toInt();
ladspaLibName = tokens[6];
pluginName = qs.section(' ', 7);
- qWarning(tr("Loading LADSPA plugin \"%1\" from library \"%2\".")
+ qWarning("%s", tr("Loading LADSPA plugin \"%1\" from library \"%2\".")
.arg(pluginName).arg(ladspaLibName).toUtf8().constData());
if (!synthdata->getLadspaIDs(ladspaLibName, pluginName,
@@ -1476,7 +1476,7 @@
continue;
if (inport->hasConnectedPort()) {
- qWarning(tr("Input port %1 of module %2 is already connected. "
+ qWarning("%s", tr("Input port %1 of module %2 is already connected. "
"New connection to module %3 ignored.")
.arg(index1).arg(moduleID1).arg(moduleID2).toUtf8());
continue;
@@ -1733,7 +1733,7 @@
}
}
else
- qWarning(tr("Unknown MIDI controller tag found: %1")
+ qWarning("%s", tr("Unknown MIDI controller tag found: %1")
.arg(qs).toUtf8());
}
@@ -1769,7 +1769,7 @@
if (pos != -1)
guiWidget->addTab(rx.cap(1));
else
- qWarning(QObject::tr("No title for tab '%1' found.")
+ qWarning("%s", QObject::tr("No title for tab '%1' found.")
.arg(qs).toUtf8());
}
@@ -1785,7 +1785,7 @@
guiWidget->addFrame(rx.cap(1));
}
else
- qWarning(QObject::tr("No data for frame '%1' found.")
+ qWarning("%s", QObject::tr("No data for frame '%1' found.")
.arg(qs).toUtf8());
}
@@ -1809,7 +1809,7 @@
index = tokens[1].toInt();
}
else {
- qWarning(QObject::tr("No parameter name '%1' found.")
+ qWarning("%s", QObject::tr("No parameter name '%1' found.")
.arg(qs).toUtf8());
continue;
}
@@ -1875,7 +1875,7 @@
if (pos != -1)
qs = rx.cap(1);
else {
- qWarning(QObject::tr("No name for preset '%1' found.")
+ qWarning("%s", QObject::tr("No name for preset '%1' found.")
.arg(qs).toUtf8());
continue;
}
