Replace emit with Q_EMIT
This commit is contained in:
@@ -116,7 +116,7 @@ void AutoExpandingTreeView::ItemDoubleClicked(const QModelIndex &idx) {
|
||||
if (MimeData *mimedata = qobject_cast<MimeData*>(q_mimedata)) {
|
||||
mimedata->from_doubleclick_ = true;
|
||||
}
|
||||
emit AddToPlaylistSignal(q_mimedata);
|
||||
Q_EMIT AddToPlaylistSignal(q_mimedata);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -135,7 +135,7 @@ void AutoExpandingTreeView::mousePressEvent(QMouseEvent *event) {
|
||||
if (MimeData *mimedata = qobject_cast<MimeData*>(q_mimedata)) {
|
||||
mimedata->enqueue_now_ = true;
|
||||
}
|
||||
emit AddToPlaylistSignal(q_mimedata);
|
||||
Q_EMIT AddToPlaylistSignal(q_mimedata);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -150,7 +150,7 @@ void AutoExpandingTreeView::mouseDoubleClickEvent(QMouseEvent *event) {
|
||||
// If the p_state was the "AnimatingState", then the base class's
|
||||
// "mouseDoubleClickEvent" method just did nothing, hence the "doubleClicked" signal is not emitted. So let's do it ourselves.
|
||||
if (idx.isValid() && p_state == AnimatingState) {
|
||||
emit doubleClicked(idx);
|
||||
Q_EMIT doubleClicked(idx);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -160,7 +160,7 @@ void AutoExpandingTreeView::keyPressEvent(QKeyEvent *e) {
|
||||
switch (e->key()) {
|
||||
case Qt::Key_Backspace:
|
||||
case Qt::Key_Escape:{
|
||||
emit FocusOnFilterSignal(e);
|
||||
Q_EMIT FocusOnFilterSignal(e);
|
||||
e->accept();
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -23,6 +23,6 @@
|
||||
ClickableLabel::ClickableLabel(QWidget *parent) : QLabel(parent) {}
|
||||
|
||||
void ClickableLabel::mousePressEvent(QMouseEvent *event) {
|
||||
emit Clicked();
|
||||
Q_EMIT Clicked();
|
||||
QLabel::mousePressEvent(event);
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ void FancyTabWidget::SetMode(const Mode mode) {
|
||||
// There appears to be a bug in QTabBar which causes tabSizeHint to be ignored thus the need for this second shot repaint
|
||||
QTimer::singleShot(1ms, this, &FancyTabWidget::TabBarUpdateGeometry);
|
||||
|
||||
emit ModeChanged(mode);
|
||||
Q_EMIT ModeChanged(mode);
|
||||
|
||||
}
|
||||
|
||||
@@ -271,7 +271,7 @@ void FancyTabWidget::CurrentTabChangedSlot(const int idx) {
|
||||
QLayout *layout = currentPage->layout();
|
||||
if (bottom_widget_) layout->addWidget(bottom_widget_);
|
||||
|
||||
emit CurrentTabChanged(idx);
|
||||
Q_EMIT CurrentTabChanged(idx);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ void FavoriteWidget::SetFavorite(const bool favorite) {
|
||||
if (favorite_ != favorite) {
|
||||
favorite_ = favorite;
|
||||
update();
|
||||
emit FavoriteStateChanged(tab_index_, favorite_);
|
||||
Q_EMIT FavoriteStateChanged(tab_index_, favorite_);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -85,6 +85,6 @@ void FavoriteWidget::mouseDoubleClickEvent(QMouseEvent*) {
|
||||
|
||||
favorite_ = !favorite_;
|
||||
update();
|
||||
emit FavoriteStateChanged(tab_index_, favorite_);
|
||||
Q_EMIT FavoriteStateChanged(tab_index_, favorite_);
|
||||
|
||||
}
|
||||
|
||||
@@ -182,7 +182,7 @@ void FileView::ChangeFilePathWithoutUndo(const QString &new_path) {
|
||||
QDir dir(new_path);
|
||||
ui_->up->setEnabled(dir.cdUp());
|
||||
|
||||
emit PathChanged(new_path);
|
||||
Q_EMIT PathChanged(new_path);
|
||||
|
||||
}
|
||||
|
||||
@@ -204,7 +204,7 @@ void FileView::ItemDoubleClick(const QModelIndex &idx) {
|
||||
mimedata->setUrls(QList<QUrl>() << QUrl::fromLocalFile(file_path));
|
||||
mimedata->name_for_new_playlist_ = file_path;
|
||||
|
||||
emit AddToPlaylist(mimedata);
|
||||
Q_EMIT AddToPlaylist(mimedata);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -149,50 +149,50 @@ void FileViewList::LoadSlot() {
|
||||
|
||||
MimeData *mimedata = MimeDataFromSelection();
|
||||
mimedata->clear_first_ = true;
|
||||
emit AddToPlaylist(mimedata);
|
||||
Q_EMIT AddToPlaylist(mimedata);
|
||||
|
||||
}
|
||||
|
||||
void FileViewList::AddToPlaylistSlot() {
|
||||
emit AddToPlaylist(MimeDataFromSelection());
|
||||
Q_EMIT AddToPlaylist(MimeDataFromSelection());
|
||||
}
|
||||
|
||||
void FileViewList::OpenInNewPlaylistSlot() {
|
||||
|
||||
MimeData *mimedata = MimeDataFromSelection();
|
||||
mimedata->open_in_new_playlist_ = true;
|
||||
emit AddToPlaylist(mimedata);
|
||||
Q_EMIT AddToPlaylist(mimedata);
|
||||
|
||||
}
|
||||
|
||||
void FileViewList::CopyToCollectionSlot() {
|
||||
emit CopyToCollection(UrlListFromSelection());
|
||||
Q_EMIT CopyToCollection(UrlListFromSelection());
|
||||
}
|
||||
|
||||
void FileViewList::MoveToCollectionSlot() {
|
||||
emit MoveToCollection(UrlListFromSelection());
|
||||
Q_EMIT MoveToCollection(UrlListFromSelection());
|
||||
}
|
||||
|
||||
void FileViewList::CopyToDeviceSlot() {
|
||||
emit CopyToDevice(UrlListFromSelection());
|
||||
Q_EMIT CopyToDevice(UrlListFromSelection());
|
||||
}
|
||||
|
||||
void FileViewList::DeleteSlot() {
|
||||
emit Delete(FilenamesFromSelection());
|
||||
Q_EMIT Delete(FilenamesFromSelection());
|
||||
}
|
||||
|
||||
void FileViewList::EditTagsSlot() {
|
||||
emit EditTags(UrlListFromSelection());
|
||||
Q_EMIT EditTags(UrlListFromSelection());
|
||||
}
|
||||
|
||||
void FileViewList::mousePressEvent(QMouseEvent *e) {
|
||||
|
||||
switch (e->button()) {
|
||||
case Qt::XButton1:
|
||||
emit Back();
|
||||
Q_EMIT Back();
|
||||
break;
|
||||
case Qt::XButton2:
|
||||
emit Forward();
|
||||
Q_EMIT Forward();
|
||||
break;
|
||||
// enqueue to playlist with middleClick
|
||||
case Qt::MiddleButton:{
|
||||
@@ -204,7 +204,7 @@ void FileViewList::mousePressEvent(QMouseEvent *e) {
|
||||
MimeData *mimedata = new MimeData;
|
||||
mimedata->setUrls(UrlListFromSelection());
|
||||
mimedata->enqueue_now_ = true;
|
||||
emit AddToPlaylist(mimedata);
|
||||
Q_EMIT AddToPlaylist(mimedata);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
||||
@@ -61,7 +61,7 @@ LoginStateWidget::~LoginStateWidget() { delete ui_; }
|
||||
|
||||
void LoginStateWidget::Logout() {
|
||||
SetLoggedIn(State::LoggedOut);
|
||||
emit LogoutClicked();
|
||||
Q_EMIT LogoutClicked();
|
||||
}
|
||||
|
||||
void LoginStateWidget::SetAccountTypeText(const QString &text) {
|
||||
@@ -138,7 +138,7 @@ bool LoginStateWidget::eventFilter(QObject *object, QEvent *event) {
|
||||
if (event->type() == QEvent::KeyPress) {
|
||||
QKeyEvent *key_event = static_cast<QKeyEvent*>(event);
|
||||
if (key_event->key() == Qt::Key_Enter || key_event->key() == Qt::Key_Return) {
|
||||
emit LoginClicked();
|
||||
Q_EMIT LoginClicked();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ void MultiLoadingIndicator::UpdateText() {
|
||||
text_ += QLatin1String("...");
|
||||
}
|
||||
|
||||
emit TaskCountChange(static_cast<int>(tasks.count()));
|
||||
Q_EMIT TaskCountChange(static_cast<int>(tasks.count()));
|
||||
update();
|
||||
updateGeometry();
|
||||
|
||||
|
||||
@@ -261,7 +261,7 @@ void PlayingWidget::ShowAboveStatusBar(const bool above) {
|
||||
s.setValue("above_status_bar", above);
|
||||
s.endGroup();
|
||||
|
||||
emit ShowAboveStatusBarChanged(above);
|
||||
Q_EMIT ShowAboveStatusBarChanged(above);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -150,7 +150,7 @@ void RatingWidget::paintEvent(QPaintEvent*) {
|
||||
void RatingWidget::mousePressEvent(QMouseEvent *e) {
|
||||
|
||||
rating_ = RatingPainter::RatingForPos(e->pos(), rect());
|
||||
emit RatingChanged(rating_);
|
||||
Q_EMIT RatingChanged(rating_);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ void RenameTabLineEdit::keyPressEvent(QKeyEvent *e) {
|
||||
|
||||
if (e->key() == Qt::Key_Escape) {
|
||||
e->accept();
|
||||
emit EditingCanceled();
|
||||
Q_EMIT EditingCanceled();
|
||||
}
|
||||
else {
|
||||
QLineEdit::keyPressEvent(e);
|
||||
@@ -45,7 +45,7 @@ void RenameTabLineEdit::focusOutEvent(QFocusEvent *e) {
|
||||
Q_UNUSED(e);
|
||||
|
||||
//if the user hasn't explicitly accepted, discard the value
|
||||
emit EditingCanceled();
|
||||
Q_EMIT EditingCanceled();
|
||||
//we don't call the default event since it will trigger editingFished()
|
||||
|
||||
}
|
||||
|
||||
@@ -99,7 +99,7 @@ void SliderSlider::mouseMoveEvent(QMouseEvent *e) {
|
||||
else {
|
||||
outside_ = false;
|
||||
slideEvent(e);
|
||||
emit sliderMoved(value());
|
||||
Q_EMIT sliderMoved(value());
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -124,7 +124,7 @@ void SliderSlider::mousePressEvent(QMouseEvent *e) {
|
||||
void SliderSlider::mouseReleaseEvent(QMouseEvent*) {
|
||||
|
||||
if (!outside_ && QSlider::value() != prev_value_) {
|
||||
emit SliderReleased(value());
|
||||
Q_EMIT SliderReleased(value());
|
||||
}
|
||||
|
||||
sliding_ = false;
|
||||
@@ -148,7 +148,7 @@ void SliderSlider::wheelEvent(QWheelEvent *e) {
|
||||
|
||||
QSlider::setValue(nval);
|
||||
|
||||
emit SliderReleased(value());
|
||||
Q_EMIT SliderReleased(value());
|
||||
|
||||
wheeling_ = false;
|
||||
|
||||
|
||||
@@ -163,7 +163,7 @@ bool StretchHeaderView::RestoreState(const QByteArray &state) {
|
||||
ResizeSections();
|
||||
}
|
||||
|
||||
emit StretchEnabledChanged(stretch_enabled_);
|
||||
Q_EMIT StretchEnabledChanged(stretch_enabled_);
|
||||
|
||||
return true;
|
||||
|
||||
@@ -207,7 +207,7 @@ void StretchHeaderView::SetStretchEnabled(const bool enabled) {
|
||||
ResizeSections();
|
||||
}
|
||||
|
||||
emit StretchEnabledChanged(enabled);
|
||||
Q_EMIT StretchEnabledChanged(enabled);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -188,7 +188,7 @@ void TrackSlider::ValueMaybeChanged(const int value) {
|
||||
if (setting_value_) return;
|
||||
|
||||
UpdateTimes(static_cast<int>(value / kMsecPerSec));
|
||||
emit ValueChangedSeconds(static_cast<quint64>(value / kMsecPerSec));
|
||||
Q_EMIT ValueChangedSeconds(static_cast<quint64>(value / kMsecPerSec));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -88,10 +88,10 @@ void TrackSliderSlider::mouseReleaseEvent(QMouseEvent *e) {
|
||||
|
||||
QSlider::mouseReleaseEvent(e);
|
||||
if (e->button() == Qt::XButton1) {
|
||||
emit Previous();
|
||||
Q_EMIT Previous();
|
||||
}
|
||||
else if (e->button() == Qt::XButton2) {
|
||||
emit Next();
|
||||
Q_EMIT Next();
|
||||
}
|
||||
e->accept();
|
||||
|
||||
@@ -128,10 +128,10 @@ void TrackSliderSlider::wheelEvent(QWheelEvent *e) {
|
||||
wheel_accumulator_ = scroll_state % WHEEL_ROTATION_TO_SEEK;
|
||||
|
||||
if (steps < 0) {
|
||||
emit SeekBackward();
|
||||
Q_EMIT SeekBackward();
|
||||
}
|
||||
else if (steps > 0) {
|
||||
emit SeekForward();
|
||||
Q_EMIT SeekForward();
|
||||
}
|
||||
e->accept();
|
||||
|
||||
@@ -166,11 +166,11 @@ void TrackSliderSlider::leaveEvent(QEvent *e) {
|
||||
void TrackSliderSlider::keyPressEvent(QKeyEvent *event) {
|
||||
|
||||
if (event->key() == Qt::Key_Left || event->key() == Qt::Key_Down) {
|
||||
emit SeekBackward();
|
||||
Q_EMIT SeekBackward();
|
||||
event->accept();
|
||||
}
|
||||
else if (event->key() == Qt::Key_Right || event->key() == Qt::Key_Up) {
|
||||
emit SeekForward();
|
||||
Q_EMIT SeekForward();
|
||||
event->accept();
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -91,7 +91,7 @@ void VolumeSlider::HandleWheel(const int delta) {
|
||||
wheeling_ = true;
|
||||
|
||||
QSlider::setValue(SliderSlider::value() + steps);
|
||||
emit SliderReleased(value());
|
||||
Q_EMIT SliderReleased(value());
|
||||
|
||||
wheeling_ = false;
|
||||
}
|
||||
@@ -271,7 +271,7 @@ void VolumeSlider::contextMenuEvent(QContextMenuEvent *e) {
|
||||
QAction *ret = menu.exec(mapToGlobal(e->pos()));
|
||||
if (ret) {
|
||||
QSlider::setValue(values[ret]);
|
||||
emit SliderReleased(values[ret]);
|
||||
Q_EMIT SliderReleased(values[ret]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user