Changeset 7489 in orxonox.OLD

Timestamp:

May 3, 2006, 12:04:12 AM (18 years ago)

Author:

bensch

Message:

compile again

Location:

branches/qt_gui

Files:

• configure.ac (modified) (1 diff)
• src/defs/debug.h (modified) (1 diff)
• src/lib/gui/gui_saveable.h (modified) (1 diff)
• src/lib/gui/qt_gui/Makefile.am (modified) (1 diff)
• src/lib/gui/qt_gui/qt_gui.h (modified) (2 diffs)
• src/lib/shell/shell_buffer.h (modified) (1 diff)

branches/qt_gui/configure.ac

@@ -671 +671 @@
                  src/lib/parser/ini_parser/Makefile
                  src/lib/parser/cmdline_parser/Makefile
-                 src/lib/parser/preferences/Makefile
+                 src/lib/parser/preferences/Makefile
                  src/util/Makefile
                  src/world_entities/Makefile

branches/qt_gui/src/defs/debug.h

@@ -28 +28 @@
 #include "confincl.h"
 #ifndef NO_SHELL
- #include "shell_buffer.h"
+#include "lib/shell/shell_buffer.h"
 #endif /* NO_SHELL */
 

branches/qt_gui/src/lib/gui/gui_saveable.h

@@ -8 +8 @@
 
 #include "base_object.h"
-#include "multi_type.h"
+#include "lib/util/multi_type.h"
 #include <vector>
 

branches/qt_gui/src/lib/gui/qt_gui/Makefile.am

@@ -1 +1 @@
 MAINSRCDIR=../../..
-AM_CXXFLAGS=-I$(MAINSRCDIR)/lib/lang
+AM_CXXFLAGS=-I$(MAINSRCDIR)/
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
 

branches/qt_gui/src/lib/gui/qt_gui/qt_gui.h

@@ -8 +8 @@
 
 #include "../gui.h"
-#include "gui_element.h"
+#include "../gui_element.h"
 #include <qapplication.h>
 #include <qmainwindow.h>
@@ -32 +32 @@
     private:
       QMainWindow*              mainWindow;
-      std::list<GuiElement*>    elements;   //!< A List of Elements within the QTGui
+      std::list<Element*>       elements;   //!< A List of Elements within the QTGui
   };
 }

branches/qt_gui/src/lib/shell/shell_buffer.h

@@ -10 +10 @@
 #include <stdarg.h>
 #include <list>
-#include "threading.h"
+#include "lib/util/threading.h"
 
 #define      SHELL_BUFFER_SIZE       16384         //!< The Size of the input-buffers (should be large enough to carry any kind of input)