fix cpp check, and unsaved stuff from previous commit

This commit is contained in:
Ondřej Fischer 2019-11-28 16:02:35 +01:00
parent 53697249c6
commit dd0f8fe267
3 changed files with 6 additions and 3 deletions

View File

@ -41,7 +41,7 @@ struct PreparedData
{ {
public: public:
PreparedData() = default; PreparedData() = default;
PreparedData(std::shared_ptr<Data> database, std::shared_ptr<Data> colnod) PreparedData(const std::shared_ptr<Data> &database, const std::shared_ptr<Data> &colnod)
:databaseData(database), colnodData(colnod) :databaseData(database), colnodData(colnod)
{ {
} }

View File

@ -48,13 +48,14 @@ public:
bool isValid(); bool isValid();
qint16 getNumOfTokensOfSubject(const QString &id);
QString getSubjectNameByTokenId(const QString &tokenId);
private: private:
int exists(const QString &id, const QString &tableName); int exists(const QString &id, const QString &tableName);
QSqlQuery getUpdatedTokens(); QSqlQuery getUpdatedTokens();
std::shared_ptr<Data> composeData(const QSqlQuery &updatedQuery, QSqlQuery &deletedQuery); std::shared_ptr<Data> composeData(const QSqlQuery &updatedQuery, QSqlQuery &deletedQuery);
qint16 getNumOfTokensOfSubject(const QString &id);
QString getSubjectNameByTokenId(const QString &tokenId);
signals: signals:
void downloadDataFinished(std::shared_ptr<Data> = std::shared_ptr<Data>()); void downloadDataFinished(std::shared_ptr<Data> = std::shared_ptr<Data>());

View File

@ -28,6 +28,8 @@ private:
std::unique_ptr<PreparedData> prepareDataNew(const std::shared_ptr<Data> &databaseData, const std::shared_ptr<Data> &colnodData); std::unique_ptr<PreparedData> prepareDataNew(const std::shared_ptr<Data> &databaseData, const std::shared_ptr<Data> &colnodData);
private: private:
void initNewToken(std::shared_ptr<Token> token);
bool downloadData(); bool downloadData();
bool prepareData(); bool prepareData();
bool processData(); bool processData();