浏览代码

Fix building on non-MSVC compilers

This function is inline, and QVariant uses a copy-on-write like copying mechanism, like most datatypes in Qt.
BtbN 11 年之前
父节点
当前提交
bb35d2ce09
共有 5 个文件被更改,包括 5 次插入9 次删除
  1. 1 1
      obs/qt-ptr-variant.hpp
  2. 1 1
      obs/window-basic-main.cpp
  3. 1 3
      obs/window-basic-main.hpp
  4. 1 1
      obs/window-namedialog.cpp
  5. 1 3
      obs/window-namedialog.hpp

+ 1 - 1
obs/qt-ptr-variant.hpp

@@ -26,7 +26,7 @@ struct PtrVariantDummy {
 
 Q_DECLARE_METATYPE(PtrVariantDummy*);
 
-template<typename T> static inline T VariantPtr(QVariant &v)
+template<typename T> static inline T VariantPtr(QVariant v)
 {
 	return (T)v.value<PtrVariantDummy*>();
 }

+ 1 - 1
obs/window-basic-main.cpp

@@ -88,7 +88,7 @@ void OBSBasic::RemoveSceneItem(obs_sceneitem_t item)
 	obs_scene_t scene = obs_sceneitem_getscene(item);
 
 	if (GetCurrentScene() == scene) {
-		for (unsigned int i = 0; i < ui->sources->count(); i++) {
+		for (int i = 0; i < ui->sources->count(); i++) {
 			QListWidgetItem *listItem = ui->sources->item(i);
 			QVariant userData = listItem->data(Qt::UserRole);
 

+ 1 - 3
obs/window-basic-main.hpp

@@ -24,9 +24,7 @@
 
 class QListWidgetItem;
 
-namespace Ui {
-	class OBSBasic;
-};
+#include "ui_OBSBasic.h"
 
 class OBSBasic : public QMainWindow {
 	Q_OBJECT

+ 1 - 1
obs/window-namedialog.cpp

@@ -36,7 +36,7 @@ bool NameDialog::AskForName(QWidget *parent, const QString &title,
 
 	bool accepted = (dialog.exec() == DialogCode::Accepted);
 	if (accepted)
-		str = dialog.ui->userText->text().toUtf8();
+		str = dialog.ui->userText->text().toStdString();
 
 	return accepted;
 }

+ 1 - 3
obs/window-namedialog.hpp

@@ -21,9 +21,7 @@
 #include <string>
 #include <memory>
 
-namespace Ui {
-	class NameDialog;
-};
+#include "ui_NameDialog.h"
 
 class NameDialog : public QDialog {
 	Q_OBJECT