Clean up some compiler warnings

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6591 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

Audio/BWFFile.cpp

@@ -49,7 +49,7 @@ namespace
     }
 
     char * operator & () {return reinterpret_cast<char *> (this);}
-    char const * operator & () const {return &*this;}
+    char const * operator & () const {return reinterpret_cast<char const *> (this);}
 
     std::array<char, 4> id_;
     quint32 size_;

Detector.hpp

@@ -31,12 +31,12 @@ public:
   bool reset () override;
 
 protected:
-  qint64 readData (char * /* data */, qint64 /* maxSize */)
+  qint64 readData (char * /* data */, qint64 /* maxSize */) override
   {
     return -1;			// we don't produce data
   }
 
-  qint64 writeData (char const * data, qint64 maxSize);
+  qint64 writeData (char const * data, qint64 maxSize) override;
 
 private:
   void clear ();		// discard buffer contents

Modulator.cpp

@@ -32,7 +32,6 @@ Modulator::Modulator (unsigned frameRate, unsigned periodLengthInSeconds,
   , m_phi {0.0}
   , m_toneSpacing {0.0}
   , m_fSpread {0.0}
-  , m_itone0 {0}
   , m_frameRate {frameRate}
   , m_period {periodLengthInSeconds}
   , m_state {Idle}

Modulator.hpp

@@ -43,8 +43,8 @@ public:
   Q_SIGNAL void stateChanged (ModulatorState) const;
 
 protected:
-  qint64 readData (char * data, qint64 maxSize);
+  qint64 readData (char * data, qint64 maxSize) override;
-  qint64 writeData (char const * /* data */, qint64 /* maxSize */)
+  qint64 writeData (char const * /* data */, qint64 /* maxSize */) override
   {
     return -1;			// we don't consume data
   }
@@ -72,7 +72,6 @@ private:
   double m_fSpread;
 
   qint64 m_silentFrames;
-  qint32 m_itone0;
   qint32 m_TRperiod;
   qint16 m_ramp;
 

TransceiverFactory.cpp

@@ -189,7 +189,7 @@ std::unique_ptr<Transceiver> TransceiverFactory::create (ParameterPack const& pa
         }
     }
 
-  return std::move (result);
+  return result;
 }
 
 #if !defined (QT_NO_DEBUG_STREAM)

lib/decode65b.f90

@@ -4,7 +4,7 @@ subroutine decode65b(s2,nflip,nadd,mode65,ntrials,naggressive,ndepth,      &
   use jt65_mod
   real s2(66,126)
   real s3(64,63)
-  logical first,ltext
+  logical ltext
   character decoded*22
   character mycall*12,hiscall*12,hisgrid*6
   save

lib/decoder.f90

@@ -226,7 +226,7 @@ contains
     integer, intent(in) :: nsubmode
     integer, intent(in) :: naggressive
 
-    integer nft,nsmo2,nsum2,n
+    integer n
     character*5 ctail
     character*22 decoded
     character*36 c

lib/ftrsd/decode_rs.c

@@ -10,7 +10,6 @@
 
 #include <string.h>
 
-#define NULL ((void *)0)
 #define	min(a,b)	((a) < (b) ? (a) : (b))
 
 #ifdef FIXED

lib/ftrsd/init_rs.c

@@ -13,8 +13,6 @@
 #include "char.h"
 #endif
 
-#define NULL ((void *)0)
-
 void FREE_RS(void *p){
   struct rs *rs = (struct rs *)p;
 

lib/hint65.f90

@@ -16,7 +16,6 @@ subroutine hint65(s3,mrs,mrs2,mrsym,mr2sym,mrprob,nadd,flip,   &
   character callsign*12,grid*4
   character*180 line
   character ceme*3,msg*22
-  character cgood*1
   character*22 msg0(MAXMSG),decoded
   logical*1 eme(MAXCALLS)
   logical first

lib/jt65_decode.f90

@@ -311,7 +311,6 @@ contains
 ! Accumulated data for message averaging
     integer iutc(MAXAVE)
     integer nfsave(MAXAVE)
-    integer listutc(10)
     integer nflipsave(MAXAVE)
     real s1b(-255:256,126)
     real s1save(-255:256,126,MAXAVE)

lib/jt65sim.f90

@@ -18,7 +18,8 @@ program jt65sim
   complex cspread(0:NFFT-1)              !Complex amplitude for Rayleigh fading
   complex z
   real*8 f0,dt,twopi,phi,dphi,baud,fsample,freq,sps
-  character msg*22,fname*11,csubmode*1,call1*5,call2*5,c,optarg*500,numbuf*32
+  character msg*22,fname*11,csubmode*1,c,optarg*500,numbuf*32
+!  character call1*5,call2*5
   logical :: display_help=.false.,seed_prngs=.true.
   type (option) :: long_options(8) = [ &
     option ('help',.false.,'h','Display this help message',''),                                &

lib/vit213.c

@@ -19,7 +19,6 @@
 unsigned int Poly213[] = {012767,016461};	/* k = 13  */
 
 #include <memory.h>
-#define NULL ((void *)0)
 
 #define LONGBITS 32
 #define LOGLONGBITS 5

lib/wsprd/wsprd.c

@@ -105,7 +105,7 @@ unsigned long readc2file(char *ptr_to_infile, float *idat, float *qdat,
 //***************************************************************************
 unsigned long readwavfile(char *ptr_to_infile, int ntrmin, float *idat, float *qdat )
 {
-    unsigned long i, j, npoints;
+    size_t i, j, npoints;
     int nfft1, nfft2, nh2, i0;
     double df;
     
@@ -151,7 +151,7 @@ unsigned long readwavfile(char *ptr_to_infile, int ntrmin, float *idat, float *q
         realin[i]=buf2[i]/32768.0;
     }
     
-    for (i=npoints; i<nfft1; i++) {
+    for (i=npoints; i<(size_t)nfft1; i++) {
         realin[i]=0.0;
     }
     
@@ -161,9 +161,9 @@ unsigned long readwavfile(char *ptr_to_infile, int ntrmin, float *idat, float *q
     
     fftin=(fftwf_complex*) fftwf_malloc(sizeof(fftwf_complex)*nfft2);
     
-    for (i=0; i<nfft2; i++) {
+    for (i=0; i<(size_t)nfft2; i++) {
         j=i0+i;
-        if( i>nh2 ) j=j-nfft2;
+        if( i>(size_t)nh2 ) j=j-nfft2;
         fftin[i][0]=fftout[j][0];
         fftin[i][1]=fftout[j][1];
     }
@@ -173,7 +173,7 @@ unsigned long readwavfile(char *ptr_to_infile, int ntrmin, float *idat, float *q
     PLAN2 = fftwf_plan_dft_1d(nfft2, fftin, fftout, FFTW_BACKWARD, PATIENCE);
     fftwf_execute(PLAN2);
     
-    for (i=0; i<nfft2; i++) {
+    for (i=0; i<(size_t)nfft2; i++) {
         idat[i]=fftout[i][0]/1000.0;
         qdat[i]=fftout[i][1]/1000.0;
     }

messageaveraging.h

@@ -30,8 +30,6 @@ private:
   void write_settings ();
   QSettings * settings_;
 
-  qint32 m_k;
-
   Ui::MessageAveraging *ui;
 };