Changeset 2942

Timestamp:

10/29/08 13:42:41 (17 months ago)

Author:

kris

Message:

Little more code cleanup for the system updater enhancements. Seems to work much nicer now, proxy support has been tested
here as well, works also.

Location:

pcbsd

Files:

• branches/7.0/SystemUpdater/UpdaterTray.cpp (modified) (2 diffs)
• branches/7.0/SystemUpdater/UpdaterTray.h (modified) (1 diff)
• trunk/SystemUpdater/UpdaterTray.cpp (modified) (2 diffs)
• trunk/SystemUpdater/UpdaterTray.h (modified) (1 diff)

pcbsd/branches/7.0/SystemUpdater/UpdaterTray.cpp

@@ -1760 +1760 @@
 
 
-// Read the results to see if this PBI needs an Update
-void UpdaterTray::slotReadPBIStatusResults()
-{
-    
-    QString line;
-
-
-    while( checkPBIProc->canReadLineStdout() )
-    {
-        line = checkPBIProc->readLineStdout();
-        if (line.find("NewVer:" ) ==  0 )
-        {
-            PBIProgNewVer[currentWorkingPBI] = line.replace("NewVer: ", "");
-        }
-        if ( line.find("FileURL1:") == 0)
-        {
-            PBIProgURL1[currentWorkingPBI] = line.replace("FileURL1: ", "");
-            // We have valid data! Set the flag that this PBI is in need of an update
-            PBIProgUpdate[currentWorkingPBI] = 1;
-            //QMessageBox::critical( 0, tr("Online Update"), "Found update to:" + PBIProgName[currentWorkingPBI], QMessageBox::Ok );
-        }
-        // Check for our other file locations
-        if ( line.find("FileURL2:") == 0)
-        {
-            PBIProgURL2[currentWorkingPBI] = line.replace("FileURL2: ", "");
-        }
-        if ( line.find("FileURL3:") == 0)
-        {
-            PBIProgURL3[currentWorkingPBI] = line.replace("FileURL3: ", "");
-        }
-        if ( line.find("MD5:") == 0)
-        {
-            PBIProgMD5[currentWorkingPBI] = line.replace("MD5: ", "");
-        }
-
-    }
-
-}
-
-
-
-
 // The update checking is finished, now see if we have any PBIs which need an update
 void UpdaterTray::slotPopulatePBIList()
@@ -1807 +1765 @@
   int i = 0, foundUpdates = 0;
   QString text, tmp, newMsg, ProgDirName, iconPath;
-
-
-
-
 
     while (! PBIProgName[i].isEmpty() )

pcbsd/branches/7.0/SystemUpdater/UpdaterTray.h

@@ -44 +44 @@
    void slotStartPBIUpdateCheck();
    void slotPBICheckUpdate();
-   void slotReadPBIStatusResults();
    void slotPopulatePBIList();
    void slotStartPBIUpgrades();

pcbsd/trunk/SystemUpdater/UpdaterTray.cpp

@@ -1760 +1760 @@
 
 
-// Read the results to see if this PBI needs an Update
-void UpdaterTray::slotReadPBIStatusResults()
-{
-    
-    QString line;
-
-
-    while( checkPBIProc->canReadLineStdout() )
-    {
-        line = checkPBIProc->readLineStdout();
-        if (line.find("NewVer:" ) ==  0 )
-        {
-            PBIProgNewVer[currentWorkingPBI] = line.replace("NewVer: ", "");
-        }
-        if ( line.find("FileURL1:") == 0)
-        {
-            PBIProgURL1[currentWorkingPBI] = line.replace("FileURL1: ", "");
-            // We have valid data! Set the flag that this PBI is in need of an update
-            PBIProgUpdate[currentWorkingPBI] = 1;
-            //QMessageBox::critical( 0, tr("Online Update"), "Found update to:" + PBIProgName[currentWorkingPBI], QMessageBox::Ok );
-        }
-        // Check for our other file locations
-        if ( line.find("FileURL2:") == 0)
-        {
-            PBIProgURL2[currentWorkingPBI] = line.replace("FileURL2: ", "");
-        }
-        if ( line.find("FileURL3:") == 0)
-        {
-            PBIProgURL3[currentWorkingPBI] = line.replace("FileURL3: ", "");
-        }
-        if ( line.find("MD5:") == 0)
-        {
-            PBIProgMD5[currentWorkingPBI] = line.replace("MD5: ", "");
-        }
-
-    }
-
-}
-
-
-
-
 // The update checking is finished, now see if we have any PBIs which need an update
 void UpdaterTray::slotPopulatePBIList()
@@ -1807 +1765 @@
   int i = 0, foundUpdates = 0;
   QString text, tmp, newMsg, ProgDirName, iconPath;
-
-
-
-
 
     while (! PBIProgName[i].isEmpty() )

pcbsd/trunk/SystemUpdater/UpdaterTray.h

@@ -44 +44 @@
    void slotStartPBIUpdateCheck();
    void slotPBICheckUpdate();
-   void slotReadPBIStatusResults();
    void slotPopulatePBIList();
    void slotStartPBIUpgrades();