From 69f802e68fa1459f7e55b8c1c72e7cd40f3db911 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Tue, 15 May 2018 20:59:22 +0100
Subject: [PATCH] Remove some compiler warnings.

---
 Common/DStarRepeaterConfig.cpp     |  7 ++++---
 Common/GMSKModemLibUsb.cpp         | 10 +++++-----
 Common/MMDVMController.cpp         |  2 +-
 Common/MMDVMController.h           |  2 +-
 DStarRepeater/DStarRepeaterApp.cpp |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Common/DStarRepeaterConfig.cpp b/Common/DStarRepeaterConfig.cpp
index 2a1fb33..3aa75e7 100644
--- a/Common/DStarRepeaterConfig.cpp
+++ b/Common/DStarRepeaterConfig.cpp
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2011-2015 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2011-2015,2018 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -828,11 +828,12 @@ m_splitTimeout(DEFAULT_SPLIT_TIMEOUT)
 
 	wxTextFile file(m_fileName.GetFullPath());
 
-	if (!file.Exists())
-		if(mustExist)
+	if (!file.Exists()) {
+		if (mustExist)
 			throw std::runtime_error("Configuration file does not exist");
 		else
 			return;
+	}
 
 	if (!file.Open())
 		throw std::runtime_error("Cannot open the configuration file");
diff --git a/Common/GMSKModemLibUsb.cpp b/Common/GMSKModemLibUsb.cpp
index d827090..d552be0 100644
--- a/Common/GMSKModemLibUsb.cpp
+++ b/Common/GMSKModemLibUsb.cpp
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2010-2014 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2010-2014,2018 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -74,11 +74,11 @@ static void libUsbLogError(int ret, const char *message) {
 
 CGMSKModemLibUsb::CGMSKModemLibUsb(unsigned int address) :
 m_address(address),
-m_dev(NULL),
-m_brokenSpace(false)
 #if !defined(WIN32)
-,m_context(NULL)
+m_context(NULL),
 #endif
+m_dev(NULL),
+m_brokenSpace(false)
 {
 
 #if defined(WIN32)
@@ -440,4 +440,4 @@ int CGMSKModemLibUsb::io(uint8_t requestType, uint8_t request, uint16_t value,
 	}
 
 	return ret;
-}
\ No newline at end of file
+}
diff --git a/Common/MMDVMController.cpp b/Common/MMDVMController.cpp
index 9028b3b..5a563f6 100644
--- a/Common/MMDVMController.cpp
+++ b/Common/MMDVMController.cpp
@@ -60,8 +60,8 @@ m_rxInvert(rxInvert),
 m_txInvert(txInvert),
 m_pttInvert(pttInvert),
 m_txDelay(txDelay),
-m_txLevel(txLevel),
 m_rxLevel(rxLevel),
+m_txLevel(txLevel),
 m_serial(port, SERIAL_115200, true),
 m_buffer(NULL),
 m_txData(1000U),
diff --git a/Common/MMDVMController.h b/Common/MMDVMController.h
index 437d711..0151c50 100644
--- a/Common/MMDVMController.h
+++ b/Common/MMDVMController.h
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2011-2015 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2011-2015,2018 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/DStarRepeater/DStarRepeaterApp.cpp b/DStarRepeater/DStarRepeaterApp.cpp
index af969e0..94c9634 100644
--- a/DStarRepeater/DStarRepeaterApp.cpp
+++ b/DStarRepeater/DStarRepeaterApp.cpp
@@ -470,7 +470,7 @@ void CDStarRepeaterApp::createThread()
 				modem = new CDVMegaController(port, wxEmptyString, txDelay, rxFrequency, txFrequency, power);
 				break;
 			default:
-				wxLogError("Unknown DVMEGA variant - %d"), int(variant);
+				wxLogError("Unknown DVMEGA variant - %d", int(variant));
 				break;
 		}
 	} else if (modemType.IsSameAs("GMSK Modem")) {