Port some things away from Omittable
This commit is contained in:
@@ -122,7 +122,7 @@ private:
|
|||||||
|
|
||||||
QString m_searchText;
|
QString m_searchText;
|
||||||
QPointer<NeoChatRoom> m_room;
|
QPointer<NeoChatRoom> m_room;
|
||||||
Quotient::Omittable<Quotient::SearchJob::ResultRoomEvents> m_result = Quotient::none;
|
std::optional<Quotient::SearchJob::ResultRoomEvents> m_result = std::nullopt;
|
||||||
Quotient::SearchJob *m_job = nullptr;
|
Quotient::SearchJob *m_job = nullptr;
|
||||||
bool m_searching = false;
|
bool m_searching = false;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ private:
|
|||||||
QHash<QString, QList<QString>> m_spaceHierarchy;
|
QHash<QString, QList<QString>> m_spaceHierarchy;
|
||||||
void cacheSpaceHierarchy();
|
void cacheSpaceHierarchy();
|
||||||
|
|
||||||
QHash<QString, Quotient::Omittable<QString>> m_nextBatchTokens;
|
QHash<QString, std::optional<QString>> m_nextBatchTokens;
|
||||||
void populateSpaceHierarchy(const QString &spaceId);
|
void populateSpaceHierarchy(const QString &spaceId);
|
||||||
void addBatch(const QString &spaceId, Quotient::GetSpaceHierarchyJob *job);
|
void addBatch(const QString &spaceId, Quotient::GetSpaceHierarchyJob *job);
|
||||||
QPointer<NeoChatConnection> m_connection;
|
QPointer<NeoChatConnection> m_connection;
|
||||||
|
|||||||
Reference in New Issue
Block a user