Skip to content

Commit 560202b

Browse files
committed
frontend: Replace and disable QString to QUrl casts
1 parent 71df6ce commit 560202b

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

frontend/dialogs/OBSYoutubeActions.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ OBSYoutubeActions::OBSYoutubeActions(QWidget *parent, Auth *auth, bool broadcast
4848
connect(ui->helpAutoStartStop, &QLabel::linkActivated, this,
4949
[](const QString &) { QToolTip::showText(QCursor::pos(), QTStr("YouTube.Actions.AutoStartStop.TT")); });
5050
connect(ui->help360Video, &QLabel::linkActivated, this,
51-
[](const QString &link) { QDesktopServices::openUrl(link); });
51+
[](const QString &link) { QDesktopServices::openUrl(QUrl(link)); });
5252
connect(ui->helpMadeForKids, &QLabel::linkActivated, this,
53-
[](const QString &link) { QDesktopServices::openUrl(link); });
53+
[](const QString &link) { QDesktopServices::openUrl(QUrl(link)); });
5454

5555
ui->scheduledTime->setVisible(false);
5656
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
@@ -712,7 +712,7 @@ void OBSYoutubeActions::OpenYouTubeDashboard()
712712
QString uri =
713713
QString("https://studio.youtube.com/channel/%1/videos/live?filter=[]&sort={\"columnType\"%3A\"date\"%2C\"sortOrder\"%3A\"DESCENDING\"}")
714714
.arg(channel.id);
715-
QDesktopServices::openUrl(uri);
715+
QDesktopServices::openUrl(QUrl(uri));
716716
}
717717

718718
void OBSYoutubeActions::Cancel()

frontend/widgets/OBSBasic.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ private slots:
458458
*/
459459
private:
460460
void AddDropSource(const char *file, DropType image);
461-
void AddDropURL(const char *url, QString &name, obs_data_t *settings, const obs_video_info &ovi);
461+
void AddDropURL(QUrl url, QString &name, obs_data_t *settings, const obs_video_info &ovi);
462462
void ConfirmDropUrl(const QString &url);
463463
void dragEnterEvent(QDragEnterEvent *event) override;
464464
void dragLeaveEvent(QDragLeaveEvent *event) override;

frontend/widgets/OBSBasic_Dropfiles.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,8 @@ static QString ReadWindowsURLFile(const QString &file)
8181
}
8282
#endif
8383

84-
void OBSBasic::AddDropURL(const char *url, QString &name, obs_data_t *settings, const obs_video_info &ovi)
84+
void OBSBasic::AddDropURL(QUrl path, QString &name, obs_data_t *settings, const obs_video_info &ovi)
8585
{
86-
QUrl path = QString::fromUtf8(url);
8786
QUrlQuery query = QUrlQuery(path.query(QUrl::FullyEncoded));
8887

8988
int cx = (int)ovi.base_width;
@@ -170,7 +169,7 @@ void OBSBasic::AddDropSource(const char *data, DropType image)
170169
type = "browser_source";
171170
break;
172171
case DropType_Url:
173-
AddDropURL(data, name, settings, ovi);
172+
AddDropURL(QUrl(data), name, settings, ovi);
174173
type = "browser_source";
175174
break;
176175
}

0 commit comments

Comments
 (0)