dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QStringLiteral

Browse Source
This commit is contained in:
Jonas Kvinge
2024-04-09 23:20:26 +02:00
parent 3cfffa5fbb
commit 58944993b8
233 changed files with 3885 additions and 3885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/busyindicator.cpp
View File

@@ -48,7 +48,7 @@ BusyIndicator::BusyIndicator(QWidget *parent)
void BusyIndicator::Init(const QString &text) {
movie_ = new QMovie(":/pictures/spinner.gif"),
movie_ = new QMovie(QStringLiteral(":/pictures/spinner.gif")),
label_ = new QLabel;
QLabel *icon = new QLabel;

6
src/widgets/fancytabwidget.cpp
View File

@@ -208,7 +208,7 @@ class FancyTabBar : public QTabBar { // clazy:exclude=missing-qobject-macro
// Restore any label text that was hidden/cached for the IconOnlyTabs mode
if (labelCache.count() > 0 && tabWidget->mode() != FancyTabWidget::Mode::IconOnlyTabs) {
for (int i = 0; i < count(); ++i) {
setTabToolTip(i, "");
setTabToolTip(i, QLatin1String(""));
setTabText(i, labelCache[tabWidget->widget(i)]);
}
labelCache.clear();
@@ -219,7 +219,7 @@ class FancyTabBar : public QTabBar { // clazy:exclude=missing-qobject-macro
for (int i = 0; i < count(); ++i) {
labelCache[tabWidget->widget(i)] = tabText(i);
setTabToolTip(i, tabText(i));
setTabText(i, "");
setTabText(i, QLatin1String(""));
}
}
QTabBar::paintEvent(pe);
@@ -461,7 +461,7 @@ FancyTabWidget::FancyTabWidget(QWidget *parent)
setMovable(true);
setElideMode(Qt::ElideNone);
setUsesScrollButtons(true);
if (QApplication::style() && QApplication::style()->objectName().contains(QRegularExpression("^adwaita.*$", QRegularExpression::CaseInsensitiveOption))) {
if (QApplication::style() && QApplication::style()->objectName().contains(QRegularExpression(QStringLiteral("^adwaita.*$"), QRegularExpression::CaseInsensitiveOption))) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
style_ = new FancyTabWidgetProxyStyle(QApplication::style()->name());
#else

4
src/widgets/favoritewidget.cpp
View File

@@ -36,8 +36,8 @@ FavoriteWidget::FavoriteWidget(const int tab_index, const bool favorite, QWidget
: QWidget(parent),
tab_index_(tab_index),
favorite_(favorite),
on_(IconLoader::Load("star")),
off_(IconLoader::Load("star-grey")),
on_(IconLoader::Load(QStringLiteral("star"))),
off_(IconLoader::Load(QStringLiteral("star-grey"))),
rect_(0, 0, kStarSize, kStarSize) {}
void FavoriteWidget::SetFavorite(const bool favorite) {

12
src/widgets/fileview.cpp
View File

@@ -65,15 +65,15 @@ FileView::FileView(QWidget *parent)
model_(nullptr),
undo_stack_(new QUndoStack(this)),
task_manager_(nullptr),
storage_(new FilesystemMusicStorage(Song::Source::LocalFile, "/")) {
storage_(new FilesystemMusicStorage(Song::Source::LocalFile, QStringLiteral("/"))) {
ui_->setupUi(this);
// Icons
ui_->back->setIcon(IconLoader::Load("go-previous"));
ui_->forward->setIcon(IconLoader::Load("go-next"));
ui_->home->setIcon(IconLoader::Load("go-home"));
ui_->up->setIcon(IconLoader::Load("go-up"));
ui_->back->setIcon(IconLoader::Load(QStringLiteral("go-previous")));
ui_->forward->setIcon(IconLoader::Load(QStringLiteral("go-next")));
ui_->home->setIcon(IconLoader::Load(QStringLiteral("go-home")));
ui_->up->setIcon(IconLoader::Load(QStringLiteral("go-up")));
QObject::connect(ui_->back, &QToolButton::clicked, undo_stack_, &QUndoStack::undo);
QObject::connect(ui_->forward, &QToolButton::clicked, undo_stack_, &QUndoStack::redo);
@@ -94,7 +94,7 @@ FileView::FileView(QWidget *parent)
QObject::connect(ui_->list, &FileViewList::EditTags, this, &FileView::EditTags);
QString filter(FileView::kFileFilter);
filter_list_ << filter.split(" ");
filter_list_ << filter.split(QStringLiteral(" "));
ReloadSettings();

18
src/widgets/fileviewlist.cpp
View File

@@ -39,18 +39,18 @@ FileViewList::FileViewList(QWidget *parent)
: QListView(parent),
menu_(new QMenu(this)) {
menu_->addAction(IconLoader::Load("media-playback-start"), tr("Append to current playlist"), this, &FileViewList::AddToPlaylistSlot);
menu_->addAction(IconLoader::Load("media-playback-start"), tr("Replace current playlist"), this, &FileViewList::LoadSlot);
menu_->addAction(IconLoader::Load("document-new"), tr("Open in new playlist"), this, &FileViewList::OpenInNewPlaylistSlot);
menu_->addAction(IconLoader::Load(QStringLiteral("media-playback-start")), tr("Append to current playlist"), this, &FileViewList::AddToPlaylistSlot);
menu_->addAction(IconLoader::Load(QStringLiteral("media-playback-start")), tr("Replace current playlist"), this, &FileViewList::LoadSlot);
menu_->addAction(IconLoader::Load(QStringLiteral("document-new")), tr("Open in new playlist"), this, &FileViewList::OpenInNewPlaylistSlot);
menu_->addSeparator();
menu_->addAction(IconLoader::Load("edit-copy"), tr("Copy to collection..."), this, &FileViewList::CopyToCollectionSlot);
menu_->addAction(IconLoader::Load("go-jump"), tr("Move to collection..."), this, &FileViewList::MoveToCollectionSlot);
menu_->addAction(IconLoader::Load("device"), tr("Copy to device..."), this, &FileViewList::CopyToDeviceSlot);
menu_->addAction(IconLoader::Load("edit-delete"), tr("Delete from disk..."), this, &FileViewList::DeleteSlot);
menu_->addAction(IconLoader::Load(QStringLiteral("edit-copy")), tr("Copy to collection..."), this, &FileViewList::CopyToCollectionSlot);
menu_->addAction(IconLoader::Load(QStringLiteral("go-jump")), tr("Move to collection..."), this, &FileViewList::MoveToCollectionSlot);
menu_->addAction(IconLoader::Load(QStringLiteral("device")), tr("Copy to device..."), this, &FileViewList::CopyToDeviceSlot);
menu_->addAction(IconLoader::Load(QStringLiteral("edit-delete")), tr("Delete from disk..."), this, &FileViewList::DeleteSlot);
menu_->addSeparator();
menu_->addAction(IconLoader::Load("edit-rename"), tr("Edit track information..."), this, &FileViewList::EditTagsSlot);
menu_->addAction(IconLoader::Load("document-open-folder"), tr("Show in file browser..."), this, &FileViewList::ShowInBrowser);
menu_->addAction(IconLoader::Load(QStringLiteral("edit-rename")), tr("Edit track information..."), this, &FileViewList::EditTagsSlot);
menu_->addAction(IconLoader::Load(QStringLiteral("document-open-folder")), tr("Show in file browser..."), this, &FileViewList::ShowInBrowser);
setAttribute(Qt::WA_MacShowFocusRect, false);

2
src/widgets/freespacebar.cpp
View File

@@ -226,7 +226,7 @@ QString FreeSpaceBar::TextForSize(const QString &prefix, const quint64 size) {
ret = Utilities::PrettySize(size);
}
else {
ret = "0 MB";
ret = QStringLiteral("0 MB");
}
if (!prefix.isEmpty()) ret.prepend(prefix + " ");

2
src/widgets/groupediconview.cpp
View File

@@ -56,7 +56,7 @@ GroupedIconView::GroupedIconView(QWidget *parent)
header_spacing_(10),
header_indent_(5),
item_indent_(10),
header_text_("%1") {
header_text_(QStringLiteral("%1")) {
setFlow(LeftToRight);
setViewMode(IconMode);

10
src/widgets/lineedit.cpp
View File

@@ -51,10 +51,10 @@ ExtendedEditor::ExtendedEditor(QWidget *widget, int extra_right_padding, bool dr
font_point_size_(widget->font().pointSizeF() - 1),
is_rtl_(false) {
clear_button_->setIcon(IconLoader::Load("edit-clear-locationbar-ltr"));
clear_button_->setIcon(IconLoader::Load(QStringLiteral("edit-clear-locationbar-ltr")));
clear_button_->setIconSize(QSize(16, 16));
clear_button_->setCursor(Qt::ArrowCursor);
clear_button_->setStyleSheet("QToolButton { border: none; padding: 0px; }");
clear_button_->setStyleSheet(QStringLiteral("QToolButton { border: none; padding: 0px; }"));
clear_button_->setToolTip(QWidget::tr("Clear"));
clear_button_->setFocusPolicy(Qt::NoFocus);
@@ -64,7 +64,7 @@ ExtendedEditor::ExtendedEditor(QWidget *widget, int extra_right_padding, bool dr
reset_button_->setIcon(widget->style()->standardIcon(QStyle::SP_DialogResetButton, &opt, widget));
reset_button_->setIconSize(QSize(16, 16));
reset_button_->setCursor(Qt::ArrowCursor);
reset_button_->setStyleSheet("QToolButton { border: none; padding: 0px; }");
reset_button_->setStyleSheet(QStringLiteral("QToolButton { border: none; padding: 0px; }"));
reset_button_->setToolTip(QWidget::tr("Reset"));
reset_button_->setFocusPolicy(Qt::NoFocus);
reset_button_->hide();
@@ -112,7 +112,7 @@ void ExtendedEditor::UpdateButtonGeometry() {
const int left = frame_width + 1 + (has_clear_button() ? clear_button_->sizeHint().width() : 0);
const int right = frame_width + 1 + (has_reset_button() ? reset_button_->sizeHint().width() : 0);
widget_->setStyleSheet(QString("QLineEdit { padding-left: %1px; padding-right: %2px; }").arg(left).arg(right));
widget_->setStyleSheet(QStringLiteral("QLineEdit { padding-left: %1px; padding-right: %2px; }").arg(left).arg(right));
QSize msz = widget_->minimumSizeHint();
widget_->setMinimumSize(msz.width() + (clear_button_->sizeHint().width() + frame_width + 1) * 2 + extra_right_padding_, qMax(msz.height(), clear_button_->sizeHint().height() + frame_width * 2 + 2));
@@ -251,7 +251,7 @@ void CheckBox::resizeEvent(QResizeEvent *e) {
QString SpinBox::textFromValue(int val) const {
if (val <= 0 && !hint_.isEmpty()) {
return "-";
return QStringLiteral("-");
}
return QSpinBox::textFromValue(val);

2
src/widgets/linetextedit.cpp
View File

@@ -45,7 +45,7 @@ QSize LineTextEdit::sizeHint() const {
static const int kMargin = 5;
int h = 2 * kMargin + qMax(fm.height(), 14);
int w = 2 * kMargin + fm.horizontalAdvance("W") * 15;
int w = 2 * kMargin + fm.horizontalAdvance(QStringLiteral("W")) * 15;
return QSize(w, h);

8
src/widgets/loginstatewidget.cpp
View File

@@ -42,10 +42,10 @@ LoginStateWidget::LoginStateWidget(QWidget *parent)
ui_->account_type->hide();
ui_->busy->hide();
ui_->sign_out->setIcon(IconLoader::Load("list-remove"));
ui_->signed_in_icon_label->setPixmap(IconLoader::Load("dialog-ok-apply").pixmap(22));
ui_->expires_icon_label->setPixmap(IconLoader::Load("dialog-password").pixmap(22));
ui_->account_type_icon_label->setPixmap(IconLoader::Load("dialog-warning").pixmap(22));
ui_->sign_out->setIcon(IconLoader::Load(QStringLiteral("list-remove")));
ui_->signed_in_icon_label->setPixmap(IconLoader::Load(QStringLiteral("dialog-ok-apply")).pixmap(22));
ui_->expires_icon_label->setPixmap(IconLoader::Load(QStringLiteral("dialog-password")).pixmap(22));
ui_->account_type_icon_label->setPixmap(IconLoader::Load(QStringLiteral("dialog-warning")).pixmap(22));
QFont bold_font(font());
bold_font.setBold(true);

6
src/widgets/multiloadingindicator.cpp
View File

@@ -76,16 +76,16 @@ void MultiLoadingIndicator::UpdateText() {
if (task.progress_max > 0) {
int percentage = static_cast<int>(static_cast<float>(task.progress) / static_cast<float>(task.progress_max) * 100.0F);
task_text += QString(" %1%").arg(percentage);
task_text += QStringLiteral(" %1%").arg(percentage);
}
strings << task_text;
}
text_ = strings.join(", ");
text_ = strings.join(QStringLiteral(", "));
if (!text_.isEmpty()) {
text_[0] = text_[0].toUpper();
text_ += "...";
text_ += QLatin1String("...");
}
emit TaskCountChange(static_cast<int>(tasks.count()));

14
src/widgets/playingwidget.cpp
View File

@@ -117,8 +117,8 @@ PlayingWidget::PlayingWidget(QWidget *parent)
details_->setUndoRedoEnabled(false);
// add placeholder text to get the correct height
if (mode_ == Mode::LargeSongDetails) {
details_->setDefaultStyleSheet("p { font-size: small; font-weight: bold; }");
details_->setHtml(QString("<p align=center><i></i><br/><br/></p>"));
details_->setDefaultStyleSheet(QStringLiteral("p { font-size: small; font-weight: bold; }"));
details_->setHtml(QStringLiteral("<p align=center><i></i><br/><br/></p>"));
}
UpdateHeight();
@@ -402,20 +402,20 @@ void PlayingWidget::UpdateHeight() {
void PlayingWidget::UpdateDetailsText() {
QString html;
details_->setDefaultStyleSheet("p { font-size: small; font-weight: bold; }");
details_->setDefaultStyleSheet(QStringLiteral("p { font-size: small; font-weight: bold; }"));
switch (mode_) {
case Mode::SmallSongDetails:
details_->setTextWidth(-1);
html += "<p>";
html += QLatin1String("<p>");
break;
case Mode::LargeSongDetails:
details_->setTextWidth(desired_height_);
html += "<p align=center>";
html += QLatin1String("<p align=center>");
break;
}
html += QString("%1<br/>%2<br/>%3").arg(song_.PrettyTitle().toHtmlEscaped(), song_.artist().toHtmlEscaped(), song_.album().toHtmlEscaped());
html += "</p>";
html += QStringLiteral("%1<br/>%2<br/>%3").arg(song_.PrettyTitle().toHtmlEscaped(), song_.artist().toHtmlEscaped(), song_.album().toHtmlEscaped());
html += QLatin1String("</p>");
details_->setHtml(html);

8
src/widgets/qsearchfield_qt.cpp
View File

@@ -72,11 +72,11 @@ QSearchField::QSearchField(QWidget *parent) : QWidget(parent) {
QObject::connect(lineEdit, &QLineEdit::textChanged, this, &QSearchField::setText);
QPushButton *clearbutton = new QPushButton(this);
QIcon clearIcon(IconLoader::Load("edit-clear-locationbar-ltr"));
QIcon clearIcon(IconLoader::Load(QStringLiteral("edit-clear-locationbar-ltr")));
clearbutton->setIcon(clearIcon);
clearbutton->setIconSize(QSize(20, 20));
clearbutton->setStyleSheet("border: none; padding: 2px;");
clearbutton->setStyleSheet(QStringLiteral("border: none; padding: 2px;"));
clearbutton->resize(clearbutton->sizeHint());
QObject::connect(clearbutton, &QPushButton::clicked, this, &QSearchField::clear);
@@ -85,7 +85,7 @@ QSearchField::QSearchField(QWidget *parent) : QWidget(parent) {
const int frame_width = lineEdit->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
lineEdit->setStyleSheet(QString("QLineEdit { padding-left: %1px; } ").arg(clearbutton->width()));
lineEdit->setStyleSheet(QStringLiteral("QLineEdit { padding-left: %1px; } ").arg(clearbutton->width()));
const int width = frame_width + qMax(lineEdit->minimumSizeHint().width(), pimpl->clearButtonPaddedWidth());
const int height = frame_width + qMax(lineEdit->minimumSizeHint().height(), pimpl->clearButtonPaddedHeight());
lineEdit->setMinimumSize(width, height);
@@ -103,7 +103,7 @@ void QSearchField::setIconSize(const int iconsize) {
pimpl->clearbutton_->setIconSize(QSize(iconsize, iconsize));
pimpl->clearbutton_->resize(pimpl->clearbutton_->sizeHint());
pimpl->lineedit_->setStyleSheet(QString("QLineEdit { padding-left: %1px; } ").arg(pimpl->clearbutton_->width()));
pimpl->lineedit_->setStyleSheet(QStringLiteral("QLineEdit { padding-left: %1px; } ").arg(pimpl->clearbutton_->width()));
const int frame_width = pimpl->lineedit_->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
const int width = frame_width + qMax(pimpl->lineedit_->minimumSizeHint().width(), pimpl->clearButtonPaddedWidth());
const int height = frame_width + qMax(pimpl->lineedit_->minimumSizeHint().height(), pimpl->clearButtonPaddedHeight());

8
src/widgets/trackslider.cpp
View File

@@ -94,8 +94,8 @@ void TrackSlider::SetApplication(Application *app) {
void TrackSlider::UpdateLabelWidth() {
// We set the label's minimum size, so it won't resize itself when the user is dragging the slider.
UpdateLabelWidth(ui_->elapsed, "0:00:00");
UpdateLabelWidth(ui_->remaining, "-0:00:00");
UpdateLabelWidth(ui_->elapsed, QStringLiteral("0:00:00"));
UpdateLabelWidth(ui_->remaining, QStringLiteral("-0:00:00"));
}
@@ -158,8 +158,8 @@ void TrackSlider::UpdateTimes(const int elapsed) {
void TrackSlider::SetStopped() {
setEnabled(false);
ui_->elapsed->setText("0:00:00");
ui_->remaining->setText("0:00:00");
ui_->elapsed->setText(QStringLiteral("0:00:00"));
ui_->remaining->setText(QStringLiteral("0:00:00"));
setting_value_ = true;
ui_->slider->setValue(0);

20
src/widgets/volumeslider.cpp
View File

@@ -115,7 +115,7 @@ void VolumeSlider::paintEvent(QPaintEvent*) {
void VolumeSlider::generateGradient() {
const QImage mask(":/pictures/volumeslider-gradient.png");
const QImage mask(QStringLiteral(":/pictures/volumeslider-gradient.png"));
QImage gradient_image(mask.size(), QImage::Format_ARGB32_Premultiplied);
QPainter p(&gradient_image);
@@ -177,8 +177,8 @@ QPixmap VolumeSlider::drawVolumePixmap() const {
void VolumeSlider::drawVolumeSliderHandle() {
QImage pixmapHandle(":/pictures/volumeslider-handle.png");
QImage pixmapHandleGlow(":/pictures/volumeslider-handle_glow.png");
QImage pixmapHandle(QStringLiteral(":/pictures/volumeslider-handle.png"));
QImage pixmapHandleGlow(QStringLiteral(":/pictures/volumeslider-handle_glow.png"));
QImage pixmapHandleGlow_image(pixmapHandleGlow.size(), QImage::Format_ARGB32_Premultiplied);
QPainter painter(&pixmapHandleGlow_image);
@@ -242,13 +242,13 @@ void VolumeSlider::contextMenuEvent(QContextMenuEvent *e) {
QHash<QAction*, int> values;
QMenu menu;
menu.setTitle("Volume");
values[menu.addAction("100%")] = 100;
values[menu.addAction("80%")] = 80;
values[menu.addAction("60%")] = 60;
values[menu.addAction("40%")] = 40;
values[menu.addAction("20%")] = 20;
values[menu.addAction("0%")] = 0;
menu.setTitle(QStringLiteral("Volume"));
values[menu.addAction(QStringLiteral("100%"))] = 100;
values[menu.addAction(QStringLiteral("80%"))] = 80;
values[menu.addAction(QStringLiteral("60%"))] = 60;
values[menu.addAction(QStringLiteral("40%"))] = 40;
values[menu.addAction(QStringLiteral("20%"))] = 20;
values[menu.addAction(QStringLiteral("0%"))] = 0;
QAction *ret = menu.exec(mapToGlobal(e->pos()));
if (ret) {