From 6ccc7e77f918503125c363eb8ac9455aa9fc095e Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Mon, 19 Jun 2023 22:42:27 +0100
Subject: Basic, unfinished & broken impl
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
launcher/ui/pages/BasePageContainer.h | 1 +
1 file changed, 1 insertion(+)
(limited to 'launcher/ui/pages/BasePageContainer.h')
diff --git a/launcher/ui/pages/BasePageContainer.h b/launcher/ui/pages/BasePageContainer.h
index b41fe12a..4cb7fe29 100644
--- a/launcher/ui/pages/BasePageContainer.h
+++ b/launcher/ui/pages/BasePageContainer.h
@@ -7,6 +7,7 @@ class BasePageContainer
public:
virtual ~BasePageContainer(){};
virtual bool selectPage(QString pageId) = 0;
+ virtual BasePage* selectedPage() = 0;
virtual BasePage* getPage(QString pageId) { return nullptr; };
virtual void refreshContainer() = 0;
virtual bool requestClose() = 0;
--
cgit
From dea33a3c1d3936cc5cfdd0917673af84e94d70de Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Thu, 22 Jun 2023 13:11:55 +0100
Subject: Make `selectedPage` const 🤦♀️
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
launcher/ui/InstanceWindow.cpp | 2 +-
launcher/ui/InstanceWindow.h | 2 +-
launcher/ui/pages/BasePageContainer.h | 2 +-
launcher/ui/widgets/PageContainer.cpp | 2 +-
launcher/ui/widgets/PageContainer.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'launcher/ui/pages/BasePageContainer.h')
diff --git a/launcher/ui/InstanceWindow.cpp b/launcher/ui/InstanceWindow.cpp
index 30a215e3..d784a40f 100644
--- a/launcher/ui/InstanceWindow.cpp
+++ b/launcher/ui/InstanceWindow.cpp
@@ -264,7 +264,7 @@ bool InstanceWindow::selectPage(QString pageId)
return m_container->selectPage(pageId);
}
-BasePage* InstanceWindow::selectedPage()
+BasePage* InstanceWindow::selectedPage() const
{
return m_container->selectedPage();
}
diff --git a/launcher/ui/InstanceWindow.h b/launcher/ui/InstanceWindow.h
index adbc46ac..582cff13 100644
--- a/launcher/ui/InstanceWindow.h
+++ b/launcher/ui/InstanceWindow.h
@@ -57,7 +57,7 @@ public:
virtual ~InstanceWindow();
bool selectPage(QString pageId) override;
- BasePage* selectedPage() override;
+ BasePage* selectedPage() const override;
void refreshContainer() override;
QString instanceId();
diff --git a/launcher/ui/pages/BasePageContainer.h b/launcher/ui/pages/BasePageContainer.h
index 4cb7fe29..eb3c9427 100644
--- a/launcher/ui/pages/BasePageContainer.h
+++ b/launcher/ui/pages/BasePageContainer.h
@@ -7,7 +7,7 @@ class BasePageContainer
public:
virtual ~BasePageContainer(){};
virtual bool selectPage(QString pageId) = 0;
- virtual BasePage* selectedPage() = 0;
+ virtual BasePage* selectedPage() const = 0;
virtual BasePage* getPage(QString pageId) { return nullptr; };
virtual void refreshContainer() = 0;
virtual bool requestClose() = 0;
diff --git a/launcher/ui/widgets/PageContainer.cpp b/launcher/ui/widgets/PageContainer.cpp
index 308fad6b..7b5b26b7 100644
--- a/launcher/ui/widgets/PageContainer.cpp
+++ b/launcher/ui/widgets/PageContainer.cpp
@@ -138,7 +138,7 @@ BasePage* PageContainer::getPage(QString pageId)
return m_model->findPageEntryById(pageId);
}
-BasePage* PageContainer::selectedPage()
+BasePage* PageContainer::selectedPage() const
{
return m_currentPage;
}
diff --git a/launcher/ui/widgets/PageContainer.h b/launcher/ui/widgets/PageContainer.h
index 1da269ce..bb365c82 100644
--- a/launcher/ui/widgets/PageContainer.h
+++ b/launcher/ui/widgets/PageContainer.h
@@ -80,7 +80,7 @@ public:
}
bool selectPage(QString pageId) override;
- BasePage* selectedPage() override;
+ BasePage* selectedPage() const override;
BasePage* getPage(QString pageId) override;
const QList<BasePage*> getPages() const;
--
cgit