From 8f64dfd922363b79f154af447724d52d7025b40e Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Wed, 13 Aug 2014 09:14:44 +0100
Subject: [PATCH] "Fix" some cppcheck warnings

.. these are trivial changes that are mostly to adjust syntax
   used in the code so cppcheck doesn't get confused.

   Thanks to Bart Coddens for pointing these out.

   CppCheck is available from:
   https://www.icts.uiowa.edu/confluence/display/BRAINSPUBLIC/Using+Cppcheck+To+Produce+Better+Code
---
 src/GcPane.cpp      | 6 ------
 src/GcPane.h        | 1 -
 src/LTMSettings.cpp | 2 +-
 src/LTMTool.cpp     | 2 +-
 src/Library.cpp     | 4 ++--
 src/NamedSearch.cpp | 4 ++--
 src/Season.cpp      | 2 +-
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/GcPane.cpp b/src/GcPane.cpp
index 6102f365e..6948d34e2 100644
--- a/src/GcPane.cpp
+++ b/src/GcPane.cpp
@@ -18,12 +18,6 @@
 
 #include "GcPane.h"
 
-GcPane::GcPane(QLayout *p)
-{
-    GcPane();
-    setLayout(p);
-}
-
 GcPane::GcPane() : QWidget(NULL, Qt::FramelessWindowHint),
     borderWidth(4), dragState(None)
 {
diff --git a/src/GcPane.h b/src/GcPane.h
index 4e55ed9bc..78a56ec03 100644
--- a/src/GcPane.h
+++ b/src/GcPane.h
@@ -39,7 +39,6 @@ class GcPane : public QWidget
 
     public:
         GcPane();
-        GcPane(QLayout *p);
 
         void setLayout(QLayout *layout); // override standard setLayout
 
diff --git a/src/LTMSettings.cpp b/src/LTMSettings.cpp
index 46943c02a..2b95f8fbd 100644
--- a/src/LTMSettings.cpp
+++ b/src/LTMSettings.cpp
@@ -121,7 +121,7 @@ LTMSettings::readChartXML(QDir home, bool useMetricUnits, QList<LTMSettings> &ch
 
     QXmlInputSource source( &chartsFile );
     QXmlSimpleReader xmlReader;
-    LTMChartParser( handler );
+    LTMChartParser handler;
     xmlReader.setContentHandler(&handler);
     xmlReader.setErrorHandler(&handler);
     xmlReader.parse( source );
diff --git a/src/LTMTool.cpp b/src/LTMTool.cpp
index 848bb6e2a..059b94994 100644
--- a/src/LTMTool.cpp
+++ b/src/LTMTool.cpp
@@ -2099,7 +2099,7 @@ LTMTool::importClicked()
             // setup XML processor
             QXmlInputSource source( &chartsFile );
             QXmlSimpleReader xmlReader;
-            LTMChartParser (handler);
+            LTMChartParser handler;
             xmlReader.setContentHandler(&handler);
             xmlReader.setErrorHandler(&handler);
 
diff --git a/src/Library.cpp b/src/Library.cpp
index fe72634fd..adb8c415f 100644
--- a/src/Library.cpp
+++ b/src/Library.cpp
@@ -70,10 +70,10 @@ Library::initialise(QDir home)
             // parse it!
             QXmlInputSource source(&libraryXML);
             QXmlSimpleReader xmlReader;
-            LibraryParser(handler);
+            LibraryParser handler;
             xmlReader.setContentHandler(&handler);
             xmlReader.setErrorHandler(&handler);
-            xmlReader.parse( source );
+            xmlReader.parse(source);
             libraries = handler.getLibraries();
 
         } else {
diff --git a/src/NamedSearch.cpp b/src/NamedSearch.cpp
index 0ffda7c8f..86604937f 100644
--- a/src/NamedSearch.cpp
+++ b/src/NamedSearch.cpp
@@ -67,10 +67,10 @@ NamedSearches::read()
     QFile namedSearchFile(home.absolutePath() + "/namedsearches.xml");
     QXmlInputSource source( &namedSearchFile );
     QXmlSimpleReader xmlReader;
-    NamedSearchParser( handler );
+    NamedSearchParser handler;
     xmlReader.setContentHandler(&handler);
     xmlReader.setErrorHandler(&handler);
-    xmlReader.parse( source );
+    xmlReader.parse(source);
 
     // go read them!
     list = handler.getResults();
diff --git a/src/Season.cpp b/src/Season.cpp
index 3070d9764..e2212fbfe 100644
--- a/src/Season.cpp
+++ b/src/Season.cpp
@@ -248,7 +248,7 @@ Seasons::readSeasons()
     QFile seasonFile(home.absolutePath() + "/seasons.xml");
     QXmlInputSource source( &seasonFile );
     QXmlSimpleReader xmlReader;
-    SeasonParser( handler );
+    SeasonParser handler;
     xmlReader.setContentHandler(&handler);
     xmlReader.setErrorHandler(&handler);
     xmlReader.parse( source );