summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLuís Pereira2019-05-17 13:55:45 +0200
committerAlf Gaida2019-05-26 14:52:13 +0200
commit1efc21ce15631e68cfe654ae343eecb3b7647ac8 (patch)
tree43ffe7484509b5aed5c351dd3887ad8fe347de97 /src
parentTranslated using Weblate (Swedish) (diff)
downloadpavucontrol-slx-1efc21ce15631e68cfe654ae343eecb3b7647ac8.tar.gz
pavucontrol-slx-1efc21ce15631e68cfe654ae343eecb3b7647ac8.tar.xz
pavucontrol-slx-1efc21ce15631e68cfe654ae343eecb3b7647ac8.zip
Avoid char raw strings literals memory allocations
Done by CLAZY_FIXIT="fix-fromCharPtrAllocations".
Diffstat (limited to 'src')
-rw-r--r--src/mainwindow.cc34
-rw-r--r--src/pavucontrol.cc6
2 files changed, 20 insertions, 20 deletions
diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index 2030cf1..c7f2718 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -97,25 +97,25 @@ MainWindow::MainWindow():
const QSettings config;
- showVolumeMetersCheckButton->setChecked(config.value("window/showVolumeMeters", true).toBool());
+ showVolumeMetersCheckButton->setChecked(config.value(QStringLiteral("window/showVolumeMeters"), true).toBool());
- const QSize last_size = config.value("window/size").toSize();
+ const QSize last_size = config.value(QStringLiteral("window/size")).toSize();
if (last_size.isValid())
resize(last_size);
- const QVariant sinkInputTypeSelection = config.value("window/sinkInputType");
+ const QVariant sinkInputTypeSelection = config.value(QStringLiteral("window/sinkInputType"));
if (sinkInputTypeSelection.isValid())
sinkInputTypeComboBox->setCurrentIndex(sinkInputTypeSelection.toInt());
- const QVariant sourceOutputTypeSelection = config.value("window/sourceOutputType");
+ const QVariant sourceOutputTypeSelection = config.value(QStringLiteral("window/sourceOutputType"));
if (sourceOutputTypeSelection.isValid())
sourceOutputTypeComboBox->setCurrentIndex(sourceOutputTypeSelection.toInt());
- const QVariant sinkTypeSelection = config.value("window/sinkType");
+ const QVariant sinkTypeSelection = config.value(QStringLiteral("window/sinkType"));
if (sinkTypeSelection.isValid())
sinkTypeComboBox->setCurrentIndex(sinkTypeSelection.toInt());
- const QVariant sourceTypeSelection = config.value("window/sourceType");
+ const QVariant sourceTypeSelection = config.value(QStringLiteral("window/sourceType"));
if (sourceTypeSelection.isValid())
sourceTypeComboBox->setCurrentIndex(sourceTypeSelection.toInt());
@@ -126,12 +126,12 @@ MainWindow::MainWindow():
MainWindow::~MainWindow() {
QSettings config;
- config.setValue("window/size", size());
- config.setValue("window/sinkInputType", sinkInputTypeComboBox->currentIndex());
- config.setValue("window/sourceOutputType", sourceOutputTypeComboBox->currentIndex());
- config.setValue("window/sinkType", sinkTypeComboBox->currentIndex());
- config.setValue("window/sourceType", sourceTypeComboBox->currentIndex());
- config.setValue("window/showVolumeMeters", showVolumeMetersCheckButton->isChecked());
+ config.setValue(QStringLiteral("window/size"), size());
+ config.setValue(QStringLiteral("window/sinkInputType"), sinkInputTypeComboBox->currentIndex());
+ config.setValue(QStringLiteral("window/sourceOutputType"), sourceOutputTypeComboBox->currentIndex());
+ config.setValue(QStringLiteral("window/sinkType"), sinkTypeComboBox->currentIndex());
+ config.setValue(QStringLiteral("window/sourceType"), sourceTypeComboBox->currentIndex());
+ config.setValue(QStringLiteral("window/showVolumeMeters"), showVolumeMetersCheckButton->isChecked());
while (!clientNames.empty()) {
auto i = clientNames.begin();
@@ -329,7 +329,7 @@ bool MainWindow::updateSink(const pa_sink_info &info) {
w->description = info.description;
w->type = info.flags & PA_SINK_HARDWARE ? SINK_HARDWARE : SINK_VIRTUAL;
- w->boldNameLabel->setText("");
+ w->boldNameLabel->setText(QLatin1String(""));
gchar *txt;
w->nameLabel->setText(txt = g_markup_printf_escaped("%s", info.description));
w->nameLabel->setToolTip(info.description);
@@ -495,7 +495,7 @@ void MainWindow::updateSource(const pa_source_info &info) {
w->description = info.description;
w->type = info.monitor_of_sink != PA_INVALID_INDEX ? SOURCE_MONITOR : (info.flags & PA_SOURCE_HARDWARE ? SOURCE_HARDWARE : SOURCE_VIRTUAL);
- w->boldNameLabel->setText("");
+ w->boldNameLabel->setText(QLatin1String(""));
gchar *txt;
w->nameLabel->setText(txt = g_markup_printf_escaped("%s", info.description));
w->nameLabel->setToolTip(info.description);
@@ -621,7 +621,7 @@ void MainWindow::updateSinkInput(const pa_sink_input_info &info) {
w->nameLabel->setText(txt = g_markup_printf_escaped(": %s", info.name));
g_free(txt);
} else {
- w->boldNameLabel->setText("");
+ w->boldNameLabel->setText(QLatin1String(""));
w->nameLabel->setText(info.name);
}
@@ -677,7 +677,7 @@ void MainWindow::updateSourceOutput(const pa_source_output_info &info) {
w->nameLabel->setText(txt = g_markup_printf_escaped(": %s", info.name));
g_free(txt);
} else {
- w->boldNameLabel->setText("");
+ w->boldNameLabel->setText(QLatin1String(""));
w->nameLabel->setText(info.name);
}
@@ -755,7 +755,7 @@ bool MainWindow::createEventRoleWidget() {
eventRoleWidget->role = "sink-input-by-media-role:event";
eventRoleWidget->setChannelMap(cm, true);
- eventRoleWidget->boldNameLabel->setText("");
+ eventRoleWidget->boldNameLabel->setText(QLatin1String(""));
eventRoleWidget->nameLabel->setText(tr("System Sounds").toUtf8().constData());
setIconByName(eventRoleWidget->iconImage, "multimedia-volume-control");
diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
index 28654bd..40f0c55 100644
--- a/src/pavucontrol.cc
+++ b/src/pavucontrol.cc
@@ -669,13 +669,13 @@ int main(int argc, char *argv[]) {
app.setApplicationVersion(VERINFO);
parser.addVersionOption();
- QCommandLineOption tabOption(QStringList() << "tab" << "t", QObject::tr("Select a specific tab on load."), "tab");
+ QCommandLineOption tabOption(QStringList() << QStringLiteral("tab") << QStringLiteral("t"), QObject::tr("Select a specific tab on load."), QStringLiteral("tab"));
parser.addOption(tabOption);
- QCommandLineOption retryOption(QStringList() << "retry" << "r", QObject::tr("Retry forever if pa quits (every 5 seconds)."));
+ QCommandLineOption retryOption(QStringList() << QStringLiteral("retry") << QStringLiteral("r"), QObject::tr("Retry forever if pa quits (every 5 seconds)."));
parser.addOption(retryOption);
- QCommandLineOption maximizeOption(QStringList() << "maximize" << "m", QObject::tr("Maximize the window."));
+ QCommandLineOption maximizeOption(QStringList() << QStringLiteral("maximize") << QStringLiteral("m"), QObject::tr("Maximize the window."));
parser.addOption(maximizeOption);
parser.process(app);