LibCecSharp: more cosmetics

diff --git a/src/CecSharpTester/CecSharpClient.cs b/src/CecSharpTester/CecSharpClient.cs
index 006c83ae24e15a72e0063aff54690dfd4867ede2..2f4977691f958d522aabf44a58ff5d016dcf8688 100644 (file)
--- a/src/CecSharpTester/CecSharpClient.cs
+++ b/src/CecSharpTester/CecSharpClient.cs
@@ -31,7 +31,6 @@
  */
 
 using System;
-using System.Collections.Generic;
 using System.Text;
 using CecSharp;
 
@@ -168,31 +167,31 @@ namespace CecSharpClient
     void ShowConsoleHelp()
     {
       Console.WriteLine(
-        "================================================================================" + System.Environment.NewLine +
-        "Available commands:" + System.Environment.NewLine +
-        System.Environment.NewLine +
-        "[tx] {bytes}              transfer bytes over the CEC line." + System.Environment.NewLine +
-        "[txn] {bytes}             transfer bytes but don't wait for transmission ACK." + System.Environment.NewLine +
-        "[on] {address}            power on the device with the given logical address." + System.Environment.NewLine +
-        "[standby] {address}       put the device with the given address in standby mode." + System.Environment.NewLine +
-        "[la] {logical_address}    change the logical address of the CEC adapter." + System.Environment.NewLine +
-        "[pa] {physical_address}   change the physical address of the CEC adapter." + System.Environment.NewLine +
-        "[osd] {addr} {string}     set OSD message on the specified device." + System.Environment.NewLine +
-        "[ver] {addr}              get the CEC version of the specified device." + System.Environment.NewLine +
-        "[ven] {addr}              get the vendor ID of the specified device." + System.Environment.NewLine +
-        "[lang] {addr}             get the menu language of the specified device." + System.Environment.NewLine +
-        "[pow] {addr}              get the power status of the specified device." + System.Environment.NewLine +
-        "[poll] {addr}             poll the specified device." + System.Environment.NewLine +
-        "[scan]                    scan the CEC bus and display device info" + System.Environment.NewLine +
-        "[mon] {1|0}               enable or disable CEC bus monitoring." + System.Environment.NewLine +
-        "[log] {1 - 31}            change the log level. see cectypes.h for values." + System.Environment.NewLine +
-        "[ping]                    send a ping command to the CEC adapter." + System.Environment.NewLine +
-        "[bl]                      to let the adapter enter the bootloader, to upgrade" + System.Environment.NewLine +
-        "                          the flash rom." + System.Environment.NewLine +
-        "[r]                       reconnect to the CEC adapter." + System.Environment.NewLine +
-        "[h] or [help]             show this help." + System.Environment.NewLine +
-        "[q] or [quit]             to quit the CEC test client and switch off all" + System.Environment.NewLine +
-        "                          connected CEC devices." + System.Environment.NewLine +
+        "================================================================================" + Environment.NewLine +
+        "Available commands:" + Environment.NewLine +
+        Environment.NewLine +
+        "[tx] {bytes}              transfer bytes over the CEC line." + Environment.NewLine +
+        "[txn] {bytes}             transfer bytes but don't wait for transmission ACK." + Environment.NewLine +
+        "[on] {address}            power on the device with the given logical address." + Environment.NewLine +
+        "[standby] {address}       put the device with the given address in standby mode." + Environment.NewLine +
+        "[la] {logical_address}    change the logical address of the CEC adapter." + Environment.NewLine +
+        "[pa] {physical_address}   change the physical address of the CEC adapter." + Environment.NewLine +
+        "[osd] {addr} {string}     set OSD message on the specified device." + Environment.NewLine +
+        "[ver] {addr}              get the CEC version of the specified device." + Environment.NewLine +
+        "[ven] {addr}              get the vendor ID of the specified device." + Environment.NewLine +
+        "[lang] {addr}             get the menu language of the specified device." + Environment.NewLine +
+        "[pow] {addr}              get the power status of the specified device." + Environment.NewLine +
+        "[poll] {addr}             poll the specified device." + Environment.NewLine +
+        "[scan]                    scan the CEC bus and display device info" + Environment.NewLine +
+        "[mon] {1|0}               enable or disable CEC bus monitoring." + Environment.NewLine +
+        "[log] {1 - 31}            change the log level. see cectypes.h for values." + Environment.NewLine +
+        "[ping]                    send a ping command to the CEC adapter." + Environment.NewLine +
+        "[bl]                      to let the adapter enter the bootloader, to upgrade" + Environment.NewLine +
+        "                          the flash rom." + Environment.NewLine +
+        "[r]                       reconnect to the CEC adapter." + Environment.NewLine +
+        "[h] or [help]             show this help." + Environment.NewLine +
+        "[q] or [quit]             to quit the CEC test client and switch off all" + Environment.NewLine +
+        "                          connected CEC devices." + Environment.NewLine +
         "================================================================================");
     }
 
@@ -205,7 +204,7 @@ namespace CecSharpClient
         Console.WriteLine("waiting for input");
 
         command = Console.ReadLine();
-        if (command.Length == 0)
+        if (command != null && command.Length == 0)
           continue;
         string[] splitCommand = command.Split(' ');
         if (splitCommand[0] == "tx" || splitCommand[0] == "txn")

diff --git a/src/cec-config-gui/AsyncForm.cs b/src/cec-config-gui/AsyncForm.cs
index c0aca4ad9bcd0b2d73e503de4a9e6247c42cfbd0..c4d02bf2edc7676d8e92abc6de02e02e10fa12ea 100644 (file)
--- a/src/cec-config-gui/AsyncForm.cs
+++ b/src/cec-config-gui/AsyncForm.cs
@@ -10,7 +10,7 @@ namespace CecConfigGui
     {
       if (control.InvokeRequired)
       {
-        SetControlEnabledCallback d = new SetControlEnabledCallback(SetControlEnabled);
+        SetControlEnabledCallback d = SetControlEnabled;
         try
         {
           Invoke(d, new object[] { control, val });
@@ -28,7 +28,7 @@ namespace CecConfigGui
     {
       if (control.InvokeRequired)
       {
-        SetControlTextCallback d = new SetControlTextCallback(SetControlText);
+        SetControlTextCallback d = SetControlText;
         try
         {
           Invoke(d, new object[] { control, val });
@@ -46,7 +46,7 @@ namespace CecConfigGui
     {
       if (control.InvokeRequired)
       {
-        SetCheckboxCheckedCallback d = new SetCheckboxCheckedCallback(SetCheckboxChecked);
+        SetCheckboxCheckedCallback d = SetCheckboxChecked;
         try
         {
           Invoke(d, new object[] { control, val });
@@ -64,7 +64,7 @@ namespace CecConfigGui
     {
       if (control.InvokeRequired)
       {
-        SetCheckboxItemCheckedCallback d = new SetCheckboxItemCheckedCallback(SetCheckboxItemChecked);
+        SetCheckboxItemCheckedCallback d = SetCheckboxItemChecked;
         try
         {
           Invoke(d, new object[] { control, index, val });
@@ -82,7 +82,7 @@ namespace CecConfigGui
     {
       if (control.InvokeRequired)
       {
-        SetProgressValueCallback d = new SetProgressValueCallback(SetProgressValue);
+        SetProgressValueCallback d = SetProgressValue;
         try
         {
           Invoke(d, new object[] { control, val });
@@ -100,7 +100,7 @@ namespace CecConfigGui
     {
       if (control.InvokeRequired)
       {
-        SetComboBoxItemsCallback d = new SetComboBoxItemsCallback(SetComboBoxItems);
+        SetComboBoxItemsCallback d = SetComboBoxItems;
         try
         {
           Invoke(d, new object[] { control, selectedText, val });
@@ -120,7 +120,7 @@ namespace CecConfigGui
     {
       if (control.InvokeRequired)
       {
-        SetControlVisibleCallback d = new SetControlVisibleCallback(SetControlVisible);
+        SetControlVisibleCallback d = SetControlVisible;
         try
         {
           Invoke(d, new object[] { control, val });
@@ -138,7 +138,7 @@ namespace CecConfigGui
     {
       if (InvokeRequired)
       {
-        DisplayDialogCallback d = new DisplayDialogCallback(DisplayDialog);
+        DisplayDialogCallback d = DisplayDialog;
         try
         {
           Invoke(d, new object[] { control, modal });

diff --git a/src/cec-config-gui/CecButtonConfig.cs b/src/cec-config-gui/CecButtonConfig.cs
index 1c2cc81916a286379790be92742f177ee4504861..1fb070d40b14d419910634e1ae940d4e1c4273a4 100644 (file)
--- a/src/cec-config-gui/CecButtonConfig.cs
+++ b/src/cec-config-gui/CecButtonConfig.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 
 namespace CecConfigGui
 {

diff --git a/src/cec-config-gui/DeviceInformation.cs b/src/cec-config-gui/DeviceInformation.cs
index 0743e9ed655905b6784b1c7b7da93b6b875f08e1..f7992e3ef68e2fe11cb5872da187380dee61a77d 100644 (file)
--- a/src/cec-config-gui/DeviceInformation.cs
+++ b/src/cec-config-gui/DeviceInformation.cs
@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using CecSharp;
 
@@ -19,8 +14,8 @@ namespace CecConfigGui
       Lib = lib;
       Address = address;
       InitializeComponent();
-      this.lDevice.Text = lib.ToString(address);
-      this.lLogicalAddress.Text = String.Format("{0,1:X}", (int)address);
+      lDevice.Text = lib.ToString(address);
+      lLogicalAddress.Text = String.Format("{0,1:X}", (int)address);
       Update(devicePresent, vendor, isActiveSource, physicalAddress, version, power, osdName, menuLanguage);
     }
 

diff --git a/src/cec-config-gui/Program.cs b/src/cec-config-gui/Program.cs
index 0bc424c6f5b6aeb9d1084d0ca1993162293837a1..25dbf33ade6553d75cdfba4ba2a19d52559445ae 100644 (file)
--- a/src/cec-config-gui/Program.cs
+++ b/src/cec-config-gui/Program.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Windows.Forms;
 
 namespace CecConfigGui

diff --git a/src/cec-config-gui/actions/RescanDevices.cs b/src/cec-config-gui/actions/RescanDevices.cs
index c81538d6577a3185391c3532429d3d47da06449d..33c6be9e0dbc092815c09db36949040408ae3405 100644 (file)
--- a/src/cec-config-gui/actions/RescanDevices.cs
+++ b/src/cec-config-gui/actions/RescanDevices.cs
@@ -1,5 +1,4 @@
 using CecSharp;
-using System.Windows.Forms;
 
 namespace CecConfigGui.actions
 {

diff --git a/src/cec-config-gui/actions/SendActivateSource.cs b/src/cec-config-gui/actions/SendActivateSource.cs
index 17154d6d0f47c78db902de3ae36a761bd6b22ddc..1470c1988975698b275966eb8d1e95a9d0352b84 100644 (file)
--- a/src/cec-config-gui/actions/SendActivateSource.cs
+++ b/src/cec-config-gui/actions/SendActivateSource.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using CecSharp;
+using CecSharp;
 
 namespace CecConfigGui.actions
 {

diff --git a/src/cec-config-gui/actions/SendImageViewOn.cs b/src/cec-config-gui/actions/SendImageViewOn.cs
index 29e261eaff0a1da95b7da184df7ba8a1b488ebe1..6757073b3214cc7110b723ae632dd6e585185dd6 100644 (file)
--- a/src/cec-config-gui/actions/SendImageViewOn.cs
+++ b/src/cec-config-gui/actions/SendImageViewOn.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using CecSharp;
+using CecSharp;
 
 namespace CecConfigGui.actions
 {

diff --git a/src/cec-config-gui/actions/SendStandby.cs b/src/cec-config-gui/actions/SendStandby.cs
index f2b587ea522944923b3c43d64f93e692fc989c35..99bd0239d5faeb9c6153c40ff7ca9f82b7cddd3d 100644 (file)
--- a/src/cec-config-gui/actions/SendStandby.cs
+++ b/src/cec-config-gui/actions/SendStandby.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using CecSharp;
+using CecSharp;
 
 namespace CecConfigGui.actions
 {

diff --git a/src/cec-config-gui/actions/ShowDeviceInfo.cs b/src/cec-config-gui/actions/ShowDeviceInfo.cs
index 628d4a9829a44d24faa3b4dcff8804b83976650e..8e6a48de71cbb42b8e07648ce80c7d1181746e5b 100644 (file)
--- a/src/cec-config-gui/actions/ShowDeviceInfo.cs
+++ b/src/cec-config-gui/actions/ShowDeviceInfo.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using CecSharp;
+using CecSharp;
 
 namespace CecConfigGui.actions
 {

diff --git a/src/cec-config-gui/actions/UpdateConnectedDevice.cs b/src/cec-config-gui/actions/UpdateConnectedDevice.cs
index c91358ebbc9ca2dea206b2be1b942cfe7c27a198..3fb635ba79e598fefc3899d27fc7e4e2f2fce13a 100644 (file)
--- a/src/cec-config-gui/actions/UpdateConnectedDevice.cs
+++ b/src/cec-config-gui/actions/UpdateConnectedDevice.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using CecSharp;
+using CecSharp;
 
 namespace CecConfigGui.actions
 {

diff --git a/src/cec-config-gui/actions/UpdateDeviceInfo.cs b/src/cec-config-gui/actions/UpdateDeviceInfo.cs
index 3cbde24d31ecf3da825378944eb38dfa14e05a8f..4fbf3934d9320ac2d8bdd35e70f5da6a71b32db6 100644 (file)
--- a/src/cec-config-gui/actions/UpdateDeviceInfo.cs
+++ b/src/cec-config-gui/actions/UpdateDeviceInfo.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using CecSharp;
+using CecSharp;
 
 namespace CecConfigGui.actions
 {

diff --git a/src/cec-config-gui/actions/UpdateEvent.cs b/src/cec-config-gui/actions/UpdateEvent.cs
index dae21bfc438439d024a819805821bfeedb626f8b..a7e2df6bbb2227e83aea53d9692f87dc1c517941 100644 (file)
--- a/src/cec-config-gui/actions/UpdateEvent.cs
+++ b/src/cec-config-gui/actions/UpdateEvent.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using CecSharp;
 
 namespace CecConfigGui
@@ -62,11 +60,7 @@ namespace CecConfigGui
 
   public abstract class UpdateProcess
   {
-    public UpdateProcess()
-    {
-    }
-
-    public void SendEvent(UpdateEventType type)
+      public void SendEvent(UpdateEventType type)
     {
       EventHandler<UpdateEvent> temp = EventHandler;
       if (temp != null)

diff --git a/src/cec-config-gui/actions/UpdatePhysicalAddress.cs b/src/cec-config-gui/actions/UpdatePhysicalAddress.cs
index 1ed32ce2612ce7359861e3789b3aab37ab2d53d9..fab730455689c43583c8352d58f7c51ce3e22de6 100644 (file)
--- a/src/cec-config-gui/actions/UpdatePhysicalAddress.cs
+++ b/src/cec-config-gui/actions/UpdatePhysicalAddress.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using CecSharp;
+using CecSharp;
 
 namespace CecConfigGui.actions
 {