QStringList SamplePlugin::generators(const QStringList &producers) const
{
QStringList result;
- if (producers.contains("pango")) result << i18n("Countdown");
- if (producers.contains("noise")) result << i18n("Noise");
+ if (producers.contains(QLatin1String("pango"))) result << i18n("Countdown");
+ if (producers.contains(QLatin1String("noise"))) result << i18n("Noise");
return result;
}
{
QString prePath;
if (generator == i18n("Noise")) {
- prePath = projectFolder.path() + "/noise";
- } else prePath = projectFolder.path() + "/counter";
+ prePath = projectFolder.path() + QLatin1String("/noise");
+ } else prePath = projectFolder.path() + QLatin1String("/counter");
int ct = 0;
- QString counter = QString::number(ct).rightJustified(5, '0', false);
- while (QFile::exists(prePath + counter + ".mlt")) {
+ QString counter = QString::number(ct).rightJustified(5, QLatin1Char('0'), false);
+ while (QFile::exists(prePath + counter + QLatin1String(".mlt"))) {
ct++;
- counter = QString::number(ct).rightJustified(5, '0', false);
+ counter = QString::number(ct).rightJustified(5, QLatin1Char('0'), false);
}
QPointer<QDialog> d = new QDialog;
Ui::CountDown_UI view;
// Set single file mode. Default seems to be File::ExistingOnly.
view.path->setMode(KFile::File);
- QString clipFile = prePath + counter + ".mlt";
+ QString clipFile = prePath + counter + QLatin1String(".mlt");
view.path->setUrl(KUrl(clipFile));
KUrl result;
// Disable VDPAU so that rendering will work even if there is a Kdenlive instance using VDPAU
#if QT_VERSION >= 0x040600
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
- env.insert("MLT_NO_VDPAU", "1");
+ env.insert(QLatin1String("MLT_NO_VDPAU"), QLatin1String("1"));
generatorProcess.setProcessEnvironment(env);
#else
QStringList env = QProcess::systemEnvironment();
- env << "MLT_NO_VDPAU=1";
+ env << QLatin1String("MLT_NO_VDPAU=1");
generatorProcess.setEnvironment(env);
#endif
QStringList args;
if (generator == i18n("Noise")) {
- args << "noise:" << "in=0" << QString("out=" + QString::number((int) fps * view.duration->value()));
+ args << QLatin1String("noise:") << QLatin1String("in=0") << QLatin1String("out=") + QString::number((int) fps * view.duration->value());
}
else {
// Countdown producer
for (int i = 0; i < view.duration->value(); i++) {
// Create the producers
- args << "pango:" << "in=0" << QString("out=" + QString::number((int) fps * view.duration->value()));
- args << QString("text=" + QString::number(view.duration->value() - i));
- args << QString("font=" + QString::number(view.font->value()) + "px");
+ args << QLatin1String("pango:") << QLatin1String("in=0") << QLatin1String("out=") + QString::number((int) fps * view.duration->value());
+ args << QLatin1String("text=") + QString::number(view.duration->value() - i);
+ args << QLatin1String("font=") + QString::number(view.font->value()) + QLatin1String("px");
}
}
- args << "-consumer"<<QString("xml:%1").arg(view.path->url().path());
+ args << QLatin1String("-consumer")<<QString::fromLatin1("xml:%1").arg(view.path->url().path());
generatorProcess.start(renderer, args);
if (generatorProcess.waitForFinished()) {
if (generatorProcess.exitStatus() == QProcess::CrashExit) {
kDebug() << "/// Generator failed: ";
- QString error = generatorProcess.readAllStandardError();
+ QString error = QString::fromLocal8Bit(generatorProcess.readAllStandardError());
KMessageBox::sorry(kapp->activeWindow(), i18n("Failed to generate clip:\n%1", error, i18n("Generator Failed")));
}
else {
}
} else {
kDebug() << "/// Generator failed: ";
- QString error = generatorProcess.readAllStandardError();
+ QString error = QString::fromLocal8Bit(generatorProcess.readAllStandardError());
KMessageBox::sorry(kapp->activeWindow(), i18n("Failed to generate clip:\n%1", error, i18n("Generator Failed")));
}
}
args.removeFirst();
bool erase = false;
- if (args.at(0) == "-erase") {
+ if (args.at(0) == QLatin1String("-erase")) {
erase = true;
args.removeFirst();
}
bool usekuiserver = false;
- if (args.at(0) == "-kuiserver") {
+ if (args.at(0) == QLatin1String("-kuiserver")) {
usekuiserver = true;
args.removeFirst();
}
- if (QString(args.at(0)).startsWith("-pid:")) {
- pid = QString(args.at(0)).section(':', 1).toInt();
+ if (QString(args.at(0)).startsWith(QLatin1String("-pid:"))) {
+ pid = QString(args.at(0)).section(QLatin1Char(':'), 1).toInt();
args.removeFirst();
}
- if (QString(args.at(0)).startsWith("-locale:")) {
- locale = QString(args.at(0)).section(':', 1);
+ if (QString(args.at(0)).startsWith(QLatin1String("-locale:"))) {
+ locale = QString(args.at(0)).section(QLatin1Char(':'), 1);
args.removeFirst();
}
- if (args.at(0).startsWith("in="))
- in = args.takeFirst().section('=', -1).toInt();
- if (args.at(0).startsWith("out="))
- out = args.takeFirst().section('=', -1).toInt();
- if (args.at(0).startsWith("preargs="))
- preargs = args.takeFirst().section('=', 1).split(' ', QString::SkipEmptyParts);
+ if (args.at(0).startsWith(QLatin1String("in=")))
+ in = args.takeFirst().section(QLatin1Char('='), -1).toInt();
+ if (args.at(0).startsWith(QLatin1String("out=")))
+ out = args.takeFirst().section(QLatin1Char('='), -1).toInt();
+ if (args.at(0).startsWith(QLatin1String("preargs=")))
+ preargs = args.takeFirst().section(QLatin1Char('='), 1).split(QLatin1Char(' '), QString::SkipEmptyParts);
QString render = args.takeFirst();
QString profile = args.takeFirst();
QString src = srcurl.path();
// The QUrl path() strips the consumer: protocol, so re-add it if necessary
if (srcString.startsWith("consumer:"))
- src.prepend("consumer:");
+ src.prepend(QLatin1String("consumer:"));
QUrl desturl = QUrl::fromEncoded(args.takeFirst().toUtf8());
QString dest = desturl.path();
bool dualpass = false;
bool doerase;
QString vpre;
- int vprepos = args.indexOf(QRegExp("vpre=.*"));
+ int vprepos = args.indexOf(QRegExp(QLatin1String("vpre=.*")));
if (vprepos >= 0) {
vpre=args.at(vprepos);
}
- QStringList vprelist = vpre.replace("vpre=", "").split(',');
+ QStringList vprelist = vpre.replace(QLatin1String("vpre="), QLatin1String("")).split(QLatin1Char(','));
if (vprelist.size() > 0) {
- args.replaceInStrings(QRegExp("^vpre=.*"), QString("vpre=").append(vprelist.at(0)));
+ args.replaceInStrings(QRegExp(QLatin1String("^vpre=.*")), QString::fromLatin1("vpre=%1").arg(vprelist.at(0)));
}
- if (args.contains("pass=2")) {
+ if (args.contains(QLatin1String("pass=2"))) {
// dual pass encoding
dualpass = true;
doerase = false;
- args.replace(args.indexOf("pass=2"), "pass=1");
- if (args.contains("vcodec=libx264")) args << QString("passlogfile=%1").arg(dest + ".log");
+ args.replace(args.indexOf(QLatin1String("pass=2")), QLatin1String("pass=1"));
+ if (args.contains(QLatin1String("vcodec=libx264"))) args << QString::fromLatin1("passlogfile=%1").arg(dest + QLatin1String(".log"));
} else {
- args.removeAll("pass=1");
+ args.removeAll(QLatin1String("pass=1"));
doerase = erase;
}
// Decode metadata
for (int i = 0; i < args.count(); ++i) {
- if (args.at(i).startsWith("meta.attr")) {
+ if (args.at(i).startsWith(QLatin1String("meta.attr"))) {
QString data = args.at(i);
- args.replace(i, data.section('=', 0, 0) + "=\"" + QUrl::fromPercentEncoding(data.section('=', 1).toUtf8()) + "\"");
+ args.replace(i, data.section(QLatin1Char('='), 0, 0) + QLatin1String("=\"") + QUrl::fromPercentEncoding(data.section(QLatin1Char('='), 1).toUtf8()) + QLatin1String("\""));
}
}
job->start();
if (dualpass) {
if (vprelist.size()>1)
- args.replaceInStrings(QRegExp("^vpre=.*"),QString("vpre=").append(vprelist.at(1)));
- args.replace(args.indexOf("pass=1"), "pass=2");
+ args.replaceInStrings(QRegExp(QLatin1String("^vpre=.*")),QString::fromLatin1("vpre=%1").arg(vprelist.at(1)));
+ args.replace(args.indexOf(QLatin1String("pass=1")), QLatin1String("pass=2"));
RenderJob *dualjob = new RenderJob(erase, usekuiserver, pid, render, profile, rendermodule, player, src, dest, preargs, args, in, out);
QObject::connect(job, SIGNAL(renderingFinished()), dualjob, SLOT(start()));
}
// Disable VDPAU so that rendering will work even if there is a Kdenlive instance using VDPAU
#if QT_VERSION >= 0x040600
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
- env.insert("MLT_NO_VDPAU", "1");
+ env.insert(QLatin1String("MLT_NO_VDPAU"), QLatin1String("1"));
m_renderProcess->setProcessEnvironment(env);
#else
QStringList env = QProcess::systemEnvironment();
- env << "MLT_NO_VDPAU=1";
+ env << QLatin1String("MLT_NO_VDPAU=1");
m_renderProcess->setEnvironment(env);
#endif
m_prog = renderer;
m_args << scenelist;
- if (in != -1) m_args << "in=" + QString::number(in);
- if (out != -1) m_args << "out=" + QString::number(out);
+ if (in != -1) m_args << QLatin1String("in=") + QString::number(in);
+ if (out != -1) m_args << QLatin1String("out=") + QString::number(out);
m_args << preargs;
//qDebug()<<"PRE ARGS: "<<preargs;
- if (scenelist.startsWith("consumer:")) {
+ if (scenelist.startsWith(QLatin1String("consumer:"))) {
// Use MLT's producer_consumer, needs a different syntax for profile:
m_args << "profile=" + profile;
} else m_args << "-profile" << profile;
// Because of the logging, we connect to stderr in all cases.
connect(m_renderProcess, SIGNAL(readyReadStandardError()), this, SLOT(receivedStderr()));
m_renderProcess->start(m_prog, m_args);
- if (m_enablelog) m_logstream << "Started render process: " << m_prog << " " << m_args.join(" ") << endl;
- qDebug() << "Started render process: " << m_prog << " " << m_args.join(" ");
+ if (m_enablelog) m_logstream << "Started render process: " << m_prog << " " << m_args.join(QLatin1String(" ")) << endl;
+ qDebug() << "Started render process: " << m_prog << " " << m_args.join(QLatin1String(" "));
}
QString kdenliveId;
QDBusConnection connection = QDBusConnection::sessionBus();
QDBusConnectionInterface* ibus = connection.interface();
- kdenliveId = QString("org.kde.kdenlive-%1").arg(m_pid);
+ kdenliveId = QString::fromLatin1("org.kde.kdenlive-%1").arg(m_pid);
if (!ibus->isServiceRegistered(kdenliveId))
{
kdenliveId.clear();
const QStringList services = ibus->registeredServiceNames();
foreach(const QString & service, services) {
- if (!service.startsWith("org.kde.kdenlive"))
+ if (!service.startsWith(QLatin1String("org.kde.kdenlive")))
continue;
kdenliveId = service;
break;
m_dbusargs.clear();
if (kdenliveId.isEmpty()) return;
m_kdenliveinterface = new QDBusInterface(kdenliveId,
- "/MainWindow",
- "org.kdenlive.MainWindow",
+ QLatin1String("/MainWindow"),
+ QLatin1String("org.kdenlive.MainWindow"),
connection,
this);
if (m_kdenliveinterface) {
m_dbusargs.append(m_dest);
m_dbusargs.append((int) 0);
- if (!m_args.contains("pass=2"))
+ if (!m_args.contains(QLatin1String("pass=2")))
m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs);
connect(m_kdenliveinterface, SIGNAL(abortRenderJob(QString)),
this, SLOT(slotAbort(QString)));
void RenderJob::slotIsOver(QProcess::ExitStatus status, bool isWritable)
{
- if (m_jobUiserver) m_jobUiserver->call("terminate", QString());
+ if (m_jobUiserver) m_jobUiserver->call(QLatin1String("terminate"), QString());
if (!isWritable) {
QString error = tr("Cannot write to %1, check the permissions.").arg(m_dest);
if (m_kdenliveinterface) {
m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs);
}
QStringList args;
- args << "--error" << error;
+ args << QLatin1String("--error") << error;
if (m_enablelog) m_logstream << error << endl;
qDebug() << error;
- QProcess::startDetached("kdialog", args);
+ QProcess::startDetached(QLatin1String("kdialog"), args);
qApp->quit();
}
if (m_erase) {
if (m_kdenliveinterface) {
m_dbusargs[1] = (int) - 2;
m_dbusargs.append(m_errorMessage);
- m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs);
+ m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, QLatin1String("setRenderingFinished"), m_dbusargs);
}
QStringList args;
QString error = tr("Rendering of %1 aborted, resulting video will probably be corrupted.").arg(m_dest);
"event");
int seconds = m_startTime.secsTo(QTime::currentTime());
QList<QVariant> args;
- args.append(QString("RenderFinished")); // action name
- args.append(QString("kdenlive")); // app name
+ args.append(QLatin1String("RenderFinished")); // action name
+ args.append(QLatin1String("kdenlive")); // app name
args.append(QVariantList()); // contexts
args.append(tr("Rendering of %1 finished in %2").arg(m_dest, QTime(0, 0, seconds).toString("hh:mm:ss"))); // body
args.append(QByteArray()); // app icon
projects / kdenlive / commitdiff