1
0
mirror of https://github.com/chylex/TweetDuck.git synced 2025-05-29 11:34:07 +02:00

Refactor (move files into different namespaces)

This commit is contained in:
chylex 2017-07-06 20:58:06 +02:00
parent 1645079bc0
commit 4bff006743
28 changed files with 40 additions and 37 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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"> <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')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
@ -30,7 +30,7 @@
<ItemGroup> <ItemGroup>
<Compile Include="AudioPlayer.cs" /> <Compile Include="AudioPlayer.cs" />
<Compile Include="Utils\NativeCoreAudio.cs" /> <Compile Include="Utils\NativeCoreAudio.cs" />
<Compile Include="Utils\PlaybackErrorEventArgs.cs" /> <Compile Include="PlaybackErrorEventArgs.cs" />
<Compile Include="Impl\SoundPlayerImplFallback.cs" /> <Compile Include="Impl\SoundPlayerImplFallback.cs" />
<Compile Include="Impl\SoundPlayerImplWMP.cs" /> <Compile Include="Impl\SoundPlayerImplWMP.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />

View File

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

View File

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

View File

@ -1,9 +1,9 @@
using Microsoft.VisualStudio.TestTools.UnitTesting; using System;
using System;
using System.IO; 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] [TestClass]
public class TestCombinedFileStream{ public class TestCombinedFileStream{
[TestMethod] [TestMethod]

View File

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

View File

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

View File

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