Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/src/gui/orxonox_gui_audio.h

Timestamp:

Mar 1, 2005, 9:50:30 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to trackManager
merged with command
svn merge -r 3369:HEAD trunk/ branches/trackManager
resoloved conflicts in favor of the trunk.

Location:

orxonox/branches/trackManager

Files:

• . (modified) (1 prop)
• src/gui/orxonox_gui_audio.h (modified) (1 diff)

orxonox/branches/trackManager/src/gui/orxonox_gui_audio.h

@@ -19 +19 @@
   Slider* effectsVolume;    //!< A Slider for effects volume.
  public:
-  OrxonoxGuiAudio ();
-  ~OrxonoxGuiAudio ();
+  OrxonoxGuiAudio(void);
+  ~OrxonoxGuiAudio(void);
   
-  Widget* getWidget ();
+  Widget* getWidget(void);
 };
 #endif /* _ORXONOX_GUI_AUDIO_H */