From ac8c99168f151e2f351043d13500741ce1ca8966 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 18 Dec 2013 07:24:13 +0100 Subject: [PATCH] Use QLatin1String --- renderer/renderjob.cpp | 88 +++++++++++----------- src/beziercurve/beziersplinewidget.cpp | 12 +-- src/beziercurve/cubicbezierspline.cpp | 4 +- src/colorcorrection/histogramgenerator.cpp | 5 +- src/colorcorrection/rgbparadegenerator.cpp | 14 ++-- src/commands/addeffectcommand.cpp | 2 +- src/commands/editeffectcommand.cpp | 2 +- src/commands/edittransitioncommand.cpp | 2 +- src/definitions.h | 4 +- src/lib/audio/audioEnvelope.cpp | 2 +- src/lib/audio/audioInfo.cpp | 2 +- src/lib/audio/audioStreamInfo.cpp | 42 +++++++---- src/lib/audio/fftTools.cpp | 4 +- src/projectlist.h | 4 +- 14 files changed, 103 insertions(+), 84 deletions(-) diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp index 0a29024c..d6e4bb5e 100644 --- a/renderer/renderjob.cpp +++ b/renderer/renderjob.cpp @@ -74,12 +74,12 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, int pid, const QString& rend //qDebug()<<"PRE ARGS: "<setReadChannel(QProcess::StandardError); @@ -88,7 +88,7 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, int pid, const QString& rend if (m_enablelog) { // Create a log of every render process. m_logfile.setAutoRemove(false); - m_logfile.setFileTemplate(QDir::tempPath() + "/kdenlive_render.log.XXXXXXXX"); + m_logfile.setFileTemplate(QDir::tempPath() + QLatin1String("/kdenlive_render.log.XXXXXXXX")); if (m_logfile.open()) { qDebug() << "Writing render log to " << m_logfile.fileName(); @@ -97,8 +97,8 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, int pid, const QString& rend } m_logstream.setDevice(&m_logfile); QString tmplist = scenelist; - if (tmplist.contains("consumer:")) { - QStringList tl = tmplist.split("consumer:"); + if (tmplist.contains(QLatin1String("consumer:"))) { + const QStringList tl = tmplist.split(QLatin1String("consumer:")); if (tl.count() == 2) { tmplist = tl[1]; } @@ -128,11 +128,11 @@ void RenderJob::setLocale(const QString &locale) { #if QT_VERSION >= 0x040600 QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); - env.insert("LC_NUMERIC", locale); + env.insert(QLatin1String("LC_NUMERIC"), locale); m_renderProcess->setProcessEnvironment(env); #else QStringList env = QProcess::systemEnvironment(); - env << QString("LC_NUMERIC=%1").arg(locale); + env << QString::fromLatin1("LC_NUMERIC=%1").arg(locale); m_renderProcess->setEnvironment(env); #endif } @@ -150,9 +150,9 @@ void RenderJob::slotAbort() if (m_kdenliveinterface) { m_dbusargs[1] = -3; m_dbusargs.append(QString()); - m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs); + m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, QLatin1String("setRenderingFinished"), m_dbusargs); } - if (m_jobUiserver) m_jobUiserver->call("terminate", QString()); + if (m_jobUiserver) m_jobUiserver->call(QLatin1String("terminate"), QString()); if (m_erase) { QFile f(m_scenelist); f.remove(); @@ -169,19 +169,19 @@ void RenderJob::slotAbort() void RenderJob::receivedStderr() { - QString result = QString(m_renderProcess->readAllStandardError()).simplified(); + QString result = QString::fromLocal8Bit(m_renderProcess->readAllStandardError()).simplified(); //fprintf(stderr, "* * * *RENDER LG: %s\n", result.toUtf8().data()); - if (!result.startsWith("Current Frame")) m_errorMessage.append(result + "
"); + if (!result.startsWith(QLatin1String("Current Frame"))) m_errorMessage.append(result + QLatin1String("
")); else { if (m_enablelog) m_logstream << "ReceivedStderr from melt: " << result << endl; - result = result.section(' ', -1); + result = result.section(QLatin1Char(' '), -1); int pro = result.toInt(); if (pro < 0 || pro > 100) return; if (pro > m_progress) { m_progress = pro; - if (m_args.contains("pass=1")) { + if (m_args.contains(QLatin1String("pass=1"))) { m_progress /= 2.0; - } else if (m_args.contains("pass=2")) { + } else if (m_args.contains(QLatin1String("pass=2"))) { m_progress = 50 + m_progress / 2.0; } if (m_kdenliveinterface) { @@ -191,7 +191,7 @@ void RenderJob::receivedStderr() // qDebug() << "BROKEN COMMUNICATION WITH KDENLIVE"; } else { m_dbusargs[1] = m_progress; - m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs); + m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, QLatin1String("setRenderingProgress"), m_dbusargs); } } else if (pro % 5 == 0) { // Try to restart communication with Kdenlive every 5 percents @@ -200,7 +200,7 @@ void RenderJob::receivedStderr() } if (m_jobUiserver) { - m_jobUiserver->call("setPercent", (uint) m_progress); + m_jobUiserver->call(QLatin1String("setPercent"), (uint) m_progress); /*int seconds = m_startTime.secsTo(QTime::currentTime()); seconds = seconds * (100 - m_progress) / m_progress; m_jobUiserver->call("setDescriptionField", (uint) 1, tr("Remaining time"), QTime().addSecs(seconds).toString("hh:mm:ss"));*/ @@ -213,16 +213,16 @@ void RenderJob::start() { QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface(); if (interface && m_usekuiserver) { - if (!interface->isServiceRegistered("org.kde.JobViewServer")) { + if (!interface->isServiceRegistered(QLatin1String("org.kde.JobViewServer"))) { qDebug() << "No org.kde.JobViewServer registered, trying to start kuiserver"; if (m_enablelog) m_logstream << "No org.kde.JobViewServer registered, trying to start kuiserver"; - if (QProcess::startDetached("kuiserver")) { + if (QProcess::startDetached(QLatin1String("kuiserver"))) { qDebug() << "Started kuiserver"; if (m_enablelog) m_logstream << "Started kuiserver"; // Give it a couple of seconds to start QTime t; t.start(); - while (!interface->isServiceRegistered("org.kde.JobViewServer") && t.elapsed() < 3000) { + while (!interface->isServiceRegistered(QLatin1String("org.kde.JobViewServer")) && t.elapsed() < 3000) { SleepThread::msleep(100); //Sleep 100 ms } } else { @@ -231,26 +231,26 @@ void RenderJob::start() } } - if (interface->isServiceRegistered("org.kde.JobViewServer")) { - QDBusInterface kuiserver("org.kde.JobViewServer", "/JobViewServer", "org.kde.JobViewServer"); - QDBusReply objectPath = kuiserver.call("requestView", "Kdenlive", "kdenlive", 0x0001); + if (interface->isServiceRegistered(QLatin1String("org.kde.JobViewServer"))) { + QDBusInterface kuiserver(QLatin1String("org.kde.JobViewServer"), QLatin1String("/JobViewServer"), QLatin1String("org.kde.JobViewServer")); + QDBusReply objectPath = kuiserver.call(QLatin1String("requestView"),QLatin1String("Kdenlive"), QLatin1String("kdenlive"), 0x0001); QString reply = ((QDBusObjectPath) objectPath).path(); // Use of the KDE JobViewServer is an ugly hack, it is not reliable - QString dbusView = "org.kde.JobViewV2"; - m_jobUiserver = new QDBusInterface("org.kde.JobViewServer", reply, dbusView); + QString dbusView = QLatin1String("org.kde.JobViewV2"); + m_jobUiserver = new QDBusInterface(QLatin1String("org.kde.JobViewServer"), reply, dbusView); if (!m_jobUiserver || !m_jobUiserver->isValid()) { - dbusView = "org.kde.JobView"; - m_jobUiserver = new QDBusInterface("org.kde.JobViewServer", reply, dbusView); + dbusView = QLatin1String("org.kde.JobView"); + m_jobUiserver = new QDBusInterface(QLatin1String("org.kde.JobViewServer"), reply, dbusView); } if (m_jobUiserver && m_jobUiserver->isValid()) { m_startTime = QTime::currentTime(); - if (!m_args.contains("pass=2")) - m_jobUiserver->call("setPercent", (uint) 0); + if (!m_args.contains(QLatin1String("pass=2"))) + m_jobUiserver->call(QLatin1String("setPercent"), (uint) 0); //m_jobUiserver->call("setInfoMessage", tr("Rendering %1").arg(QFileInfo(m_dest).fileName())); - m_jobUiserver->call("setDescriptionField", (uint) 0, tr("Rendering"), m_dest); - QDBusConnection::sessionBus().connect("org.kde.JobViewServer", reply, dbusView, "cancelRequested", this, SLOT(slotAbort())); + m_jobUiserver->call(QLatin1String("setDescriptionField"), (uint) 0, tr("Rendering"), m_dest); + QDBusConnection::sessionBus().connect(QLatin1String("org.kde.JobViewServer"), reply, dbusView, QLatin1String("cancelRequested"), this, SLOT(slotAbort())); } } } @@ -301,7 +301,7 @@ void RenderJob::initKdenliveDbusInterface() m_dbusargs.append(m_dest); m_dbusargs.append((int) 0); if (!m_args.contains(QLatin1String("pass=2"))) - m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs); + m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, QLatin1String("setRenderingProgress"), m_dbusargs); connect(m_kdenliveinterface, SIGNAL(abortRenderJob(QString)), this, SLOT(slotAbort(QString))); } @@ -323,7 +323,7 @@ void RenderJob::slotIsOver(QProcess::ExitStatus status, bool isWritable) if (m_kdenliveinterface) { m_dbusargs[1] = (int) - 2; m_dbusargs.append(error); - m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs); + m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, QLatin1String("setRenderingFinished"), m_dbusargs); } QStringList args; args << QLatin1String("--error") << error; @@ -345,29 +345,29 @@ void RenderJob::slotIsOver(QProcess::ExitStatus status, bool isWritable) } QStringList args; QString error = tr("Rendering of %1 aborted, resulting video will probably be corrupted.").arg(m_dest); - 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(); } else { if (!m_dualpass && m_kdenliveinterface) { m_dbusargs[1] = (int) - 1; m_dbusargs.append(QString()); - m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs); + m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, QLatin1String("setRenderingFinished"), m_dbusargs); } QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface(); - if (!m_dualpass && interface && interface->isServiceRegistered("org.kde.knotify")) { - QDBusMessage m = QDBusMessage::createMethodCall("org.kde.knotify", - "/Notify", - "org.kde.KNotify", - "event"); + if (!m_dualpass && interface && interface->isServiceRegistered(QLatin1String("org.kde.knotify"))) { + QDBusMessage m = QDBusMessage::createMethodCall(QLatin1String("org.kde.knotify"), + QLatin1String("/Notify"), + QLatin1String("org.kde.KNotify"), + QLatin1String("event")); int seconds = m_startTime.secsTo(QTime::currentTime()); QList args; 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(tr("Rendering of %1 finished in %2").arg(m_dest, QTime(0, 0, seconds).toString(QLatin1String("hh:mm:ss")))); // body args.append(QByteArray()); // app icon QStringList actionList; args.append(actionList); // actions @@ -379,7 +379,7 @@ void RenderJob::slotIsOver(QProcess::ExitStatus status, bool isWritable) } if (m_enablelog) m_logstream << "Rendering of " << m_dest << " finished" << endl; qDebug() << "Rendering of " << m_dest << " finished"; - if (!m_dualpass && m_player != "-") { + if (!m_dualpass && m_player != QLatin1String("-")) { if (m_enablelog) m_logstream << "Starting player" << endl; QStringList args; args << m_dest; diff --git a/src/beziercurve/beziersplinewidget.cpp b/src/beziercurve/beziersplinewidget.cpp index 6f7683f8..dca3f40f 100644 --- a/src/beziercurve/beziersplinewidget.cpp +++ b/src/beziercurve/beziersplinewidget.cpp @@ -38,13 +38,13 @@ BezierSplineWidget::BezierSplineWidget(const QString& spline, QWidget* parent) : m_ui.setupUi(widget); layout->addWidget(widget); - m_ui.buttonLinkHandles->setIcon(KIcon("insert-link")); - m_ui.buttonZoomIn->setIcon(KIcon("zoom-in")); - m_ui.buttonZoomOut->setIcon(KIcon("zoom-out")); - m_ui.buttonGridChange->setIcon(KIcon("view-grid")); + m_ui.buttonLinkHandles->setIcon(KIcon(QLatin1String("insert-link"))); + m_ui.buttonZoomIn->setIcon(KIcon(QLatin1String("zoom-in"))); + m_ui.buttonZoomOut->setIcon(KIcon(QLatin1String("zoom-out"))); + m_ui.buttonGridChange->setIcon(KIcon(QLatin1String("view-grid"))); m_ui.buttonShowPixmap->setIcon(QIcon(QPixmap::fromImage(ColorTools::rgbCurvePlane(QSize(16, 16), ColorTools::COL_Luma, 0.8)))); - m_ui.buttonResetSpline->setIcon(KIcon("view-refresh")); - m_ui.buttonShowAllHandles->setIcon(KIcon("draw-bezier-curves")); + m_ui.buttonResetSpline->setIcon(KIcon(QLatin1String("view-refresh"))); + m_ui.buttonShowAllHandles->setIcon(KIcon(QLatin1String("draw-bezier-curves"))); m_ui.widgetPoint->setEnabled(false); m_pX = new DragValue(i18n("In"), 0, 3, 0, 1, -1, QString(), false, this); diff --git a/src/beziercurve/cubicbezierspline.cpp b/src/beziercurve/cubicbezierspline.cpp index 45cca94c..c912c8be 100644 --- a/src/beziercurve/cubicbezierspline.cpp +++ b/src/beziercurve/cubicbezierspline.cpp @@ -71,11 +71,11 @@ QString CubicBezierSpline::toString() const QStringList spline; QLocale locale; foreach(const BPoint &p, m_points) { - spline << QString("%1;%2#%3;%4#%5;%6").arg(locale.toString(p.h1.x())).arg(locale.toString(p.h1.y())) + spline << QString::fromLatin1("%1;%2#%3;%4#%5;%6").arg(locale.toString(p.h1.x())).arg(locale.toString(p.h1.y())) .arg(locale.toString(p.p.x())).arg(locale.toString(p.p.y())) .arg(locale.toString(p.h2.x())).arg(locale.toString(p.h2.y())); } - return spline.join("|"); + return spline.join(QLatin1String("|")); } int CubicBezierSpline::setPoint(int ix, const BPoint& point) diff --git a/src/colorcorrection/histogramgenerator.cpp b/src/colorcorrection/histogramgenerator.cpp index c08cb0e1..3541d300 100644 --- a/src/colorcorrection/histogramgenerator.cpp +++ b/src/colorcorrection/histogramgenerator.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include "histogramgenerator.h" HistogramGenerator::HistogramGenerator() @@ -183,9 +184,9 @@ void HistogramGenerator::drawComponentFull(QPainter *davinci, const int *y, cons const int dist = 40; const int cw = component.width(); - davinci->drawText(0, textY, "min"); + davinci->drawText(0, textY, i18n("min")); davinci->drawText(dist, textY, QString::number(min, 'f', 0)); - davinci->drawText(cw-dist-30, textY, "max"); + davinci->drawText(cw-dist-30, textY, i18n("max")); davinci->drawText(cw-30, textY, QString::number(maxVal, 'f', 0)); } diff --git a/src/colorcorrection/rgbparadegenerator.cpp b/src/colorcorrection/rgbparadegenerator.cpp index aee6fa65..6d85d081 100644 --- a/src/colorcorrection/rgbparadegenerator.cpp +++ b/src/colorcorrection/rgbparadegenerator.cpp @@ -10,6 +10,8 @@ #include "rgbparadegenerator.h" +#include + #include #include @@ -167,19 +169,19 @@ QImage RGBParadeGenerator::calculateRGBParade(const QSize ¶deSize, const QIm // Show numerical minimum if (minR == 0) { davinci.setPen(colHighlight); } else { davinci.setPen(colSoft); } - davinci.drawText(0, wh, "min: "); + davinci.drawText(0, wh, i18n("min: ")); if (minG == 0) { davinci.setPen(colHighlight); } else { davinci.setPen(colSoft); } - davinci.drawText(partW + offset, wh, "min: "); + davinci.drawText(partW + offset, wh, i18n("min: ")); if (minB == 0) { davinci.setPen(colHighlight); } else { davinci.setPen(colSoft); } - davinci.drawText(2*partW + 2*offset, wh, "min: "); + davinci.drawText(2*partW + 2*offset, wh, i18n("min: ")); // Show numerical maximum if (maxR == 255) { davinci.setPen(colHighlight); } else { davinci.setPen(colSoft); } - davinci.drawText(0, wh-20, "max: "); + davinci.drawText(0, wh-20, i18n("max: ")); if (maxG == 255) { davinci.setPen(colHighlight); } else { davinci.setPen(colSoft); } - davinci.drawText(partW + offset, wh-20, "max: "); + davinci.drawText(partW + offset, wh-20, i18n("max: ")); if (maxB == 255) { davinci.setPen(colHighlight); } else { davinci.setPen(colSoft); } - davinci.drawText(2*partW + 2*offset, wh-20, "max: "); + davinci.drawText(2*partW + 2*offset, wh-20, i18n("max: ")); davinci.setPen(colLight); davinci.drawText(d, wh, QString::number(minR, 'f', 0)); diff --git a/src/commands/addeffectcommand.cpp b/src/commands/addeffectcommand.cpp index 8df25a9a..eac8e7cd 100644 --- a/src/commands/addeffectcommand.cpp +++ b/src/commands/addeffectcommand.cpp @@ -32,7 +32,7 @@ AddEffectCommand::AddEffectCommand(CustomTrackView *view, const int track, const m_doIt(doIt) { QString effectName; - QDomElement namenode = m_effect.firstChildElement("name"); + QDomElement namenode = m_effect.firstChildElement(QLatin1String("name")); if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data()); else diff --git a/src/commands/editeffectcommand.cpp b/src/commands/editeffectcommand.cpp index e6ab0a35..d4969122 100644 --- a/src/commands/editeffectcommand.cpp +++ b/src/commands/editeffectcommand.cpp @@ -35,7 +35,7 @@ EditEffectCommand::EditEffectCommand(CustomTrackView *view, const int track, con m_refreshEffectStack(refreshEffectStack) { QString effectName; - QDomElement namenode = effect.firstChildElement("name"); + QDomElement namenode = effect.firstChildElement(QLatin1String("name")); if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data()); else diff --git a/src/commands/edittransitioncommand.cpp b/src/commands/edittransitioncommand.cpp index 533a6b20..a20b7378 100644 --- a/src/commands/edittransitioncommand.cpp +++ b/src/commands/edittransitioncommand.cpp @@ -30,7 +30,7 @@ EditTransitionCommand::EditTransitionCommand(CustomTrackView *view, const int tr { m_effect = effect.cloneNode().toElement(); QString effectName; - QDomElement namenode = effect.firstChildElement("name"); + QDomElement namenode = effect.firstChildElement(QLatin1String("name")); if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data()); else effectName = i18n("effect"); setText(i18n("Edit transition %1", effectName)); diff --git a/src/definitions.h b/src/definitions.h index 4812dd79..67b99440 100644 --- a/src/definitions.h +++ b/src/definitions.h @@ -188,11 +188,11 @@ public: int collapsedState = (int) isCollapsed; if (groupIsCollapsed) collapsedState += 2; data << QString::number(collapsedState) << QString::number(groupIndex) << groupName; - return data.join("/"); + return data.join(QLatin1String("/")); } void fromString(QString value) { if (value.isEmpty()) return; - QStringList data = value.split("/"); + QStringList data = value.split(QLatin1String("/")); isCollapsed = data.at(0).toInt() == 1 || data.at(0).toInt() == 3; groupIsCollapsed = data.at(0).toInt() >= 2; if (data.count() > 1) groupIndex = data.at(1).toInt(); diff --git a/src/lib/audio/audioEnvelope.cpp b/src/lib/audio/audioEnvelope.cpp index e57335a3..6a5da33b 100644 --- a/src/lib/audio/audioEnvelope.cpp +++ b/src/lib/audio/audioEnvelope.cpp @@ -30,7 +30,7 @@ AudioEnvelope::AudioEnvelope(const QString &url, Mlt::Producer *producer, int of { // make a copy of the producer to avoid audio playback issues QString path = QString::fromUtf8(producer->get("resource")); - if (path == "" || path == "" || path == "") + if (path == QLatin1String("") || path == QLatin1String("") || path ==QLatin1String( "")) path = url; m_producer = new Mlt::Producer(*(producer->profile()), path.toUtf8().constData()); if (!m_producer || !m_producer->is_valid()) { diff --git a/src/lib/audio/audioInfo.cpp b/src/lib/audio/audioInfo.cpp index 30e18f28..e9b88c49 100644 --- a/src/lib/audio/audioInfo.cpp +++ b/src/lib/audio/audioInfo.cpp @@ -24,7 +24,7 @@ AudioInfo::AudioInfo(Mlt::Producer *producer) : // Get the number of streams and add the information of each of them if it is an audio stream. int streams = producer->get_int("meta.media.nb_streams"); for (int i = 0; i < streams; ++i) { - QByteArray propertyName = QString("meta.media.%1.stream.type").arg(i).toLocal8Bit(); + QByteArray propertyName = QString::fromLatin1("meta.media.%1.stream.type").arg(i).toLocal8Bit(); const char* streamtype = producer->get(propertyName.data()); if (streamtype && strcmp("audio", streamtype) == 0) { m_list << new AudioStreamInfo(producer, i); diff --git a/src/lib/audio/audioStreamInfo.cpp b/src/lib/audio/audioStreamInfo.cpp index 7c394755..1a172277 100644 --- a/src/lib/audio/audioStreamInfo.cpp +++ b/src/lib/audio/audioStreamInfo.cpp @@ -19,33 +19,49 @@ AudioStreamInfo::AudioStreamInfo(Mlt::Producer *producer, int audioStreamIndex) { QByteArray key; - key = QString("meta.media.%1.codec.sample_fmt").arg(audioStreamIndex).toLocal8Bit(); - m_samplingFormat = QString(producer->get(key.data())); + key = QString::fromLatin1("meta.media.%1.codec.sample_fmt").arg(audioStreamIndex).toLocal8Bit(); + m_samplingFormat = QString::fromLatin1(producer->get(key.data())); - key = QString("meta.media.%1.codec.sample_rate").arg(audioStreamIndex).toLocal8Bit(); + key = QString::fromLatin1("meta.media.%1.codec.sample_rate").arg(audioStreamIndex).toLocal8Bit(); m_samplingRate = atoi(producer->get(key.data())); - key = QString("meta.media.%1.codec.bit_rate").arg(audioStreamIndex).toLocal8Bit(); + key = QString::fromLatin1("meta.media.%1.codec.bit_rate").arg(audioStreamIndex).toLocal8Bit(); m_bitRate = atoi(producer->get(key.data())); - key = QString("meta.media.%1.codec.channels").arg(audioStreamIndex).toLocal8Bit(); + key = QString::fromLatin1("meta.media.%1.codec.channels").arg(audioStreamIndex).toLocal8Bit(); m_channels = atoi(producer->get(key.data())); - key = QString("meta.media.%1.codec.name").arg(audioStreamIndex).toLocal8Bit(); - m_codecName = QString(producer->get(key.data())); + key = QString::fromLatin1("meta.media.%1.codec.name").arg(audioStreamIndex).toLocal8Bit(); + m_codecName = QString::fromLatin1(producer->get(key.data())); - key = QString("meta.media.%1.codec.long_name").arg(audioStreamIndex).toLocal8Bit(); - m_codecLongName = QString(producer->get(key.data())); + key = QString::fromLatin1("meta.media.%1.codec.long_name").arg(audioStreamIndex).toLocal8Bit(); + m_codecLongName = QString::fromLatin1(producer->get(key.data())); } AudioStreamInfo::~AudioStreamInfo() { } -int AudioStreamInfo::streamIndex() const { return m_audioStreamIndex; } -int AudioStreamInfo::samplingRate() const { return m_samplingRate; } -int AudioStreamInfo::channels() const { return m_channels; } -int AudioStreamInfo::bitrate() const { return m_bitRate; } +int AudioStreamInfo::streamIndex() const +{ + return m_audioStreamIndex; +} + +int AudioStreamInfo::samplingRate() const +{ + return m_samplingRate; +} + +int AudioStreamInfo::channels() const +{ + return m_channels; +} + +int AudioStreamInfo::bitrate() const +{ + return m_bitRate; +} + const QString& AudioStreamInfo::codecName(bool longName) const { if (longName) { diff --git a/src/lib/audio/fftTools.cpp b/src/lib/audio/fftTools.cpp index a72df6bd..f2372433 100644 --- a/src/lib/audio/fftTools.cpp +++ b/src/lib/audio/fftTools.cpp @@ -39,11 +39,11 @@ FFTTools::~FFTTools() const QString FFTTools::windowSignature(const WindowType windowType, const int size, const float param) { - return QString("s%1_t%2_p%3").arg(size).arg(windowType).arg(param, 0, 'f', 3); + return QString::fromLatin1("s%1_t%2_p%3").arg(size).arg(windowType).arg(param, 0, 'f', 3); } const QString FFTTools::cfgSignature(const int size) { - return QString("s%1").arg(size); + return QString::fromLatin1("s%1").arg(size); } // http://cplusplus.syntaxerrors.info/index.php?title=Cannot_declare_member_function_%E2%80%98static_int_Foo::bar%28%29%E2%80%99_to_have_static_linkage diff --git a/src/projectlist.h b/src/projectlist.h index ad87dea2..b944eea1 100644 --- a/src/projectlist.h +++ b/src/projectlist.h @@ -174,7 +174,7 @@ public: painter->setFont(font); QString subText = index.data(DurationRole).toString(); int usage = index.data(UsageRole).toInt(); - if (usage != 0) subText.append(QString(" (%1)").arg(usage)); + if (usage != 0) subText.append(QString::fromLatin1(" (%1)").arg(usage)); QRectF bounding; painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , subText, &bounding); int jobProgress = index.data(Qt::UserRole + 5).toInt(); @@ -202,7 +202,7 @@ public: } else if (jobProgress == JOBCRASHED) { QString jobText = index.data(Qt::UserRole + 7).toString(); if (!jobText.isEmpty()) { - QRectF txtBounding = painter->boundingRect(r2, Qt::AlignRight | Qt::AlignVCenter, " " + jobText + " "); + QRectF txtBounding = painter->boundingRect(r2, Qt::AlignRight | Qt::AlignVCenter, QLatin1Char(' ') + jobText + QLatin1Char(' ') ); painter->setPen(Qt::NoPen); painter->setBrush(option.palette.highlight()); painter->drawRoundedRect(txtBounding, 2, 2); -- 2.39.2