Changeset 7489 in orxonox.OLD for branches/qt_gui/src/lib/gui

Timestamp:

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

Author:

bensch

Message:

compile again

Location:

branches/qt_gui/src/lib/gui

Files:

• gui_saveable.h (modified) (1 diff)
• qt_gui/Makefile.am (modified) (1 diff)
• qt_gui/qt_gui.h (modified) (2 diffs)

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
   };
 }