code merge

This commit is contained in:
Max-Wilhelm Bruker
2011-01-15 21:41:16 +01:00
23 changed files with 257 additions and 75 deletions

View File

@@ -61,6 +61,7 @@ public:
bool getReceiverMayDelete() const { return receiverMayDelete; }
void setReceiverMayDelete(bool _receiverMayDelete) { receiverMayDelete = _receiverMayDelete; }
ProtocolItem(const QString &_itemType, const QString &_itemSubType);
bool isEmpty() const { return false; }
};
class ProtocolItem_Invalid : public ProtocolItem {
@@ -80,6 +81,7 @@ public:
TopLevelProtocolItem();
bool readElement(QXmlStreamReader *xml);
void writeElement(QXmlStreamWriter *xml);
bool isEmpty() const { return false; }
};
// ----------------
@@ -161,6 +163,15 @@ public:
void setGameId(int _gameId) { static_cast<SerializableItem_Int *>(itemMap.value("game_id"))->setData(_gameId); }
};
class AdminCommand : public Command {
Q_OBJECT
public:
AdminCommand(const QString &_cmdName)
: Command(_cmdName)
{
}
};
class Command_DeckUpload : public Command {
Q_OBJECT
public: