Forráskód Böngészése

frontend: Replace and disable QString to QUrl casts

gxalpha 11 hónapja
szülő
commit
876806bbf5

+ 3 - 3
frontend/dialogs/OBSYoutubeActions.cpp

@@ -48,9 +48,9 @@ OBSYoutubeActions::OBSYoutubeActions(QWidget *parent, Auth *auth, bool broadcast
 	connect(ui->helpAutoStartStop, &QLabel::linkActivated, this,
 		[](const QString &) { QToolTip::showText(QCursor::pos(), QTStr("YouTube.Actions.AutoStartStop.TT")); });
 	connect(ui->help360Video, &QLabel::linkActivated, this,
-		[](const QString &link) { QDesktopServices::openUrl(link); });
+		[](const QString &link) { QDesktopServices::openUrl(QUrl(link)); });
 	connect(ui->helpMadeForKids, &QLabel::linkActivated, this,
-		[](const QString &link) { QDesktopServices::openUrl(link); });
+		[](const QString &link) { QDesktopServices::openUrl(QUrl(link)); });
 
 	ui->scheduledTime->setVisible(false);
 #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
@@ -712,7 +712,7 @@ void OBSYoutubeActions::OpenYouTubeDashboard()
 	QString uri =
 		QString("https://studio.youtube.com/channel/%1/videos/live?filter=[]&sort={\"columnType\"%3A\"date\"%2C\"sortOrder\"%3A\"DESCENDING\"}")
 			.arg(channel.id);
-	QDesktopServices::openUrl(uri);
+	QDesktopServices::openUrl(QUrl(uri));
 }
 
 void OBSYoutubeActions::Cancel()

+ 1 - 1
frontend/widgets/OBSBasic.hpp

@@ -470,7 +470,7 @@ private slots:
 	 */
 private:
 	void AddDropSource(const char *file, DropType image);
-	void AddDropURL(const char *url, QString &name, obs_data_t *settings, const obs_video_info &ovi);
+	void AddDropURL(QUrl url, QString &name, obs_data_t *settings, const obs_video_info &ovi);
 	void ConfirmDropUrl(const QString &url);
 	void dragEnterEvent(QDragEnterEvent *event) override;
 	void dragLeaveEvent(QDragLeaveEvent *event) override;

+ 6 - 7
frontend/widgets/OBSBasic_Dropfiles.cpp

@@ -81,10 +81,9 @@ static QString ReadWindowsURLFile(const QString &file)
 }
 #endif
 
-void OBSBasic::AddDropURL(const char *url, QString &name, obs_data_t *settings, const obs_video_info &ovi)
+void OBSBasic::AddDropURL(QUrl url, QString &name, obs_data_t *settings, const obs_video_info &ovi)
 {
-	QUrl path = QString::fromUtf8(url);
-	QUrlQuery query = QUrlQuery(path.query(QUrl::FullyEncoded));
+	QUrlQuery query = QUrlQuery(url.query(QUrl::FullyEncoded));
 
 	int cx = (int)ovi.base_width;
 	int cy = (int)ovi.base_height;
@@ -109,15 +108,15 @@ void OBSBasic::AddDropURL(const char *url, QString &name, obs_data_t *settings,
 	obs_data_set_int(settings, "width", cx);
 	obs_data_set_int(settings, "height", cy);
 
-	name = query.hasQueryItem("layer-name") ? query.queryItemValue("layer-name", QUrl::FullyDecoded) : path.host();
+	name = query.hasQueryItem("layer-name") ? query.queryItemValue("layer-name", QUrl::FullyDecoded) : url.host();
 
 	query.removeQueryItem("layer-width");
 	query.removeQueryItem("layer-height");
 	query.removeQueryItem("layer-name");
 	query.removeQueryItem("layer-css");
-	path.setQuery(query);
+	url.setQuery(query);
 
-	obs_data_set_string(settings, "url", QT_TO_UTF8(path.url()));
+	obs_data_set_string(settings, "url", QT_TO_UTF8(url.url()));
 }
 
 void OBSBasic::AddDropSource(const char *data, DropType image)
@@ -170,7 +169,7 @@ void OBSBasic::AddDropSource(const char *data, DropType image)
 		type = "browser_source";
 		break;
 	case DropType_Url:
-		AddDropURL(data, name, settings, ovi);
+		AddDropURL(QUrl(data), name, settings, ovi);
 		type = "browser_source";
 		break;
 	}