DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

General module - Fix namespace to avoid collision with Core type

Browse Source
This commit is contained in:
SpoinkyNL 2020-09-02 01:01:47 +02:00
parent 04f925972f
commit 5f34c8afac
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowsDataModel.cs
View File

@ -1,6 +0,0 @@
namespace Artemis.Plugins.Modules.General.DataModel.Windows
{
public class WindowsDataModel
{
}
}

9
src/Plugins/Artemis.Plugins.Modules.General/DataModel/GeneralDataModel.cs → src/Plugins/Artemis.Plugins.Modules.General/DataModels/GeneralDataModel.cs
View File

@ -1,11 +1,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Artemis.Plugins.Modules.General.DataModel.Windows; using Artemis.Core.DataModelExpansions;
using Artemis.Plugins.Modules.General.DataModels.Windows;
namespace Artemis.Plugins.Modules.General.DataModel namespace Artemis.Plugins.Modules.General.DataModels
{ {
public class GeneralDataModel : Core.DataModelExpansions.DataModel public class GeneralDataModel : DataModel
{ {
public GeneralDataModel() public GeneralDataModel()
{ {
@ -25,7 +26,7 @@ namespace Artemis.Plugins.Modules.General.DataModel
public List<TimeDataModel> TestTimeList { get; set; } public List<TimeDataModel> TestTimeList { get; set; }
} }
public class TimeDataModel : Core.DataModelExpansions.DataModel public class TimeDataModel : DataModel
{ {
public DateTime CurrentTime { get; set; } public DateTime CurrentTime { get; set; }
public DateTime CurrentTimeUTC { get; set; } public DateTime CurrentTimeUTC { get; set; }

2
src/Plugins/Artemis.Plugins.Modules.General/DataModel/Windows/WindowDataModel.cs → src/Plugins/Artemis.Plugins.Modules.General/DataModels/Windows/WindowDataModel.cs
View File

@ -2,7 +2,7 @@
using Artemis.Core; using Artemis.Core;
using Artemis.Core.DataModelExpansions; using Artemis.Core.DataModelExpansions;
namespace Artemis.Plugins.Modules.General.DataModel.Windows namespace Artemis.Plugins.Modules.General.DataModels.Windows
{ {
public class WindowDataModel public class WindowDataModel
{ {

6
src/Plugins/Artemis.Plugins.Modules.General/DataModels/Windows/WindowsDataModel.cs Normal file
View File

@ -0,0 +1,6 @@
namespace Artemis.Plugins.Modules.General.DataModels.Windows
{
public class WindowsDataModel
{
}
}

4
src/Plugins/Artemis.Plugins.Modules.General/GeneralModule.cs
View File

@ -2,8 +2,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using Artemis.Core.Modules; using Artemis.Core.Modules;
using Artemis.Plugins.Modules.General.DataModel; using Artemis.Plugins.Modules.General.DataModels;
using Artemis.Plugins.Modules.General.DataModel.Windows; using Artemis.Plugins.Modules.General.DataModels.Windows;
using Artemis.Plugins.Modules.General.Utilities; using Artemis.Plugins.Modules.General.Utilities;
using Artemis.Plugins.Modules.General.ViewModels; using Artemis.Plugins.Modules.General.ViewModels;