Changeset 3315 in orxonox.OLD for orxonox/branches/updater/src/gui/orxonox_gui_update.cc

Timestamp:

Jan 3, 2005, 12:13:38 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: code-standartisation updated in all files.

1. member → this→member
2. function (bla) → function(bla)
3. other small fixes

File:

• orxonox/branches/updater/src/gui/orxonox_gui_update.cc (modified) (24 diffs)

orxonox/branches/updater/src/gui/orxonox_gui_update.cc

@@ -1 +1 @@
 /* 
    orxonox - the future of 3D-vertical-scrollers
-
    Copyright (C) 2004 orx
 
@@ -37 +36 @@
    \brief Creates an Audio-Frame
 */
-OrxonoxGuiUpdate::OrxonoxGuiUpdate ()
+OrxonoxGuiUpdate::OrxonoxGuiUpdate(void)
 {
   this->getSystemInfo();
 
-  this->updateFrame = new Frame ("Update-Options:");
-  this->updateFrame->setGroupName ("update");
-  this->updateBox = new Box ('v');
+  this->updateFrame = new Frame("Update-Options:");
+  this->updateFrame->setGroupName("update");
+  this->updateBox = new Box('v');
 #ifdef HAVE_CURL
 
   // the Button for autoUpdating
-  this->autoUpdate = new CheckButton ("auto update");
+  this->autoUpdate = new CheckButton("auto update");
   this->updateBox->fill(this->autoUpdate);
-  this->autoUpdate->setFlagName ("update", "u", 0);
+  this->autoUpdate->setFlagName("update", "u", 0);
   this->autoUpdate->saveability();
 
-  this->updateSourceWindowCreate ();
+  this->updateSourceWindowCreate();
   this->updateBox->fill(this->updateSourceWindowGetButton());
 
-  this->updateDataWindowCreate ();
+  this->updateDataWindowCreate();
   this->updateBox->fill(this->updateDataWindowGetButton());
 
@@ -70 +69 @@
    \return Returns the Audio-frame
 */
-Widget* OrxonoxGuiUpdate::getWidget ()
-{
-  return updateFrame;
+Widget* OrxonoxGuiUpdate::getWidget(void)
+{
+  return this->updateFrame;
 }
 
@@ -81 +80 @@
 {
   PRINTF(3)("Grabbing system information\n");
-  tmpDir = getenv("TMPDIR");
-  if (!tmpDir)
-    tmpDir = "/tmp";
-  PRINTF(4)("Temporary directory is: %s\n", tmpDir);
+  this->tmpDir = getenv("TMPDIR");
+  if(!tmpDir)
+    this->tmpDir = "/tmp";
+  PRINTF(4)("Temporary directory is: %s\n", this->tmpDir);
 
 #ifdef __WIN32__
-  homeDir = getenv ("USERPROFILE");
+  this->homeDir = getenv("USERPROFILE");
 #else
-  homeDir = getenv("HOME");
+  this->homeDir = getenv("HOME");
 #endif
   PRINTF(4)("Home directory is %s\n", homeDir);
 
-  installDataDir = "/usr/share/games/orxonox";
-  PRINTF(4)("Installation of orxonox-data will go to this directory: %s\n", installDataDir);
-
-  installSourceDir = "/usr/games/bin";
-  PRINTF(4)("Installation of orxonox-source will go to this directory: %s\n", installSourceDir);
-
-  userName = getenv("USER");
-  PRINTF(4)("Logged in username is: %s\n", userName);
+  this->installDataDir = "/usr/share/games/orxonox";
+  PRINTF(4)("Installation of orxonox-data will go to this directory: %s\n", this->installDataDir);
+
+  this->installSourceDir = "/usr/games/bin";
+  PRINTF(4)("Installation of orxonox-source will go to this directory: %s\n", this->installSourceDir);
+
+  this->userName = getenv("USER");
+  PRINTF(4)("Logged in username is: %s\n", this->userName);
 }
 
@@ -119 +118 @@
    \brief Creates a window, and all it contains for the Data-update.
 */
-void OrxonoxGuiUpdate::updateDataWindowCreate (void)
-{
-  updateDataWindow = new Window ("update orxonox::Data");   
-  updateDataBox = new Box ('v');
+void OrxonoxGuiUpdate::updateDataWindowCreate(void)
+{
+  this->updateDataWindow = new Window("update orxonox::Data");   
+  this->updateDataBox = new Box('v');
 
   // the close-Button of the Update Window.
-  //  updateWindowClose = new Button ("close");
+  //  updateWindowClose = new Button("close");
 #ifdef HAVE_GTK2 
   //  updateWindowClose->connectSignal("button_press_event", updateWindow, Window::windowClose);
@@ -131 +130 @@
   //  updateWindowBox->fill(updateWindowClose);
 
-  updateDataBar = new ProgressBar ();
-  updateDataBox->fill(updateDataBar);
+  this->updateDataBar = new ProgressBar();
+  this->updateDataBox->fill(this->updateDataBar);
 
   FileInfo* dataInfo = new FileInfo;
-  dataInfo->bar = updateDataBar;
-
-  updateDataBegin = new Button ("begin.");
-  dataInfo->stateButton = updateDataBegin;
-#ifdef HAVE_GTK2 
-  dataInfo->buttonSignal = updateDataBegin->connectSignal ("button_press_event", dataInfo, updateDataFunc);
-#endif /* HAVE_GTK2 */
-  updateDataBox->fill(updateDataBegin);
-
-  updateDataWindow->fill (updateDataBox);
-
-  updateDataWindowButton = new Button ("update orxonox::Data");
-#ifdef HAVE_GTK2 
-  updateDataWindowButton->connectSignal("button_press_event", updateDataWindow, Window::windowOpen);
-  updateDataWindow->connectSignal("destroy", updateDataWindow, Window::windowClose);
-  updateDataWindow->connectSignal("delete_event", updateDataWindow, Window::windowClose);
+  dataInfo->bar = this->updateDataBar;
+
+  this->updateDataBegin = new Button("begin.");
+  dataInfo->stateButton = this->updateDataBegin;
+#ifdef HAVE_GTK2 
+  dataInfo->buttonSignal = updateDataBegin->connectSignal("button_press_event", dataInfo, updateDataFunc);
+#endif /* HAVE_GTK2 */
+  this->updateDataBox->fill(this->updateDataBegin);
+
+  this->updateDataWindow->fill(this->updateDataBox);
+
+  this->updateDataWindowButton = new Button("update orxonox::Data");
+#ifdef HAVE_GTK2 
+  this->updateDataWindowButton->connectSignal("button_press_event", this->updateDataWindow, Window::windowOpen);
+  this->updateDataWindow->connectSignal("destroy", this->updateDataWindow, Window::windowClose);
+  this->updateDataWindow->connectSignal("delete_event", this->updateDataWindow, Window::windowClose);
 #endif /* HAVE_GTK2 */
 
@@ -160 +159 @@
 Button* OrxonoxGuiUpdate::updateDataWindowGetButton(void)
 {
-  return updateDataWindowButton;
+  return this->updateDataWindowButton;
 }
 
@@ -166 +165 @@
    \brief Creates a window, and all it contains for the Source-update.
 */
-void OrxonoxGuiUpdate::updateSourceWindowCreate (void)
+void OrxonoxGuiUpdate::updateSourceWindowCreate(void)
 {
   // the button, that opens this Window.
-  updateSourceWindowButton = new Button ("update orxonox::Source");
+  this->updateSourceWindowButton = new Button("update orxonox::Source");
 
   // the Window itself
-  updateSourceWindow = new Window ("update orxonox::Source");
-
-  updateSourceBox = new Box ();
-
-  updateSourceBar = new ProgressBar ();
-  updateSourceBox->fill(updateSourceBar);
-  test = new Button ("increment");
+  this->updateSourceWindow = new Window("update orxonox::Source");
+
+  this->updateSourceBox = new Box();
+
+  this->updateSourceBar = new ProgressBar();
+  this->updateSourceBox->fill(this->updateSourceBar);
+  test = new Button("increment");
 
 #ifdef HAVE_GTK2 
@@ -184 +183 @@
 #endif /* HAVE_GTK2 */
 
-  updateSourceBox->fill(test);
-  updateSourceWindow->fill(updateSourceBox); 
-#ifdef HAVE_GTK2 
-  updateSourceWindowButton->connectSignal("button_press_event", updateSourceWindow, Window::windowOpen);
-  updateSourceWindow->connectSignal("destroy", updateSourceWindow, Window::windowClose);
-  updateSourceWindow->connectSignal("delete_event", updateSourceWindow, Window::windowClose);
+  this->updateSourceBox->fill(test);
+  this->updateSourceWindow->fill(updateSourceBox); 
+#ifdef HAVE_GTK2 
+  this->updateSourceWindowButton->connectSignal("button_press_event", this->updateSourceWindow, Window::windowOpen);
+  this->updateSourceWindow->connectSignal("destroy", this->updateSourceWindow, Window::windowClose);
+  this->updateSourceWindow->connectSignal("delete_event", this->updateSourceWindow, Window::windowClose);
 #endif /* HAVE_GTK2 */
 
@@ -199 +198 @@
 Button* OrxonoxGuiUpdate::updateSourceWindowGetButton(void)
 {
-  return updateSourceWindowButton;
+  return this->updateSourceWindowButton;
 }
 
@@ -212 +211 @@
 gint OrxonoxGuiUpdate::updateDataFunc(GtkWidget* w, GdkEventKey* event, void* info)
 {
-  FileInfo* dataInfo = (FileInfo*)info;
+  FileInfo* dataInfo =(FileInfo*)info;
 
   dataInfo->fileName = "02%20orxonox%203.mp3";
@@ -242 +241 @@
    \param stream Filehandler to write to.
 */
-size_t OrxonoxGuiUpdate::curlWriteFunc (void* ptr, size_t size, size_t nmemb, FILE* stream)
+size_t OrxonoxGuiUpdate::curlWriteFunc(void* ptr, size_t size, size_t nmemb, FILE* stream)
 {
   return fwrite(ptr, size, nmemb, stream);
@@ -254 +253 @@
    \param stream Filehandler to get data from.
 */
-size_t OrxonoxGuiUpdate::curlReadFunc (void* ptr, size_t size, size_t nmemb, FILE* stream)
+size_t OrxonoxGuiUpdate::curlReadFunc(void* ptr, size_t size, size_t nmemb, FILE* stream)
 {
   return fread(ptr, size, nmemb, stream);
@@ -268 +267 @@
    \param upProgress not needed
 */
-int OrxonoxGuiUpdate::curlProgressFunc (ProgressBar* Bar, double totalSize, double progress, double upTotal, double upProgress)
-{
-  Bar->setProgress(progress);
-  Bar->setTotalSize(totalSize);
+int OrxonoxGuiUpdate::curlProgressFunc(ProgressBar* bar, double totalSize, double progress, double upTotal, double upProgress)
+{
+  bar->setProgress(progress);
+  bar->setTotalSize(totalSize);
 #ifdef HAVE_GTK2
 #ifndef HAVE_PTHREAD_H
@@ -281 +280 @@
 
 /**
-   \brief The Curl handle for only one CURL (static).
+   \brief The Curl handle for only one CURL(static).
 */
 CURL* OrxonoxGuiUpdate::curlHandle = NULL;
@@ -305 +304 @@
 bool OrxonoxGuiUpdate::download(void* fileInfo)
 {
-  if (isDownloading)
+  if(isDownloading)
     {
       PRINTF(2)("unable to Download. already getting some file\n");
@@ -311 +310 @@
     }
   PRINTF(3)("Downloading.\n");
-  FileInfo* info = (FileInfo*)fileInfo;
+  FileInfo* info =(FileInfo*)fileInfo;
   CURLcode res;
   CURL* localCurl;
   localCurl = curl_easy_init();
   char* fileOnNet = new char [strlen(info->webRoot)+strlen(info->fileName)+2];
-  strcpy (fileOnNet, info->webRoot);
-  if (fileOnNet[strlen(fileOnNet)] != '/') //!< \todo windows-shit
-    strcat (fileOnNet, "/");
-  strcat (fileOnNet, info->fileName);
+  strcpy(fileOnNet, info->webRoot);
+  if(fileOnNet[strlen(fileOnNet)] != '/') //!< \todo windows-shit
+    strcat(fileOnNet, "/");
+  strcat(fileOnNet, info->fileName);
   char* fileOnDisk = new char [strlen(info->localRoot)+strlen(info->fileName)+2];
-  strcpy (fileOnDisk, info->localRoot);
-  if (fileOnDisk[strlen(fileOnDisk)] != '/') //!< \todo windows-shit
-    strcat (fileOnDisk, "/");
-  strcat (fileOnDisk, info->fileName);
+  strcpy(fileOnDisk, info->localRoot);
+  if(fileOnDisk[strlen(fileOnDisk)] != '/') //!< \todo windows-shit
+    strcat(fileOnDisk, "/");
+  strcat(fileOnDisk, info->fileName);
   
   if(localCurl)
@@ -340 +339 @@
 
       curl_easy_cleanup(localCurl);
-      fclose (info->fileHandle);
+      fclose(info->fileHandle);
     }
 }
@@ -353 +352 @@
 bool OrxonoxGuiUpdate::downloadWithStyle(void* fileInfo)
 {
-  if (isDownloading)
+  if(isDownloading)
     {
       PRINTF(2)("unable to Download. already getting some file\n");
@@ -359 +358 @@
     }
   PRINTF(3)("Downloading.\n");
-  FileInfo* info = (FileInfo*)fileInfo;
+  FileInfo* info =(FileInfo*)fileInfo;
   CURLcode res;
   curlHandle = curl_easy_init();
   char* fileOnNet = new char [strlen(info->webRoot)+strlen(info->fileName)+1];
-  strcpy (fileOnNet, info->webRoot);
-  strcat (fileOnNet, info->fileName);
+  strcpy(fileOnNet, info->webRoot);
+  strcat(fileOnNet, info->fileName);
   char* fileOnDisk = new char [strlen(info->localRoot)+strlen(info->fileName)+1];
-  strcpy (fileOnDisk, info->localRoot);
-  strcat (fileOnDisk, info->fileName);
+  strcpy(fileOnDisk, info->localRoot);
+  strcat(fileOnDisk, info->fileName);
 
   if(curlHandle)
@@ -382 +381 @@
       curl_easy_setopt(curlHandle, CURLOPT_PROGRESSDATA, info->bar);
 
-      if (!isDownloading)
+      if(!isDownloading)
         {
 #ifdef HAVE_PTHREAD_H     
@@ -418 +417 @@
 
 /**
-   \brief The downloading process (either threaded or not).
+   \brief The downloading process(either threaded or not).
    \param fileInfo the FileInfo.
 
@@ -435 +434 @@
 void* OrxonoxGuiUpdate::downloadThreadFinished(void* fileInfo)
 { 
-  FileInfo* info = (FileInfo*)fileInfo;
-#ifdef HAVE_PTHREAD_H
-  pthread_join (*downloadThreadID, NULL);
+  FileInfo* info =(FileInfo*)fileInfo;
+#ifdef HAVE_PTHREAD_H
+  pthread_join(*downloadThreadID, NULL);
 #ifdef HAVE_GTK2 
   gdk_threads_enter();
 #endif /* HAVE_GTK2 */
 #endif /* HAVE_PTHREAD_H */
-  if (curlHandle)
+  if(curlHandle)
     curl_easy_cleanup(curlHandle);
  
@@ -448 +447 @@
   fclose(info->fileHandle);
 
-  if (isDownloading)
+  if(isDownloading)
     info->stateButton->setTitle("go on");
   //  else