diff options
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates')
5 files changed, 9 insertions, 11 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs index 1dd1794275..7bf87f33b9 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateCompletionData.cs @@ -27,7 +27,7 @@ using System; using MonoDevelop.Ide.Gui; using MonoDevelop.Projects.Dom.Parser; -using MonoDevelop.Projects.Gui.Completion; +using MonoDevelop.Ide.CodeCompletion; using MonoDevelop.Core; namespace MonoDevelop.Ide.CodeTemplates diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateListDataProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateListDataProvider.cs index 09be8ba643..0801a086a7 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateListDataProvider.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateListDataProvider.cs @@ -62,7 +62,7 @@ namespace MonoDevelop.Ide.CodeTemplates string iconName = itemList[index].IconName; if (string.IsNullOrEmpty (iconName)) return null; - return MonoDevelop.Core.Gui.ImageService.GetPixbuf (iconName, Gtk.IconSize.Menu); + return ImageService.GetPixbuf (iconName, Gtk.IconSize.Menu); } public int Count { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs index 550613dc00..4e7b9ff689 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs @@ -29,8 +29,7 @@ using System.Collections.Generic; using Gtk; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; -using MonoDevelop.Core.Gui.Dialogs; +using MonoDevelop.Ide.Gui.Dialogs; namespace MonoDevelop.Ide.CodeTemplates { @@ -168,7 +167,7 @@ namespace MonoDevelop.Ide.CodeTemplates CodeTemplate template = (CodeTemplate)templateStore.GetValue (iter, 0); if (template == null) { - pixbufCellRenderer.Pixbuf = ImageService.GetPixbuf (treeviewCodeTemplates.GetRowExpanded (templateStore.GetPath (iter)) ? MonoDevelop.Core.Gui.Stock.OpenFolder : MonoDevelop.Core.Gui.Stock.ClosedFolder, IconSize.Menu); + pixbufCellRenderer.Pixbuf = ImageService.GetPixbuf (treeviewCodeTemplates.GetRowExpanded (templateStore.GetPath (iter)) ? MonoDevelop.Ide.Gui.Stock.OpenFolder : MonoDevelop.Ide.Gui.Stock.ClosedFolder, IconSize.Menu); } else { pixbufCellRenderer.Pixbuf = ImageService.GetPixbuf ("md-template", IconSize.Menu); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs index 6bfdc87733..2b840dad38 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplateService.cs @@ -34,8 +34,7 @@ using System.Collections.Generic; using System.Xml; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; -using MonoDevelop.Projects.Gui.Completion; +using MonoDevelop.Ide.CodeCompletion; using Mono.Addins; namespace MonoDevelop.Ide.CodeTemplates diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs index 7a49bb15a5..48748cb84e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/ExpansionObject.cs @@ -132,7 +132,7 @@ namespace MonoDevelop.Ide.CodeTemplates return "var"; } - MonoDevelop.Projects.Gui.Completion.ICompletionDataList list; + MonoDevelop.Ide.CodeCompletion.ICompletionDataList list; public IListDataProvider<string> GetCollections () { var result = new List<CodeTemplateVariableValue> (); @@ -142,7 +142,7 @@ namespace MonoDevelop.Ide.CodeTemplates list = ext.CodeCompletionCommand (CurrentContext.Document.TextEditor.CurrentCodeCompletionContext); foreach (object o in list) { - MonoDevelop.Projects.Gui.Completion.IMemberCompletionData data = o as MonoDevelop.Projects.Gui.Completion.IMemberCompletionData; + MonoDevelop.Ide.CodeCompletion.IMemberCompletionData data = o as MonoDevelop.Ide.CodeCompletion.IMemberCompletionData; if (data == null) continue; @@ -154,7 +154,7 @@ namespace MonoDevelop.Ide.CodeTemplates } foreach (object o in list) { - MonoDevelop.Projects.Gui.Completion.IMemberCompletionData data = o as MonoDevelop.Projects.Gui.Completion.IMemberCompletionData; + MonoDevelop.Ide.CodeCompletion.IMemberCompletionData data = o as MonoDevelop.Ide.CodeCompletion.IMemberCompletionData; if (data == null) continue; if (data.Member is IParameter) { @@ -165,7 +165,7 @@ namespace MonoDevelop.Ide.CodeTemplates } foreach (object o in list) { - MonoDevelop.Projects.Gui.Completion.IMemberCompletionData data = o as MonoDevelop.Projects.Gui.Completion.IMemberCompletionData; + MonoDevelop.Ide.CodeCompletion.IMemberCompletionData data = o as MonoDevelop.Ide.CodeCompletion.IMemberCompletionData; if (data == null) continue; if (data.Member is LocalVariable) { |