Changeset 4746 in orxonox.OLD for orxonox/trunk/src/lib/gui
- Timestamp:
- Jul 1, 2005, 12:48:48 PM (19 years ago)
- Location:
- orxonox/trunk/src/lib/gui
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/lib/gui/gui.cc
r4427 r4746 123 123 \brief starts the OrxonoxGUI 124 124 */ 125 void Gui::startGui( void)125 void Gui::startGui() 126 126 { 127 127 mainloopGUI(); … … 145 145 \brief Destructor. 146 146 */ 147 Gui::~Gui( void)147 Gui::~Gui() 148 148 { 149 149 delete video; -
orxonox/trunk/src/lib/gui/gui.h
r4427 r4746 24 24 public: 25 25 Gui(int argc, char *argv[]); 26 ~Gui( void);26 ~Gui(); 27 27 28 void startGui( void);29 void printHelp( void);28 void startGui(); 29 void printHelp(); 30 30 31 31 static bool startOrxonox; -
orxonox/trunk/src/lib/gui/gui_audio.cc
r4427 r4746 31 31 \brief Creates an Audio-Frame 32 32 */ 33 GuiAudio::GuiAudio( void)33 GuiAudio::GuiAudio() 34 34 { 35 35 Frame* audioFrame; //!< The Frame that holds the audio Options. … … 74 74 \brief Destructs the Audio-Stuff 75 75 */ 76 GuiAudio::~GuiAudio( void)76 GuiAudio::~GuiAudio() 77 77 { 78 78 // nothing to do here. -
orxonox/trunk/src/lib/gui/gui_audio.h
r4427 r4746 13 13 { 14 14 public: 15 GuiAudio( void);16 ~GuiAudio( void);15 GuiAudio(); 16 ~GuiAudio(); 17 17 }; 18 18 #endif /* _GUI_AUDIO_H */ -
orxonox/trunk/src/lib/gui/gui_banner.cc
r4427 r4746 34 34 \brief Creates a new BannerEventBox and its content. 35 35 */ 36 GuiBanner::GuiBanner( void)36 GuiBanner::GuiBanner() 37 37 { 38 38 // the banner Frame … … 92 92 \brief Destructs it. 93 93 */ 94 GuiBanner::~GuiBanner( void)94 GuiBanner::~GuiBanner() 95 95 { 96 96 // nothing to do here -
orxonox/trunk/src/lib/gui/gui_banner.h
r4427 r4746 15 15 { 16 16 public: 17 GuiBanner( void);18 ~GuiBanner( void);17 GuiBanner(); 18 ~GuiBanner(); 19 19 }; 20 20 -
orxonox/trunk/src/lib/gui/gui_element.h
r4427 r4746 18 18 19 19 /** \returns the main Widget of this GuiElement. */ 20 Widget* getWidget( void) {return this->mainWidget;}20 Widget* getWidget() {return this->mainWidget;} 21 21 protected: 22 22 void setMainWidget(Widget* widget); -
orxonox/trunk/src/lib/gui/gui_exec.cc
r4427 r4746 41 41 \brief Creates the Exec-Frame 42 42 */ 43 GuiExec::GuiExec( void)43 GuiExec::GuiExec() 44 44 { 45 45 Frame* execFrame; //!< The Frame that holds the ExecutionOptions. … … 133 133 \brief Destructs the Execution-stuff 134 134 */ 135 GuiExec::~GuiExec( void)135 GuiExec::~GuiExec() 136 136 { 137 137 if(this->confFile) … … 178 178 \returns The name of the Configuration-File 179 179 */ 180 const char* GuiExec::getConfigFile( void) const180 const char* GuiExec::getConfigFile() const 181 181 { 182 182 return this->confFile; -
orxonox/trunk/src/lib/gui/gui_exec.h
r4427 r4746 33 33 34 34 public: 35 GuiExec( void);36 ~GuiExec( void);35 GuiExec(); 36 ~GuiExec(); 37 37 38 38 void setConfDir(const char* confDir); 39 39 void setConfFile(const char* confFile); 40 const char* getConfigFile( void) const;41 int shouldsave( void);40 const char* getConfigFile() const; 41 int shouldsave(); 42 42 void writeToFile(Widget* widget); 43 43 void writeFileText(Widget* widget, int depth); -
orxonox/trunk/src/lib/gui/gui_flags.cc
r4427 r4746 29 29 \brief Creates the Flags-Frame 30 30 */ 31 GuiFlags::GuiFlags( void)31 GuiFlags::GuiFlags() 32 32 { 33 33 this->flagsFrame = new Frame("Orxonox-Startup-Flags:"); … … 48 48 \brief Destructs the Flags-stuff 49 49 */ 50 GuiFlags::~GuiFlags( void)50 GuiFlags::~GuiFlags() 51 51 { 52 52 // nothing to do here -
orxonox/trunk/src/lib/gui/gui_flags.h
r4427 r4746 21 21 22 22 public: 23 GuiFlags( void);24 ~GuiFlags( void);23 GuiFlags(); 24 ~GuiFlags(); 25 25 26 26 void setTextFromFlags(Widget* widget); -
orxonox/trunk/src/lib/gui/gui_gtk.cc
r4427 r4746 66 66 \brief enters the GUI's main-loop 67 67 */ 68 bool mainloopGUI( void)68 bool mainloopGUI() 69 69 { 70 70 #ifdef HAVE_GTK2 … … 146 146 \brief constructs a Widget 147 147 */ 148 Widget::Widget( void)148 Widget::Widget() 149 149 { 150 150 next = NULL; … … 156 156 This is still pretty crappy. 157 157 */ 158 Widget::~Widget( void)158 Widget::~Widget() 159 159 { 160 160 if (this->title) … … 190 190 \brief makes the widget visible. 191 191 */ 192 void Widget::show( void)192 void Widget::show() 193 193 { 194 194 #ifdef HAVE_GTK2 … … 200 200 \brief hides the widget. 201 201 */ 202 void Widget::hide( void)202 void Widget::hide() 203 203 { 204 204 #ifdef HAVE_GTK2 … … 571 571 \brief Constructs a Packer 572 572 */ 573 Packer::Packer( void)573 Packer::Packer() 574 574 { 575 575 this->down = NULL; … … 580 580 \brief Destroys a Packer. 581 581 */ 582 Packer::~Packer( void)582 Packer::~Packer() 583 583 { 584 584 PRINTF(5)("deleting the Packer part.\n"); … … 611 611 sets the Container-Specific defaults. 612 612 */ 613 Container::Container( void)613 Container::Container() 614 614 { 615 615 this->optionType = GUI_CONTAINER; … … 619 619 \brief Destroys a Container. 620 620 */ 621 Container::~Container( void)621 Container::~Container() 622 622 { 623 623 PRINTF(5)("deleting the Container part.\n"); … … 694 694 \brief Destructs a Window. 695 695 */ 696 Window::~Window( void)696 Window::~Window() 697 697 { 698 698 PRINTF(5)("deleting the Window: %s\n", this->title); … … 725 725 \brief Shows all Widgets that are included within this->widget. 726 726 */ 727 void Window::showall( void)727 void Window::showall() 728 728 { 729 729 #ifdef HAVE_GTK2 … … 753 753 \brief opens up a Window and fixes the Focus to it 754 754 */ 755 void Window::open( void)755 void Window::open() 756 756 { 757 757 if (this != mainWindow) … … 768 768 \brief closes up a Window and removes the Focus from it 769 769 */ 770 void Window::close( void)770 void Window::close() 771 771 { 772 772 if (this != mainWindow) … … 831 831 \brief destrcucts a Frame 832 832 */ 833 Frame::~Frame( void)833 Frame::~Frame() 834 834 { 835 835 PRINTF(5)("deleting the Frame: %s\n", this->title); … … 872 872 \brief destructs an EventBox. 873 873 */ 874 EventBox::~EventBox( void)874 EventBox::~EventBox() 875 875 { 876 876 PRINTF(5)("deleting the EventBox: %s\n", this->title); … … 899 899 \brief destructs a Box. 900 900 */ 901 Box::~Box( void)901 Box::~Box() 902 902 { 903 903 PRINTF(5)("deleting the Box: %s\n", this->title); … … 934 934 sets all Option-Specific-Values to their defaults. 935 935 */ 936 Option::Option( void)936 Option::Option() 937 937 { 938 938 this->value = 0; … … 950 950 \brief Destroys an Option. 951 951 */ 952 Option::~Option( void)952 Option::~Option() 953 953 { 954 954 PRINTF(5)("deleting the Option Part.\n"); … … 1051 1051 this is a default Option save 1052 1052 */ 1053 char* Option::save( void)1053 char* Option::save() 1054 1054 { 1055 1055 char* value = new char [30]; … … 1072 1072 \returns The saveable-state. 1073 1073 */ 1074 bool Option::isSaveable( void)1074 bool Option::isSaveable() 1075 1075 { 1076 1076 return this->saveable; … … 1114 1114 \brief destructs a Button. 1115 1115 */ 1116 Button::~Button( void)1116 Button::~Button() 1117 1117 { 1118 1118 PRINTF(5)("deleting the Label: %s\n", this->title); … … 1138 1138 \todo not implemented yet 1139 1139 */ 1140 void Button::redraw( void)1140 void Button::redraw() 1141 1141 { 1142 1142 } … … 1147 1147 \todo Actions for non-GTK-mode 1148 1148 */ 1149 void Button::changeOption( void)1149 void Button::changeOption() 1150 1150 { 1151 1151 // This will possibly be used for ACTIONS ! … … 1178 1178 \brief destructs a CheckButton. 1179 1179 */ 1180 CheckButton::~CheckButton( void)1180 CheckButton::~CheckButton() 1181 1181 { 1182 1182 if (this->title) … … 1204 1204 \returns the Active state of the checkButton 1205 1205 */ 1206 bool CheckButton::isActive( void)1206 bool CheckButton::isActive() 1207 1207 { 1208 1208 #ifdef HAVE_GTK2 … … 1214 1214 \brief Changed the Option, call this Function 1215 1215 */ 1216 void CheckButton::changeOption( void)1216 void CheckButton::changeOption() 1217 1217 { 1218 1218 #ifdef HAVE_GTK2 … … 1234 1234 Example: if new settings are loaded the Button must be redrawn for the GUI to display that Change 1235 1235 */ 1236 void CheckButton::redraw( void)1236 void CheckButton::redraw() 1237 1237 { 1238 1238 #ifdef HAVE_GTK2 … … 1270 1270 \brief destructs a Slider. 1271 1271 */ 1272 Slider::~Slider( void)1272 Slider::~Slider() 1273 1273 { 1274 1274 PRINTF(5)("deleting the Slider: %s\n", this->title); … … 1298 1298 /** 1299 1299 \brief Redraws the widget 1300 Example: see void CheckButton::redraw( void)1301 */ 1302 void Slider::redraw( void)1300 Example: see void CheckButton::redraw() 1301 */ 1302 void Slider::redraw() 1303 1303 { 1304 1304 #ifdef HAVE_GTK2 … … 1310 1310 \brief Changed the Option, call this Function 1311 1311 */ 1312 void Slider::changeOption( void)1312 void Slider::changeOption() 1313 1313 { 1314 1314 #ifdef HAVE_GTK2 … … 1328 1328 } 1329 1329 1330 char* Slider::save( void)1330 char* Slider::save() 1331 1331 { 1332 1332 char* value = new char [30]; … … 1380 1380 \brief destructs a Menu. 1381 1381 */ 1382 Menu::~Menu( void)1382 Menu::~Menu() 1383 1383 { 1384 1384 PRINTF(5)("deleting the Menu: %s\n", this->title); … … 1401 1401 \brief Initializes a new Menu with no items 1402 1402 */ 1403 void Menu::init( void)1403 void Menu::init() 1404 1404 { 1405 1405 this->optionType = GUI_INT; … … 1418 1418 \returns the name of the selected Menu-Item 1419 1419 */ 1420 char* Menu::save( void)1420 char* Menu::save() 1421 1421 { 1422 1422 MenuItem* tmpItem = this->firstItem; … … 1491 1491 /** 1492 1492 \brief Redraws the widget 1493 Example: see void CheckButton::redraw( void)1494 */ 1495 void Menu::redraw( void)1493 Example: see void CheckButton::redraw() 1494 */ 1495 void Menu::redraw() 1496 1496 { 1497 1497 #ifdef HAVE_GTK2 … … 1503 1503 \brief Changed the Option, call this Function 1504 1504 */ 1505 void Menu::changeOption( void)1505 void Menu::changeOption() 1506 1506 { 1507 1507 #ifdef HAVE_GTK2 … … 1540 1540 \brief destructs an OptionLabel. 1541 1541 */ 1542 OptionLabel::~OptionLabel( void)1542 OptionLabel::~OptionLabel() 1543 1543 { 1544 1544 PRINTF(5)("deleting the OptionLabel: %s\n", this->title); … … 1564 1564 \brief Redraws an OptionLabel(not implemented yet, but it works). 1565 1565 */ 1566 void OptionLabel::redraw( void)1566 void OptionLabel::redraw() 1567 1567 { 1568 1568 #ifdef HAVE_GTK2 … … 1574 1574 \brief Changed the Option, call this Function 1575 1575 */ 1576 void OptionLabel::changeOption( void)1576 void OptionLabel::changeOption() 1577 1577 { 1578 1578 #ifdef HAVE_GTK2 … … 1592 1592 \returns the String to save. 1593 1593 */ 1594 char* OptionLabel::save( void)1594 char* OptionLabel::save() 1595 1595 { 1596 1596 return cValue; … … 1630 1630 \brief destructs a Label. 1631 1631 */ 1632 Label::~Label( void)1632 Label::~Label() 1633 1633 { 1634 1634 PRINTF(5)("deleting the Label: %s\n", this->title); … … 1653 1653 \brief ereases the Text of a Label 1654 1654 */ 1655 void Label::ereaseText( void)1655 void Label::ereaseText() 1656 1656 { 1657 1657 this->setTitle(""); … … 1698 1698 \return The Text the Label holds. 1699 1699 */ 1700 const char* Label::getText( void)1700 const char* Label::getText() 1701 1701 { 1702 1702 return this->title; … … 1728 1728 \brief destructs a ProgressBar 1729 1729 */ 1730 ProgressBar::~ProgressBar( void)1730 ProgressBar::~ProgressBar() 1731 1731 { 1732 1732 PRINTF(5)("deleting the ProgressBar: %s\n", this->title); … … 1762 1762 \brief returns the Progress Status 1763 1763 */ 1764 double ProgressBar::getProgress( void)1764 double ProgressBar::getProgress() 1765 1765 { 1766 1766 return this->progress; … … 1800 1800 \brief destructs an Image. 1801 1801 */ 1802 Image::~Image( void)1802 Image::~Image() 1803 1803 { 1804 1804 PRINTF(5)("deleting the Image: %s\n", this->title); … … 1861 1861 \brief destructs a FileDialog 1862 1862 */ 1863 FileDialog::~FileDialog( void)1863 FileDialog::~FileDialog() 1864 1864 { 1865 1865 PRINTF(5)("deleting FileDialog %s\n", this->title); … … 1903 1903 \brief disables the File Operator Buttons 1904 1904 */ 1905 void FileDialog::disableFileOpts( void)1905 void FileDialog::disableFileOpts() 1906 1906 { 1907 1907 #ifdef HAVE_GTK2 … … 1913 1913 \brief The ok-button has been pressed 1914 1914 */ 1915 void FileDialog::okEvent( void)1915 void FileDialog::okEvent() 1916 1916 { 1917 1917 if (this->okFunc) … … 1936 1936 \biref opens up the FileDialog-Window 1937 1937 */ 1938 void FileDialog::open( void)1938 void FileDialog::open() 1939 1939 { 1940 1940 isOpen = true; … … 1948 1948 \closes the FileDialog-Window 1949 1949 */ 1950 void FileDialog::close( void)1950 void FileDialog::close() 1951 1951 { 1952 1952 this->isOpen = false; -
orxonox/trunk/src/lib/gui/gui_gtk.h
r4427 r4746 45 45 46 46 bool initGUI(int argc, char* argv[]); 47 bool mainloopGUI( void);47 bool mainloopGUI(); 48 48 49 49 //! This is the topmost object that can be displayed all others are derived from it. … … 53 53 54 54 public: 55 Widget( void);56 virtual ~Widget( void);57 58 void show( void);59 void hide( void);55 Widget(); 56 virtual ~Widget(); 57 58 void show(); 59 void hide(); 60 60 void setSize(int width, int height); 61 61 62 62 virtual void setTitle(const char* title); //!< An abstract Function, that sets the title of Widgets. 63 virtual const char* getTitle( void) const { return this->title; };63 virtual const char* getTitle() const { return this->title; }; 64 64 65 65 Widget* findWidgetByName(char* name, unsigned int depth); … … 115 115 { 116 116 public: 117 Packer( void);118 virtual ~Packer( void);117 Packer(); 118 virtual ~Packer(); 119 119 120 120 Widget* down; //!< this points to the Widget below this. … … 123 123 void setGroupName(const char* name); 124 124 /** \returns the GroupName if existent NULL otherwise */ 125 inline const char* getGroupName( void) const {return this->groupName;}125 inline const char* getGroupName() const {return this->groupName;} 126 126 127 127 … … 142 142 143 143 public: 144 Container( void);145 virtual ~Container( void);144 Container(); 145 virtual ~Container(); 146 146 147 147 void setBorderWidth(int borderwidth); … … 163 163 164 164 Window(const char* windowName = NULL); 165 virtual ~Window( void);165 virtual ~Window(); 166 166 167 167 virtual void setTitle(const char* title); 168 void showall( void);169 void open( void);170 void close( void);168 void showall(); 169 void open(); 170 void close(); 171 171 172 172 #ifdef HAVE_GTK2 … … 189 189 public: 190 190 Frame(const char* frameName = NULL); 191 virtual ~Frame( void);191 virtual ~Frame(); 192 192 193 193 virtual void setTitle(const char* title); … … 202 202 public: 203 203 EventBox(const char* eventBoxName = NULL); 204 virtual ~EventBox( void);204 virtual ~EventBox(); 205 205 }; 206 206 … … 215 215 public: 216 216 Box(char boxtype = 'h'); 217 virtual ~Box( void);217 virtual ~Box(); 218 218 219 219 virtual void fill(Widget* lowerWidget); … … 230 230 231 231 public: 232 Option( void);233 virtual ~Option( void);232 Option(); 233 virtual ~Option(); 234 234 235 235 int value; //!< every option has a value either true or false(0,1) or something else like 25 for 25% of the volume … … 242 242 243 243 void saveability(bool isSaveable = true); 244 virtual char* save( void);244 virtual char* save(); 245 245 virtual void load(char* loadString); 246 246 247 bool isSaveable( void);247 bool isSaveable(); 248 248 void setDefaultValue(int defaultValue); 249 249 void setFlagName(const char* flagname, int defaultvalue); … … 251 251 void setDescription(const char* shortDescription, const char* longDescription = NULL); 252 252 253 virtual void redraw( void) = 0; //!< A Option must be able to redraw itself.254 virtual void changeOption( void) = 0; //!< What to do, if an Option is Changed. eacht option decides for itself.253 virtual void redraw() = 0; //!< A Option must be able to redraw itself. 254 virtual void changeOption() = 0; //!< What to do, if an Option is Changed. eacht option decides for itself. 255 255 #ifdef HAVE_GTK2 256 256 // Signals … … 267 267 public: 268 268 Button(const char* buttonName = NULL); 269 virtual ~Button( void);269 virtual ~Button(); 270 270 271 271 virtual void setTitle(const char* title); 272 virtual void redraw( void);273 virtual void changeOption( void);272 virtual void redraw(); 273 virtual void changeOption(); 274 274 }; 275 275 … … 281 281 public: 282 282 CheckButton(const char* buttonName = NULL); 283 virtual ~CheckButton( void);284 285 bool isActive( void);283 virtual ~CheckButton(); 284 285 bool isActive(); 286 286 287 287 virtual void setTitle(const char* title); 288 virtual void redraw( void);289 virtual void changeOption( void);288 virtual void redraw(); 289 virtual void changeOption(); 290 290 }; 291 291 … … 302 302 public: 303 303 Slider(const char* slidername, float start, float end); 304 virtual ~Slider( void);304 virtual ~Slider(); 305 305 306 306 void setExactness(int exactness); 307 307 void setValue(float value); 308 virtual void redraw( void);309 virtual void changeOption( void);310 311 virtual char* save( void);308 virtual void redraw(); 309 virtual void changeOption(); 310 311 virtual char* save(); 312 312 virtual void load(char* loadString); 313 313 }; … … 338 338 Menu(const char* menuName); 339 339 Menu(char* menuname, ...); 340 virtual ~Menu( void);341 void init( void);342 343 virtual char* save( void);340 virtual ~Menu(); 341 void init(); 342 343 virtual char* save(); 344 344 virtual void load(char* loadString); 345 345 346 346 void addItem(char* itemName); 347 virtual void redraw( void);348 virtual void changeOption( void);347 virtual void redraw(); 348 virtual void changeOption(); 349 349 }; 350 350 … … 354 354 public: 355 355 OptionLabel(const char* label, const char* value); 356 virtual ~OptionLabel( void);356 virtual ~OptionLabel(); 357 357 358 358 void setValue(const char* newValue); 359 359 360 virtual char* save( void);360 virtual char* save(); 361 361 virtual void load(char* loadString); 362 362 363 virtual void redraw( void);364 virtual void changeOption( void);363 virtual void redraw(); 364 virtual void changeOption(); 365 365 366 366 char* cValue; //!< The Value the Label will have. \todo make private … … 372 372 public: 373 373 EntryField(const char* name = NULL); 374 virtual ~EntryField( void);374 virtual ~EntryField(); 375 375 376 376 void setValue(const char* newValue); 377 virtual char* save( void);377 virtual char* save(); 378 378 virtual void load(char* loadString); 379 379 380 virtual void redraw( void);381 virtual void changeOption( void);380 virtual void redraw(); 381 virtual void changeOption(); 382 382 }; 383 383 … … 387 387 public: 388 388 Label(const char* text = NULL); 389 virtual ~Label( void);389 virtual ~Label(); 390 390 391 391 virtual void setTitle(const char* text); 392 void ereaseText( void);392 void ereaseText(); 393 393 void appendText(char* textToAppend); 394 394 void appendInt(int intToAppend); 395 const char* getText( void);395 const char* getText(); 396 396 }; 397 397 … … 401 401 public: 402 402 ProgressBar(const char* label = NULL); 403 virtual ~ProgressBar( void);403 virtual ~ProgressBar(); 404 404 405 405 void setProgress(double progress); 406 406 void setTotalSize(double totalSize); 407 double getProgress( void);407 double getProgress(); 408 408 409 409 private: … … 425 425 Image(const char* imgaeName); 426 426 Image(char** imageData); 427 virtual ~Image( void);427 virtual ~Image(); 428 428 void init(const char* name); 429 429 }; … … 441 441 public: 442 442 FileDialog(const char* fileDialogName); 443 virtual ~FileDialog( void);443 virtual ~FileDialog(); 444 444 445 445 void setChangeOption(OptionLabel* changeOption); … … 448 448 void setDefaultFileName(const char* defaultFileName); 449 449 void setMask(const char* mask); 450 void disableFileOpts( void);450 void disableFileOpts(); 451 451 452 452 void okEvent(); -
orxonox/trunk/src/lib/gui/gui_keys.cc
r4427 r4746 31 31 \brief Creates an Keyboard-Frame 32 32 */ 33 GuiKeys::GuiKeys( void)33 GuiKeys::GuiKeys() 34 34 { 35 35 Frame* keysFrame; //!< The Frame that holds the keyOptions. … … 79 79 \brief Destructs the Keys-stuff 80 80 */ 81 GuiKeys::~GuiKeys( void)81 GuiKeys::~GuiKeys() 82 82 { 83 83 // nothing to do here. … … 149 149 \returns the OpenButton of a Player 150 150 */ 151 Button* PlayerKeys::getOpenButton( void)151 Button* PlayerKeys::getOpenButton() 152 152 { 153 153 return this->openButton; … … 214 214 \returns the OpenButton of a Misc 215 215 */ 216 Button* MiscKeys::getOpenButton( void)216 Button* MiscKeys::getOpenButton() 217 217 { 218 218 return this->openButton; -
orxonox/trunk/src/lib/gui/gui_keys.h
r4427 r4746 27 27 { 28 28 public: 29 GuiKeys( void);30 ~GuiKeys( void);29 GuiKeys(); 30 ~GuiKeys(); 31 31 32 32 static Window* inputWindow; //!< A Window that gets keyboard clicks. Static, because only one needed. … … 44 44 PlayerKeys(char* player); 45 45 46 Button* getOpenButton( void);46 Button* getOpenButton(); 47 47 }; 48 48 … … 55 55 MiscKeys(); 56 56 57 Button* getOpenButton( void);57 Button* getOpenButton(); 58 58 }; 59 59 -
orxonox/trunk/src/lib/gui/gui_update.cc
r4427 r4746 35 35 \brief Creates an Update-Frame 36 36 */ 37 GuiUpdate::GuiUpdate( void)37 GuiUpdate::GuiUpdate() 38 38 { 39 39 FileDialog* dataDirDialog; //!< A FileDialog for the selection of the DataRepos … … 100 100 \brief Destructs the Update-stuff 101 101 */ 102 GuiUpdate::~GuiUpdate( void)102 GuiUpdate::~GuiUpdate() 103 103 { 104 104 … … 128 128 \brief Look what info we can get from this system 129 129 */ 130 bool GuiUpdate::getSystemInfo( void)130 bool GuiUpdate::getSystemInfo() 131 131 { 132 132 PRINTF(5)("Grabbing system information\n"); … … 155 155 156 156 #ifdef HAVE_CURL 157 bool* GuiUpdate::checkForUpdates( void)157 bool* GuiUpdate::checkForUpdates() 158 158 { 159 159 PRINTF(4)("checking for new version of orxonox\n"); … … 169 169 \brief Creates a window, and all it contains for the Data-update. 170 170 */ 171 void GuiUpdate::updateDataWindowCreate( void)171 void GuiUpdate::updateDataWindowCreate() 172 172 { 173 173 this->updateDataWindow = new Window("update orxonox::Data"); … … 208 208 \returns A Pointer to the Button of the UpdaterDataWindow 209 209 */ 210 Button* GuiUpdate::updateDataWindowGetButton( void)210 Button* GuiUpdate::updateDataWindowGetButton() 211 211 { 212 212 return this->updateDataWindowButton; … … 216 216 \brief Creates a window, and all it contains for the Source-update. 217 217 */ 218 void GuiUpdate::updateSourceWindowCreate( void)218 void GuiUpdate::updateSourceWindowCreate() 219 219 { 220 220 // the button, that opens this Window. … … 247 247 \returns A Pointer to the Button of the UpdaterSourceWindow 248 248 */ 249 Button* GuiUpdate::updateSourceWindowGetButton( void)249 Button* GuiUpdate::updateSourceWindowGetButton() 250 250 { 251 251 return this->updateSourceWindowButton; -
orxonox/trunk/src/lib/gui/gui_update.h
r4427 r4746 37 37 char* userName; //!< The user logged in. 38 38 39 bool getSystemInfo( void);39 bool getSystemInfo(); 40 40 41 41 // Window creation. … … 99 99 100 100 public: 101 GuiUpdate( void);102 ~GuiUpdate( void);101 GuiUpdate(); 102 ~GuiUpdate(); 103 103 104 104 #ifdef HAVE_CURL 105 void updateDataWindowCreate( void);106 Button* updateDataWindowGetButton( void);105 void updateDataWindowCreate(); 106 Button* updateDataWindowGetButton(); 107 107 108 void updateSourceWindowCreate( void);109 Button* updateSourceWindowGetButton( void);108 void updateSourceWindowCreate(); 109 Button* updateSourceWindowGetButton(); 110 110 111 bool* checkForUpdates( void);111 bool* checkForUpdates(); 112 112 113 113 #endif /* HAVE_CURL */ -
orxonox/trunk/src/lib/gui/gui_video.cc
r4427 r4746 34 34 \brief Creates the Video-Option-Frame 35 35 */ 36 GuiVideo::GuiVideo( void)36 GuiVideo::GuiVideo() 37 37 { 38 38 Frame* videoFrame; //!< The Frame that holds the video options. … … 76 76 \brief Destructs the Video-stuff 77 77 */ 78 GuiVideo::~GuiVideo( void)78 GuiVideo::~GuiVideo() 79 79 { 80 80 // nothing to do here. … … 84 84 \brief Creates a window, and all it contains for the Source-update. 85 85 */ 86 Widget* GuiVideo::advancedWindowCreate( void)86 Widget* GuiVideo::advancedWindowCreate() 87 87 { 88 88 // advanced-Performance-Options -
orxonox/trunk/src/lib/gui/gui_video.h
r4427 r4746 17 17 { 18 18 private: 19 // Button* advancedWindowGetButton( void);19 // Button* advancedWindowGetButton(); 20 20 21 21 public: 22 GuiVideo( void);23 ~GuiVideo( void);22 GuiVideo(); 23 ~GuiVideo(); 24 24 25 25 private: 26 26 void getResolutions(Menu* menu); 27 Widget* advancedWindowCreate( void);27 Widget* advancedWindowCreate(); 28 28 }; 29 29 #endif /* _GUI_VIDEO_H */
Note: See TracChangeset
for help on using the changeset viewer.