Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4056 in orxonox.OLD for orxonox/trunk/src/lib/gui


Ignore:
Timestamp:
May 5, 2005, 1:43:20 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk/gui: naming

Location:
orxonox/trunk/src/lib/gui/gui
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/lib/gui/gui/gui.cc

    r4054 r4056  
    3737
    3838// GUI-modules
    39 OrxonoxGuiFlags* flags = NULL;
    40 OrxonoxGuiVideo* video = NULL;
    41 OrxonoxGuiAudio* audio = NULL;
    42 OrxonoxGuiExec* exec = NULL;
    43 OrxonoxGuiBanner* banner = NULL;
    44 OrxonoxGuiKeys* keys = NULL;
    45 OrxonoxGuiUpdate* update = NULL;
     39GuiFlags* flags = NULL;
     40GuiVideo* video = NULL;
     41GuiAudio* audio = NULL;
     42GuiExec* exec = NULL;
     43GuiBanner* banner = NULL;
     44GuiKeys* keys = NULL;
     45GuiUpdate* update = NULL;
    4646
    4747/* ORXONOXGUI */
    … …  
    5050   \brief Initializes the Gui
    5151*/
    52 OrxonoxGui::OrxonoxGui(int argc, char *argv[])
     52Gui::Gui(int argc, char *argv[])
    5353{
    5454  Window* orxonoxGUI = NULL;
    … …  
    6060    Box* windowBox = new Box ('h');
    6161    {
    62       banner = new OrxonoxGuiBanner();
     62      banner = new GuiBanner();
    6363      windowBox->fill (banner->getWidget());
    6464     
    … …  
    6767        Box* avBox = new Box('h');
    6868       
    69         video = new OrxonoxGuiVideo();
     69        video = new GuiVideo();
    7070        avBox->fill(video->getWidget());
    71         audio = new OrxonoxGuiAudio();
     71        audio = new GuiAudio();
    7272        avBox->fill(audio->getWidget());
    7373     
    7474        optionBoxL->fill(avBox);
    7575
    76         keys = new OrxonoxGuiKeys();
     76        keys = new GuiKeys();
    7777        optionBoxL->fill(keys->getWidget());
    7878        windowBox->fill(optionBoxL);
    … …  
    8080      Box* optionBoxR = new Box('v');
    8181      {
    82         exec = new OrxonoxGuiExec();
     82        exec = new GuiExec();
    8383        optionBoxR->fill(exec->getWidget());
    8484       
    85         flags = new OrxonoxGuiFlags();
     85        flags = new GuiFlags();
    8686       
    8787        optionBoxR->fill(flags->getWidget());
    8888       
    89         update = new OrxonoxGuiUpdate();
     89        update = new GuiUpdate();
    9090        optionBoxR->fill(update->getWidget());
    9191      }
    … …  
    118118  if (!access(exec->getConfigFile(), F_OK) &&
    119119      static_cast<Option*>(orxonoxGUI->findWidgetByName("Always Show this Menu", 0))->value == 0)
    120     OrxonoxGuiExec::startOrxonox(NULL, exec);
     120    GuiExec::startOrxonox(NULL, exec);
    121121  else
    122122    {
    … …  
    126126}
    127127
    128 bool OrxonoxGui::startOrxonox = false;
     128bool Gui::startOrxonox = false;
    129129
    130130/**
    131131   \brief Destructor.
    132132*/
    133 OrxonoxGui::~OrxonoxGui(void)
     133Gui::~Gui(void)
    134134{
    135135  delete video;

  • orxonox/trunk/src/lib/gui/gui/gui.h

    r4054 r4056  
    1919#define GUI_DEFAULT_CONF_FILE "orxonox.conf"
    2020
    21 class OrxonoxGuiElement;
    22 
    23 //! Class that creates the OrxonoxGui
    24 class OrxonoxGui
     21//! Class that creates the Gui
     22class Gui
    2523{
    2624 public:
    27   OrxonoxGui(int argc, char *argv[]);
    28   ~OrxonoxGui(void);
     25  Gui(int argc, char *argv[]);
     26  ~Gui(void);
    2927
    3028  static bool startOrxonox;

  • orxonox/trunk/src/lib/gui/gui/gui_audio.cc

    r4054 r4056  
    3131   \brief Creates an Audio-Frame
    3232*/
    33 OrxonoxGuiAudio::OrxonoxGuiAudio(void)
     33GuiAudio::GuiAudio(void)
    3434{
    3535  Frame* audioFrame;        //!< The Frame that holds the audio Options.
    … …  
    7070    \brief Destructs the Audio-Stuff
    7171*/
    72 OrxonoxGuiAudio::~OrxonoxGuiAudio(void)
     72GuiAudio::~GuiAudio(void)
    7373{
    7474  // nothing to do here.

  • orxonox/trunk/src/lib/gui/gui/gui_audio.h

    r4054 r4056  
    1010
    1111//! Class that creates the Audio-Options.
    12 class OrxonoxGuiAudio : public OrxonoxGuiElement
     12class GuiAudio : public GuiElement
    1313{
    1414 public:
    15   OrxonoxGuiAudio(void);
    16   ~OrxonoxGuiAudio(void);
     15  GuiAudio(void);
     16  ~GuiAudio(void);
    1717};
    1818#endif /* _GUI_AUDIO_H */

  • orxonox/trunk/src/lib/gui/gui/gui_banner.cc

    r4054 r4056  
    3434   \brief Creates a new BannerEventBox and its content.
    3535*/
    36 OrxonoxGuiBanner::OrxonoxGuiBanner(void)
     36GuiBanner::GuiBanner(void)
    3737{
    3838  // the banner Frame
    … …  
    9292   \brief Destructs it.
    9393*/
    94 OrxonoxGuiBanner::~OrxonoxGuiBanner(void)
     94GuiBanner::~GuiBanner(void)
    9595{
    9696  // nothing to do here

  • orxonox/trunk/src/lib/gui/gui/gui_banner.h

    r4054 r4056  
    1212
    1313//! Class that creates the Banner-Image
    14 class OrxonoxGuiBanner : public OrxonoxGuiElement
     14class GuiBanner : public GuiElement
    1515{
    1616 public:
    17   OrxonoxGuiBanner(void);
    18   ~OrxonoxGuiBanner(void);
     17  GuiBanner(void);
     18  ~GuiBanner(void);
    1919};
    2020

  • orxonox/trunk/src/lib/gui/gui/gui_element.cc

    r4054 r4056  
    2727   \todo this constructor is not jet implemented - do it
    2828*/
    29 OrxonoxGuiElement::OrxonoxGuiElement ()
     29GuiElement::GuiElement ()
    3030{
    3131  this->mainWidget = NULL;
    … …  
    3737
    3838*/
    39 OrxonoxGuiElement::~OrxonoxGuiElement ()
     39GuiElement::~GuiElement ()
    4040{
    4141  // delete what has to be deleted here
    … …  
    4545   \brief Every GuiElement should set this, or it could result in a SegFault.
    4646*/
    47 void OrxonoxGuiElement::setMainWidget(Widget* widget)
     47void GuiElement::setMainWidget(Widget* widget)
    4848{
    4949  this->mainWidget = widget;

  • orxonox/trunk/src/lib/gui/gui/gui_element.h

    r4054 r4056  
    1111
    1212//! A SuperClass for all the Different GuiElements
    13 class OrxonoxGuiElement {
     13class GuiElement {
    1414
    1515 public:
    16   OrxonoxGuiElement();
    17   virtual ~OrxonoxGuiElement();
     16  GuiElement();
     17  virtual ~GuiElement();
    1818 
    1919  /** \returns the main Widget of this GuiElement. */

  • orxonox/trunk/src/lib/gui/gui/gui_exec.cc

    r4054 r4056  
    3838    \brief Creates the Exec-Frame
    3939*/
    40 OrxonoxGuiExec::OrxonoxGuiExec(void)
     40GuiExec::GuiExec(void)
    4141{
    4242  Frame* execFrame;            //!< The Frame that holds the ExecutionOptions.
    … …  
    7676      quit = new Button("Quit");
    7777#ifdef HAVE_GTK2
    78       quit->connectSignal("clicked", this, OrxonoxGuiExec::quitGui);
    79       //  Window::mainWindow->connectSignal("remove", this, OrxonoxGuiExec::quitGui);
    80       Window::mainWindow->connectSignal("destroy", this, OrxonoxGuiExec::quitGui);
     78      quit->connectSignal("clicked", this, GuiExec::quitGui);
     79      //  Window::mainWindow->connectSignal("remove", this, GuiExec::quitGui);
     80      Window::mainWindow->connectSignal("destroy", this, GuiExec::quitGui);
    8181#endif /* HAVE_GTK2 */
    8282      execBox->fill(quit);
    … …  
    9090   \brief Destructs the Execution-stuff
    9191*/
    92 OrxonoxGuiExec::~OrxonoxGuiExec(void)
     92GuiExec::~GuiExec(void)
    9393{
    9494  if(this->confFile)
    … …  
    104104   \param confDir the Directory for the configuration files
    105105*/
    106 void OrxonoxGuiExec::setConfDir(const char* confDir)
     106void GuiExec::setConfDir(const char* confDir)
    107107{
    108108  this->confDir = ResourceManager::homeDirCheck(confDir);
    … …  
    123123   The name will be parsed from ~/ to /home/[username] on unix and c:/Documents and Settings/username/Settings/ on Windows
    124124*/
    125 void OrxonoxGuiExec::setConfFile(const char* fileName)
     125void GuiExec::setConfFile(const char* fileName)
    126126{
    127127  if (!this->confDir)
    … …  
    135135   \returns The name of the Configuration-File
    136136*/
    137 const char* OrxonoxGuiExec::getConfigFile(void) const
     137const char* GuiExec::getConfigFile(void) const
    138138{
    139139  return this->confFile;
    … …  
    144144   \return 1 if it should 0 if not/
    145145*/
    146 int OrxonoxGuiExec::shouldsave()
     146int GuiExec::shouldsave()
    147147{
    148148  return(static_cast<Option*>(this->saveSettings)->value);
    … …  
    153153    \param widget from which Widget on should be saved.
    154154
    155     this Function only opens and closes the file, in between OrxonoxGuiExec::writeFileText(Widget* widget) will execute the real writing process.
    156 */
    157 void OrxonoxGuiExec::writeToFile(Widget* widget)
     155    this Function only opens and closes the file, in between GuiExec::writeFileText(Widget* widget) will execute the real writing process.
     156*/
     157void GuiExec::writeToFile(Widget* widget)
    158158{
    159159  this->CONFIG_FILE = fopen(this->confFile, "w");
    … …  
    168168   \param depth initially "0", and grows higher, while new Groups are bundeled.
    169169*/
    170 void OrxonoxGuiExec::writeFileText(Widget* widget, int depth)
     170void GuiExec::writeFileText(Widget* widget, int depth)
    171171{
    172172  int counter = 0;
    … …  
    219219   \param widget from which Widget on should be saved.
    220220*/
    221 void OrxonoxGuiExec::readFromFile(Widget* widget)
     221void GuiExec::readFromFile(Widget* widget)
    222222{
    223223  this->CONFIG_FILE = fopen(this->confFile, "r");
    … …  
    268268   \param varInfo Information about the Variable to read
    269269*/
    270 void OrxonoxGuiExec::readFileText(Widget* widget, void* varInfo)
     270void GuiExec::readFileText(Widget* widget, void* varInfo)
    271271{
    272272  VarInfo* info =(VarInfo*)varInfo;
    … …  
    288288   \todo do this in gui-gtk.
    289289*/
    290 Widget* OrxonoxGuiExec::locateGroup(Widget* widget, char* groupName, int depth)
     290Widget* GuiExec::locateGroup(Widget* widget, char* groupName, int depth)
    291291{
    292292  Widget* tmp;
    … …  
    329329*/
    330330#ifdef HAVE_GTK2
    331 int OrxonoxGuiExec::startOrxonox(GtkWidget* widget, void* data)
     331int GuiExec::startOrxonox(GtkWidget* widget, void* data)
    332332#else /* HAVE_GTK2 */
    333 int OrxonoxGuiExec::startOrxonox(void* widget, void* data)
     333int GuiExec::startOrxonox(void* widget, void* data)
    334334#endif /* HAVE_GTK2 */
    335335{
    … …  
    343343
    344344  PRINT(3)("Starting Orxonox\n");
    345   OrxonoxGui::startOrxonox = true;
     345  Gui::startOrxonox = true;
    346346}
    347347
    … …  
    354354*/
    355355#ifdef HAVE_GTK2
    356 int OrxonoxGuiExec::quitGui(GtkWidget* widget, void* data)
     356int GuiExec::quitGui(GtkWidget* widget, void* data)
    357357#else /* HAVE_GTK2 */
    358 int OrxonoxGuiExec::quitGui(void* widget, void* data)
    359 #endif /* HAVE_GTK2 */
    360 {
    361   OrxonoxGuiExec* exec =(OrxonoxGuiExec*)data;
     358int GuiExec::quitGui(void* widget, void* data)
     359#endif /* HAVE_GTK2 */
     360{
     361  GuiExec* exec =(GuiExec*)data;
    362362  if(exec->shouldsave())
    363363    exec->writeToFile(Window::mainWindow);

  • orxonox/trunk/src/lib/gui/gui/gui_exec.h

    r4054 r4056  
    1616
    1717//! Class that creates the execute-Options.
    18 class OrxonoxGuiExec : public OrxonoxGuiElement
     18class GuiExec : public GuiElement
    1919{
    2020 private:
    … …  
    3333
    3434 public:
    35   OrxonoxGuiExec(void);
    36   ~OrxonoxGuiExec(void);
     35  GuiExec(void);
     36  ~GuiExec(void);
    3737 
    3838  void setConfDir(const char* confDir);

  • orxonox/trunk/src/lib/gui/gui/gui_flags.cc

    r4054 r4056  
    2929   \brief Creates the Flags-Frame
    3030*/
    31 OrxonoxGuiFlags::OrxonoxGuiFlags(void)
     31GuiFlags::GuiFlags(void)
    3232{
    3333  this->flagsFrame = new Frame("Orxonox-Startup-Flags:");
    … …  
    4747   \brief Destructs the Flags-stuff
    4848*/
    49 OrxonoxGuiFlags::~OrxonoxGuiFlags(void)
     49GuiFlags::~GuiFlags(void)
    5050{
    5151  // nothing to do here
    … …  
    5656   \param widget the Widget from which on to scan for deeper Options and their settings.
    5757*/
    58 void OrxonoxGuiFlags::setTextFromFlags(Widget* widget)
     58void GuiFlags::setTextFromFlags(Widget* widget)
    5959{
    6060  FlagInfo flagInfo;
    … …  
    6464  this->flagsLabel->ereaseText();
    6565  this->flagsLabel->appendText(executable);
    66   widget->walkThrough(OrxonoxGuiFlags::flagsText, &flagInfo, 0);
     66  widget->walkThrough(GuiFlags::flagsText, &flagInfo, 0);
    6767  //  flagsLabel->setTitle(flagText);
    6868}
    … …  
    7070/**
    7171    \brief this actually sets the flagtext, and appends it to flagText
    72     \param widget like OrxonoxGuiFlags::setTextFromFlags(widget)
     72    \param widget like GuiFlags::setTextFromFlags(widget)
    7373    \param flagInfo Information aboout the Flag that should be updated.
    7474*/
    75 void OrxonoxGuiFlags::flagsText(Widget* widget, void* flagInfo)
     75void GuiFlags::flagsText(Widget* widget, void* flagInfo)
    7676{
    7777  FlagInfo* info =(FlagInfo*)flagInfo;

  • orxonox/trunk/src/lib/gui/gui/gui_flags.h

    r4054 r4056  
    1212
    1313//! Class that creates the flags-Text.
    14 class OrxonoxGuiFlags : public OrxonoxGuiElement
     14class GuiFlags : public GuiElement
    1515{
    1616 private:
    … …  
    2121
    2222 public:
    23   OrxonoxGuiFlags(void);
    24   ~OrxonoxGuiFlags(void);
     23  GuiFlags(void);
     24  ~GuiFlags(void);
    2525
    2626  void setTextFromFlags(Widget* widget);

  • orxonox/trunk/src/lib/gui/gui/gui_gtk.cc

    r4054 r4056  
    3434
    3535#include "gui_flags.h"
    36 extern OrxonoxGuiFlags* flags;
     36extern GuiFlags* flags;
    3737
    3838char* executable;

  • orxonox/trunk/src/lib/gui/gui/gui_keys.cc

    r4054 r4056  
    3131   \brief Creates an Keyboard-Frame
    3232*/
    33 OrxonoxGuiKeys::OrxonoxGuiKeys(void)
     33GuiKeys::GuiKeys(void)
    3434{
    3535  this->keysFrame = new Frame("Keyboard-Options:");
    … …  
    4949   \brief Destructs the Keys-stuff
    5050*/
    51 OrxonoxGuiKeys::~OrxonoxGuiKeys(void)
     51GuiKeys::~GuiKeys(void)
    5252{
    5353  // nothing to do here.

  • orxonox/trunk/src/lib/gui/gui/gui_keys.h

    r4054 r4056  
    2222class Player;
    2323//! Class that creates the Keys-Options.
    24 class OrxonoxGuiKeys : public OrxonoxGuiElement
     24class GuiKeys : public GuiElement
    2525{
    2626 private:
    … …  
    3232
    3333 public:
    34   OrxonoxGuiKeys(void);
    35   ~OrxonoxGuiKeys(void);
     34  GuiKeys(void);
     35  ~GuiKeys(void);
    3636};
    3737

  • orxonox/trunk/src/lib/gui/gui/gui_main.cc

    r4054 r4056  
    3030int main(int argc, char *argv[])
    3131{
    32   OrxonoxGui* orxonoxgui = new OrxonoxGui(argc, argv);
     32  Gui* orxonoxgui = new Gui(argc, argv);
    3333  return 0;
    3434}

  • orxonox/trunk/src/lib/gui/gui/gui_update.cc

    r4054 r4056  
    3535   \brief Creates an Update-Frame
    3636*/
    37 OrxonoxGuiUpdate::OrxonoxGuiUpdate(void)
     37GuiUpdate::GuiUpdate(void)
    3838{
    3939  this->tmpDir = NULL;
    … …  
    7373   \brief Destructs the Update-stuff
    7474*/
    75 OrxonoxGuiUpdate::~OrxonoxGuiUpdate(void)
     75GuiUpdate::~GuiUpdate(void)
    7676{
    7777
    … …  
    8181    \brief Look what info we can get from this system
    8282*/
    83 bool OrxonoxGuiUpdate::getSystemInfo(void)
     83bool GuiUpdate::getSystemInfo(void)
    8484{
    8585  PRINTF(3)("Grabbing system information\n");
    … …  
    107107
    108108#ifdef HAVE_CURL
    109 bool* OrxonoxGuiUpdate::checkForUpdates(void)
     109bool* GuiUpdate::checkForUpdates(void)
    110110{
    111111  PRINTF(3)("checking for new version of orxonox\n");
    … …  
    122122   \brief Creates a window, and all it contains for the Data-update.
    123123*/
    124 void OrxonoxGuiUpdate::updateDataWindowCreate(void)
     124void GuiUpdate::updateDataWindowCreate(void)
    125125{
    126126  this->updateDataWindow = new Window("update orxonox::Data");   
    … …  
    161161   \returns A Pointer to the Button of the UpdaterDataWindow
    162162*/
    163 Button* OrxonoxGuiUpdate::updateDataWindowGetButton(void)
     163Button* GuiUpdate::updateDataWindowGetButton(void)
    164164{
    165165  return this->updateDataWindowButton;
    … …  
    169169   \brief Creates a window, and all it contains for the Source-update.
    170170*/
    171 void OrxonoxGuiUpdate::updateSourceWindowCreate(void)
     171void GuiUpdate::updateSourceWindowCreate(void)
    172172{
    173173  // the button, that opens this Window.
    … …  
    200200   \returns A Pointer to the Button of the UpdaterSourceWindow
    201201*/
    202 Button* OrxonoxGuiUpdate::updateSourceWindowGetButton(void)
     202Button* GuiUpdate::updateSourceWindowGetButton(void)
    203203{
    204204  return this->updateSourceWindowButton;
    … …  
    213213   \param button The Button, that triggered this event.
    214214*/
    215 gint OrxonoxGuiUpdate::updateDataFunc(GtkWidget* w, GdkEventKey* event, void* info)
     215gint GuiUpdate::updateDataFunc(GtkWidget* w, GdkEventKey* event, void* info)
    216216{
    217217  FileInfo* dataInfo =(FileInfo*)info;
    … …  
    230230   \param button The Button, that triggered this event.
    231231*/
    232 gint OrxonoxGuiUpdate::updateSourceFunc(GtkWidget* w, GdkEventKey* event, void* bar)
     232gint GuiUpdate::updateSourceFunc(GtkWidget* w, GdkEventKey* event, void* bar)
    233233{
    234234  ProgressBar* tmpBar = static_cast<ProgressBar*>(bar);
    … …  
    245245   \param stream Filehandler to write to.
    246246*/
    247 size_t OrxonoxGuiUpdate::curlWriteFunc(void* ptr, size_t size, size_t nmemb, FILE* stream)
     247size_t GuiUpdate::curlWriteFunc(void* ptr, size_t size, size_t nmemb, FILE* stream)
    248248{
    249249  return fwrite(ptr, size, nmemb, stream);
    … …  
    257257   \param stream Filehandler to get data from.
    258258*/
    259 size_t OrxonoxGuiUpdate::curlReadFunc(void* ptr, size_t size, size_t nmemb, FILE* stream)
     259size_t GuiUpdate::curlReadFunc(void* ptr, size_t size, size_t nmemb, FILE* stream)
    260260{
    261261  return fread(ptr, size, nmemb, stream);
    … …  
    271271   \param upProgress not needed
    272272*/
    273 int OrxonoxGuiUpdate::curlProgressFunc(ProgressBar* bar, double totalSize, double progress, double upTotal, double upProgress)
     273int GuiUpdate::curlProgressFunc(ProgressBar* bar, double totalSize, double progress, double upTotal, double upProgress)
    274274{
    275275  bar->setProgress(progress);
    … …  
    286286   \brief The Curl handle for only one CURL(static).
    287287*/
    288 CURL* OrxonoxGuiUpdate::curlHandle = NULL;
     288CURL* GuiUpdate::curlHandle = NULL;
    289289
    290290#ifdef HAVE_PTHREAD_H
    291291/** \brief The download Thread ID */
    292 pthread_t* OrxonoxGuiUpdate::downloadThreadID = new pthread_t;
     292pthread_t* GuiUpdate::downloadThreadID = new pthread_t;
    293293/**   \brief The download Thread ID*/
    294 pthread_t* OrxonoxGuiUpdate::downloadThreadFinishID = new pthread_t;
     294pthread_t* GuiUpdate::downloadThreadFinishID = new pthread_t;
    295295#endif /* HAVE_PTHREAD_H */
    296296/**
    297297   \brief A bool parameter that shows if we are downloading.
    298298*/
    299 bool OrxonoxGuiUpdate::isDownloading = false;
     299bool GuiUpdate::isDownloading = false;
    300300
    301301
    … …  
    306306   !! BE AWARE THIS WILL NOT BE THREADED. !!
    307307*/
    308 bool OrxonoxGuiUpdate::download(void* fileInfo)
     308bool GuiUpdate::download(void* fileInfo)
    309309{
    310310  if(isDownloading)
    … …  
    354354   Downloading with a Button that gets a different Name while downloading, and a Bar, that gets to be updated. More to be followed
    355355*/
    356 bool OrxonoxGuiUpdate::downloadWithStyle(void* fileInfo)
     356bool GuiUpdate::downloadWithStyle(void* fileInfo)
    357357{
    358358  if(isDownloading)
    … …  
    426426   \todo Threads get locked, if the cancel button is pressed in to small intervals.
    427427*/
    428 void* OrxonoxGuiUpdate::downloadThread(void* fileInfo)
     428void* GuiUpdate::downloadThread(void* fileInfo)
    429429{
    430430  isDownloading = true;
    … …  
    436436   \param fileInfo the FileInfo.
    437437*/
    438 void* OrxonoxGuiUpdate::downloadThreadFinished(void* fileInfo)
     438void* GuiUpdate::downloadThreadFinished(void* fileInfo)
    439439{
    440440  FileInfo* info =(FileInfo*)fileInfo;
    … …  
    477477   \todo canceling a session in non-threaded mode.
    478478*/
    479 gint OrxonoxGuiUpdate::cancelDownload(GtkWidget* w, GdkEventKey* event, void* bar)
     479gint GuiUpdate::cancelDownload(GtkWidget* w, GdkEventKey* event, void* bar)
    480480{
    481481#ifdef HAVE_PTHREAD_H

  • orxonox/trunk/src/lib/gui/gui/gui_update.h

    r4054 r4056  
    2424
    2525//! Class that creates the execute-Options.
    26 class OrxonoxGuiUpdate : public OrxonoxGuiElement
     26class GuiUpdate : public GuiElement
    2727{
    2828 private:
    … …  
    9797
    9898 public:
    99   OrxonoxGuiUpdate(void);
    100   ~OrxonoxGuiUpdate(void);
     99  GuiUpdate(void);
     100  ~GuiUpdate(void);
    101101 
    102102#ifdef HAVE_CURL   

  • orxonox/trunk/src/lib/gui/gui/gui_video.cc

    r4054 r4056  
    3333   \brief Creates the Video-Option-Frame
    3434*/
    35 OrxonoxGuiVideo::OrxonoxGuiVideo(void)
     35GuiVideo::GuiVideo(void)
    3636{
    3737  this->videoFrame = new Frame("Video-Options:");
    … …  
    6262   \brief Destructs the Video-stuff
    6363*/
    64 OrxonoxGuiVideo::~OrxonoxGuiVideo(void)
     64GuiVideo::~GuiVideo(void)
    6565{
    6666  // nothing to do here.
    … …  
    7070   \brief Creates a window, and all it contains for the Source-update.
    7171*/
    72 void OrxonoxGuiVideo::advancedWindowCreate(void)
     72void GuiVideo::advancedWindowCreate(void)
    7373{
    7474  // the button, that opens this Window.
    … …  
    137137   \returns A Pointer to the Button of the UpdaterSourceWindow
    138138*/
    139 Button* OrxonoxGuiVideo::advancedWindowGetButton(void)
     139Button* GuiVideo::advancedWindowGetButton(void)
    140140{
    141141  return this->advancedButton;
    142142}
    143143
    144 void OrxonoxGuiVideo::getResolutions(Menu* menu)
     144void GuiVideo::getResolutions(Menu* menu)
    145145{
    146146  SDL_Init(SDL_INIT_VIDEO);

  • orxonox/trunk/src/lib/gui/gui/gui_video.h

    r4054 r4056  
    1111
    1212//! Class that creates the Video-Options.
    13 class OrxonoxGuiVideo : public OrxonoxGuiElement
     13class GuiVideo : public GuiElement
    1414{
    1515 private:
    … …  
    4545 
    4646 public:
    47   OrxonoxGuiVideo(void);
    48   ~OrxonoxGuiVideo(void);
     47  GuiVideo(void);
     48  ~GuiVideo(void);
    4949
    5050  void getResolutions(Menu* menu);
Note: See TracChangeset for help on using the changeset viewer.