mirror of
				https://git.suyu.dev/suyu/suyu
				synced 2025-11-03 16:39:01 -06:00 
			
		
		
		
	applets/profile_select: Use aliases for callbacks
Deduplicates callback definitions and situates it in one place.
This commit is contained in:
		@@ -9,8 +9,7 @@ namespace Core::Frontend {
 | 
			
		||||
 | 
			
		||||
ProfileSelectApplet::~ProfileSelectApplet() = default;
 | 
			
		||||
 | 
			
		||||
void DefaultProfileSelectApplet::SelectProfile(
 | 
			
		||||
    std::function<void(std::optional<Common::UUID>)> callback) const {
 | 
			
		||||
void DefaultProfileSelectApplet::SelectProfile(SelectProfileCallback callback) const {
 | 
			
		||||
    Service::Account::ProfileManager manager;
 | 
			
		||||
    callback(manager.GetUser(Settings::values.current_user.GetValue()).value_or(Common::UUID{}));
 | 
			
		||||
    LOG_INFO(Service_ACC, "called, selecting current user instead of prompting...");
 | 
			
		||||
 
 | 
			
		||||
@@ -11,14 +11,16 @@ namespace Core::Frontend {
 | 
			
		||||
 | 
			
		||||
class ProfileSelectApplet {
 | 
			
		||||
public:
 | 
			
		||||
    using SelectProfileCallback = std::function<void(std::optional<Common::UUID>)>;
 | 
			
		||||
 | 
			
		||||
    virtual ~ProfileSelectApplet();
 | 
			
		||||
 | 
			
		||||
    virtual void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const = 0;
 | 
			
		||||
    virtual void SelectProfile(SelectProfileCallback callback) const = 0;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
class DefaultProfileSelectApplet final : public ProfileSelectApplet {
 | 
			
		||||
public:
 | 
			
		||||
    void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const override;
 | 
			
		||||
    void SelectProfile(SelectProfileCallback callback) const override;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
} // namespace Core::Frontend
 | 
			
		||||
 
 | 
			
		||||
@@ -163,8 +163,7 @@ QtProfileSelector::QtProfileSelector(GMainWindow& parent) {
 | 
			
		||||
 | 
			
		||||
QtProfileSelector::~QtProfileSelector() = default;
 | 
			
		||||
 | 
			
		||||
void QtProfileSelector::SelectProfile(
 | 
			
		||||
    std::function<void(std::optional<Common::UUID>)> callback_) const {
 | 
			
		||||
void QtProfileSelector::SelectProfile(SelectProfileCallback callback_) const {
 | 
			
		||||
    callback = std::move(callback_);
 | 
			
		||||
    emit MainWindowSelectProfile();
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -65,7 +65,7 @@ public:
 | 
			
		||||
    explicit QtProfileSelector(GMainWindow& parent);
 | 
			
		||||
    ~QtProfileSelector() override;
 | 
			
		||||
 | 
			
		||||
    void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback_) const override;
 | 
			
		||||
    void SelectProfile(SelectProfileCallback callback_) const override;
 | 
			
		||||
 | 
			
		||||
signals:
 | 
			
		||||
    void MainWindowSelectProfile() const;
 | 
			
		||||
@@ -73,5 +73,5 @@ signals:
 | 
			
		||||
private:
 | 
			
		||||
    void MainWindowFinishedSelection(std::optional<Common::UUID> uuid);
 | 
			
		||||
 | 
			
		||||
    mutable std::function<void(std::optional<Common::UUID>)> callback;
 | 
			
		||||
    mutable SelectProfileCallback callback;
 | 
			
		||||
};
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user