Skip to content

Commit 43ac8b7

Browse files
reitoworeitowo
committed
save
1 parent f443138 commit 43ac8b7

File tree

5 files changed

+100
-101
lines changed

5 files changed

+100
-101
lines changed

‎diag/amd/DeviceDX11.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ AMF_RESULT DeviceDX11::Init(amf_uint32 adapterID, bool onlyWithOutputs, bool bCh
146146
if(FAILED(hr))
147147
{
148148
createDeviceFlags &= (~D3D11_CREATE_DEVICE_DEBUG);
149-
hr = D3D11CreateDevice(pAdapter, eDriverType, NULL, createDeviceFlags, featureLevels, _countof(featureLevels),
149+
hr = D3D11CreateDevice(pAdapter.Get(), eDriverType, NULL, createDeviceFlags, featureLevels, _countof(featureLevels),
150150
D3D11_SDK_VERSION, &pD3D11Device, &featureLevel, &pD3D11Context);
151151
}
152152
#endif

‎ui/windows/collabroom.ui

+35-35
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<class>CollabRoom</class>
44
<widget class="QDialog" name="CollabRoom">
55
<property name="windowModality">
6-
<enum>Qt::WindowModality::NonModal</enum>
6+
<enum>Qt::NonModal</enum>
77
</property>
88
<property name="geometry">
99
<rect>
@@ -66,10 +66,10 @@
6666
</font>
6767
</property>
6868
<property name="verticalScrollMode">
69-
<enum>QAbstractItemView::ScrollMode::ScrollPerPixel</enum>
69+
<enum>QAbstractItemView::ScrollPerPixel</enum>
7070
</property>
7171
<property name="resizeMode">
72-
<enum>QListView::ResizeMode::Adjust</enum>
72+
<enum>QListView::Adjust</enum>
7373
</property>
7474
</widget>
7575
<widget class="QWidget" name="horizontalLayoutWidget">
@@ -140,10 +140,10 @@
140140
</font>
141141
</property>
142142
<property name="orientation">
143-
<enum>Qt::Orientation::Horizontal</enum>
143+
<enum>Qt::Horizontal</enum>
144144
</property>
145145
<property name="sizeType">
146-
<enum>QSizePolicy::Policy::Preferred</enum>
146+
<enum>QSizePolicy::Preferred</enum>
147147
</property>
148148
<property name="sizeHint" stdset="0">
149149
<size>
@@ -209,7 +209,7 @@
209209
<string>D3D11</string>
210210
</property>
211211
<property name="alignment">
212-
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
212+
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
213213
</property>
214214
</widget>
215215
</item>
@@ -249,7 +249,7 @@
249249
<string>未捕获</string>
250250
</property>
251251
<property name="alignment">
252-
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
252+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
253253
</property>
254254
</widget>
255255
</item>
@@ -334,7 +334,7 @@
334334
</font>
335335
</property>
336336
<property name="orientation">
337-
<enum>Qt::Orientation::Horizontal</enum>
337+
<enum>Qt::Horizontal</enum>
338338
</property>
339339
<property name="sizeHint" stdset="0">
340340
<size>
@@ -489,10 +489,10 @@
489489
</font>
490490
</property>
491491
<property name="orientation">
492-
<enum>Qt::Orientation::Vertical</enum>
492+
<enum>Qt::Vertical</enum>
493493
</property>
494494
<property name="sizeType">
495-
<enum>QSizePolicy::Policy::Fixed</enum>
495+
<enum>QSizePolicy::Fixed</enum>
496496
</property>
497497
<property name="sizeHint" stdset="0">
498498
<size>
@@ -508,7 +508,7 @@
508508
<number>5</number>
509509
</property>
510510
<property name="sizeConstraint">
511-
<enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
511+
<enum>QLayout::SetDefaultConstraint</enum>
512512
</property>
513513
<item>
514514
<widget class="QLabel" name="label_14">
@@ -577,7 +577,7 @@
577577
<string/>
578578
</property>
579579
<property name="alignment">
580-
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
580+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
581581
</property>
582582
</widget>
583583
</item>
@@ -620,10 +620,10 @@
620620
</font>
621621
</property>
622622
<property name="orientation">
623-
<enum>Qt::Orientation::Vertical</enum>
623+
<enum>Qt::Vertical</enum>
624624
</property>
625625
<property name="sizeType">
626-
<enum>QSizePolicy::Policy::Fixed</enum>
626+
<enum>QSizePolicy::Fixed</enum>
627627
</property>
628628
<property name="sizeHint" stdset="0">
629629
<size>
@@ -639,7 +639,7 @@
639639
<number>0</number>
640640
</property>
641641
<property name="sizeConstraint">
642-
<enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
642+
<enum>QLayout::SetDefaultConstraint</enum>
643643
</property>
644644
<item>
645645
<widget class="QLabel" name="label_5">
@@ -705,13 +705,13 @@
705705
<string/>
706706
</property>
707707
<property name="frameShadow">
708-
<enum>QFrame::Shadow::Plain</enum>
708+
<enum>QFrame::Plain</enum>
709709
</property>
710710
<property name="text">
711711
<string>检测网络中</string>
712712
</property>
713713
<property name="alignment">
714-
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
714+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
715715
</property>
716716
</widget>
717717
</item>
@@ -723,7 +723,7 @@
723723
<number>2</number>
724724
</property>
725725
<property name="sizeConstraint">
726-
<enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
726+
<enum>QLayout::SetDefaultConstraint</enum>
727727
</property>
728728
<item>
729729
<widget class="QLabel" name="label_3">
@@ -750,10 +750,10 @@
750750
</font>
751751
</property>
752752
<property name="orientation">
753-
<enum>Qt::Orientation::Horizontal</enum>
753+
<enum>Qt::Horizontal</enum>
754754
</property>
755755
<property name="sizeType">
756-
<enum>QSizePolicy::Policy::Fixed</enum>
756+
<enum>QSizePolicy::Fixed</enum>
757757
</property>
758758
<property name="sizeHint" stdset="0">
759759
<size>
@@ -784,7 +784,7 @@
784784
</font>
785785
</property>
786786
<property name="echoMode">
787-
<enum>QLineEdit::EchoMode::Password</enum>
787+
<enum>QLineEdit::Password</enum>
788788
</property>
789789
</widget>
790790
</item>
@@ -832,10 +832,10 @@
832832
</font>
833833
</property>
834834
<property name="orientation">
835-
<enum>Qt::Orientation::Vertical</enum>
835+
<enum>Qt::Vertical</enum>
836836
</property>
837837
<property name="sizeType">
838-
<enum>QSizePolicy::Policy::Fixed</enum>
838+
<enum>QSizePolicy::Fixed</enum>
839839
</property>
840840
<property name="sizeHint" stdset="0">
841841
<size>
@@ -882,10 +882,10 @@
882882
</font>
883883
</property>
884884
<property name="orientation">
885-
<enum>Qt::Orientation::Vertical</enum>
885+
<enum>Qt::Vertical</enum>
886886
</property>
887887
<property name="sizeType">
888-
<enum>QSizePolicy::Policy::Fixed</enum>
888+
<enum>QSizePolicy::Fixed</enum>
889889
</property>
890890
<property name="sizeHint" stdset="0">
891891
<size>
@@ -1124,8 +1124,8 @@
11241124
<colorrole role="ButtonText">
11251125
<brush brushstyle="SolidPattern">
11261126
<color alpha="255">
1127-
<red>65</red>
1128-
<green>109</green>
1127+
<red>85</red>
1128+
<green>0</green>
11291129
<blue>255</blue>
11301130
</color>
11311131
</brush>
@@ -1135,9 +1135,9 @@
11351135
<colorrole role="ButtonText">
11361136
<brush brushstyle="SolidPattern">
11371137
<color alpha="255">
1138-
<red>65</red>
1139-
<green>109</green>
1140-
<blue>255</blue>
1138+
<red>0</red>
1139+
<green>0</green>
1140+
<blue>0</blue>
11411141
</color>
11421142
</brush>
11431143
</colorrole>
@@ -1334,7 +1334,7 @@
13341334
<string>问题反馈</string>
13351335
</property>
13361336
<property name="alignment">
1337-
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
1337+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
13381338
</property>
13391339
</widget>
13401340
</item>
@@ -1445,7 +1445,7 @@
14451445
<string/>
14461446
</property>
14471447
<property name="alignment">
1448-
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
1448+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
14491449
</property>
14501450
</widget>
14511451
</item>
@@ -1516,7 +1516,7 @@
15161516
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;div&gt;在B站投稿联动视频至话题「&lt;span style=&quot; color:#0099ff;&quot;&gt;一起来用VLink联动！&lt;/span&gt;」&lt;/div&gt;&lt;div&gt;即可参加有奖活动！&lt;/div&gt;&lt;/body&gt;&lt;/html&gt;</string>
15171517
</property>
15181518
<property name="alignment">
1519-
<set>Qt::AlignmentFlag::AlignHCenter|Qt::AlignmentFlag::AlignTop</set>
1519+
<set>Qt::AlignHCenter|Qt::AlignTop</set>
15201520
</property>
15211521
<property name="wordWrap">
15221522
<bool>true</bool>
@@ -1599,7 +1599,7 @@
15991599
</font>
16001600
</property>
16011601
<property name="orientation">
1602-
<enum>Qt::Orientation::Horizontal</enum>
1602+
<enum>Qt::Horizontal</enum>
16031603
</property>
16041604
<property name="sizeHint" stdset="0">
16051605
<size>
@@ -1627,7 +1627,7 @@
16271627
<number>100</number>
16281628
</property>
16291629
<property name="orientation">
1630-
<enum>Qt::Orientation::Horizontal</enum>
1630+
<enum>Qt::Horizontal</enum>
16311631
</property>
16321632
</widget>
16331633
</item>

‎ui/windows/framequality.ui

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<class>FrameQuality</class>
44
<widget class="QDialog" name="FrameQuality">
55
<property name="windowModality">
6-
<enum>Qt::WindowModality::ApplicationModal</enum>
6+
<enum>Qt::ApplicationModal</enum>
77
</property>
88
<property name="geometry">
99
<rect>
@@ -76,10 +76,10 @@
7676
<item>
7777
<spacer name="verticalSpacer">
7878
<property name="orientation">
79-
<enum>Qt::Orientation::Vertical</enum>
79+
<enum>Qt::Vertical</enum>
8080
</property>
8181
<property name="sizeType">
82-
<enum>QSizePolicy::Policy::Fixed</enum>
82+
<enum>QSizePolicy::Fixed</enum>
8383
</property>
8484
<property name="sizeHint" stdset="0">
8585
<size>
@@ -131,10 +131,10 @@
131131
<item>
132132
<spacer name="verticalSpacer_2">
133133
<property name="orientation">
134-
<enum>Qt::Orientation::Vertical</enum>
134+
<enum>Qt::Vertical</enum>
135135
</property>
136136
<property name="sizeType">
137-
<enum>QSizePolicy::Policy::Fixed</enum>
137+
<enum>QSizePolicy::Fixed</enum>
138138
</property>
139139
<property name="sizeHint" stdset="0">
140140
<size>
@@ -367,7 +367,7 @@
367367
<item>
368368
<widget class="Line" name="line_2">
369369
<property name="orientation">
370-
<enum>Qt::Orientation::Horizontal</enum>
370+
<enum>Qt::Horizontal</enum>
371371
</property>
372372
</widget>
373373
</item>
@@ -402,7 +402,7 @@
402402
<item>
403403
<widget class="Line" name="line">
404404
<property name="orientation">
405-
<enum>Qt::Orientation::Horizontal</enum>
405+
<enum>Qt::Horizontal</enum>
406406
</property>
407407
</widget>
408408
</item>
@@ -441,7 +441,7 @@
441441
<item>
442442
<widget class="Line" name="line_3">
443443
<property name="orientation">
444-
<enum>Qt::Orientation::Horizontal</enum>
444+
<enum>Qt::Horizontal</enum>
445445
</property>
446446
</widget>
447447
</item>

0 commit comments

Comments
 (0)