Changeset 1766 for trunk/gsinstaller

Timestamp:

2000-12-08T04:17:20+13:00 (23 years ago)

Author:

cs025

Message:

No true alterations; any differences should be merely whitespace from
debugging.

Location:

trunk/gsinstaller

Files:

• fileCopier.cpp (modified) (5 diffs)
• fileCopier.h (modified) (1 diff)

trunk/gsinstaller/fileCopier.cpp

@@ -73 +73 @@
  * Copy a particular file to its destination
  */
-bool fileCopySet::copyFile(File *file, fileCopyMonitor *monitor, copyProgressBar &progressBar)
+bool fileCopySet::copyFile(File *file, fileCopyMonitor *monitor, copyProgressBar *progressBar)
 {
   unsigned long copied = 0;
@@ -141 +141 @@
  *  destination
  */
-void fileCopySet::copy(File *file, fileCopyMonitor *monitor, copyProgressBar &progressBar)
+void fileCopySet::copy(File *file, fileCopyMonitor *monitor, copyProgressBar *progressBar)
 {
   // just skip this file if it doesn't exist
@@ -152 +152 @@
   if (file->isDirectory())
     {
+
       // get destination directory
       char *thisDestDir = this->destination(file);
@@ -191 +192 @@
     }
 
-  progressBar.done(file->getRawFileSize());
-}
-
-void fileCopySet::copy(fileCopyMonitor *monitor, copyProgressBar &progressBar)
+  if (progressBar != NULL)
+  { progressBar->done(file->getRawFileSize());
+  }
+}
+
+void fileCopySet::copy(fileCopyMonitor *monitor, copyProgressBar *progressBar)
 {
   FileVector::iterator here = fileList.begin();
@@ -322 +325 @@
   fileCopySetList::iterator end = list.end();
 
+
   this->progressBar.show();
   while (here != end)
     {
-      here->copy(this->monitor, this->progressBar);
+      here->copy(this->monitor, &this->progressBar);
       here ++;
     }

trunk/gsinstaller/fileCopier.h

@@ -27 +27 @@
   unsigned long getCopiedSize(DiskSpace &space);
   bool ensureParent(FilePath &child, fileCopyMonitor *monitor);
-  bool copyFile(File *file, fileCopyMonitor *monitor, copyProgressBar &progressBar);
-  void copy(File *file, fileCopyMonitor *monitor, copyProgressBar &progressBar);
-  void copy(fileCopyMonitor *monitor, copyProgressBar &progressBar);
+  bool copyFile(File *file, fileCopyMonitor *monitor, copyProgressBar *progressBar);
+  void copy(File *file, fileCopyMonitor *monitor, copyProgressBar *progressBar);
+  void copy(fileCopyMonitor *monitor, copyProgressBar *progressBar);
 };