Updated integrated cursespp's directory structure to match external

project's to make future merging much easier.
This commit is contained in:
casey langen 2018-12-20 17:59:55 -08:00
parent a82d736a8b
commit 6e15a895aa
105 changed files with 370 additions and 378 deletions

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include <stdlib.h>
#include <time.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include <cursespp/Colors.h>
#include <cursespp/Screen.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include <cursespp/Colors.h>
#include <cursespp/Screen.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "ConsoleLayout.h"

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include <core/library/query/local/DirectoryTrackListQuery.h>
#include <core/support/Messages.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "HotkeysLayout.h"
#include <core/support/Common.h>
#include <cursespp/App.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include <cursespp/App.h>
#include <cursespp/Colors.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include <cursespp/Screen.h>
#include <cursespp/Colors.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include <cursespp/Colors.h>
#include <cursespp/Screen.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include <cursespp/App.h>
#include <cursespp/Colors.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include <cursespp/Colors.h>
#include <cursespp/Screen.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include <core/support/Common.h>
#include <cursespp/Text.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "HotkeysAdapter.h"
#include <app/util/Hotkeys.h>
#include <cursespp/Colors.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "BrowseOverlays.h"
#include <core/library/query/local/AllCategoriesQuery.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "ColorThemeOverlay.h"

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "EqualizerOverlay.h"

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "LastFmOverlay.h"
#include <app/util/Messages.h>
#include <core/support/LastFm.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "LocaleOverlay.h"

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include <chrono>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "PlaybackOverlays.h"

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "PluginOverlay.h"

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "PreampOverlay.h"
#include "PlaybackOverlays.h"

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "ReassignHotkeyOverlay.h"
#include <cursespp/App.h>
#include <cursespp/Screen.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "ServerOverlay.h"

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "VisualizerOverlay.h"

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "GlobalHotkeys.h"
#include "Hotkeys.h"

View File

@ -34,7 +34,7 @@
#pragma once
#include "stdafx.h"
#include <stdafx.h>
#include <core/audio/PlaybackService.h>
#include <core/library/ILibrary.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "Hotkeys.h"
#include <core/support/Preferences.h>
#include <app/util/Playback.h>

View File

@ -34,7 +34,7 @@
#pragma once
#include "stdafx.h"
#include <stdafx.h>
#include <cursespp/INavigationKeys.h>

View File

@ -34,7 +34,7 @@
#pragma once
#include "stdafx.h"
#include <stdafx.h>
#include <core/support/Messages.h>
namespace musik {

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "Playback.h"
#include <core/sdk/constants.h>

View File

@ -34,7 +34,7 @@
#pragma once
#include "stdafx.h"
#include <stdafx.h>
#include <core/audio/PlaybackService.h>
#include <core/support/Preferences.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "PreferenceKeys.h"
namespace musik { namespace cube { namespace prefs {

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "UpdateCheck.h"
#include <json.hpp>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include <cursespp/Colors.h>
#include <cursespp/SingleLineEntry.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "LogWindow.h"

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "TrackListView.h"
#include <cursespp/Colors.h>

View File

@ -32,7 +32,7 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "TransportWindow.h"
#include <cursespp/Screen.h>

View File

@ -34,18 +34,18 @@
#include <stdafx.h>
#include "App.h"
#include "Colors.h"
#include "ILayout.h"
#include "IInput.h"
#include "Window.h"
#include "Text.h"
#include "Screen.h"
#include <cursespp/App.h>
#include <cursespp/Colors.h>
#include <cursespp/ILayout.h>
#include <cursespp/IInput.h>
#include <cursespp/Window.h>
#include <cursespp/Text.h>
#include <cursespp/Screen.h>
#include <thread>
#ifdef WIN32
#include "Win32Util.h"
#include <cursespp/Win32Util.h>
#undef MOUSE_MOVED
#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
#endif

View File

@ -38,7 +38,7 @@
#include <cursespp/Colors.h>
#include <cursespp/Text.h>
#include "Checkbox.h"
#include <cursespp/Checkbox.h>
using namespace cursespp;

View File

@ -34,7 +34,7 @@
#include <stdafx.h>
#include <json.hpp>
#include "Colors.h"
#include <cursespp/Colors.h>
#include <boost/filesystem.hpp>
#include <core/support/Common.h>

View File

@ -33,10 +33,10 @@
//////////////////////////////////////////////////////////////////////////////
#include <stdafx.h>
#include "DialogOverlay.h"
#include "Colors.h"
#include "Screen.h"
#include "Text.h"
#include <cursespp/DialogOverlay.h>
#include <cursespp/Colors.h>
#include <cursespp/Screen.h>
#include <cursespp/Text.h>
using namespace cursespp;

View File

@ -33,8 +33,8 @@
//////////////////////////////////////////////////////////////////////////////
#include <stdafx.h>
#include "IMouseHandler.h"
#include "IWindow.h"
#include <cursespp/IMouseHandler.h>
#include <cursespp/IWindow.h>
using namespace cursespp;

View File

@ -33,12 +33,12 @@
//////////////////////////////////////////////////////////////////////////////
#include <stdafx.h>
#include "App.h"
#include "InputOverlay.h"
#include "DialogOverlay.h"
#include "Colors.h"
#include "Screen.h"
#include "Text.h"
#include <cursespp/App.h>
#include <cursespp/InputOverlay.h>
#include <cursespp/DialogOverlay.h>
#include <cursespp/Colors.h>
#include <cursespp/Screen.h>
#include <cursespp/Text.h>
using namespace cursespp;

View File

@ -34,8 +34,8 @@
#include <stdafx.h>
#include <climits>
#include "LayoutBase.h"
#include "Colors.h"
#include <cursespp/LayoutBase.h>
#include <cursespp/Colors.h>
using namespace cursespp;

View File

@ -33,11 +33,11 @@
//////////////////////////////////////////////////////////////////////////////
#include <stdafx.h>
#include "ListOverlay.h"
#include "Scrollbar.h"
#include "Colors.h"
#include "Screen.h"
#include "Text.h"
#include <cursespp/ListOverlay.h>
#include <cursespp/Scrollbar.h>
#include <cursespp/Colors.h>
#include <cursespp/Screen.h>
#include <cursespp/Text.h>
using namespace cursespp;

View File

@ -34,8 +34,8 @@
#include <stdafx.h>
#include <algorithm>
#include "ListWindow.h"
#include "Scrollbar.h"
#include <cursespp/ListWindow.h>
#include <cursespp/Scrollbar.h>
using namespace cursespp;

View File

@ -33,8 +33,8 @@
//////////////////////////////////////////////////////////////////////////////
#include <stdafx.h>
#include "Text.h"
#include "MultiLineEntry.h"
#include <cursespp/Text.h>
#include <cursespp/MultiLineEntry.h>
using namespace cursespp;

View File

@ -33,10 +33,10 @@
//////////////////////////////////////////////////////////////////////////////
#include <stdafx.h>
#include "OverlayStack.h"
#include "DialogOverlay.h"
#include "Colors.h"
#include "Screen.h"
#include <cursespp/OverlayStack.h>
#include <cursespp/DialogOverlay.h>
#include <cursespp/Colors.h>
#include <cursespp/Screen.h>
using namespace cursespp;

View File

@ -33,7 +33,7 @@
//////////////////////////////////////////////////////////////////////////////
#include <stdafx.h>
#include "Screen.h"
#include <cursespp/Screen.h>
using namespace cursespp;

View File

@ -33,10 +33,10 @@
//////////////////////////////////////////////////////////////////////////////
#include <stdafx.h>
#include "ScrollAdapterBase.h"
#include "ScrollableWindow.h"
#include "MultiLineEntry.h"
#include "ListWindow.h"
#include <cursespp/ScrollAdapterBase.h>
#include <cursespp/ScrollableWindow.h>
#include <cursespp/MultiLineEntry.h>
#include <cursespp/ListWindow.h>
using namespace cursespp;

View File

@ -35,9 +35,9 @@
#include <stdafx.h>
#include <algorithm>
#include "ScrollableWindow.h"
#include "Screen.h"
#include "Colors.h"
#include <cursespp/ScrollableWindow.h>
#include <cursespp/Screen.h>
#include <cursespp/Colors.h>
#include <core/debug.h>

View File

@ -32,8 +32,8 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "Scrollbar.h"
#include <stdafx.h>
#include <cursespp/Scrollbar.h>
using namespace cursespp;

View File

@ -32,11 +32,11 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "ShortcutsWindow.h"
#include "Colors.h"
#include "Text.h"
#include <cursespp/ShortcutsWindow.h>
#include <cursespp/Colors.h>
#include <cursespp/Text.h>
using namespace cursespp;

View File

@ -32,13 +32,13 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <stdafx.h>
#include "SimpleScrollAdapter.h"
#include "SingleLineEntry.h"
#include "MultiLineEntry.h"
#include "ScrollableWindow.h"
#include "Colors.h"
#include <cursespp/SimpleScrollAdapter.h>
#include <cursespp/SingleLineEntry.h>
#include <cursespp/MultiLineEntry.h>
#include <cursespp/ScrollableWindow.h>
#include <cursespp/Colors.h>
#include <utf8/utf8/unchecked.h>
using namespace cursespp;

View File

@ -33,8 +33,8 @@
//////////////////////////////////////////////////////////////////////////////
#include <stdafx.h>
#include "SingleLineEntry.h"
#include "Text.h"
#include <cursespp/SingleLineEntry.h>
#include <cursespp/Text.h>
using namespace cursespp;

View File

@ -32,8 +32,8 @@
//
//////////////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "Text.h"
#include <stdafx.h>
#include <cursespp/Text.h>
#include <math.h>

View File

@ -35,9 +35,9 @@
#include <stdafx.h>
#include <limits.h>
#include "Screen.h"
#include "Colors.h"
#include "TextInput.h"
#include <cursespp/Screen.h>
#include <cursespp/Colors.h>
#include <cursespp/TextInput.h>
using namespace cursespp;

View File

@ -39,7 +39,7 @@
#include <cursespp/Text.h>
#include <cursespp/ILayout.h>
#include "TextLabel.h"
#include <cursespp/TextLabel.h>
using namespace cursespp;

View File

@ -33,11 +33,11 @@
//////////////////////////////////////////////////////////////////////////////
#include <stdafx.h>
#include "App.h"
#include "ToastOverlay.h"
#include "Colors.h"
#include "Screen.h"
#include "Text.h"
#include <cursespp/App.h>
#include <cursespp/ToastOverlay.h>
#include <cursespp/Colors.h>
#include <cursespp/Screen.h>
#include <cursespp/Text.h>
static const int TOAST_MESSAGE_HIDE = 1000;

View File

@ -34,8 +34,8 @@
#pragma once
#include "stdafx.h"
#include "Win32Util.h"
#include <stdafx.h>
#include <cursespp/Win32Util.h>
#include <Windows.h>
#include <Commctrl.h>
#include <shellapi.h>

View File

@ -33,13 +33,13 @@
//////////////////////////////////////////////////////////////////////////////
#include <stdafx.h>
#include "Window.h"
#include "IWindowGroup.h"
#include "IInput.h"
#include "ILayout.h"
#include "Colors.h"
#include "Screen.h"
#include "Text.h"
#include <cursespp/Window.h>
#include <cursespp/IWindowGroup.h>
#include <cursespp/IInput.h>
#include <cursespp/ILayout.h>
#include <cursespp/Colors.h>
#include <cursespp/Screen.h>
#include <cursespp/Text.h>
#include <core/runtime/Message.h>
#include <core/runtime/MessageQueue.h>

View File

@ -35,11 +35,11 @@
#pragma once
#include <queue>
#include "ILayout.h"
#include "IInput.h"
#include "IKeyHandler.h"
#include "OverlayStack.h"
#include "Colors.h"
#include <cursespp/ILayout.h>
#include <cursespp/IInput.h>
#include <cursespp/IKeyHandler.h>
#include <cursespp/OverlayStack.h>
#include <cursespp/Colors.h>
namespace cursespp {
class App {

View File

@ -34,7 +34,7 @@
#pragma once
#include "curses_config.h"
#include <cursespp/curses_config.h>
#include <string>
namespace cursespp {

View File

@ -34,9 +34,9 @@
#pragma once
#include "OverlayBase.h"
#include "TextLabel.h"
#include "ShortcutsWindow.h"
#include <cursespp/OverlayBase.h>
#include <cursespp/TextLabel.h>
#include <cursespp/ShortcutsWindow.h>
#include <vector>
#include <map>

View File

@ -34,8 +34,6 @@
#pragma once
#include <stdafx.h>
namespace cursespp {
class IInput {
public:

View File

@ -34,8 +34,6 @@
#pragma once
#include <stdafx.h>
namespace cursespp {
class IKeyHandler {
public:

View File

@ -34,10 +34,10 @@
#pragma once
#include "IWindowGroup.h"
#include "IDisplayable.h"
#include "IKeyHandler.h"
#include "IMouseHandler.h"
#include <cursespp/IWindowGroup.h>
#include <cursespp/IDisplayable.h>
#include <cursespp/IKeyHandler.h>
#include <cursespp/IMouseHandler.h>
#include <memory>
namespace cursespp {

View File

@ -34,8 +34,7 @@
#pragma once
#include <stdafx.h>
#include "curses_config.h"
#include <cursespp/curses_config.h>
namespace cursespp {
class IWindow;

View File

@ -34,8 +34,6 @@
#pragma once
#include <stdafx.h>
namespace cursespp {
class ScrollableWindow;

View File

@ -34,11 +34,11 @@
#pragma once
#include "curses_config.h"
#include "IDisplayable.h"
#include "IOrderable.h"
#include "IMouseHandler.h"
#include "Colors.h"
#include <cursespp/curses_config.h>
#include <cursespp/IDisplayable.h>
#include <cursespp/IOrderable.h>
#include <cursespp/IMouseHandler.h>
#include <cursespp/Colors.h>
#include <core/runtime/IMessage.h>
#include <core/runtime/IMessageTarget.h>

View File

@ -34,7 +34,7 @@
#pragma once
#include "IWindow.h"
#include <cursespp/IWindow.h>
namespace cursespp {
class IWindowGroup {

View File

@ -34,8 +34,8 @@
#pragma once
#include "OverlayBase.h"
#include "TextInput.h"
#include <cursespp/OverlayBase.h>
#include <cursespp/TextInput.h>
namespace cursespp {
class InputOverlay :

View File

@ -34,8 +34,8 @@
#pragma once
#include "ILayout.h"
#include "Window.h"
#include <cursespp/ILayout.h>
#include <cursespp/Window.h>
#include <sigslot/sigslot.h>
#include <vector>

View File

@ -34,8 +34,8 @@
#pragma once
#include "OverlayBase.h"
#include "ListWindow.h"
#include <cursespp/OverlayBase.h>
#include <cursespp/ListWindow.h>
#include <vector>
#include <map>

View File

@ -34,9 +34,9 @@
#pragma once
#include "IScrollable.h"
#include "IScrollAdapter.h"
#include "ScrollableWindow.h"
#include <cursespp/IScrollable.h>
#include <cursespp/IScrollAdapter.h>
#include <cursespp/ScrollableWindow.h>
#include <sigslot/sigslot.h>
#include <functional>

View File

@ -34,7 +34,7 @@
#pragma once
#include "IScrollAdapter.h"
#include <cursespp/IScrollAdapter.h>
namespace cursespp {
class MultiLineEntry : public IScrollAdapter::IEntry {

View File

@ -34,14 +34,14 @@
#pragma once
#include "Colors.h"
#include "IOverlay.h"
#include "LayoutBase.h"
#include "OverlayStack.h"
#include "TextLabel.h"
#include "Checkbox.h"
#include "TextInput.h"
#include "ListWindow.h"
#include <cursespp/Colors.h>
#include <cursespp/IOverlay.h>
#include <cursespp/LayoutBase.h>
#include <cursespp/OverlayStack.h>
#include <cursespp/TextLabel.h>
#include <cursespp/Checkbox.h>
#include <cursespp/TextInput.h>
#include <cursespp/ListWindow.h>
namespace cursespp {
class OverlayBase : public LayoutBase, public IOverlay {

View File

@ -34,7 +34,7 @@
#pragma once
#include "ILayout.h"
#include <cursespp/ILayout.h>
#include <vector>
namespace cursespp {

View File

@ -34,7 +34,7 @@
#pragma once
#include "curses_config.h"
#include <cursespp/curses_config.h>
namespace cursespp {
class Screen {

View File

@ -34,8 +34,8 @@
#pragma once
#include "curses_config.h"
#include "IScrollAdapter.h"
#include <cursespp/curses_config.h>
#include <cursespp/IScrollAdapter.h>
#include <deque>
namespace cursespp {

View File

@ -34,11 +34,11 @@
#pragma once
#include "curses_config.h"
#include "Window.h"
#include "IScrollAdapter.h"
#include "IScrollable.h"
#include "IKeyHandler.h"
#include <cursespp/curses_config.h>
#include <cursespp/Window.h>
#include <cursespp/IScrollAdapter.h>
#include <cursespp/IScrollable.h>
#include <cursespp/IKeyHandler.h>
namespace cursespp {
class ScrollableWindow :

View File

@ -34,7 +34,7 @@
#pragma once
#include "ListWindow.h"
#include <cursespp/ListWindow.h>
namespace cursespp {
class Scrollbar {

View File

@ -34,9 +34,9 @@
#pragma once
#include "IKeyHandler.h"
#include "Window.h"
#include "Text.h"
#include <cursespp/IKeyHandler.h>
#include <cursespp/Window.h>
#include <cursespp/Text.h>
namespace cursespp {
class ShortcutsWindow :

View File

@ -34,8 +34,8 @@
#pragma once
#include "curses_config.h"
#include "ScrollAdapterBase.h"
#include <cursespp/curses_config.h>
#include <cursespp/ScrollAdapterBase.h>
#include <deque>
namespace cursespp {

View File

@ -34,8 +34,8 @@
#pragma once
#include "IScrollAdapter.h"
#include "Colors.h"
#include <cursespp/IScrollAdapter.h>
#include <cursespp/Colors.h>
namespace cursespp {
class SingleLineEntry : public IScrollAdapter::IEntry {

View File

@ -34,8 +34,6 @@
#pragma once
#include "stdafx.h"
namespace cursespp {
namespace text {
enum TextAlign {

View File

@ -34,10 +34,10 @@
#pragma once
#include "curses_config.h"
#include "Window.h"
#include "IInput.h"
#include "IKeyHandler.h"
#include <cursespp/curses_config.h>
#include <cursespp/Window.h>
#include <cursespp/IInput.h>
#include <cursespp/IKeyHandler.h>
#include <sigslot/sigslot.h>
namespace cursespp {

View File

@ -34,7 +34,7 @@
#pragma once
#include "OverlayBase.h"
#include <cursespp/OverlayBase.h>
#include <vector>
namespace cursespp {

View File

@ -34,8 +34,6 @@
#pragma once
#include "stdafx.h"
#ifdef WIN32
namespace cursespp {

Some files were not shown because too many files have changed in this diff Show More