Refactor (move files into different namespaces)

Configuration/Arguments.cs

@@ -1,5 +1,5 @@
 using System;
-using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 
 namespace TweetDuck.Configuration{
     static class Arguments{

Configuration/UserConfig.cs

@@ -6,7 +6,7 @@
 using TweetDuck.Core;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
-using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 
 namespace TweetDuck.Configuration{
     [Serializable]

Core/FormBrowser.cs

@@ -19,7 +19,7 @@
 using TweetDuck.Resources;
 using TweetDuck.Updates;
 using TweetDuck.Updates.Events;
-using TweetLib.Audio.Utils;
+using TweetLib.Audio;
 
 namespace TweetDuck.Core{
     sealed partial class FormBrowser : Form{

Core/Notification/FormNotificationMain.cs

@@ -5,6 +5,7 @@
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 using TweetDuck.Plugins;
 using TweetDuck.Plugins.Enums;
 using TweetDuck.Resources;

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -4,6 +4,7 @@
 using System.Windows.Forms;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 using TweetDuck.Plugins;
 using TweetDuck.Resources;
 

Core/Notification/SoundNotification.cs

@@ -1,6 +1,5 @@
 using System;
 using TweetLib.Audio;
-using TweetLib.Audio.Utils;
 
 namespace TweetDuck.Core.Notification{
     sealed class SoundNotification : IDisposable{

Core/Other/Settings/Dialogs/DialogSettingsRestart.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsRestart : Form{

Core/Other/Settings/Export/ExportManager.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
+using TweetDuck.Data;
 using TweetDuck.Plugins;
 using TweetDuck.Plugins.Enums;
 

Core/Other/Settings/TabSettingsSounds.cs

@@ -3,7 +3,7 @@
 using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Core.Notification;
-using TweetLib.Audio.Utils;
+using TweetLib.Audio;
 
 namespace TweetDuck.Core.Other.Settings{
     partial class TabSettingsSounds : BaseTabSettings{

Core/Utils/CommandLineArgsParser.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Text.RegularExpressions;
+using TweetDuck.Data;
 
 namespace TweetDuck.Core.Utils{
     static class CommandLineArgsParser{

Data/CombinedFileStream.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-namespace TweetDuck.Core.Other.Settings.Export{
+namespace TweetDuck.Data{
     class CombinedFileStream : IDisposable{
         public const char KeySeparator = '|';
 

Data/CommandLineArgs.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TweetDuck.Core.Utils{
+namespace TweetDuck.Data{
     class CommandLineArgs{
         public static CommandLineArgs FromStringArray(char entryChar, string[] array){
             CommandLineArgs args = new CommandLineArgs();

Data/InjectedHTML.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TweetDuck.Core.Utils{
+namespace TweetDuck.Data{
     class InjectedHTML{
         public enum Position{
             Before, After

Data/TwoKeyDictionary.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace TweetDuck.Core.Utils{
+namespace TweetDuck.Data{
     class TwoKeyDictionary<K1, K2, V>{
         private readonly Dictionary<K1, Dictionary<K2, V>> dict;
         private readonly int innerCapacity;

Data/WindowState.cs

@@ -3,7 +3,7 @@
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 
-namespace TweetDuck.Core.Utils{
+namespace TweetDuck.Data{
     [Serializable]
     class WindowState{
         private Rectangle rect;

Plugins/PluginBridge.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 using TweetDuck.Plugins.Enums;
 using TweetDuck.Plugins.Events;
 

Program.cs

@@ -11,6 +11,7 @@
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Other.Settings.Export;
 using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 using TweetDuck.Plugins;
 using TweetDuck.Plugins.Events;
 using TweetDuck.Updates;

TweetDuck.csproj

@@ -164,7 +164,7 @@
     <Compile Include="Core\Other\Settings\Dialogs\DialogSettingsRestart.Designer.cs">
       <DependentUpon>DialogSettingsRestart.cs</DependentUpon>
     </Compile>
-    <Compile Include="Core\Other\Settings\Export\CombinedFileStream.cs" />
+    <Compile Include="Data\CombinedFileStream.cs" />
     <Compile Include="Core\Other\Settings\Export\ExportFileFlags.cs" />
     <Compile Include="Core\Other\Settings\Export\ExportManager.cs" />
     <Compile Include="Core\Other\Settings\TabSettingsAdvanced.cs">
@@ -195,15 +195,15 @@
       <DependentUpon>TabSettingsNotifications.cs</DependentUpon>
     </Compile>
     <Compile Include="Core\Bridge\CallbackBridge.cs" />
-    <Compile Include="Core\Utils\CommandLineArgs.cs" />
+    <Compile Include="Data\CommandLineArgs.cs" />
     <Compile Include="Core\Utils\CommandLineArgsParser.cs" />
     <Compile Include="Core\Notification\Screenshot\FormNotificationScreenshotable.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Core\Notification\Screenshot\TweetScreenshotManager.cs" />
-    <Compile Include="Core\Utils\InjectedHTML.cs" />
-    <Compile Include="Core\Utils\TwoKeyDictionary.cs" />
-    <Compile Include="Core\Utils\WindowState.cs" />
+    <Compile Include="Data\InjectedHTML.cs" />
+    <Compile Include="Data\TwoKeyDictionary.cs" />
+    <Compile Include="Data\WindowState.cs" />
     <Compile Include="Core\Utils\WindowsUtils.cs" />
     <Compile Include="Core\Bridge\TweetDeckBridge.cs" />
     <Compile Include="Core\Other\FormSettings.cs">

lib/TweetLib.Audio/AudioPlayer.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
 using TweetLib.Audio.Impl;
-using TweetLib.Audio.Utils;
 
 namespace TweetLib.Audio{
     public abstract class AudioPlayer : IDisposable{

lib/TweetLib.Audio/Impl/SoundPlayerImplFallback.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Media;
-using TweetLib.Audio.Utils;
 
 namespace TweetLib.Audio.Impl{
     sealed class SoundPlayerImplFallback : AudioPlayer{

lib/TweetLib.Audio/PlaybackErrorEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TweetLib.Audio.Utils{
+namespace TweetLib.Audio{
     public sealed class PlaybackErrorEventArgs : EventArgs{
         public string Message { get; }
         public bool Ignore { get; set; }

lib/TweetLib.Audio/TweetLib.Audio.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -30,7 +30,7 @@
   <ItemGroup>
     <Compile Include="AudioPlayer.cs" />
     <Compile Include="Utils\NativeCoreAudio.cs" />
-    <Compile Include="Utils\PlaybackErrorEventArgs.cs" />
+    <Compile Include="PlaybackErrorEventArgs.cs" />
     <Compile Include="Impl\SoundPlayerImplFallback.cs" />
     <Compile Include="Impl\SoundPlayerImplWMP.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

tests/Core/TestBrowserUtils.cs

@@ -1,7 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using TweetDuck.Core.Utils;
 
-namespace UnitTests.Core.Utils{
+namespace UnitTests.Core{
     [TestClass]
     public class TestBrowserUtils{
         [TestMethod]

tests/Core/TestCommandLineArgsParser.cs

@@ -1,7 +1,8 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 
-namespace UnitTests.Core.Utils{
+namespace UnitTests.Core{
     [TestClass]
     public class TestCommandLineArgsParser{
         [TestMethod]

tests/Data/TestCombinedFileStream.cs

@@ -1,9 +1,9 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
+using System;
 using System.IO;
-using TweetDuck.Core.Other.Settings.Export;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TweetDuck.Data;
 
-namespace UnitTests.Core.Settings{
+namespace UnitTests.Data{
     [TestClass]
     public class TestCombinedFileStream{
         [TestMethod]

tests/Data/TestCommandLineArgs.cs

@@ -1,8 +1,8 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
-using TweetDuck.Core.Utils;
+using System.Collections.Generic;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using TweetDuck.Data;
 
-namespace UnitTests.Core.Utils{
+namespace UnitTests.Data{
     [TestClass]
     public class TestCommandLineArgs{
         [TestMethod]

tests/Data/TestInjectedHTML.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TweetDuck.Core.Utils;
+using TweetDuck.Data;
 
-namespace UnitTests.Core.Utils{
+namespace UnitTests.Data{
     [TestClass]
     public class TestInjectedHTML{
         private static IEnumerable<InjectedHTML.Position> Positions => Enum.GetValues(typeof(InjectedHTML.Position)).Cast<InjectedHTML.Position>();

tests/Data/TestTwoKeyDictionary.cs

@@ -1,10 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TweetDuck.Core.Utils;
-using System.Collections.Generic;
+using TweetDuck.Data;
 
-namespace UnitTests.Core.Utils{
+namespace UnitTests.Data{
     [TestClass]
     public class TestTwoKeyDictionary{
         private static TwoKeyDictionary<string, int, string> CreateDict(){