Menu
▾
▴
[Planeshift-cvs] SF.net SVN: planeshift: [259] trunk/src/pslaunch
|
From: <mg...@us...> - 2007-11-13 03:45:31
|
Revision: 259
http://planeshift.svn.sourceforge.net/planeshift/?rev=259&view=rev
Author: mgist
Date: 2007-11-12 19:45:35 -0800 (Mon, 12 Nov 2007)
Log Message:
-----------
- A few class renames and improvement to UpdaterEngine ctor.
Modified Paths:
--------------
trunk/src/pslaunch/download.cpp
trunk/src/pslaunch/download.h
trunk/src/pslaunch/pslaunch.cpp
trunk/src/pslaunch/updater.cpp
trunk/src/pslaunch/updater.h
trunk/src/pslaunch/updaterconfig.cpp
trunk/src/pslaunch/updaterconfig.h
trunk/src/pslaunch/updaterengine.cpp
trunk/src/pslaunch/updaterengine.h
Modified: trunk/src/pslaunch/download.cpp
===================================================================
--- trunk/src/pslaunch/download.cpp 2007-11-12 22:13:31 UTC (rev 258)
+++ trunk/src/pslaunch/download.cpp 2007-11-13 03:45:35 UTC (rev 259)
@@ -29,7 +29,7 @@
return written;
}
-Downloader::Downloader(csRef<iVFS> _vfs, psUpdaterConfig* _config)
+Downloader::Downloader(csRef<iVFS> _vfs, UpdaterConfig* _config)
{
curl_global_init(CURL_GLOBAL_ALL);
curl = curl_easy_init();
Modified: trunk/src/pslaunch/download.h
===================================================================
--- trunk/src/pslaunch/download.h 2007-11-12 22:13:31 UTC (rev 258)
+++ trunk/src/pslaunch/download.h 2007-11-13 03:45:35 UTC (rev 259)
@@ -27,7 +27,7 @@
class Downloader
{
public:
- Downloader(csRef<iVFS> _vfs, psUpdaterConfig* _config);
+ Downloader(csRef<iVFS> _vfs, UpdaterConfig* _config);
Downloader(csRef<iVFS> _vfs);
~Downloader();
@@ -60,7 +60,7 @@
csRef<iVFS> vfs;
/* Config pointer */
- psUpdaterConfig* config;
+ UpdaterConfig* config;
};
#endif // __DOWNLOAD_H__
Modified: trunk/src/pslaunch/pslaunch.cpp
===================================================================
--- trunk/src/pslaunch/pslaunch.cpp 2007-11-12 22:13:31 UTC (rev 258)
+++ trunk/src/pslaunch/pslaunch.cpp 2007-11-13 03:45:35 UTC (rev 259)
@@ -313,7 +313,7 @@
csArray<csString> consoleOut;
// Initialize updater engine.
- psUpdaterEngine* engine = new psUpdaterEngine(args, object_reg, "pslaunch", &performUpdate, &exitGUI, &updateNeeded, &consoleOut, &mutex);
+ UpdaterEngine* engine = new UpdaterEngine(args, object_reg, "pslaunch", &performUpdate, &exitGUI, &updateNeeded, &consoleOut, &mutex);
// If we're self updating, continue self update.
if(engine->GetConfig()->IsSelfUpdating())
Modified: trunk/src/pslaunch/updater.cpp
===================================================================
--- trunk/src/pslaunch/updater.cpp 2007-11-12 22:13:31 UTC (rev 258)
+++ trunk/src/pslaunch/updater.cpp 2007-11-13 03:45:35 UTC (rev 259)
@@ -49,7 +49,7 @@
csInitializer::DestroyApplication(object_reg);
}
-void psUpdater::RunUpdate(psUpdaterEngine* engine)
+void psUpdater::RunUpdate(UpdaterEngine* engine)
{
// Check if we're already in the middle of a self-update.
if(engine->GetConfig()->IsSelfUpdating())
@@ -77,12 +77,8 @@
args.Push(argv[i]);
}
- // Inputs to satisfy updaterengine.
- bool a = false, b = false, c = true;
- csArray<csString> d;
-
// Initialize updater engine.
- psUpdaterEngine* engine = new psUpdaterEngine(args, updater->GetObjectRegistry(), "psupdater", &a, &b, &c, &d, NULL);
+ UpdaterEngine* engine = new UpdaterEngine(args, updater->GetObjectRegistry(), "psupdater");
// Run the update process!
updater->RunUpdate(engine);
Modified: trunk/src/pslaunch/updater.h
===================================================================
--- trunk/src/pslaunch/updater.h 2007-11-12 22:13:31 UTC (rev 258)
+++ trunk/src/pslaunch/updater.h 2007-11-13 03:45:35 UTC (rev 259)
@@ -35,7 +35,7 @@
psUpdater(int argc, char* argv[]);
~psUpdater();
iObjectRegistry* GetObjectRegistry(){ return object_reg; }
- void RunUpdate(psUpdaterEngine* engine);
+ void RunUpdate(UpdaterEngine* engine);
private:
static iObjectRegistry* object_reg;
};
Modified: trunk/src/pslaunch/updaterconfig.cpp
===================================================================
--- trunk/src/pslaunch/updaterconfig.cpp 2007-11-12 22:13:31 UTC (rev 258)
+++ trunk/src/pslaunch/updaterconfig.cpp 2007-11-13 03:45:35 UTC (rev 259)
@@ -21,9 +21,9 @@
#include "updaterconfig.h"
-iObjectRegistry* psUpdaterConfig::object_reg = NULL;
+iObjectRegistry* UpdaterConfig::object_reg = NULL;
-psUpdaterConfig::psUpdaterConfig(csArray<csString> args, iObjectRegistry* _object_reg, csRef<iVFS> _vfs)
+UpdaterConfig::UpdaterConfig(csArray<csString> args, iObjectRegistry* _object_reg, csRef<iVFS> _vfs)
{
// Initialize the config manager.
object_reg = _object_reg;
@@ -60,7 +60,7 @@
newCon = new Config;
}
-psUpdaterConfig::~psUpdaterConfig()
+UpdaterConfig::~UpdaterConfig()
{
delete currentCon;
delete newCon;
Modified: trunk/src/pslaunch/updaterconfig.h
===================================================================
--- trunk/src/pslaunch/updaterconfig.h 2007-11-12 22:13:31 UTC (rev 258)
+++ trunk/src/pslaunch/updaterconfig.h 2007-11-13 03:45:35 UTC (rev 259)
@@ -36,7 +36,7 @@
#define PS_PAUSEEXIT(x) exit(x)
#endif
-class psUpdaterConfig;
+class UpdaterConfig;
class Mirror
{
@@ -128,11 +128,11 @@
csPDelArray<ClientVersion> clientVersions;
};
-class psUpdaterConfig
+class UpdaterConfig
{
public:
- psUpdaterConfig(const csArray<csString> args, iObjectRegistry* _object_reg, csRef<iVFS> _vfs);
- ~psUpdaterConfig();
+ UpdaterConfig(const csArray<csString> args, iObjectRegistry* _object_reg, csRef<iVFS> _vfs);
+ ~UpdaterConfig();
/* Returns true if the updater is self updating */
int IsSelfUpdating() const { return selfUpdating; }
Modified: trunk/src/pslaunch/updaterengine.cpp
===================================================================
--- trunk/src/pslaunch/updaterengine.cpp 2007-11-12 22:13:31 UTC (rev 258)
+++ trunk/src/pslaunch/updaterengine.cpp 2007-11-13 03:45:35 UTC (rev 259)
@@ -33,9 +33,16 @@
#include <unistd.h>
#endif
-iObjectRegistry* psUpdaterEngine::object_reg = NULL;
+iObjectRegistry* UpdaterEngine::object_reg = NULL;
-psUpdaterEngine::psUpdaterEngine(const csArray<csString> args, iObjectRegistry* _object_reg, const char* _appName,
+UpdaterEngine::UpdaterEngine(const csArray<csString> args, iObjectRegistry* object_reg, const char* appName)
+{
+ bool a = false, b = false, c = true;
+ csArray<csString> d;
+ UpdaterEngine(args, object_reg, appName, &a, &b, &c, &d, NULL);
+}
+
+UpdaterEngine::UpdaterEngine(const csArray<csString> args, iObjectRegistry* _object_reg, const char* _appName,
bool *_performUpdate, bool *_exitGui, bool *_updateNeeded, csArray<csString> *_consoleOut, CS::Threading::Mutex *_mutex)
{
object_reg = _object_reg;
@@ -45,7 +52,7 @@
printf("No VFS!\n");
PS_PAUSEEXIT(1);
}
- config = new psUpdaterConfig(args, object_reg, vfs);
+ config = new UpdaterConfig(args, object_reg, vfs);
fileUtil = new FileUtil(vfs);
appName = _appName;
exitGUI = _exitGui;
@@ -55,7 +62,7 @@
mutex = _mutex;
}
-psUpdaterEngine::~psUpdaterEngine()
+UpdaterEngine::~UpdaterEngine()
{
delete fileUtil;
delete config;
@@ -63,7 +70,7 @@
config = NULL;
}
-void psUpdaterEngine::printOutput(const char *string, ...)
+void UpdaterEngine::printOutput(const char *string, ...)
{
if ( mutex )
{
@@ -84,7 +91,7 @@
}
}
-void psUpdaterEngine::checkForUpdates()
+void UpdaterEngine::checkForUpdates()
{
// Make sure the old instance had time to terminate (self-update).
@@ -209,7 +216,7 @@
return;
}
-bool psUpdaterEngine::checkUpdater()
+bool UpdaterEngine::checkUpdater()
{
// Backup old config, download new.
@@ -244,7 +251,7 @@
return(config->GetNewConfig()->GetUpdaterVersionLatest() > UPDATER_VERSION);
}
-bool psUpdaterEngine::checkGeneral()
+bool UpdaterEngine::checkGeneral()
{
/*
* Compare length of both old and new client version lists.
@@ -284,7 +291,7 @@
return true;
}
-csRef<iDocumentNode> psUpdaterEngine::GetRootNode(csString nodeName)
+csRef<iDocumentNode> UpdaterEngine::GetRootNode(csString nodeName)
{
// Load xml.
csRef<iDocumentSystem> xml = csPtr<iDocumentSystem> (new csTinyDocumentSystem);
@@ -324,7 +331,7 @@
#ifdef CS_PLATFORM_WIN32
-bool psUpdaterEngine::selfUpdate(int selfUpdating)
+bool UpdaterEngine::selfUpdate(int selfUpdating)
{
// Info for CreateProcess.
STARTUPINFO siStartupInfo;
@@ -420,7 +427,7 @@
#else
-bool psUpdaterEngine::selfUpdate(int selfUpdating)
+bool UpdaterEngine::selfUpdate(int selfUpdating)
{
// Check what stage of the update we're in.
switch(selfUpdating)
@@ -511,7 +518,7 @@
#endif
-void psUpdaterEngine::generalUpdate()
+void UpdaterEngine::generalUpdate()
{
/*
* This function updates our non-updater files to the latest versions,
Modified: trunk/src/pslaunch/updaterengine.h
===================================================================
--- trunk/src/pslaunch/updaterengine.h 2007-11-12 22:13:31 UTC (rev 258)
+++ trunk/src/pslaunch/updaterengine.h 2007-11-13 03:45:35 UTC (rev 259)
@@ -37,7 +37,7 @@
struct iConfigManager;
struct iVFS;
-class psUpdaterEngine
+class UpdaterEngine
{
private:
static iObjectRegistry* object_reg;
@@ -52,7 +52,7 @@
Downloader* downloader;
/* Config file; check for proxy and clean update. */
- psUpdaterConfig* config;
+ UpdaterConfig* config;
/* Real name of the app (e.g. updater, pslaunch, etc.) */
csString appName;
@@ -75,13 +75,14 @@
CS::Threading::Mutex *mutex;
public:
- psUpdaterEngine(const csArray<csString> args, iObjectRegistry* _object_reg, const char* _appName,
+ UpdaterEngine(const csArray<csString> args, iObjectRegistry* _object_reg, const char* _appName);
+ UpdaterEngine(const csArray<csString> args, iObjectRegistry* _object_reg, const char* _appName,
bool *_performUpdate, bool *_exitGui, bool *_updateNeeded, csArray<csString> *_consoleOut,
CS::Threading::Mutex *_mutex);
- ~psUpdaterEngine();
+ ~UpdaterEngine();
/* Return the config object */
- psUpdaterConfig* GetConfig() { return config; }
+ UpdaterConfig* GetConfig() { return config; }
/* Return VFS */
csRef<iVFS> GetVFS() { return vfs; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|