Skip to content

Commit 00fd1d6

Browse files
Merge pull request #34 from Reim-developer/dev
Refactor & Fix naming convention issue # Change Log: commit f4846cb Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:41:11 2025 +0700 Fix naming conflict in `ListenerDisconnect.hpp` for implement new naming convention commit 2bbeb05 Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:41:03 2025 +0700 Fix naming conflict in `ListenerDisconnect.cc` for implement new naming convention commit 5bfa1c3 Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:40:48 2025 +0700 Fix naming conflict in `Managaer_MainWindow_Components.hpp` for implement new naming convention commit 9db970b Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:40:42 2025 +0700 Fix naming conflict in `Managaer_MainWindow_Components.hpp` for implement new naming convention commit d7dafb0 Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:39:40 2025 +0700 Fix naming conflict in `MainWindow_GUI_Impl_Helper.hpp` for implement new naming convention commit 8bcc01c Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:39:25 2025 +0700 Fix naming conflict in `LayoutManager_Impl_Helper.hpp` for implement new naming convention commit 6e192c4 Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:39:18 2025 +0700 Fix naming conflict in `LayoutManager_Impl_Helper.cc` for implement new naming convention commit 9a5a57d Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:39:00 2025 +0700 Defined new LayoutManager abstract class for SettingWindow commit 223a8fa Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:38:46 2025 +0700 Fix naming conflict in `SettingWindow_Components.hpp` for implement new naming convention commit 1a8b8a0 Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:38:35 2025 +0700 Fix naming conflict in `MainWindow_LayoutManager.hpp` for implement new naming convention commit 713021f Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:37:50 2025 +0700 Fix naming conflict in `MainWindow_Components.hpp` for implement new naming convention commit d708f1e Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:37:37 2025 +0700 Fix naming conflict in `Layout_Toolkit.hpp` for implement new naming convention commit a7221ae Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:37:01 2025 +0700 Implement LayoutManager for Setting Window. commit bfe8cc0 Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:36:40 2025 +0700 Fix naming conflict in `MainWindow_LayoutManager` for implement new naming convention commit 958c41a Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:36:29 2025 +0700 Fix naming conflict in `Window.hpp` for implement new naming convention commit f81685b Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:36:20 2025 +0700 Fix naming conflict in `TableView.hpp` for implement new naming convention commit bcbee9d Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:36:11 2025 +0700 Fix naming conflict in `SystemTray.hpp` for implement new naming convention commit 48a6cd2 Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:36:01 2025 +0700 Removed legacy Toolkit Layout commit c1ccd2e Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:35:45 2025 +0700 Fix naming conflict in `SettingButton.hpp` for implement new naming convention commit 5c80fe7 Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:35:35 2025 +0700 Fix naming conflict in `SearchPanel.hpp` for implement new naming convention commit e4e0eff Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:35:24 2025 +0700 Fix naming conflict in `GetCconnectButton.hpp` for implement new naming convention commit 1a3f2e3 Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:35:14 2025 +0700 Fix naming conflict in `DisconnectButton.hpp` for implement new naming convention commit 74232d3 Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:35:04 2025 +0700 Fix naming conflict in `ClearButton.hpp` for implement new naming convention commit 2e62b1d Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:34:51 2025 +0700 Fix naming conflict in `Window.cc` for implement new naming convention commit bcfbbad Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:34:35 2025 +0700 Fix naming conflict in `TableView.cc` for implement new naming convention commit aca46c7 Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:34:26 2025 +0700 Fix naming conflict in `SearchPanel.cc` for implement new naming convention commit 5dae5a8 Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:34:17 2025 +0700 Fix naming conflict in `GetConnectButton.cc` for implement new naming convention commit e410cbc Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:34:03 2025 +0700 Fix naming conflict in `DisconnectButton.cc` for implement new naming convention commit 2602c21 Author: Reim-developer <contact.kaxtr@gmail.com> Date: Sun Jul 20 22:33:22 2025 +0700 Fix naming conflict in `ClearButton.cc` for implement new naming convention
2 parents 5c9e728 + 5c4aff2 commit 00fd1d6

31 files changed

Lines changed: 249 additions & 99 deletions

Source/GUI/ClearButton.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ using ZClipboard::AppUtils::Utils;
1414
#include "../Utils/Include/AssertNullPtr.hpp"
1515
#endif
1616

17-
void ClearButton::SetupClearButton(Toolkit *toolkit, TableView *tableView) {
17+
void ClearButton::SetupClearButton(ComponentsManager *toolkit, TableView *tableView) {
1818
auto clearButton = toolkit->GetClearButton();
1919
Utils::MakeSmartPtr<QSettings>(settings, AUTHOR_NAME, APP_NAME);
2020

Source/GUI/DisconnectButton.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ using ZClipboard::Listener::DisconnectImpl;
1414
using ZClipboard::GUI::DisconnectButton;
1515

1616
using Self = DisconnectButton;
17-
using Toolkit = ComponentsToolkit;
17+
using ComponentsManager = MainWindowComponentsManager;
1818
using Window = QMainWindow;
1919
using Impl = DisconnectImpl;
2020

@@ -24,7 +24,7 @@ Self *Self::UseConnectButton(ConnectButton *button) {
2424
return this;
2525
}
2626

27-
void Self::SetupDisconnectButton(Toolkit *toolkit, Window *window) {
27+
void Self::SetupDisconnectButton(ComponentsManager *toolkit, Window *window) {
2828
Utils::MakeSmartPtr<QSettings>(settings, AUTHOR_NAME, APP_NAME);
2929
auto disconnectButton = toolkit->GetDisconnectButton();
3030

@@ -40,7 +40,7 @@ void Self::SetupDisconnectButton(Toolkit *toolkit, Window *window) {
4040
. StartBuild()
4141
-> WithAndThen(&Impl::setting, settings.get())
4242
-> WithAndThen(&Impl::getButton, getButton)
43-
-> WithAndThen(&Impl::toolkit, toolkit)
43+
-> WithAndThen(&Impl::componentsManager, toolkit)
4444
-> WithAndThen(&Impl::windowParent, window)
4545
-> WhenDone()
4646
-> TryGetListener();

Source/GUI/GetConnectButton.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ using Self = ConnectButton;
1212
using Window = QMainWindow;
1313
using Button = QPushButton;
1414

15-
void Self::SetupConnectButton(Window *window, Toolkit *toolkit) {
15+
void Self::SetupConnectButton(Window *window, ComponentsManager *toolkit) {
1616
Utils::MakeSmartPtr<QSettings>(settings, AUTHOR_NAME, APP_NAME);
1717
Utils::MakeSmartPtr<NetworkState>(networkState);
1818

Source/GUI/Include/ClearButton.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ using ZClipboard::GUI::TableView;
2121
using ZClipboard::Lib_Memory::PtrUnique;
2222
using ZClipboard::Core::ClearCoreBuilder;
2323
using ZClipboard::Listener::ClearCacheListener;
24-
using ZClipboard::GUI::Toolkit::ComponentsToolkit;
24+
using ZClipboard::GUI::Toolkit::MainWindowComponentsManager;
2525

2626
GUI_NAMESPACE
2727

@@ -31,10 +31,10 @@ GUI_NAMESPACE
3131
ClearCacheListener BuilderFunc;
3232

3333
private:
34-
using Toolkit = ComponentsToolkit;
34+
using ComponentsManager = MainWindowComponentsManager;
3535

3636
public:
37-
void SetupClearButton(Toolkit *toolkit, TableView *tableView);
37+
void SetupClearButton(ComponentsManager *toolkit, TableView *tableView);
3838

3939
private:
4040
void SetupEventListener(QPushButton *clearButton, TableView *tableView);

Source/GUI/Include/DisconnectButton.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ using ZClipboard::GUI::ConnectButton;
1414
using ZClipboard::Lib_Memory::PtrUnique;
1515
using ZClipboard::Core::CoreDisconnect;
1616
using ZClipboard::Listener::ListenerDisconnect;
17-
using ZClipboard::GUI::Toolkit::ComponentsToolkit;
17+
using ZClipboard::GUI::Toolkit::MainWindowComponentsManager;
1818

1919
GUI_NAMESPACE
2020

@@ -26,12 +26,12 @@ GUI_NAMESPACE
2626
ConnectButton *getButton;
2727

2828
private:
29-
using Toolkit = ComponentsToolkit;
29+
using ComponentsManager = MainWindowComponentsManager;
3030
using Self = DisconnectButton;
3131

3232
public:
3333
Self *UseConnectButton(ConnectButton *button);
34-
void SetupDisconnectButton(Toolkit *toolkit, QMainWindow *window);
34+
void SetupDisconnectButton(ComponentsManager *componentsManager, QMainWindow *window);
3535
};
3636

3737
END_NAMESPACE

Source/GUI/Include/GetConnectButton.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ using ZClipboard::Core::CoreConnect;
2020
using ZClipboard::Lib_Memory::PtrUnique;
2121
using ZClipboard::Listener::ListenerConnect;
2222
using ZClipboard::Network::NetworkState;
23-
using ZClipboard::GUI::Toolkit::ComponentsToolkit;
23+
using ZClipboard::GUI::Toolkit::MainWindowComponentsManager;
2424

2525
GUI_NAMESPACE
2626
class ConnectButton {
2727
private:
28-
using Toolkit = ComponentsToolkit;
28+
using ComponentsManager = MainWindowComponentsManager;
2929
using FnConnect = ListenerConnect;
3030
using LanguageType = Translate::LanguageType;
3131
using Window = QMainWindow;
3232
using Button = QPushButton;
3333

3434
public:
35-
void SetupConnectButton(Window *window, Toolkit *toolkit);
35+
void SetupConnectButton(Window *window, ComponentsManager *componentsManager);
3636
void ResetServer();
3737
NetworkState *GetNetworkState();
3838

Source/GUI/Include/SearchPanel.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
using ZClipboard::GUI::TableView;
1515
using ZClipboard::GUI::TableModel;
16-
using ZClipboard::GUI::Toolkit::ComponentsToolkit;
16+
using ZClipboard::GUI::Toolkit::MainWindowComponentsManager;
1717
using ZClipboard::Lib_Memory::PtrUnique;
1818
using ZClipboard::AppUtils::Utils;
1919

2020
GUI_NAMESPACE
2121
struct SearchAreaImpl {
2222
TableView *tableView;
23-
ComponentsToolkit *toolkit;
23+
MainWindowComponentsManager *componentsManager;
2424
};
2525

2626
class SearchArea {

Source/GUI/Include/SettingButton.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "../../Utils/Include/Namespace_Macro.hpp"
1818

1919
using ZClipboard::Core::SettingCore;
20-
using ZClipboard::GUI::Toolkit::ComponentsToolkit;
20+
using ZClipboard::GUI::Toolkit::MainWindowComponentsManager;
2121
using ZClipboard::Lib_Memory::PtrUnique;
2222

2323
GUI_NAMESPACE
@@ -36,7 +36,7 @@ GUI_NAMESPACE
3636

3737
private:
3838
using Window = QMainWindow;
39-
using Toolkit = ComponentsToolkit;
39+
using Toolkit = MainWindowComponentsManager;
4040

4141
public:
4242
void SetupSettingButton(Window *window, Toolkit *toolkit);

Source/GUI/Include/SystemTray.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
#include "../Toolkit/Include/MainWindow_Components.hpp"
1010

1111
using ZClipboard::Core::SystemTrayCore;
12-
using ZClipboard::GUI::Toolkit::ComponentsToolkit;
12+
using ZClipboard::GUI::Toolkit::MainWindowComponentsManager;
1313

1414
GUI_NAMESPACE
1515
class SystemTray {
1616

1717
private:
18-
using Toolkit = ComponentsToolkit;
18+
using Toolkit = MainWindowComponentsManager;
1919
using Window = QMainWindow;
2020

2121
public:

Source/GUI/Include/TableView.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ using ZClipboard::GUI::TableModel;
3030
using ZClipboard::Database::DatabaseManager;
3131
using ZClipboard::GUI::ClipboardDialog;
3232
using ZClipboard::Lib_Memory::PtrUnique;
33-
using ZClipboard::GUI::Toolkit::ComponentsToolkit;
33+
using ZClipboard::GUI::Toolkit::MainWindowComponentsManager;
3434

3535
GUI_NAMESPACE
3636

@@ -39,9 +39,10 @@ GUI_NAMESPACE
3939

4040
private:
4141
using Self = TableView;
42+
using ComponentsManager = MainWindowComponentsManager;
4243

4344
public:
44-
Self *UseToolkit(ComponentsToolkit *toolkit);
45+
Self *UseToolkit(ComponentsManager *componentsManager);
4546
void SetupTableView();
4647
TableModel *GetTableModel();
4748
DatabaseManager &GetDatabase();
@@ -54,7 +55,7 @@ GUI_NAMESPACE
5455
void SetupTableProperty();
5556

5657
private:
57-
ComponentsToolkit *toolkit;
58+
ComponentsManager *componentsManager;
5859
QClipboard *clipboard;
5960
QTableView *tableView;
6061
TableModel *tableModel;

0 commit comments

Comments
 (0)