dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove reference to deprecated Q_OS_OSX macro (#3824)

Browse source
This commit is contained in:
Alexandru Ionut Tripon 2025-06-02 12:45:24 +03:00 • committed by GitHub
commit 178965676e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
launcher/ui/pages/global/ExternalToolsPage.cpp
View file

@ -156,7 +156,7 @@ void ExternalToolsPage::on_mceditPathBtn_clicked()
QString raw_dir = ui->mceditPathEdit->text();
QString error;
do {
#ifdef Q_OS_OSX
#ifdef Q_OS_MACOS
raw_dir = QFileDialog::getOpenFileName(this, tr("MCEdit Application"), raw_dir);
#else
raw_dir = QFileDialog::getExistingDirectory(this, tr("MCEdit Folder"), raw_dir);

4
launcher/ui/pages/instance/ServerPingTask.cpp
View file

@ -16,7 +16,7 @@ void ServerPingTask::executeTask()
// Resolve the actual IP and port for the server
McResolver* resolver = new McResolver(nullptr, m_domain, m_port);
QObject::connect(resolver, &McResolver::succeeded, this, [this, resolver](QString ip, int port) {
QObject::connect(resolver, &McResolver::succeeded, this, [this](QString ip, int port) {
qDebug() << "Resolved Address for" << m_domain << ": " << ip << ":" << port;
// Now that we have the IP and port, query the server
@ -30,7 +30,7 @@ void ServerPingTask::executeTask()
QObject::connect(client, &McClient::failed, this, [this](QString error) { emitFailed(error); });
// Delete McClient object when done
QObject::connect(client, &McClient::finished, this, [this, client]() { client->deleteLater(); });
QObject::connect(client, &McClient::finished, this, [client]() { client->deleteLater(); });
client->getStatusData();
});
QObject::connect(resolver, &McResolver::failed, this, [this](QString error) { emitFailed(error); });

2
launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
View file

@ -36,7 +36,7 @@ namespace FTBImportAPP {
QString getFTBRoot()
{
QString partialPath = QDir::homePath();
#if defined(Q_OS_OSX)
#if defined(Q_OS_MACOS)
partialPath = FS::PathCombine(partialPath, "Library/Application Support");
#endif
return FS::PathCombine(partialPath, ".ftba");