jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix building on non-MSVC compilers

Browse Source 
This function is inline, and QVariant uses a copy-on-write like copying mechanism, like most datatypes in Qt.
This commit is contained in:
BtbN 2014-01-24 07:58:48 +01:00
parent 45ec80fb7d
commit bb35d2ce09
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
obs/qt-ptr-variant.hpp
View File

@ -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*>();
}

2
obs/window-basic-main.cpp
View File

@ -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);

4
obs/window-basic-main.hpp
View File

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

2
obs/window-namedialog.cpp
View File

@ -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;
}

4
obs/window-namedialog.hpp
View File

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