Skip to content

Commit 2fcff58

Browse files
committed
fixup! Separate OBSQTDisplay code into another repository
1 parent c368b02 commit 2fcff58

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ if(OS_LINUX)
104104
if(ENABLE_COVERAGE)
105105
target_compile_options(${PROJECT_NAME} PRIVATE -coverage)
106106
target_link_options(${PROJECT_NAME} PRIVATE -coverage)
107+
if(NORISCOMMONUI_SUBMODULE)
108+
target_compile_options(noriscommonui PRIVATE -coverage)
109+
target_link_options(noriscommonui PRIVATE -coverage)
110+
endif()
107111
endif()
108112
endif()
109113

src/scope-widget.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static void draw(void *param, uint32_t cx, uint32_t cy)
175175
pthread_mutex_unlock(&data->mutex);
176176
}
177177

178-
ScopeWidget::ScopeWidget(QWidget *parent) : OBSQTDisplay(parent)
178+
ScopeWidget::ScopeWidget(QWidget *parent) : NorisQTDisplay(parent)
179179
{
180180
properties = NULL;
181181
setAttribute(Qt::WA_PaintOnScreen);
@@ -194,12 +194,12 @@ ScopeWidget::ScopeWidget(QWidget *parent) : OBSQTDisplay(parent)
194194
data->i_mouse_last = -1;
195195
data->i_src_menu = -1;
196196

197-
connect(this, &OBSQTDisplay::DisplayCreated, this, &ScopeWidget::RegisterCallbackToDisplay);
197+
connect(this, &NorisQTDisplay::DisplayCreated, this, &ScopeWidget::RegisterCallbackToDisplay);
198198
}
199199

200200
ScopeWidget::~ScopeWidget()
201201
{
202-
disconnect(this, &OBSQTDisplay::DisplayCreated, this, &ScopeWidget::RegisterCallbackToDisplay);
202+
disconnect(this, &NorisQTDisplay::DisplayCreated, this, &ScopeWidget::RegisterCallbackToDisplay);
203203

204204
scope_dock_deleted(this);
205205

src/scope-widget.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#include <QWidget>
55
#include <memory>
66
#include <string>
7-
#include <OBSQTDisplay.hpp>
7+
#include <NorisQTDisplay.hpp>
88

99
#define SCOPE_WIDGET_N_SRC 7
1010

11-
class ScopeWidget : public OBSQTDisplay {
11+
class ScopeWidget : public NorisQTDisplay {
1212
Q_OBJECT
1313

1414
struct scope_widget_s *data;

0 commit comments

Comments
 (0)