Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/windirstat/windirstat.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Schneider <oliver@assarbad.net>2012-10-01 02:21:44 +0400
committerOliver Schneider <oliver@assarbad.net>2012-10-01 02:21:44 +0400
commitc4be63974c5acac2f96bb8dde4bac4004f202638 (patch)
treec8cec951a4c08548d4e6c87e1ca7f45223b12bbf /windirstat/item.cpp
parent6046b5a3b15be75fb9be53286586eebec274ec94 (diff)
Replaying a number of changes from my private clone
- Adding and removing a few files - Adjusted VS2010 project to exclude the resource DLLs - WDS_Lua_C.c builds nicely now - Introducing WEAK_ASSERT - Premake signed binary (from rev 696d6c41518e or premake/premake-stable) - Adding an initial premake4.lua ... works alright, but needs more fine-tuning
Diffstat (limited to 'windirstat/item.cpp')
-rw-r--r--windirstat/item.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/windirstat/item.cpp b/windirstat/item.cpp
index 53b6568..c296a73 100644
--- a/windirstat/item.cpp
+++ b/windirstat/item.cpp
@@ -1010,12 +1010,12 @@ void CItem::SetDone()
}
}
-#ifdef _DEBUG
- for(int i = 0; i < GetChildrenCount(); i++)
- {
- ASSERT(GetChild(i)->IsDone());
- }
-#endif // _DEBUG
+// #ifdef _DEBUG
+// for(int i = 0; i < GetChildrenCount(); i++)
+// {
+// ASSERT(GetChild(i)->IsDone());
+// }
+// #endif // _DEBUG
//m_children.FreeExtra(); // Doesn't help much.
qsort(m_children.GetData(), m_children.GetSize(), sizeof(CItem *), &_compareBySize);
@@ -1091,32 +1091,32 @@ void CItem::DoSomeWork(DWORD ticks)
}
}
- CItem *filesFolder = 0;
- if(dirCount > 0 && fileCount > 1)
- {
- filesFolder = new CItem(IT_FILESFOLDER, LoadString(IDS_FILES_ITEM));
- filesFolder->SetReadJobDone();
- AddChild(filesFolder);
- }
- else if(fileCount > 0)
- {
- filesFolder = this;
- }
+// CItem *filesFolder = 0;
+// if(dirCount > 0 && fileCount > 1)
+// {
+// filesFolder = new CItem(IT_FILESFOLDER, LoadString(IDS_FILES_ITEM));
+// filesFolder->SetReadJobDone();
+// AddChild(filesFolder);
+// }
+// if(fileCount > 0)
+// {
+// filesFolder = this;
+// }
for(POSITION pos = files.GetHeadPosition(); pos != NULL; files.GetNext(pos))
{
const FILEINFO& fi = files.GetAt(pos);
- filesFolder->AddFile(fi);
+ this->AddFile(fi);
}
- if(filesFolder != NULL)
- {
- filesFolder->UpwardAddFiles(fileCount);
- if(dirCount > 0 && fileCount > 1)
+// if(filesFolder != NULL)
+// {
+ this->UpwardAddFiles(fileCount);
+ if(dirCount > 0 && fileCount > 0)
{
- filesFolder->SetDone();
+ this->SetDone();
}
- }
+// }
UpwardAddSubdirs(dirCount);
SetReadJobDone();