Changeset 7608 in orxonox.OLD for branches/qt_gui/src/lib
- Timestamp:
- May 12, 2006, 10:43:53 AM (18 years ago)
- Location:
- branches/qt_gui/src/lib
- Files:
-
- 9 edited
- 21 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/qt_gui/src/lib/BuildLibs.am
r7457 r7608 3 3 $(LIB_PREFIX)/libORXlibs.a \ 4 4 $(LIB_PREFIX)/shell/libORXshell.a \ 5 $(LIB_PREFIX)/gui/gtk_gui/libORXgui.a \ 5 $(LIB_PREFIX)/gui/gtk_gui/libORXgtkgui.a \ 6 $(LIB_PREFIX)/gui/qt_gui/libORXqtgui.a \ 6 7 $(LIB_PREFIX)/gui/gl_gui/libORXglgui.a \ 8 $(LIB_PREFIX)/gui/libORXbasegui.a \ 7 9 $(LIB_PREFIX)/graphics/importer/libORXimporter.a \ 8 10 $(LIB_PREFIX)/graphics/libORXgraphics.a \ -
branches/qt_gui/src/lib/gui/Makefile.am
r5315 r7608 1 SUBDIRS = gtk_gui \ 2 gl_gui 1 MAINSRCDIR=../.. 2 include $(MAINSRCDIR)/defs/include_paths.am 3 4 AM_LDFLAGS = 5 6 noinst_LIBRARIES = libORXbasegui.a 7 8 9 libORXbasegui_a_SOURCES = \ 10 gui_element.cc \ 11 gui_saveable.cc \ 12 gui.cc 13 14 15 noinst_HEADERS= \ 16 gui_element.h \ 17 gui_saveable.h \ 18 gui.h 19 20 21 EXTRA_DIST = 22 23 SUBDIRS = \ 24 . \ 25 gtk_gui \ 26 gl_gui \ 27 qt_gui -
branches/qt_gui/src/lib/gui/gtk_gui/Makefile.am
r5463 r7608 2 2 include $(MAINSRCDIR)/defs/include_paths.am 3 3 4 noinst_LIBRARIES = libORXg ui.a4 noinst_LIBRARIES = libORXgtkgui.a 5 5 6 libORXgui_a_CPPFLAGS = -DBUILD_ORXONOX \ 7 $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) 6 libORXgtkgui_a_CPPFLAGS = \ 7 -DBUILD_ORXONOX \ 8 $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) 8 9 9 libORXgui_a_SOURCES = gui.cc \ 10 gui_gtk.cc \ 11 gui_element.cc \ 12 gui_video.cc \ 13 gui_audio.cc \ 14 gui_exec.cc \ 15 gui_flags.cc \ 16 gui_banner.cc \ 17 gui_keys.cc \ 18 gui_update.cc 10 libORXgtkgui_a_SOURCES = \ 11 gui.cc \ 12 gui_gtk.cc \ 13 gui_element.cc \ 14 gui_video.cc \ 15 gui_audio.cc \ 16 gui_exec.cc \ 17 gui_flags.cc \ 18 gui_banner.cc \ 19 gui_keys.cc \ 20 gui_update.cc 19 21 20 22 noinst_HEADERS= gui.h \ 21 22 23 24 25 26 27 28 29 23 gui_gtk.h \ 24 gui_element.h \ 25 gui_video.h \ 26 gui_audio.h \ 27 gui_exec.h \ 28 gui_flags.h \ 29 gui_banner.h \ 30 gui_keys.h \ 31 gui_update.h 30 32 31 33 EXTRA_DIST = rc \ -
branches/qt_gui/src/lib/gui/gtk_gui/gui_element.h
r5039 r7608 1 /*! 1 /*! 2 2 * @file gui_element.h 3 3 * Definition of ... 4 4 5 5 */ … … 16 16 GuiElement(); 17 17 virtual ~GuiElement(); 18 18 19 19 /** @returns the main Widget of this GuiElement. */ 20 Widget* getWidget() { return this->mainWidget;}20 Widget* getWidget() { return this->mainWidget; } 21 21 protected: 22 22 void setMainWidget(Widget* widget); 23 23 24 24 private: 25 25 Widget* mainWidget; -
branches/qt_gui/src/lib/gui/gtk_gui/gui_update.cc
r5766 r7608 51 51 52 52 this->updateFrame = new Frame("Update-Options:"); 53 this->updateFrame->setGroupName(CONFIG_SECTION_ DATA);53 this->updateFrame->setGroupName(CONFIG_SECTION_GENERAL); 54 54 this->updateBox = new Box('v'); 55 55 -
branches/qt_gui/src/lib/lang/base_object.cc
r7429 r7608 20 20 21 21 #include "util/loading/load_param.h" 22 #include "compiler.h"23 22 #include "class_list.h" 24 23 … … 32 31 * @param root the element to load from 33 32 */ 34 BaseObject::BaseObject( )33 BaseObject::BaseObject(const std::string& objectName) 35 34 { 36 35 this->classID = CL_BASE_OBJECT; 37 36 this->className = "BaseObject"; 38 37 39 this->objectName = "";38 this->objectName = objectName; 40 39 this->classList = NULL; 41 40 this->xmlElem = NULL; -
branches/qt_gui/src/lib/lang/base_object.h
r7221 r7608 27 27 28 28 public: 29 BaseObject ();29 BaseObject (const std::string& objectName = ""); 30 30 virtual ~BaseObject (); 31 31 -
branches/qt_gui/src/lib/particles/dot_emitter.cc
r7302 r7608 23 23 #include "util/loading/factory.h" 24 24 #include "debug.h" 25 #include "stdlibincl.h"26 25 27 26 using namespace std; -
branches/qt_gui/src/lib/shell/shell_buffer.h
r7374 r7608 10 10 #include <stdarg.h> 11 11 #include <list> 12 #include " threading.h"12 #include "lib/util/threading.h" 13 13 14 14 #define SHELL_BUFFER_SIZE 16384 //!< The Size of the input-buffers (should be large enough to carry any kind of input)
Note: See TracChangeset
for help on using the changeset viewer.