kopia lustrzana https://gitlab.com/eliggett/wfview
Fix linux build
rodzic
5cae813ad6
commit
c18323fe22
|
@ -70,7 +70,6 @@ void cachingQueue::run()
|
|||
prio = priorityLowest;
|
||||
}
|
||||
counter++;
|
||||
QMutableMultiMapIterator<queuePriority,queueItem> itt(queue);
|
||||
|
||||
auto it = queue.find(prio);
|
||||
if (it != queue.end())
|
||||
|
@ -214,7 +213,7 @@ void cachingQueue::message(QString msg)
|
|||
void cachingQueue::receiveValue(funcs func, QVariant value, bool sub)
|
||||
{
|
||||
QMutexLocker locker(&mutex);
|
||||
cacheItem c = cacheItem(func,value);
|
||||
cacheItem c = cacheItem(func,value,sub);
|
||||
items.enqueue(c);
|
||||
updateCache(true,func,value);
|
||||
waiting.wakeOne();
|
||||
|
|
|
@ -2095,7 +2095,7 @@ void rigCommander::parseCommand()
|
|||
break;
|
||||
// Return a duplexMode_t for split or duplex (same function)
|
||||
case funcSplitStatus:
|
||||
value.setValue(duplexMode_t(payloadIn[1]));
|
||||
value.setValue(static_cast<duplexMode_t>(uchar(payloadIn[1])));
|
||||
break;
|
||||
case funcAntenna:
|
||||
{
|
||||
|
|
14
rigctld.h
14
rigctld.h
|
@ -68,13 +68,13 @@ struct commandStruct
|
|||
const char *str;
|
||||
funcs func;
|
||||
char type;
|
||||
int flags;
|
||||
const char* arg1;
|
||||
const char* arg2;
|
||||
const char* arg3;
|
||||
const char* arg4;
|
||||
const char* arg5;
|
||||
const char* arg6;
|
||||
int flags = 0;
|
||||
const char* arg1=nullptr;
|
||||
const char* arg2=nullptr;
|
||||
const char* arg3=nullptr;
|
||||
const char* arg4=nullptr;
|
||||
const char* arg5=nullptr;
|
||||
const char* arg6=nullptr;
|
||||
};
|
||||
|
||||
struct subCommandStruct
|
||||
|
|
|
@ -249,5 +249,6 @@ Q_DECLARE_METATYPE(filterType)
|
|||
Q_DECLARE_METATYPE(inputTypes)
|
||||
Q_DECLARE_METATYPE(genericType)
|
||||
Q_DECLARE_METATYPE(bandType)
|
||||
Q_DECLARE_METATYPE(centerSpanData)
|
||||
|
||||
#endif // RIGIDENTITIES_H
|
||||
|
|
|
@ -94,6 +94,8 @@ wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode
|
|||
qRegisterMetaType<queueItemType>();
|
||||
qRegisterMetaType<queueItem>();
|
||||
qRegisterMetaType<cacheItem>();
|
||||
qRegisterMetaType<spectrumBounds>();
|
||||
qRegisterMetaType<centerSpanData>();
|
||||
|
||||
haveRigCaps = false;
|
||||
|
||||
|
|
|
@ -424,5 +424,6 @@ Q_DECLARE_METATYPE(timekind)
|
|||
Q_DECLARE_METATYPE(datekind)
|
||||
Q_DECLARE_METATYPE(toneInfo)
|
||||
Q_DECLARE_METATYPE(meter_t)
|
||||
Q_DECLARE_METATYPE(spectrumBounds)
|
||||
|
||||
#endif // WFVIEWTYPES_H
|
||||
|
|
Ładowanie…
Reference in New Issue