Moved scanWorkspace to Repository

FossilOrigin-Name: 61734cf430e041d514222c71f751feead5b7faf6
This commit is contained in:
kostas
2015-04-30 10:30:47 +00:00
parent 97f210fd46
commit d289dee92b
4 changed files with 58 additions and 41 deletions

View File

@ -124,7 +124,12 @@ public:
stashmap_t stashMap;
stringset_t selectedDirs; // The directory selected in the tree
Bridge bridge;
Bridge & fossil() { return bridge; }
const Bridge & fossil() const { return bridge; }
static bool scanDirectory(QFileInfoList &entries, const QString& dirPath, const QString &baseDir, const QString ignoreSpec, const bool& abort, Bridge::UICallback &uiCallback);
void scanWorkspace(bool scanLocal, bool scanIgnored, bool scanModified, bool scanUnchanged, const QString &ignoreGlob, Bridge::UICallback &uiCallback, bool &operationAborted);
};
//////////////////////////////////////////////////////////////////////////
@ -165,7 +170,6 @@ private:
void loadFossilSettings();
QString getFossilPath();
QString getFossilHttpAddress();
//static bool scanDirectory(QFileInfoList &entries, const QString& dirPath, const QString &baseDir, const QString ignoreSpec, const bool& abort);
void updateDirView();
void updateFileView();
void updateStashView();
@ -268,13 +272,12 @@ private:
class QShortcut *abortShortcut;
bool operationAborted;
Bridge bridge;
Bridge & fossil() { return bridge; }
const Bridge & fossil() const { return bridge; }
Repository repo;
Repository & getRepo() { return repo; }
Bridge & fossil() { return repo.bridge; }
const Bridge & fossil() const { return repo.bridge; }
Settings &settings;
QStringList workspaceHistory;