Clean up some (harmless) compiler warnings.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7496 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-01-14 16:26:57 +00:00
parent f157fcfc66
commit 460f268d82
6 changed files with 6 additions and 34 deletions

View File

@ -1461,7 +1461,7 @@
<attribute name="title"> <attribute name="title">
<string>Si570 Control</string> <string>Si570 Control</string>
</attribute> </attribute>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget_6">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>41</x> <x>41</x>

View File

@ -6,7 +6,7 @@ int ptt_(int *nport, int *ntx, int *iptt)
static HANDLE hFile; static HANDLE hFile;
static int open=0; static int open=0;
char s[10]; char s[10];
int i3,i4,i5,i6,i9,i00; int i3=0,i4=0,i5=0,i6=0,i9=0,i00=0;
if(*nport==0) { if(*nport==0) {
*iptt=*ntx; *iptt=*ntx;
@ -38,5 +38,6 @@ int ptt_(int *nport, int *ntx, int *iptt)
*iptt=0; *iptt=0;
open=0; open=0;
} }
if((i00+i3+i4+i5+i6+i9)==-99) return -1; //Silence compiler warning
return 0; return 0;
} }

View File

@ -1,4 +1,4 @@
//------------------------------------------------------------- MainWindow //-------------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "devsetup.h" #include "devsetup.h"

View File

@ -1122,8 +1122,6 @@ p, li { white-space: pre-wrap; }
</property> </property>
<addaction name="actionLinrad"/> <addaction name="actionLinrad"/>
<addaction name="actionCuteSDR"/> <addaction name="actionCuteSDR"/>
<addaction name="actionAFMHot"/>
<addaction name="actionBlue"/>
</widget> </widget>
<addaction name="actionAstro_Data"/> <addaction name="actionAstro_Data"/>
<addaction name="actionBand_Map"/> <addaction name="actionBand_Map"/>

View File

@ -5,7 +5,7 @@
void paInputDevice(int id, char* hostAPI_DeviceName, int* minChan, void paInputDevice(int id, char* hostAPI_DeviceName, int* minChan,
int* maxChan, int* minSpeed, int* maxSpeed) int* maxChan, int* minSpeed, int* maxSpeed)
{ {
int i, j, k; int i;
char pa_device_name[128]; char pa_device_name[128];
char pa_device_hostapi[128]; char pa_device_hostapi[128];
double pa_device_max_speed; double pa_device_max_speed;
@ -16,7 +16,7 @@ void paInputDevice(int id, char* hostAPI_DeviceName, int* minChan,
int pa_device_min_channels; int pa_device_min_channels;
char p2[50]; char p2[50];
char *p,*p1; char *p,*p1;
static int iret, numDevices, valid_dev_cnt; static int iret, valid_dev_cnt;
iret=pa_get_device_info (id, iret=pa_get_device_info (id,
&pa_device_name, &pa_device_name,

View File

@ -721,33 +721,6 @@ void CPlotter::setPalette(QString palette) //setPalette()
} }
m_ColorTbl[255].setRgb(255,255,100); m_ColorTbl[255].setRgb(255,255,100);
} }
if(palette=="Blue") {
FILE* fp=fopen("blue.dat","r");
int n,r,g,b;
float xr,xg,xb;
for(int i=0; i<256; i++) {
// fscanf(fp,"%d%f%f%f",&n,&xr,&xg,&xb);
r=255.0*xr + 0.5;
g=255.0*xg + 0.5;
b=255.0*xb + 0.5;
m_ColorTbl[i].setRgb(r,g,b);
}
}
if(palette=="AFMHot") {
FILE* fp=fopen("afmhot.dat","r");
int n,r,g,b;
float xr,xg,xb;
for(int i=0; i<256; i++) {
// fscanf(fp,"%d%f%f%f",&n,&xr,&xg,&xb);
r=255.0*xr + 0.5;
g=255.0*xg + 0.5;
b=255.0*xb + 0.5;
m_ColorTbl[i].setRgb(r,g,b);
}
}
} }
void CPlotter::setFsample(int n) void CPlotter::setFsample(int n)