mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-04-24 15:25:21 -05:00
[Fix-Warnings] Remove more redundant empty declarations. (extra semicolons) (#6374)
Some checks are pending
Build Desktop / Configure (push) Waiting to run
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, 11) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, 13) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, skip, 12) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Fedora, RPM, 43) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Fedora, RPM, skip, 42) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Servatrice_Debian, DEB, yes, skip, 11) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, 24.04) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, skip, 22.04) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (yes, Arch, skip) (push) Blocked by required conditions
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (Windows10-installer, true, Visual Studio 17 2022, x64, 1, Windows, -Win10, win64_msvc2019_64, qtimageformats qtmultimedia qt… (push) Blocked by required conditions
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (Windows7-installer, true, Visual Studio 17 2022, x64, 1, Windows, -Win7, win64_msvc2019_64, 5.15.*, windows-2022, 7, Release) (push) Blocked by required conditions
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (false, Ninja, macOS, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*, macos-15, Apple, 15, Debug, 1, 16.4) (push) Blocked by required conditions
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (macOS13_Intel-package, false, Ninja, 1, macOS, 13, -macOS13_Intel, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*… (push) Blocked by required conditions
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (macOS14-package, false, Ninja, 1, macOS, -macOS14, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*, macos-14, Appl… (push) Blocked by required conditions
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (macOS15-package, false, Ninja, 1, macOS, -macOS15, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*, macos-15, Appl… (push) Blocked by required conditions
Build Docker Image / amd64 & arm64 (push) Waiting to run
Some checks are pending
Build Desktop / Configure (push) Waiting to run
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, 11) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, 13) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Debian, DEB, skip, 12) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Fedora, RPM, 43) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Fedora, RPM, skip, 42) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Servatrice_Debian, DEB, yes, skip, 11) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, 24.04) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (Ubuntu, DEB, skip, 22.04) (push) Blocked by required conditions
Build Desktop / ${{matrix.distro}} ${{matrix.version}} (yes, Arch, skip) (push) Blocked by required conditions
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (Windows10-installer, true, Visual Studio 17 2022, x64, 1, Windows, -Win10, win64_msvc2019_64, qtimageformats qtmultimedia qt… (push) Blocked by required conditions
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (Windows7-installer, true, Visual Studio 17 2022, x64, 1, Windows, -Win7, win64_msvc2019_64, 5.15.*, windows-2022, 7, Release) (push) Blocked by required conditions
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (false, Ninja, macOS, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*, macos-15, Apple, 15, Debug, 1, 16.4) (push) Blocked by required conditions
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (macOS13_Intel-package, false, Ninja, 1, macOS, 13, -macOS13_Intel, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*… (push) Blocked by required conditions
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (macOS14-package, false, Ninja, 1, macOS, -macOS14, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*, macos-14, Appl… (push) Blocked by required conditions
Build Desktop / ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} (macOS15-package, false, Ninja, 1, macOS, -macOS15, clang_64, qtimageformats qtmultimedia qtwebsockets, 6.6.*, macos-15, Appl… (push) Blocked by required conditions
Build Docker Image / amd64 & arm64 (push) Waiting to run
This commit is contained in:
parent
858361e6d3
commit
8abd04dab1
|
|
@ -22,7 +22,7 @@ public:
|
|||
inline QString getCardUpdaterBinaryName()
|
||||
{
|
||||
return "oracle";
|
||||
};
|
||||
}
|
||||
QByteArray getHash(const QString fileName);
|
||||
QByteArray getHash(QByteArray data);
|
||||
static bool deleteSpoilerFile();
|
||||
|
|
|
|||
|
|
@ -99,15 +99,15 @@ public:
|
|||
void setSequence(const QList &_sequence)
|
||||
{
|
||||
QList::operator=(_sequence);
|
||||
};
|
||||
}
|
||||
[[nodiscard]] QString getName() const
|
||||
{
|
||||
return QApplication::translate("shortcutsTab", name.toUtf8().data());
|
||||
};
|
||||
}
|
||||
[[nodiscard]] QString getGroupName() const
|
||||
{
|
||||
return ShortcutGroup::getGroupName(group);
|
||||
};
|
||||
}
|
||||
|
||||
private:
|
||||
QString name;
|
||||
|
|
@ -129,7 +129,7 @@ public:
|
|||
[[nodiscard]] QList<QString> getAllShortcutKeys() const
|
||||
{
|
||||
return shortCuts.keys();
|
||||
};
|
||||
}
|
||||
|
||||
void setShortcuts(const QString &name, const QList<QKeySequence> &Sequence);
|
||||
void setShortcuts(const QString &name, const QKeySequence &Sequence);
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ public:
|
|||
[[nodiscard]] bool getIncludeRebalancedCards() const override
|
||||
{
|
||||
return SettingsCache::instance().getIncludeRebalancedCards();
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
#endif // COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ public:
|
|||
[[nodiscard]] PlayerActions *getPlayerActions() const
|
||||
{
|
||||
return playerActions;
|
||||
};
|
||||
}
|
||||
|
||||
[[nodiscard]] PlayerEventHandler *getPlayerEventHandler() const
|
||||
{
|
||||
|
|
@ -123,7 +123,7 @@ public:
|
|||
[[nodiscard]] PlayerInfo *getPlayerInfo() const
|
||||
{
|
||||
return playerInfo;
|
||||
};
|
||||
}
|
||||
|
||||
[[nodiscard]] PlayerMenu *getPlayerMenu() const
|
||||
{
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ public:
|
|||
void rawInsertCard(CardItem *card, int index)
|
||||
{
|
||||
cards.insert(index, card);
|
||||
};
|
||||
}
|
||||
|
||||
[[nodiscard]] const CardList &getCards() const
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,15 +23,15 @@ public:
|
|||
[[nodiscard]] bool isColorActive() const
|
||||
{
|
||||
return isActive;
|
||||
};
|
||||
}
|
||||
[[nodiscard]] QString getSymbol() const
|
||||
{
|
||||
return symbol;
|
||||
};
|
||||
}
|
||||
[[nodiscard]] QChar getSymbolChar() const
|
||||
{
|
||||
return symbol[0];
|
||||
};
|
||||
}
|
||||
|
||||
void loadManaIcon();
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public:
|
|||
QTreeView *getDatabaseView()
|
||||
{
|
||||
return databaseView;
|
||||
};
|
||||
}
|
||||
|
||||
public slots:
|
||||
ExactCard currentCard() const;
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ public:
|
|||
[[nodiscard]] DeckListModel *getDeckModel() const
|
||||
{
|
||||
return deckModel;
|
||||
};
|
||||
}
|
||||
|
||||
public slots:
|
||||
void retranslateUi();
|
||||
|
|
|
|||
|
|
@ -167,4 +167,4 @@ const ServerInfo_User *UserListManager::getOnlineUser(const QString &userName) c
|
|||
}
|
||||
|
||||
return nullptr;
|
||||
};
|
||||
}
|
||||
|
|
@ -24,7 +24,7 @@ public:
|
|||
[[nodiscard]] QString getBannerText() const
|
||||
{
|
||||
return header->getText();
|
||||
};
|
||||
}
|
||||
|
||||
private:
|
||||
QVBoxLayout *layout;
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ public:
|
|||
{
|
||||
state = newState;
|
||||
update();
|
||||
};
|
||||
}
|
||||
|
||||
signals:
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ public:
|
|||
[[nodiscard]] FlowWidget *getFlowWidget() const
|
||||
{
|
||||
return flowWidget;
|
||||
};
|
||||
}
|
||||
|
||||
public slots:
|
||||
void updateVisibility(bool recursive = true);
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ private:
|
|||
inline QString getCardUpdaterBinaryName()
|
||||
{
|
||||
return "oracle";
|
||||
};
|
||||
}
|
||||
void createCardUpdateProcess(bool background = false);
|
||||
void exitCardDatabaseUpdate();
|
||||
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ public:
|
|||
const QSet<QString> &getAltNames()
|
||||
{
|
||||
return altNames;
|
||||
};
|
||||
}
|
||||
[[nodiscard]] const QString &getText() const
|
||||
{
|
||||
return text;
|
||||
|
|
|
|||
|
|
@ -53,6 +53,6 @@ inline static const QString getNicePropertyName(QString key)
|
|||
return QCoreApplication::translate("Mtg", "Color Identity");
|
||||
return key;
|
||||
}
|
||||
}; // namespace Mtg
|
||||
} // namespace Mtg
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ protected:
|
|||
virtual QString getCardZoneFromName(const QString /*cardName*/, QString currentZoneName)
|
||||
{
|
||||
return currentZoneName;
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Produce the complete display name of a card.
|
||||
|
|
@ -169,7 +169,7 @@ protected:
|
|||
virtual QString getCompleteCardName(const QString &cardName) const
|
||||
{
|
||||
return cardName;
|
||||
};
|
||||
}
|
||||
|
||||
signals:
|
||||
/// Emitted when the deck hash changes.
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@ public:
|
|||
[[nodiscard]] QModelIndex getRoot() const
|
||||
{
|
||||
return nodeToIndex(root);
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Returns the value of the grouping category for a card based on the current criteria.
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ public:
|
|||
QString getConnectionType() const override
|
||||
{
|
||||
return "local";
|
||||
};
|
||||
}
|
||||
void transmitProtocolItem(const ServerMessage &item) override;
|
||||
signals:
|
||||
void itemToClient(const ServerMessage &item);
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ public:
|
|||
virtual void prepareDestroy()
|
||||
{
|
||||
removeFromGame();
|
||||
};
|
||||
}
|
||||
void removeFromGame();
|
||||
Server_AbstractUserInterface *getUserInterface() const
|
||||
{
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ public:
|
|||
virtual bool usernameIsValid(const QString & /*userName */, QString & /* error */)
|
||||
{
|
||||
return true;
|
||||
};
|
||||
}
|
||||
public slots:
|
||||
virtual void endSession(qint64 /* sessionId */)
|
||||
{
|
||||
|
|
@ -154,16 +154,16 @@ public:
|
|||
int & /* banSecondsRemaining */)
|
||||
{
|
||||
return false;
|
||||
};
|
||||
}
|
||||
virtual int checkNumberOfUserAccounts(const QString & /* email */)
|
||||
{
|
||||
return 0;
|
||||
};
|
||||
}
|
||||
virtual bool
|
||||
changeUserPassword(const QString & /* user */, const QString & /* password */, bool /* passwordNeedsHash */)
|
||||
{
|
||||
return false;
|
||||
};
|
||||
}
|
||||
virtual bool changeUserPassword(const QString & /* user */,
|
||||
const QString & /* oldPassword */,
|
||||
bool /* oldPasswordNeedsHash */,
|
||||
|
|
@ -171,7 +171,7 @@ public:
|
|||
bool /* newPasswordNeedsHash */)
|
||||
{
|
||||
return false;
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ public:
|
|||
QString getConnectionType() const
|
||||
{
|
||||
return "tcp";
|
||||
};
|
||||
}
|
||||
|
||||
private:
|
||||
QTcpSocket *socket;
|
||||
|
|
@ -190,11 +190,11 @@ protected:
|
|||
void writeToSocket(QByteArray &data)
|
||||
{
|
||||
socket->write(data);
|
||||
};
|
||||
}
|
||||
void flushSocket()
|
||||
{
|
||||
socket->flush();
|
||||
};
|
||||
}
|
||||
void initSessionDeprecated();
|
||||
bool initTcpSession();
|
||||
protected slots:
|
||||
|
|
@ -224,7 +224,7 @@ public:
|
|||
QString getConnectionType() const
|
||||
{
|
||||
return "websocket";
|
||||
};
|
||||
}
|
||||
|
||||
private:
|
||||
QWebSocket *socket;
|
||||
|
|
@ -234,11 +234,11 @@ protected:
|
|||
void writeToSocket(QByteArray &data)
|
||||
{
|
||||
socket->sendBinaryMessage(data);
|
||||
};
|
||||
}
|
||||
void flushSocket()
|
||||
{
|
||||
socket->flush();
|
||||
};
|
||||
}
|
||||
bool initWebsocketSession();
|
||||
protected slots:
|
||||
void binaryMessageReceived(const QByteArray &message);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user