Skip to content

Commit df8a8b5

Browse files
JvanKatwijkJvanKatwijk
committed
preparing for Qt6
1 parent d00f466 commit df8a8b5

7 files changed

Lines changed: 23 additions & 25 deletions

File tree

‎devices/rtlsdr-handler/rtlsdr-handler.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ QString temp;
216216
rtlsdr_set_tuner_gain_mode (device, 1);
217217
rtlsdr_set_tuner_gain (device, theGain);
218218

219-
connect (combo_gain, SIGNAL (activated (const QString &)),
219+
connect (combo_gain, SIGNAL (textActivated (const QString &)),
220220
this, SLOT (setExternalGain (const QString &)));
221221
connect (f_correction, SIGNAL (valueChanged (int)),
222222
this, SLOT (setCorrection (int)));

‎devices/sdrplay-handler-v2/sdrplay-handler-v2.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ ULONG APIkeyValue_length = 255;
271271
err = my_mir_sdr_RSPII_AntennaControl (mir_sdr_RSPII_ANTENNA_A);
272272
if (err != mir_sdr_Success)
273273
fprintf (stderr, "error %d in setting antenna\n", err);
274-
connect (antennaSelector, SIGNAL (activated (const QString &)),
274+
connect (antennaSelector, SIGNAL (textActivated (const QString &)),
275275
this, SLOT (set_antennaSelect (const QString &)));
276276
break;
277277

@@ -285,7 +285,7 @@ ULONG APIkeyValue_length = 255;
285285
err = my_mir_sdr_rspDuo_TunerSel (mir_sdr_rspDuo_Tuner_1);
286286
if (err != mir_sdr_Success)
287287
fprintf (stderr, "error %d in setting of rspDuo\n", err);
288-
connect (tunerSelector, SIGNAL (activated (const QString &)),
288+
connect (tunerSelector, SIGNAL (textActivated (const QString &)),
289289
this, SLOT (set_tunerControl (const QString &)));
290290
break;
291291
default:

‎devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
this, SLOT (set_agcControl (int)));
113113
connect (ppmControl, SIGNAL (valueChanged (int)),
114114
this, SLOT (set_ppmControl (int)));
115-
connect (antennaSelector, SIGNAL (activated (const QString &)),
115+
connect (antennaSelector, SIGNAL (textActivated (const QString &)),
116116
this, SLOT (set_selectAntenna (const QString &)));
117117
connect (biasT_selector, SIGNAL (stateChanged (int)),
118118
this, SLOT (set_biasT (int)));

‎forms/newradio.ui‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>687</width>
10-
<height>507</height>
9+
<width>637</width>
10+
<height>508</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -33,7 +33,7 @@
3333
<string>©</string>
3434
</property>
3535
<property name="alignment">
36-
<set>Qt::AlignCenter</set>
36+
<set>Qt::AlignmentFlag::AlignCenter</set>
3737
</property>
3838
</widget>
3939
</item>
@@ -138,7 +138,7 @@
138138
<number>10</number>
139139
</property>
140140
<property name="segmentStyle">
141-
<enum>QLCDNumber::Flat</enum>
141+
<enum>QLCDNumber::SegmentStyle::Flat</enum>
142142
</property>
143143
</widget>
144144
</item>
@@ -263,10 +263,10 @@
263263
<item>
264264
<widget class="QLabel" name="timeDisplay">
265265
<property name="frameShape">
266-
<enum>QFrame::Panel</enum>
266+
<enum>QFrame::Shape::Panel</enum>
267267
</property>
268268
<property name="frameShadow">
269-
<enum>QFrame::Raised</enum>
269+
<enum>QFrame::Shadow::Raised</enum>
270270
</property>
271271
<property name="text">
272272
<string/>
@@ -294,7 +294,7 @@
294294
<item>
295295
<widget class="QSlider" name="lfScopeSlider">
296296
<property name="orientation">
297-
<enum>Qt::Vertical</enum>
297+
<enum>Qt::Orientation::Vertical</enum>
298298
</property>
299299
</widget>
300300
</item>
@@ -303,12 +303,9 @@
303303
<property name="maximumSize">
304304
<size>
305305
<width>16777215</width>
306-
<height>111</height>
306+
<height>121</height>
307307
</size>
308308
</property>
309-
<property name="toolTip">
310-
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Main Spectrum Window. This window shows the spectrum of the signal arriving from the selected input device, decimated to the selected inputrate.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
311-
</property>
312309
</widget>
313310
</item>
314311
</layout>
@@ -318,7 +315,7 @@
318315
<item>
319316
<widget class="QSlider" name="hfScopeSlider">
320317
<property name="orientation">
321-
<enum>Qt::Vertical</enum>
318+
<enum>Qt::Orientation::Vertical</enum>
322319
</property>
323320
</widget>
324321
</item>
@@ -327,7 +324,7 @@
327324
<property name="maximumSize">
328325
<size>
329326
<width>16777215</width>
330-
<height>111</height>
327+
<height>131</height>
331328
</size>
332329
</property>
333330
</widget>
@@ -347,8 +344,8 @@
347344
<rect>
348345
<x>0</x>
349346
<y>0</y>
350-
<width>687</width>
351-
<height>29</height>
347+
<width>637</width>
348+
<height>23</height>
352349
</rect>
353350
</property>
354351
</widget>

‎qt-wspr.pro‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ QT += widgets network
66
#CONFIG += console
77
CONFIG -= console
88
TARGET = qt-wspr
9-
QMAKE_CXXFLAGS += -std=c++14
9+
QMAKE_CXXFLAGS += -std=c++17
1010
QMAKE_CFLAGS += -flto -ffast-math
1111
QMAKE_CXXFLAGS += -flto -ffast-math
1212
QMAKE_LFLAGS += -flto
@@ -113,8 +113,8 @@ CONFIG += spyServer
113113
LIBS += -L/usr/lib64
114114
LIBS += -L/lib64
115115
INCLUDEPATH += /usr/include/qt5/qwt
116-
LIBS += -lqwt-qt5 -lrt -lsndfile -lsamplerate -lportaudio -lusb-1.0 -lfftw3f -ldl
117-
LIBS += -lqwt-qt5 -lrt -lsndfile -lsamplerate -lportaudio -lusb-1.0 -lfftw3f -ldl
116+
LIBS += -lqwt-qt6 -lrt -lsndfile -lsamplerate -lportaudio -lusb-1.0 -lfftw3f -ldl
117+
#LIBS += -lqwt-qt5 -lrt -lsndfile -lsamplerate -lportaudio -lusb-1.0 -lfftw3f -ldl
118118
}
119119

120120
win32 {
@@ -139,7 +139,7 @@ INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/eigen3
139139
INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
140140
INCLUDEPATH += /usr/local/include
141141
LIBS += -L/usr/i686-w64-mingw32/sys-root/mingw/lib
142-
LIBS += -lqwt-qt5
142+
LIBS += -lqwt-qt6
143143
#LIBS += -lqwt
144144
LIBS += -lusb-1.0
145145
LIBS += -lole32

‎sources/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ QString iniFile = QDir::homePath ();
9494
* Before we connect control to the gui, we have to
9595
* instantiate
9696
*/
97-
MyRadioInterface = new RadioInterface (&ISettings);
97+
MyRadioInterface = new RadioInterface (&ISettings);
9898
MyRadioInterface -> show ();
9999
a. exec ();
100100
/*

‎sources/radio.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ struct timeval lTime;
113113
this, SLOT (switch_lfViewMode (int)));
114114
connect (mouse_Inc, SIGNAL (valueChanged (int)),
115115
this, SLOT (set_mouseIncrement (int)));
116-
connect (freqButton, SIGNAL (activated (const QString &)),
116+
connect (freqButton, SIGNAL (textActivated (const QString &)),
117117
this, SLOT (set_band (const QString &)));
118118
connect (quickMode_Button, SIGNAL (clicked ()),
119119
this, SLOT (handle_quickMode_Button ()));
@@ -261,6 +261,7 @@ void RadioInterface::closeEvent (QCloseEvent *event) {
261261

262262
void RadioInterface::set_band (const QString &s) {
263263
int freq = arg_to_freq (s);
264+
fprintf (stderr, "preparing a change to %d\n", freq);
264265
changeRequest. freqChange = true;
265266
changeRequest. freqValue = freq;
266267
settings -> setValue ("selected band", s);

0 commit comments

Comments
 (0)