From 7c8eeff1b1c691898406d31b091175c50529cafc Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 13 Sep 2012 19:34:50 +0000 Subject: [PATCH] Clean up a few compiler warning messages. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2581 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 2 +- set570.cpp | 4 ++-- soundin.h | 4 ++-- soundout.cpp | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index d28729a63..da48c07d1 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//---------------------------------------------------------------- MainWindow +//--------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" diff --git a/set570.cpp b/set570.cpp index 0380963c3..fef003c49 100644 --- a/set570.cpp +++ b/set570.cpp @@ -124,9 +124,9 @@ unsigned char Si570usbOpenDevice(usb_dev_handle **device, char *usbSerialID) char string[256]; int len; int vendor = USBDEV_SHARED_VENDOR; - char *vendorName = VENDOR_NAME; + char *vendorName = (char *)VENDOR_NAME; int product = USBDEV_SHARED_PRODUCT; - char *productName = PRODUCT_NAME; + char *productName = (char *)PRODUCT_NAME; char serialNumberString[20]; static int didUsbInit = 0; diff --git a/soundin.h b/soundin.h index b31420fd2..5e53e7ef8 100644 --- a/soundin.h +++ b/soundin.h @@ -29,9 +29,9 @@ public: SoundInThread(): quitExecution(false), - m_dataSinkBusy(false), m_rate(0), - bufSize(0) + bufSize(0), + m_dataSinkBusy(false) { } diff --git a/soundout.cpp b/soundout.cpp index 780147fa6..2f850f4c1 100644 --- a/soundout.cpp +++ b/soundout.cpp @@ -27,7 +27,8 @@ extern "C" int d2aCallback(const void *inputBuffer, void *outputBuffer, { paUserData *udata=(paUserData*)userData; short *wptr = (short*)outputBuffer; - unsigned int i,n; + unsigned int i; + int n; static int ic=0; static bool btxok0=false; static int nStart=0;