self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-04-14 11:18:47 +02:00
Code Issues Releases Activity

refactoring

Browse Source
This commit is contained in:
Laurent Cozic 2017-01-13 21:19:47 +01:00
parent 31ded8c6a9
commit 91e74f024e
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
QtClient/JoplinQtClient/models/abstractlistmodel.cpp
View File

@ -106,3 +106,16 @@ QHash<int, QByteArray> AbstractListModel::roleNames() const {
//roles[RawRole] = "raw"; //roles[RawRole] = "raw";
return roles; return roles;
} }
QString AbstractListModel::indexToId(int index) const {
return data(this->index(index), IdRole).toString();
}
int AbstractListModel::idToIndex(const QString &id) const {
qFatal("AbstractListModel::idToIndex() not implemented");
return -1;
}
QString AbstractListModel::lastInsertId() const {
return lastInsertId_;
}

5
QtClient/JoplinQtClient/models/abstractlistmodel.h
View File

@ -27,6 +27,8 @@ public:
protected: protected:
QString lastInsertId_;
virtual int baseModelCount() const; virtual int baseModelCount() const;
// All these methods are const because we want to be able to clear the // All these methods are const because we want to be able to clear the
@ -48,6 +50,9 @@ public slots:
bool virtualItemShown() const; bool virtualItemShown() const;
void hideVirtualItem(); void hideVirtualItem();
QHash<int, QByteArray> roleNames() const; QHash<int, QByteArray> roleNames() const;
virtual QString indexToId(int index) const;
virtual int idToIndex(const QString& id) const;
QString lastInsertId() const;
}; };

13
QtClient/JoplinQtClient/models/foldermodel.cpp
View File

@ -33,9 +33,9 @@ BaseModel* FolderModel::atIndex(int index) const {
} }
} }
QString FolderModel::indexToId(int index) const { //QString FolderModel::indexToId(int index) const {
return data(this->index(index), IdRole).toString(); // return data(this->index(index), IdRole).toString();
} //}
int FolderModel::idToIndex(const QString &id) const { int FolderModel::idToIndex(const QString &id) const {
int count = this->rowCount(); int count = this->rowCount();
@ -46,9 +46,10 @@ int FolderModel::idToIndex(const QString &id) const {
return -1; return -1;
} }
QString FolderModel::lastInsertId() const { //QString FolderModel::lastInsertId() const {
return lastInsertId_; // return lastInsertId_;
} //}
bool FolderModel::setTitle(int index, const QVariant &value, int role) { bool FolderModel::setTitle(int index, const QVariant &value, int role) {
return setData(this->index(index), value, role); return setData(this->index(index), value, role);

6
QtClient/JoplinQtClient/models/foldermodel.h
View File

@ -35,16 +35,16 @@ private:
QString orderBy_; QString orderBy_;
mutable std::vector<std::unique_ptr<Folder>> cache_; mutable std::vector<std::unique_ptr<Folder>> cache_;
QString lastInsertId_; //QString lastInsertId_;
public slots: public slots:
void addData(const QString& title); void addData(const QString& title);
void deleteData(const int index); void deleteData(const int index);
bool setTitle(int index, const QVariant &value, int role = Qt::EditRole); bool setTitle(int index, const QVariant &value, int role = Qt::EditRole);
QString indexToId(int index) const; //QString indexToId(int index) const;
int idToIndex(const QString& id) const; int idToIndex(const QString& id) const;
QString lastInsertId() const; //QString lastInsertId() const;
void dispatcher_folderCreated(const QString& folderId); void dispatcher_folderCreated(const QString& folderId);
void dispatcher_folderUpdated(const QString& folderId); void dispatcher_folderUpdated(const QString& folderId);