CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2023-10-25 19:26:05 +03:00
parent 932cd9e262 38d77b58cd
commit a5938a7de9
40 changed files with 117 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/ui/dialogs/ExportInstanceDialog.h
View File

@ -43,7 +43,7 @@
#include "FileIgnoreProxy.h"
class BaseInstance;
typedef std::shared_ptr<BaseInstance> InstancePtr;
using InstancePtr = std::shared_ptr<BaseInstance>;
namespace Ui {
class ExportInstanceDialog;

2
launcher/ui/instanceview/AccessibleInstanceView_p.h
View File

@ -59,7 +59,7 @@ class AccessibleInstanceView : public QAccessibleTableInterface, public QAccessi
protected:
// maybe vector
typedef QHash<int, QAccessible::Id> ChildCache;
using ChildCache = QHash<int, QAccessible::Id>;
mutable ChildCache childToId;
virtual ~AccessibleInstanceView();

2
launcher/ui/pages/BasePage.h
View File

@ -77,4 +77,4 @@ class BasePage {
bool isOpened = false;
};
typedef std::shared_ptr<BasePage> BasePagePtr;
using BasePagePtr = std::shared_ptr<BasePage>;

2
launcher/ui/pages/BasePageProvider.h
View File

@ -26,7 +26,7 @@ class BasePageProvider {
};
class GenericPageProvider : public BasePageProvider {
typedef std::function<BasePage*()> PageCreator;
using PageCreator = std::function<BasePage*()>;
public:
explicit GenericPageProvider(const QString& dialogTitle) : m_dialogTitle(dialogTitle) {}

4
launcher/ui/pages/instance/ScreenshotsPage.cpp
View File

@ -68,8 +68,8 @@
#include <FileSystem.h>
#include "RWStorage.h"
typedef RWStorage<QString, QIcon> SharedIconCache;
typedef std::shared_ptr<SharedIconCache> SharedIconCachePtr;
using SharedIconCache = RWStorage<QString, QIcon>;
using SharedIconCachePtr = std::shared_ptr<SharedIconCache>;
class ThumbnailingResult : public QObject {
Q_OBJECT

4
launcher/ui/pages/modplatform/atlauncher/AtlListModel.h
View File

@ -24,8 +24,8 @@
namespace Atl {
typedef QMap<QString, QIcon> LogoMap;
typedef std::function<void(QString)> LogoCallback;
using LogoMap = QMap<QString, QIcon>;
using LogoCallback = std::function<void(QString)>;
class ListModel : public QAbstractListModel {
Q_OBJECT

4
launcher/ui/pages/modplatform/flame/FlameModel.h
View File

@ -19,8 +19,8 @@
namespace Flame {
typedef QMap<QString, QIcon> LogoMap;
typedef std::function<void(QString)> LogoCallback;
using LogoMap = QMap<QString, QIcon>;
using LogoCallback = std::function<void(QString)>;
class ListModel : public QAbstractListModel {
Q_OBJECT

4
launcher/ui/pages/modplatform/legacy_ftb/ListModel.h
View File

@ -13,8 +13,8 @@
namespace LegacyFTB {
typedef QMap<QString, QIcon> FTBLogoMap;
typedef std::function<void(QString)> LogoCallback;
using FTBLogoMap = QMap<QString, QIcon>;
using LogoCallback = std::function<void(QString)>;
class FilterModel : public QSortFilterProxyModel {
Q_OBJECT

2
launcher/ui/pages/modplatform/technic/TechnicModel.h
View File

@ -42,7 +42,7 @@
namespace Technic {
typedef std::function<void(QString)> LogoCallback;
using LogoCallback = std::function<void(QString)>;
class ListModel : public QAbstractListModel {
Q_OBJECT

3
launcher/ui/setupwizard/JavaWizardPage.cpp
View File

@ -64,8 +64,7 @@ bool JavaWizardPage::validatePage()
}
case JavaSettingsWidget::ValidationStatus::AllOK: {
settings->set("JavaPath", m_java_widget->javaPath());
return true;
}
} /* fallthrough */
case JavaSettingsWidget::ValidationStatus::JavaBad: {
// Memory
auto s = APPLICATION->settings();