GNOME.org
 

[chronojump] Removes C# compiler easy warnings.

commit dd5df685c011a2938cb6f11f26374504e633ef54
Author: Carles Pina i Estany <carles pina cat>
Date:   Fri Oct 7 23:40:49 2016 +0200

    Removes C# compiler easy warnings.

 src/chronopicDetect.cs    |    2 +-
 src/encoder.cs            |    2 +-
 src/execute/run.cs        |    2 +-
 src/gui/convertWeight.cs  |    2 +-
 src/gui/executeAuto.cs    |    4 ++--
 src/gui/jump.cs           |    2 +-
 src/gui/person.cs         |    6 +++---
 src/gui/run.cs            |    2 +-
 src/sqlite/country.cs     |    2 +-
 src/sqlite/jumpRj.cs      |    2 +-
 src/sqlite/preferences.cs |    2 +-
 src/sqlite/runInterval.cs |    2 +-
 src/sqlite/runType.cs     |    2 +-
 src/sqlite/speciallity.cs |    2 +-
 src/sqlite/sport.cs       |    2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/chronopicDetect.cs b/src/chronopicDetect.cs
index 51a8c12..e5c35d5 100644
--- a/src/chronopicDetect.cs
+++ b/src/chronopicDetect.cs
@@ -230,8 +230,8 @@ public class ChronopicAutoDetect
                this.configAutoDetect = configAutoDetect;
                
                if(configAutoDetect == Config.AutodetectPortEnum.INACTIVE) {
-                       return;
                        Detected = "";
+                       return;
                }
 
                //no matter if we are searching for 4MHz or 20MHz (encoder)
diff --git a/src/encoder.cs b/src/encoder.cs
index 62b3ab6..ee67201 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -484,7 +484,7 @@ public class EncoderSignalCurve {
                this.msCentral = msCentral;
        }
        
-       public string ToString() {
+       public override string ToString() {
                return uniqueID.ToString() + ":" + signalID.ToString() + ":" + 
                        curveID.ToString() + ":" + msCentral.ToString();
        }
diff --git a/src/execute/run.cs b/src/execute/run.cs
index 9224fbf..02bf466 100644
--- a/src/execute/run.cs
+++ b/src/execute/run.cs
@@ -941,7 +941,7 @@ public class RunIntervalExecute : RunExecute
                        eventDone = new RunInterval(uniqueID, personID, sessionID, type, distanceTotal, 
timeTotal, distanceInterval, intervalTimesString, tracksHere, description, limitString, 
Util.BoolToNegativeInt(simulated), !startIn); 
 
 
-                       string tempValuesString = "";
+                       string tempValuesString;
                        if(tracksLimited) 
                                tempValuesString = " (" + distanceIntervalFixed + "x" + tracksHere + "R), " + 
Catalog.GetString("Time") + ": " + Util.TrimDecimals( timeTotal.ToString(), pDN);
                        else
diff --git a/src/gui/convertWeight.cs b/src/gui/convertWeight.cs
index 447c92e..400a818 100644
--- a/src/gui/convertWeight.cs
+++ b/src/gui/convertWeight.cs
@@ -84,7 +84,7 @@ public class ConvertWeightWindow
                fillTreeView( treeview1, store );
        }
 
-       static public new ConvertWeightWindow Show (
+       static public ConvertWeightWindow Show (
                        double oldPersonWeight, double newPersonWeight, string [] jumpsNormal, string [] 
jumpsReactive)
        {
                if (ConvertWeightWindowBox == null) {
diff --git a/src/gui/executeAuto.cs b/src/gui/executeAuto.cs
index f0e9ce4..5db7caa 100644
--- a/src/gui/executeAuto.cs
+++ b/src/gui/executeAuto.cs
@@ -100,7 +100,7 @@ public class ExecuteAutoWindow
                FakeButtonAccept = new Gtk.Button();
        }
 
-       static new public ExecuteAutoWindow Show (Gtk.Window parent, int sessionID)
+       static public ExecuteAutoWindow Show (Gtk.Window parent, int sessionID)
        {
                if (ExecuteAutoWindowBox == null) {
                        ExecuteAutoWindowBox = new ExecuteAutoWindow (parent);
@@ -115,7 +115,7 @@ public class ExecuteAutoWindow
        }
        
        //creates and shows the third tab
-       static new public ExecuteAutoWindow ShowJustOrder (Gtk.Window parent, ArrayList orderedData, int 
orderedDataPos)
+       static public ExecuteAutoWindow ShowJustOrder (Gtk.Window parent, ArrayList orderedData, int 
orderedDataPos)
        {
                if (ExecuteAutoWindowBox == null) {
                        ExecuteAutoWindowBox = new ExecuteAutoWindow (parent);
diff --git a/src/gui/jump.cs b/src/gui/jump.cs
index 5613af0..5f4f5a4 100644
--- a/src/gui/jump.cs
+++ b/src/gui/jump.cs
@@ -67,7 +67,7 @@ public class EditJumpWindow : EditEventWindow
                eventBigTypeString = Catalog.GetString("jump");
        }
 
-       static new public EditJumpWindow Show (Gtk.Window parent, Event myEvent, bool weightPercentPreferred, 
int pDN)
+       static public EditJumpWindow Show (Gtk.Window parent, Event myEvent, bool weightPercentPreferred, int 
pDN)
        {
                if (EditJumpWindowBox == null) {
                        EditJumpWindowBox = new EditJumpWindow (parent);
diff --git a/src/gui/person.cs b/src/gui/person.cs
index c1fdd48..c638dc4 100644
--- a/src/gui/person.cs
+++ b/src/gui/person.cs
@@ -356,7 +356,7 @@ public class PersonsRecuperateFromOtherSessionWindow : PersonRecuperateWindow
                treeview_person_recuperate.Selection.Changed += onSelectionEntry;
        }
 
-       static public new PersonsRecuperateFromOtherSessionWindow Show (
+       static public PersonsRecuperateFromOtherSessionWindow Show (
                        Gtk.Window parent, Session currentSession)
        {
                if (PersonsRecuperateFromOtherSessionWindowBox == null) {
@@ -698,7 +698,7 @@ public class PersonNotUploadWindow : PersonsRecuperateFromOtherSessionWindow
                treeview_person_recuperate.Selection.Changed += onSelectionEntry;
        }
 
-       static public new PersonNotUploadWindow Show (Gtk.Window parent, int sessionID)
+       static public PersonNotUploadWindow Show (Gtk.Window parent, int sessionID)
        {
                if (PersonNotUploadWindowBox == null) {
                        PersonNotUploadWindowBox = 
@@ -784,7 +784,7 @@ public class PersonNotUploadWindow : PersonsRecuperateFromOtherSessionWindow
                on_button_close_clicked (o, new EventArgs());
        }
        
-       public Button FakeButtonDone 
+       public new Button FakeButtonDone 
        {
                set { fakeButtonDone = value; }
                get { return fakeButtonDone; }
diff --git a/src/gui/run.cs b/src/gui/run.cs
index 85ab20f..b1272d2 100644
--- a/src/gui/run.cs
+++ b/src/gui/run.cs
@@ -52,7 +52,7 @@ public class EditRunWindow : EditEventWindow
                eventBigTypeString = Catalog.GetString("run");
        }
 
-       static new public EditRunWindow Show (Gtk.Window parent, Event myEvent, int pDN, bool 
metersSecondsPreferred)
+       static public EditRunWindow Show (Gtk.Window parent, Event myEvent, int pDN, bool 
metersSecondsPreferred)
        {
                if (EditRunWindowBox == null) {
                        EditRunWindowBox = new EditRunWindow (parent);
diff --git a/src/sqlite/country.cs b/src/sqlite/country.cs
index 117a234..f7700f1 100644
--- a/src/sqlite/country.cs
+++ b/src/sqlite/country.cs
@@ -32,7 +32,7 @@ using Mono.Unix;
 
 class SqliteCountry : Sqlite
 {
-       protected internal static void createTable()
+       protected internal static new void createTable()
         {
                dbcmd.CommandText = 
                        "CREATE TABLE " + Constants.CountryTable + " ( " +
diff --git a/src/sqlite/jumpRj.cs b/src/sqlite/jumpRj.cs
index 670fa0a..0ba27a1 100644
--- a/src/sqlite/jumpRj.cs
+++ b/src/sqlite/jumpRj.cs
@@ -91,7 +91,7 @@ class SqliteJumpRj : SqliteJump
                return myLast;
        }
 
-       public new static string[] SelectJumps(bool dbconOpened, int sessionID, int personID, string 
filterWeight, string filterType) 
+       public static string[] SelectJumps(bool dbconOpened, int sessionID, int personID, string 
filterWeight, string filterType) 
        {
                if(!dbconOpened)
                        Sqlite.Open();
diff --git a/src/sqlite/preferences.cs b/src/sqlite/preferences.cs
index b909b64..5f94b1f 100644
--- a/src/sqlite/preferences.cs
+++ b/src/sqlite/preferences.cs
@@ -26,7 +26,7 @@ using Mono.Data.Sqlite;
 
 class SqlitePreferences : Sqlite
 {
-       protected internal static void createTable()
+       protected internal static new void createTable()
        {
                dbcmd.CommandText = 
                        "CREATE TABLE " + Constants.PreferencesTable + " ( " +
diff --git a/src/sqlite/runInterval.cs b/src/sqlite/runInterval.cs
index a2dda81..5f7f3e2 100644
--- a/src/sqlite/runInterval.cs
+++ b/src/sqlite/runInterval.cs
@@ -89,7 +89,7 @@ class SqliteRunInterval : SqliteRun
                return myLast;
        }
 
-       public new static string[] SelectRuns(bool dbconOpened, int sessionID, int personID, string 
filterType) 
+       public static string[] SelectRuns(bool dbconOpened, int sessionID, int personID, string filterType) 
        {
                if(!dbconOpened)
                        Sqlite.Open();
diff --git a/src/sqlite/runType.cs b/src/sqlite/runType.cs
index 53a7984..a157711 100644
--- a/src/sqlite/runType.cs
+++ b/src/sqlite/runType.cs
@@ -577,7 +577,7 @@ class SqliteRunIntervalType : SqliteRunType
                }
        }
        
-       public static void Delete(string name)
+       public static new void Delete(string name)
        {
                Sqlite.Open();
                dbcmd.CommandText = "Delete FROM " + Constants.RunIntervalTypeTable +
diff --git a/src/sqlite/speciallity.cs b/src/sqlite/speciallity.cs
index f2c9b78..46467d0 100644
--- a/src/sqlite/speciallity.cs
+++ b/src/sqlite/speciallity.cs
@@ -30,7 +30,7 @@ using Mono.Unix;
 
 class SqliteSpeciallity : Sqlite
 {
-       protected internal static void createTable()
+       protected internal static new void createTable()
         {
                dbcmd.CommandText = 
                        "CREATE TABLE " + Constants.SpeciallityTable + " ( " +
diff --git a/src/sqlite/sport.cs b/src/sqlite/sport.cs
index 7c134ac..2079c23 100644
--- a/src/sqlite/sport.cs
+++ b/src/sqlite/sport.cs
@@ -29,7 +29,7 @@ using Mono.Unix;
 
 class SqliteSport : Sqlite
 {
-       protected internal static void createTable()
+       protected internal static new void createTable()
         {
                dbcmd.CommandText = 
                        "CREATE TABLE " + Constants.SportTable + " ( " +
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]