Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4047 in orxonox.OLD for orxonox/branches/guiMerge/src/lib/gui


Ignore:
Timestamp:
May 5, 2005, 12:01:29 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/guiMerge: nameSpace-changes

Location:
orxonox/branches/guiMerge/src/lib/gui/gui
Files:
2 edited
21 moved

Legend:

Unmodified
Added
Removed

  • orxonox/branches/guiMerge/src/lib/gui/gui/Makefile.am

    r4039 r4047  
    1111AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
    1212AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
     13AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui
    1314AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
    1415AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    … …  
    2425
    2526bin_PROGRAMS=gui
    26 gui_SOURCES=orxonox_gui_main.cc \
    27             orxonox_gui.cc \
    28             orxonox_gui_gtk.cc \
    29             orxonox_gui_element.cc \
    30             orxonox_gui_video.cc \
    31             orxonox_gui_audio.cc \
    32             orxonox_gui_exec.cc \
    33             orxonox_gui_flags.cc \
    34             orxonox_gui_banner.cc \
    35             orxonox_gui_keys.cc \
    36             orxonox_gui_update.cc
     27gui_SOURCES=gui_main.cc \
     28            gui.cc \
     29            gui_gtk.cc \
     30            gui_element.cc \
     31            gui_video.cc \
     32            gui_audio.cc \
     33            gui_exec.cc \
     34            gui_flags.cc \
     35            gui_banner.cc \
     36            gui_keys.cc \
     37            gui_update.cc
    3738
    38 noinst_HEADERS=orxonox_gui.h \
    39             orxonox_gui_gtk.h \
    40             orxonox_gui_element.h \
    41             orxonox_gui_video.h \
    42             orxonox_gui_audio.h \
    43             orxonox_gui_exec.h \
    44             orxonox_gui_flags.h \
    45             orxonox_gui_banner.h \
    46             orxonox_gui_keys.h \
    47             orxonox_gui_update.h
     39noinst_HEADERS=gui.h \
     40            gui_gtk.h \
     41            gui_element.h \
     42            gui_video.h \
     43            gui_audio.h \
     44            gui_exec.h \
     45            gui_flags.h \
     46            gui_banner.h \
     47            gui_keys.h \
     48            gui_update.h
    4849
    4950#  uncomment the following if orxonox requires the mathlibrary

  • orxonox/branches/guiMerge/src/lib/gui/gui/Makefile.in

    r4044 r4047  
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    55 am_gui_OBJECTS = orxonox_gui_main.$(OBJEXT) orxonox_gui.$(OBJEXT) \
    56         orxonox_gui_gtk.$(OBJEXT) orxonox_gui_element.$(OBJEXT) \
    57         orxonox_gui_video.$(OBJEXT) orxonox_gui_audio.$(OBJEXT) \
    58         orxonox_gui_exec.$(OBJEXT) orxonox_gui_flags.$(OBJEXT) \
    59         orxonox_gui_banner.$(OBJEXT) orxonox_gui_keys.$(OBJEXT) \
    60         orxonox_gui_update.$(OBJEXT)
     55am_gui_OBJECTS = gui_main.$(OBJEXT) gui.$(OBJEXT) gui_gtk.$(OBJEXT) \
     56        gui_element.$(OBJEXT) gui_video.$(OBJEXT) gui_audio.$(OBJEXT) \
     57        gui_exec.$(OBJEXT) gui_flags.$(OBJEXT) gui_banner.$(OBJEXT) \
     58        gui_keys.$(OBJEXT) gui_update.$(OBJEXT)
    6159gui_OBJECTS = $(am_gui_OBJECTS)
    6260gui_LDADD = $(LDADD)
    … …  
    6462depcomp = $(SHELL) $(top_srcdir)/depcomp
    6563am__depfiles_maybe = depfiles
    66 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_gui.Po \
    67 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_audio.Po \
    68 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_banner.Po \
    69 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_element.Po \
    70 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_exec.Po \
    71 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_flags.Po \
    72 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_gtk.Po \
    73 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_keys.Po \
    74 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_main.Po \
    75 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_update.Po \
    76 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_video.Po
     64@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gui.Po ./$(DEPDIR)/gui_audio.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/gui_banner.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/gui_element.Po ./$(DEPDIR)/gui_exec.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/gui_flags.Po ./$(DEPDIR)/gui_gtk.Po \
     68@AMDEP_TRUE@    ./$(DEPDIR)/gui_keys.Po ./$(DEPDIR)/gui_main.Po \
     69@AMDEP_TRUE@    ./$(DEPDIR)/gui_update.Po ./$(DEPDIR)/gui_video.Po
    7770CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    7871        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    198191target_vendor = @target_vendor@
    199192MAINSRCDIR = ../../..
    200 AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
     193AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
    201194
    202195#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
    203196AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    204 gui_SOURCES = orxonox_gui_main.cc \
    205             orxonox_gui.cc \
    206             orxonox_gui_gtk.cc \
    207             orxonox_gui_element.cc \
    208             orxonox_gui_video.cc \
    209             orxonox_gui_audio.cc \
    210             orxonox_gui_exec.cc \
    211             orxonox_gui_flags.cc \
    212             orxonox_gui_banner.cc \
    213             orxonox_gui_keys.cc \
    214             orxonox_gui_update.cc
    215 
    216 noinst_HEADERS = orxonox_gui.h \
    217             orxonox_gui_gtk.h \
    218             orxonox_gui_element.h \
    219             orxonox_gui_video.h \
    220             orxonox_gui_audio.h \
    221             orxonox_gui_exec.h \
    222             orxonox_gui_flags.h \
    223             orxonox_gui_banner.h \
    224             orxonox_gui_keys.h \
    225             orxonox_gui_update.h
     197gui_SOURCES = gui_main.cc \
     198            gui.cc \
     199            gui_gtk.cc \
     200            gui_element.cc \
     201            gui_video.cc \
     202            gui_audio.cc \
     203            gui_exec.cc \
     204            gui_flags.cc \
     205            gui_banner.cc \
     206            gui_keys.cc \
     207            gui_update.cc
     208
     209noinst_HEADERS = gui.h \
     210            gui_gtk.h \
     211            gui_element.h \
     212            gui_video.h \
     213            gui_audio.h \
     214            gui_exec.h \
     215            gui_flags.h \
     216            gui_banner.h \
     217            gui_keys.h \
     218            gui_update.h
    226219
    227220
    … …  
    301294        -rm -f *.tab.c
    302295
    303 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui.Po@am__quote@
    304 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_audio.Po@am__quote@
    305 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_banner.Po@am__quote@
    306 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_element.Po@am__quote@
    307 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_exec.Po@am__quote@
    308 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_flags.Po@am__quote@
    309 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_gtk.Po@am__quote@
    310 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_keys.Po@am__quote@
    311 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_main.Po@am__quote@
    312 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_update.Po@am__quote@
    313 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_video.Po@am__quote@
     296@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui.Po@am__quote@
     297@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_audio.Po@am__quote@
     298@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_banner.Po@am__quote@
     299@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_element.Po@am__quote@
     300@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_exec.Po@am__quote@
     301@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_flags.Po@am__quote@
     302@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_gtk.Po@am__quote@
     303@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_keys.Po@am__quote@
     304@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_main.Po@am__quote@
     305@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_update.Po@am__quote@
     306@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_video.Po@am__quote@
    314307
    315308.cc.o:

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui.cc

    r4046 r4047  
    2626#include <unistd.h>
    2727
    28 #include "orxonox_gui_gtk.h"
    29 #include "orxonox_gui.h"
    30 #include "orxonox_gui_video.h"
    31 #include "orxonox_gui_audio.h"
    32 #include "orxonox_gui_exec.h"
    33 #include "orxonox_gui_flags.h"
    34 #include "orxonox_gui_banner.h"
    35 #include "orxonox_gui_keys.h"
    36 #include "orxonox_gui_update.h"
     28#include "gui_gtk.h"
     29#include "gui.h"
     30#include "gui_video.h"
     31#include "gui_audio.h"
     32#include "gui_exec.h"
     33#include "gui_flags.h"
     34#include "gui_banner.h"
     35#include "gui_keys.h"
     36#include "gui_update.h"
    3737
    3838// GUI-modules

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_audio.cc

    r4046 r4047  
    2424*/
    2525
    26 #include "orxonox_gui_audio.h"
     26#include "gui_audio.h"
    2727
    2828/**

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_audio.h

    r4046 r4047  
    77#define _ORXONOX_GUI_AUDIO_H
    88
    9 #include "orxonox_gui_element.h"
     9#include "gui_element.h"
    1010
    1111//! Class that creates the Audio-Options.

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_banner.cc

    r4046 r4047  
    2424*/
    2525
    26 #include "orxonox_gui_banner.h"
     26#include "gui_banner.h"
     27
    2728#include "banner.xpm"
    2829#include "logo.xpm"

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_banner.h

    r4046 r4047  
    88#define _ORXONOX_GUI_BANNER_H
    99
    10 #include "orxonox_gui.h"
    11 #include "orxonox_gui_element.h"
     10#include "gui.h"
     11#include "gui_element.h"
    1212
    1313//! Class that creates the Banner-Image

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_element.cc

    r4046 r4047  
    1616//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
    1717
    18 #include "orxonox_gui_element.h"
     18#include "gui_element.h"
    1919
    2020using namespace std;

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_element.h

    r4046 r4047  
    88#define _ORXONOX_GUI_ELEMENT_H
    99
    10 #include "orxonox_gui_gtk.h"
     10#include "gui_gtk.h"
    1111
    1212//! A SuperClass for all the Different GuiElements

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_exec.cc

    r4046 r4047  
    2424*/
    2525
    26 #include "orxonox_gui_exec.h"
     26#include "gui_exec.h"
    2727
    2828#include <string.h>

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_exec.h

    r4046 r4047  
    77#define _ORXONOX_GUI_EXEC_H
    88
    9 #include "orxonox_gui.h"
    10 #include "orxonox_gui_element.h"
     9#include "gui.h"
     10#include "gui_element.h"
    1111
    1212using namespace std;

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_flags.cc

    r4046 r4047  
    2424*/
    2525
    26 #include "orxonox_gui_flags.h"
     26#include "gui_flags.h"
    2727
    2828/**

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_flags.h

    r4046 r4047  
    77#define _ORXONOX_GUI_FLAGS_H
    88
    9 #include "orxonox_gui.h"
    10 #include "orxonox_gui_element.h"
     9#include "gui.h"
     10#include "gui_element.h"
    1111
    1212//! Class that creates the flags-Text.

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_gtk.cc

    r4046 r4047  
    2525
    2626
    27 #include "orxonox_gui_gtk.h"
     27#include "gui_gtk.h"
    2828
    2929#include <stdarg.h>
    … …  
    3232using namespace std;
    3333
    34 #include "orxonox_gui_flags.h"
     34#include "gui_flags.h"
    3535extern OrxonoxGuiFlags* flags;
    3636

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_keys.cc

    r4046 r4047  
    2424*/
    2525
    26 #include "orxonox_gui_keys.h"
     26#include "gui_keys.h"
    2727
    2828#include <string.h>

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_keys.h

    r4046 r4047  
    77#define _ORXONOX_GUI_KEYS_H
    88
    9 #include "orxonox_gui.h"
    10 #include "orxonox_gui_element.h"
     9#include "gui.h"
     10#include "gui_element.h"
    1111
    1212#ifdef HAVE_GTK2

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_main.cc

    r4046 r4047  
    2424*/
    2525
    26 #include "orxonox_gui.h"
     26#include "gui.h"
    2727
    2828int verbose = 4;

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_update.cc

    r4046 r4047  
    2323*/
    2424
    25 #include "orxonox_gui_update.h"
     25#include "gui_update.h"
    2626#include <string.h>
    2727
    28 #include "orxonox_gui.h"
     28#include "gui.h"
    2929#include <stdio.h>
    3030#include <stdlib.h>

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_update.h

    r4046 r4047  
    77#define _ORXONOX_GUI_UPDATE_H
    88
    9 #include "orxonox_gui.h"
    10 #include "orxonox_gui_element.h"
     9#include "gui.h"
     10#include "gui_element.h"
    1111
    1212#include <stdio.h>

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_video.cc

    r4046 r4047  
    2525
    2626
    27 #include "orxonox_gui_video.h"
     27#include "gui_video.h"
    2828
    2929#include "glincl.h"

  • orxonox/branches/guiMerge/src/lib/gui/gui/gui_video.h

    r4046 r4047  
    66#define _ORXONOX_GUI_VIDEO_H
    77
    8 #include "orxonox_gui.h"
    9 #include "orxonox_gui_element.h"
     8#include "gui.h"
     9#include "gui_element.h"
    1010
    1111//! Class that creates the Video-Options.
Note: See TracChangeset for help on using the changeset viewer.