i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tracker: Remove duplicated logic to check for temporary queries.

Browse Source 
It wasn't used anyway.
This commit is contained in:
Augustin Cavalier
2024-10-18 14:53:21 -04:00
parent 4f83537025
commit abaac74f80
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/FindPanel.cpp
+4 -12
View File
@@ -713,8 +713,6 @@ FindWindow::SaveQueryAsAttributes(BNode* file, BEntry* entry, bool queryTemplate
} }
} }
file->WriteAttr("_trk/temporary", B_BOOL_TYPE, 0, &temporary, sizeof(temporary));
MoreOptionsStruct saveMoreOptions; MoreOptionsStruct saveMoreOptions;
saveMoreOptions.searchTrash = fSearchInTrash->IsMarked(); saveMoreOptions.searchTrash = fSearchInTrash->IsMarked();
saveMoreOptions.temporary = temporary; saveMoreOptions.temporary = temporary;
@@ -2546,8 +2544,8 @@ CheckForDuplicates(BObjectList<EntryWithDate>* list, EntryWithDate* entry)
void void
FindPanel::AddRecentQueries(BMenu* menu, bool addSaveAsItem, const BMessenger* target, uint32 what, FindPanel::AddRecentQueries(BMenu* menu, bool addSaveAsItem, const BMessenger* target,
bool includeTemplates, bool includeTemporaryQueries, bool includePersistedQueries) uint32 what, bool includeTemplates)
{ {
BObjectList<entry_ref> templates(10, true); BObjectList<entry_ref> templates(10, true);
BObjectList<EntryWithDate> recentQueries(10, true); BObjectList<EntryWithDate> recentQueries(10, true);
@@ -2557,8 +2555,7 @@ FindPanel::AddRecentQueries(BMenu* menu, bool addSaveAsItem, const BMessenger* t
BVolume volume; BVolume volume;
roster.Rewind(); roster.Rewind();
while (roster.GetNextVolume(&volume) == B_OK) { while (roster.GetNextVolume(&volume) == B_OK) {
if (volume.IsPersistent() && volume.KnowsQuery() if (volume.IsPersistent() && volume.KnowsQuery() && volume.KnowsAttr()) {
&& volume.KnowsAttr()) {
BQuery query; BQuery query;
query.SetVolume(&volume); query.SetVolume(&volume);
query.SetPredicate("_trk/recentQuery == 1"); query.SetPredicate("_trk/recentQuery == 1");
@@ -2579,16 +2576,11 @@ FindPanel::AddRecentQueries(BMenu* menu, bool addSaveAsItem, const BMessenger* t
if (strcasecmp(type, B_QUERY_TEMPLATE_MIMETYPE) == 0 && includeTemplates) { if (strcasecmp(type, B_QUERY_TEMPLATE_MIMETYPE) == 0 && includeTemplates) {
templates.AddItem(new entry_ref(ref)); templates.AddItem(new entry_ref(ref));
} else if (strcasecmp(type, B_QUERY_MIMETYPE) == 0) { } else if (strcasecmp(type, B_QUERY_MIMETYPE) == 0) {
bool isTemporary = true;
node.ReadAttr("_trk/temporary", B_BOOL_TYPE, 0, &isTemporary, sizeof(bool));
int32 changeTime; int32 changeTime;
if (node.ReadAttr(kAttrQueryLastChange, B_INT32_TYPE, 0, &changeTime, if (node.ReadAttr(kAttrQueryLastChange, B_INT32_TYPE, 0, &changeTime,
sizeof(int32)) == sizeof(int32)) { sizeof(int32)) == sizeof(int32)) {
EntryWithDate* item = new EntryWithDate(ref, changeTime); EntryWithDate* item = new EntryWithDate(ref, changeTime);
if (((isTemporary && includeTemporaryQueries) if (!CheckForDuplicates(&recentQueries, item)) {
|| (!isTemporary && includePersistedQueries))
&& !CheckForDuplicates(&recentQueries, item)) {
recentQueries.AddItem(item); recentQueries.AddItem(item);
} else { } else {
delete item; delete item;
src/kits/tracker/FindPanel.h
+1 -3
View File
@@ -243,9 +243,7 @@ public:
// populate the recent query menu with query templates and recent queries // populate the recent query menu with query templates and recent queries
static void AddRecentQueries(BMenu*, bool addSaveAsItem, static void AddRecentQueries(BMenu*, bool addSaveAsItem,
const BMessenger* target, uint32 what, const BMessenger* target, uint32 what,
bool includeTemplates = true, bool includeTemplates = true);
bool includeTemporaryQueries = true,
bool includePersistedQueries = true);
status_t SaveDirectoryFiltersToFile(BNode*); status_t SaveDirectoryFiltersToFile(BNode*);
void LoadDirectoryFiltersFromFile(const BNode*); void LoadDirectoryFiltersFromFile(const BNode*);