diff options
author | Lluis Sanchez <lluis@xamarin.com> | 2013-05-02 22:07:57 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@xamarin.com> | 2013-05-02 22:07:57 +0400 |
commit | 8fe75c7ec634d65bdf3c0d654619e67414a3061e (patch) | |
tree | 884148c945ecd19fd3c3afd0973d641fbbd89987 /main/src | |
parent | 04c5e80870e436f07d4617c8044b37f57fb54edf (diff) |
Fix warnings
Diffstat (limited to 'main/src')
8 files changed, 12 insertions, 13 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs index 3f33345b32..b2757a5336 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs @@ -65,7 +65,6 @@ namespace MonoDevelop.Components.Docking DockItemToolbar toolbarRight; DockItemTitleTab titleTab; - bool allowPlaceholderDocking; DockVisualStyle regionStyle; DockVisualStyle itemStyle; diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs index 8f8a941a1b..cf5a8aabc0 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/TabStrip.cs @@ -42,13 +42,11 @@ namespace MonoDevelop.Components.Docking { int currentTab = -1; HBox box = new HBox (); - DockFrame frame; Label bottomFiller = new Label (); DockVisualStyle visualStyle; public TabStrip (DockFrame frame) { - this.frame = frame; VBox vbox = new VBox (); box = new TabStripBox () { TabStrip = this }; vbox.PackStart (box, false, false, 0); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs index 5af9950691..095a1b681b 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/RoundButton.cs @@ -69,7 +69,7 @@ namespace MonoDevelop.Components.MainToolbar Cairo.Color fill2Color; Cairo.Color fill3Color;*/ - LazyImage btnNormal, btnPressed, btnInactive, btnHover; + LazyImage btnNormal/*, btnInactive, btnHover, btnPressed*/; LazyImage iconRunNormal, iconRunDisabled; LazyImage iconStopNormal, iconStopDisabled; @@ -89,9 +89,9 @@ namespace MonoDevelop.Components.MainToolbar SetSizeRequest (height, height); btnNormal = new LazyImage ("btExecuteBase-Normal.png"); - btnInactive = new LazyImage ("btExecuteBase-Disabled.png"); - btnPressed = new LazyImage ("btExecuteBase-Pressed.png"); - btnHover = new LazyImage ("btExecuteBase-Hover.png"); +// btnInactive = new LazyImage ("btExecuteBase-Disabled.png"); + //btnPressed = new LazyImage ("btExecuteBase-Pressed.png"); +// btnHover = new LazyImage ("btExecuteBase-Hover.png"); iconRunNormal = new LazyImage ("icoExecute-Normal.png"); iconRunDisabled = new LazyImage ("icoExecute-Disabled.png"); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs index a30b534e5f..83af910613 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWidget.cs @@ -417,7 +417,6 @@ namespace MonoDevelop.Ide.CodeCompletion { using (var context = Gdk.CairoHelper.Create (args.Window)) { context.LineWidth = 1; - Gdk.Window window = args.Window; var alloc = Allocation; int width = alloc.Width; int height = alloc.Height; @@ -442,7 +441,6 @@ namespace MonoDevelop.Ide.CodeCompletion return false; } - var fgGCNormal = this.Style.ForegroundGC (StateType.Normal); var matcher = CompletionMatcher.CreateCompletionMatcher (CompletionString); Iterate (true, ref yPos, delegate (Category category, int ypos) { if (ypos >= height) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs index 316f2bad41..360b044631 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs @@ -272,8 +272,10 @@ namespace MonoDevelop.Ide.Commands Description = GettextCatalog.GetString ("Open {0}", ri.FileName) }; Gdk.Pixbuf icon = DesktopService.GetPixbufForFile (ri.FileName, IconSize.Menu); + #pragma warning disable 618 if (icon != null) cmd.Icon = ImageService.GetStockId (icon, IconSize.Menu); + #pragma warning restore 618 info.Add (cmd, ri.FileName); i++; } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs index b17db01225..ea445fa470 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs @@ -28,6 +28,7 @@ using System; using System.IO; +using System.Linq; using System.Collections; using System.Collections.Generic; using System.Diagnostics; @@ -232,8 +233,8 @@ namespace MonoDevelop.Ide.Desktop var mimeTypeNode = (MimeTypeNode)args.ExtensionNode; switch (args.Change) { case ExtensionChange.Add: - // initialize child nodes. - var initialize = mimeTypeNode.ChildNodes; + // initialize child nodes. + mimeTypeNode.ChildNodes.GetEnumerator (); newList.Add (mimeTypeNode); break; case ExtensionChange.Remove: diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/SdkLocationPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/SdkLocationPanel.cs index d39bb940d3..2ea1b131cf 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/SdkLocationPanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/SdkLocationPanel.cs @@ -66,7 +66,9 @@ namespace MonoDevelop.Ide.Gui.OptionPanels /// </summary> public virtual FilePath[] DefaultSdkLocations { get { +#pragma warning disable 618 return DefaultSdkLocation.IsNull? new FilePath[0] : new FilePath[] { DefaultSdkLocation }; +#pragma warning restore 618 } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/UpdateService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/UpdateService.cs index 5512a21172..f64352d70e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/UpdateService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/UpdateService.cs @@ -36,7 +36,6 @@ namespace MonoDevelop.Ide.Updater public static class UpdateService { static readonly TimeSpan AutoUpdateSpan = TimeSpan.FromDays (3); - static Timer autoUpdateTimer; static UpdateService () { @@ -46,7 +45,7 @@ namespace MonoDevelop.Ide.Updater static void ScheduleUpdateRun () { - autoUpdateTimer = new Timer (_ => CheckForUpdates (true), null, AutoUpdateSpan, AutoUpdateSpan); + new Timer (_ => CheckForUpdates (true), null, AutoUpdateSpan, AutoUpdateSpan); } public static bool AutoCheckForUpdates { |