Changeset 1673 for trunk/gsinstaller

Timestamp:

2000-11-16T09:13:48+13:00 (23 years ago)

Author:

cs025

Message:

Fixed problem in uninstalling which appeared when uninstalling the shortcut
icons.
Parameters to undo didn't permit two parameters to be the same, and if for
example a shortcut was in a group with the same name, a parameter
disappeared. Fixed by extending stringArray class to be configured to accept
duplicate entries.

Location:

trunk/gsinstaller

Files:

• stringArray.cpp (modified) (1 diff)
• stringArray.h (modified) (1 diff)
• unInstall.cpp (modified) (3 diffs)
• unInstall.h (modified) (1 diff)

trunk/gsinstaller/stringArray.cpp

@@ -26 +26 @@
 }
 
+void stringArray::permitDuplication(bool permit)
+{   this->permitDups    = permit;
+}
+
 /**
  * Add a new string to the array
  */
 void stringArray::add(string member)
-{   if (!this->includes(member))
+{   if (this->permitDups || !this->includes(member))
     { this->array.push_back(member);
   }

trunk/gsinstaller/stringArray.h

@@ -19 +19 @@
 {
 private:
+  vector<string> array;
+  bool                   permitDups;
 protected:
 public:
-  vector<string> array;
   stringArray();
   stringArray(char *list, char *divider);
+  void permitDuplication(bool permit);
   void add(char *member);
   void add(string member);

trunk/gsinstaller/unInstall.cpp

@@ -57 +57 @@
     // open the log file 
     this->logfile.open(this->logfileName.c_str(), ios::in);
+#ifndef __BORLANDC__
     if (this->logfile.is_open())
+#else
+    if (this->logfile.rdbuf()->is_open())
+#endif
     {
         // Get the commands into this object from the existing log file
@@ -225 +229 @@
 
 bool installManager::recordLog()
-{ 
-    // just return if there are no changes to record
+{   // just return if there are no changes to record
     if (this->changed == false)
-    {   return true;
+    { return true;
     }
 
@@ -237 +240 @@
     this->ensureLog();
     this->logfile.open(this->logfileName.c_str(), ios::out);
+#ifndef __BORLANDC__
     if (!this->logfile.is_open())
+#else
+    if (!this->logfile.rdbuf()->is_open())
+#endif
     {   MessageBox(0, "Unable to open log file", "Test", MB_OK);
     }

trunk/gsinstaller/unInstall.h

@@ -32 +32 @@
   stringArray parameters;
 
-  unInstallCommand() { };
-  unInstallCommand(string commandname) { this->command = commandname; };
+  unInstallCommand()
+  { this->parameters.permitDuplication(true);
+  }
+  unInstallCommand(string commandname)
+  { this->command = commandname;
+    this->parameters.permitDuplication(true);
+  }
   unInstallCommand(string commandname, stringArray params)
-  { 
+  {
     this->command = commandname;
     this->parameters = params;
+    this->parameters.permitDuplication(true);
   };
   void addParameter(string parameter) { this->parameters.add(parameter); };