From 13f86ce27e6f7697d83d912c391517a1239fa378 Mon Sep 17 00:00:00 2001
From: dagenais <dagenais@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Tue, 20 Apr 2004 15:33:40 +0000
Subject: [PATCH] More intermediate cleanup

git-svn-id: http://ltt.polymtl.ca/svn@505 04897980-b3bd-0310-b5e0-8ef037075253
---
 ltt/branches/poly/configure.in                | 13 ++++---
 .../poly/lttv/modules/gui/Makefile.am         |  2 +-
 .../lttv/modules/gui/controlflow/Makefile.am  |  2 +-
 .../poly/lttv/modules/gui/controlflow/cfv.h   |  4 +--
 .../lttv/modules/gui/controlflow/drawing.c    |  2 +-
 .../lttv/modules/gui/controlflow/eventhooks.c |  4 +--
 .../lttv/modules/gui/controlflow/eventhooks.h |  2 +-
 .../lttv/modules/gui/controlflow/module.c     |  2 +-
 .../modules/gui/detailedevents/Makefile.am    |  2 +-
 .../lttv/modules/gui/detailedevents/events.c  |  2 +-
 .../poly/lttv/modules/gui/lttvgui/Makefile.am | 34 -------------------
 .../lttv/modules/gui/lttvwindow/Makefile.am   |  2 +-
 .../modules/gui/lttvwindow/src/Makefile.am    | 16 ++++++++-
 .../modules/gui/lttvwindow/src/callbacks.c    | 12 +++----
 .../modules/gui/lttvwindow/src/callbacks.h    |  4 +--
 .../gui/{lttvgui => lttvwindow/src}/common.h  |  2 +-
 .../{lttvgui => lttvwindow/src}/gtkdirsel.c   |  2 +-
 .../{lttvgui => lttvwindow/src}/gtkdirsel.h   |  0
 .../src}/gtkmultivpaned.c                     |  6 ++--
 .../src}/gtkmultivpaned.h                     |  2 +-
 .../{lttvgui => lttvwindow/src}/gtktraceset.c | 10 +++---
 .../{lttvgui => lttvwindow/src}/gtktraceset.h |  2 +-
 .../modules/gui/lttvwindow/src/init_module.c  |  6 ++--
 .../modules/gui/lttvwindow/src/lttvfilter.c   |  2 +-
 .../{lttvgui => lttvwindow/src}/lttvfilter.h  |  0
 .../lttv/modules/gui/lttvwindow/src/main.c    |  2 +-
 .../{lttvgui => lttvwindow/src}/mainwindow.h  |  4 +--
 .../gui/{lttvgui => lttvwindow/src}/menu.c    |  2 +-
 .../gui/{lttvgui => lttvwindow/src}/menu.h    |  2 +-
 .../gui/{lttvgui => lttvwindow/src}/toolbar.c |  2 +-
 .../gui/{lttvgui => lttvwindow/src}/toolbar.h |  2 +-
 .../lttv/modules/gui/statistics/Makefile.am   |  2 +-
 .../lttv/modules/gui/statistics/statistics.c  |  4 +--
 33 files changed, 67 insertions(+), 88 deletions(-)
 delete mode 100644 ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am
 rename ltt/branches/poly/lttv/modules/gui/{lttvgui => lttvwindow/src}/common.h (97%)
 rename ltt/branches/poly/lttv/modules/gui/{lttvgui => lttvwindow/src}/gtkdirsel.c (99%)
 rename ltt/branches/poly/lttv/modules/gui/{lttvgui => lttvwindow/src}/gtkdirsel.h (100%)
 rename ltt/branches/poly/lttv/modules/gui/{lttvgui => lttvwindow/src}/gtkmultivpaned.c (99%)
 rename ltt/branches/poly/lttv/modules/gui/{lttvgui => lttvwindow/src}/gtkmultivpaned.h (99%)
 rename ltt/branches/poly/lttv/modules/gui/{lttvgui => lttvwindow/src}/gtktraceset.c (99%)
 rename ltt/branches/poly/lttv/modules/gui/{lttvgui => lttvwindow/src}/gtktraceset.h (99%)
 rename ltt/branches/poly/lttv/modules/gui/{lttvgui => lttvwindow/src}/lttvfilter.h (100%)
 rename ltt/branches/poly/lttv/modules/gui/{lttvgui => lttvwindow/src}/mainwindow.h (97%)
 rename ltt/branches/poly/lttv/modules/gui/{lttvgui => lttvwindow/src}/menu.c (98%)
 rename ltt/branches/poly/lttv/modules/gui/{lttvgui => lttvwindow/src}/menu.h (97%)
 rename ltt/branches/poly/lttv/modules/gui/{lttvgui => lttvwindow/src}/toolbar.c (98%)
 rename ltt/branches/poly/lttv/modules/gui/{lttvgui => lttvwindow/src}/toolbar.h (97%)

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index a166264a..4a179b1a 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -80,10 +80,10 @@ AC_SUBST(lttlibdir)
 top_lttvdir="\$(top_srcdir)/lttv"
 AC_SUBST(top_lttvdir)
 
-top_guidir="\$(top_srcdir)/lttv/modules/gui"
-AC_SUBST(top_guidir)
+top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow"
+AC_SUBST(top_lttvwindowdir)
 
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_guidir)"
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
 AC_SUBST(DEFAULT_INCLUDES)
 
 #CPPFLAGS="${GLIB_CFLAGS}"
@@ -95,8 +95,8 @@ AC_SUBST(lttincludedir)
 lttvincludedir="${includedir}/lttv"
 AC_SUBST(lttvincludedir)
 
-lttvguiincludedir="${includedir}/lttvgui"
-AC_SUBST(lttvguiincludedir)
+lttvwindowincludedir="${includedir}/lttvwindow"
+AC_SUBST(lttvwindowincludedir)
 
 AC_CONFIG_FILES([Makefile
 		 lttv/Makefile
@@ -104,9 +104,8 @@ AC_CONFIG_FILES([Makefile
 		 lttv/modules/Makefile
 		 lttv/modules/text/Makefile
 		 lttv/modules/gui/Makefile
-		 lttv/modules/gui/lttvgui/Makefile
 		 lttv/modules/gui/lttvwindow/Makefile
-		 lttv/modules/gui/lttvwindow/src/Makefile
+		 lttv/modules/gui/lttvwindow/lttvwindow/Makefile
 		 lttv/modules/gui/lttvwindow/pixmaps/Makefile
 		 lttv/modules/gui/lttvwindow/glade/Makefile
 		 lttv/modules/gui/controlflow/Makefile
diff --git a/ltt/branches/poly/lttv/modules/gui/Makefile.am b/ltt/branches/poly/lttv/modules/gui/Makefile.am
index 7b3fd205..039dae06 100644
--- a/ltt/branches/poly/lttv/modules/gui/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/Makefile.am
@@ -6,5 +6,5 @@
 
 # WARNING : subdirs order is important : mainWin depends on API
 
-SUBDIRS = lttvgui lttvwindow controlflow detailedevents statistics
+SUBDIRS = lttvwindow controlflow detailedevents statistics
 
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
index 4a42f660..89050810 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/Makefile.am
@@ -25,7 +25,7 @@
 AM_CFLAGS = $(GLIB_CFLAGS) 
 AM_CFLAGS += $(GTK_CFLAGS)
 LIBS += $(GLIB_LIBS)
-LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvgui -llttvgui
+LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 
 libdir = ${lttvplugindir}
 
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h
index 928936d5..c5f9d14f 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/cfv.h
@@ -22,8 +22,8 @@
 #define _CFV_H
 
 #include <gtk/gtk.h>
-#include <lttvgui/common.h>
-#include <lttvgui/mainwindow.h>
+#include <lttvwindow/common.h>
+#include <lttvwindow/mainwindow.h>
 #include "processlist.h"
 
 typedef struct _ControlFlowData ControlFlowData;
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
index bc2297ca..27df2e4a 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
@@ -21,7 +21,7 @@
 
 #include <lttv/lttv.h>
 #include <lttv/tracecontext.h>
-#include <lttvgui/gtktraceset.h>
+#include <lttvwindow/gtktraceset.h>
 #include <lttv/hook.h>
 
 #include "drawing.h"
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
index 38748bed..df5291d0 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
@@ -38,9 +38,9 @@
 
 #include <lttv/lttv.h>
 #include <lttv/hook.h>
-#include <lttvgui/common.h>
+#include <lttvwindow/common.h>
 #include <lttv/state.h>
-#include <lttvgui/gtktraceset.h>
+#include <lttvwindow/gtktraceset.h>
 
 
 #include "eventhooks.h"
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.h b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.h
index 134307bd..05e7e7c0 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.h
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.h
@@ -27,7 +27,7 @@
 #define _EVENT_HOOKS_H
 
 #include <gtk/gtk.h>
-#include <lttvgui/mainwindow.h>
+#include <lttvwindow/mainwindow.h>
 #include <ltt/time.h>
 
 #include "processlist.h"
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
index 72ebf0ca..d5f49f4e 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
@@ -40,7 +40,7 @@
 #include <glib.h>
 #include <lttv/lttv.h>
 #include <lttv/module.h>
-#include <lttvgui/gtktraceset.h>
+#include <lttvwindow/gtktraceset.h>
 
 #include "cfv.h"
 #include "eventhooks.h"
diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am b/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am
index e3523257..d507882b 100644
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/Makefile.am
@@ -26,7 +26,7 @@
 AM_CFLAGS = $(GLIB_CFLAGS) 
 AM_CFLAGS += $(GTK_CFLAGS)
 LIBS += $(GLIB_LIBS)
-LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvgui -llttvgui
+LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 
 libdir = ${lttvplugindir}
 
diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
index 7bb79fdc..858ca481 100644
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@ -45,7 +45,7 @@
 
 #include <lttv/module.h>
 #include <lttv/hook.h>
-#include <lttvgui/gtktraceset.h>
+#include <lttvwindow/gtktraceset.h>
 #include <lttv/tracecontext.h>
 #include <lttv/state.h>
 #include <ltt/ltt.h>
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am b/ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am
deleted file mode 100644
index a428cfc7..00000000
--- a/ltt/branches/poly/lttv/modules/gui/lttvgui/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Makefile for LTT New generation user interface : plugins.
-#
-# Created by Mathieu Desnoyers on May 6, 2003
-#
-
-libdir = ${lttvlibdir}
-
-AM_CFLAGS = $(GLIB_CFLAGS) 
-AM_CFLAGS += $(GTK_CFLAGS)
-LIBS += $(GLIB_LIBS)
-LIBS += $(GTK_LIBS)
-
-lib_LTLIBRARIES = liblttvgui.la
-liblttvgui_la_SOURCES =\
-	toolbar.c\
-	menu.c\
-	gtkdirsel.c\
-	gtkmultivpaned.c\
-	gtktraceset.c
-
-#liblttvgui_la_LDFLAGS = -L${top_srcdir}/lttv/modules/gui/lttvgui -lcustomBox
-
-lttvguiinclude_HEADERS = \
-	common.h\
-	gtkdirsel.h\
-	gtkmultivpaned.h\
-	gtktraceset.h\
-	lttvfilter.h\
-	mainwindow.h\
-	menu.h\
-	toolbar.h
-
-EXTRA_DIST =
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/Makefile.am b/ltt/branches/poly/lttv/modules/gui/lttvwindow/Makefile.am
index 7e90b8f2..cb3ae327 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src glade
+SUBDIRS = lttvwindow glade
 
 install-data-local:
 	@$(NORMAL_INSTALL)
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/Makefile.am b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/Makefile.am
index 35d1cb50..cf6aa237 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/Makefile.am
@@ -3,7 +3,7 @@
 AM_CFLAGS = $(GLIB_CFLAGS) 
 AM_CFLAGS += $(GTK_CFLAGS)
 LIBS += $(GLIB_LIBS)
-LIBS += $(GTK_LIBS) -L$(top_srcdir)/lttv/modules/gui/lttvgui -llttvgui
+LIBS += $(GTK_LIBS) -lcustomBox
 
 INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
@@ -19,6 +19,11 @@ lib_LTLIBRARIES = liblttvwindow.la
 
 liblttvwindow_la_LDFLAGS = -module
 liblttvwindow_la_SOURCES = \
+	toolbar.c\
+	menu.c\
+	gtkdirsel.c\
+	gtkmultivpaned.c\
+	gtktraceset.c \
 	init_module.c \
 	support.c \
 	interface.c \
@@ -30,6 +35,15 @@ noinst_HEADERS = \
 	interface.h \
 	callbacks.h
 
+lttvguiinclude_HEADERS = \
+	common.h\
+	gtkdirsel.h\
+	gtkmultivpaned.h\
+	gtktraceset.h\
+	lttvfilter.h\
+	mainwindow.h\
+	menu.h\
+	toolbar.h
 
 liblttvwindow_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
 
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/callbacks.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/callbacks.c
index 76890d15..3dfaad14 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/callbacks.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/callbacks.c
@@ -26,14 +26,14 @@
 #include "interface.h"
 #include "support.h"
 #include <lttv/lttv.h>
-#include <lttvgui/mainwindow.h>
-#include <lttvgui/menu.h>
-#include <lttvgui/toolbar.h>
-#include <lttvgui/gtktraceset.h>
+#include <lttvwindow/mainwindow.h>
+#include <lttvwindow/menu.h>
+#include <lttvwindow/toolbar.h>
+#include <lttvwindow/gtktraceset.h>
 #include <lttv/module.h>
-#include <lttvgui/gtkdirsel.h>
+#include <lttvwindow/gtkdirsel.h>
 #include <lttv/iattribute.h>
-#include <lttvgui/lttvfilter.h>
+#include <lttvwindow/lttvfilter.h>
 #include <ltt/trace.h>
 #include <ltt/facility.h>
 
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/callbacks.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/callbacks.h
index 2ec6b0bf..96cc541b 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/callbacks.h
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/callbacks.h
@@ -17,8 +17,8 @@
  */
 
 #include <gtk/gtk.h>
-#include <lttvgui/common.h>
-#include <lttvgui/mainwindow.h>
+#include <lttvwindow/common.h>
+#include <lttvwindow/mainwindow.h>
 
 /* internal functions */
 
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/common.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/common.h
similarity index 97%
rename from ltt/branches/poly/lttv/modules/gui/lttvgui/common.h
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/common.h
index 5ec75179..e41a7357 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvgui/common.h
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/common.h
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <ltt/ltt.h>
 #include <gtk/gtk.h>
-#include <lttvgui/lttvfilter.h>
+#include <lttvwindow/lttvfilter.h>
 
 #define MAX_NUMBER_EVENT     "MAX_NUMBER_EVENT"
 #define TRACESET_TIME_SPAN   "TRACESET_TIME_SPAN"
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/gtkdirsel.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkdirsel.c
similarity index 99%
rename from ltt/branches/poly/lttv/modules/gui/lttvgui/gtkdirsel.c
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkdirsel.c
index 138d9750..a52e877d 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvgui/gtkdirsel.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkdirsel.c
@@ -49,7 +49,7 @@
 
 #include "gdk/gdkkeysyms.h"
 #include <gtk/gtk.h>
-#include <lttvgui/gtkdirsel.h>
+#include <lttvwindow/gtkdirsel.h>
 
 #define _(A) A
 #define WANT_HPANED 1
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/gtkdirsel.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkdirsel.h
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/lttvgui/gtkdirsel.h
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkdirsel.h
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/gtkmultivpaned.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkmultivpaned.c
similarity index 99%
rename from ltt/branches/poly/lttv/modules/gui/lttvgui/gtkmultivpaned.c
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkmultivpaned.c
index 6bf873a4..93d87c5c 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvgui/gtkmultivpaned.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkmultivpaned.c
@@ -18,10 +18,10 @@
 
 #include <gtk/gtk.h>
 
-#include <lttvgui/gtkmultivpaned.h>
+#include <lttvwindow/gtkmultivpaned.h>
 //#include "gtkintl.h"
-#include <lttvgui/mainwindow.h>
-#include <lttvgui/gtktraceset.h>
+#include <lttvwindow/mainwindow.h>
+#include <lttvwindow/gtktraceset.h>
 
 static void gtk_multi_vpaned_class_init (GtkMultiVPanedClass    *klass);
 static void gtk_multi_vpaned_init       (GtkMultiVPaned         *multi_vpaned);
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/gtkmultivpaned.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkmultivpaned.h
similarity index 99%
rename from ltt/branches/poly/lttv/modules/gui/lttvgui/gtkmultivpaned.h
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkmultivpaned.h
index f6ab2e49..316ec4d1 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvgui/gtkmultivpaned.h
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtkmultivpaned.h
@@ -25,7 +25,7 @@
 #include <glib-object.h>
 #include <gdk/gdk.h>
 #include <gtk/gtkcontainer.h>
-#include <lttvgui/common.h>
+#include <lttvwindow/common.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/gtktraceset.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtktraceset.c
similarity index 99%
rename from ltt/branches/poly/lttv/modules/gui/lttvgui/gtktraceset.c
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtktraceset.c
index e82d4c0d..9d0fc7f7 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvgui/gtktraceset.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtktraceset.c
@@ -28,14 +28,14 @@
  * 
  */
 
-#include <lttvgui/common.h>
+#include <lttvwindow/common.h>
 #include <ltt/ltt.h>
 #include <lttv/lttv.h>
-#include <lttvgui/mainwindow.h>   
-#include <lttvgui/gtktraceset.h>
+#include <lttvwindow/mainwindow.h>   
+#include <lttvwindow/gtktraceset.h>
 #include <lttv/tracecontext.h>
-#include <lttvgui/toolbar.h>
-#include <lttvgui/menu.h>
+#include <lttvwindow/toolbar.h>
+#include <lttvwindow/menu.h>
 #include <lttv/state.h>
 #include <lttv/stats.h>
 
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/gtktraceset.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtktraceset.h
similarity index 99%
rename from ltt/branches/poly/lttv/modules/gui/lttvgui/gtktraceset.h
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtktraceset.h
index a0b08f2b..e26e7183 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvgui/gtktraceset.h
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/gtktraceset.h
@@ -59,7 +59,7 @@ set_hpane_dividor
 #include <gtk/gtk.h>
 #include <ltt/ltt.h>
 #include <lttv/hook.h>
-#include <lttvgui/common.h>
+#include <lttvwindow/common.h>
 #include <lttv/stats.h>
 
 /**
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/init_module.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/init_module.c
index 22a7ea4f..a6d63cb3 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/init_module.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/init_module.c
@@ -35,12 +35,12 @@
 #include <lttv/tracecontext.h>
 #include <lttv/state.h>
 #include <lttv/stats.h>
-#include <lttvgui/menu.h>
-#include <lttvgui/toolbar.h>
+#include <lttvwindow/menu.h>
+#include <lttvwindow/toolbar.h>
 
 #include "interface.h"
 #include "support.h"
-#include <lttvgui/mainwindow.h>
+#include <lttvwindow/mainwindow.h>
 #include "callbacks.h"
 #include <ltt/trace.h>
 
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/lttvfilter.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/lttvfilter.c
index e81e82ab..2ab00de1 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/lttvfilter.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/lttvfilter.c
@@ -17,7 +17,7 @@
  */
 
 
-#include <lttvgui/lttvfilter.h>
+#include <lttvwindow/lttvfilter.h>
 #include <stdio.h>
 #include <ltt/trace.h>
 #include <ltt/type.h>
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/lttvfilter.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/lttvfilter.h
similarity index 100%
rename from ltt/branches/poly/lttv/modules/gui/lttvgui/lttvfilter.h
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/lttvfilter.h
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/main.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/main.c
index 854839f5..7b31ac63 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/main.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/main.c
@@ -12,7 +12,7 @@
 
 #include "interface.h"
 #include "support.h"
-#include <lttvgui/mainWindow.h>
+#include <lttvwindow/mainWindow.h>
 #include "callbacks.h"
 
 /* global variable */
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/mainwindow.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/mainwindow.h
similarity index 97%
rename from ltt/branches/poly/lttv/modules/gui/lttvgui/mainwindow.h
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/mainwindow.h
index cf0925c4..93496872 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvgui/mainwindow.h
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/mainwindow.h
@@ -26,8 +26,8 @@
 #include <lttv/traceset.h>
 #include <lttv/tracecontext.h>
 
-#include <lttvgui/common.h>
-#include <lttvgui/gtkmultivpaned.h>
+#include <lttvwindow/common.h>
+#include <lttvwindow/gtkmultivpaned.h>
 #include <lttv/hook.h>
 #include <lttv/stats.h>
 
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/menu.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/menu.c
similarity index 98%
rename from ltt/branches/poly/lttv/modules/gui/lttvgui/menu.c
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/menu.c
index 827f843b..32c35c2c 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvgui/menu.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/menu.c
@@ -17,7 +17,7 @@
  */
 
 #include <lttv/lttv.h>
-#include <lttvgui/menu.h>
+#include <lttvwindow/menu.h>
 
 
 inline LttvMenus *lttv_menus_new() {
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/menu.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/menu.h
similarity index 97%
rename from ltt/branches/poly/lttv/modules/gui/lttvgui/menu.h
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/menu.h
index d08572c5..3253bf75 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvgui/menu.h
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/menu.h
@@ -19,7 +19,7 @@
 #ifndef MENU_H
 #define MENU_H
 
-#include <lttvgui/common.h>
+#include <lttvwindow/common.h>
 
 /* constructor of the viewer */
 //typedef GtkWidget* (*lttv_constructor)(void * main_window);
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/toolbar.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/toolbar.c
similarity index 98%
rename from ltt/branches/poly/lttv/modules/gui/lttvgui/toolbar.c
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/toolbar.c
index cfb4dda0..2a1dbb10 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvgui/toolbar.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/toolbar.c
@@ -17,7 +17,7 @@
  */
 
 #include <lttv/lttv.h>
-#include <lttvgui/toolbar.h>
+#include <lttvwindow/toolbar.h>
 
 
 inline LttvToolbars *lttv_toolbars_new() {
diff --git a/ltt/branches/poly/lttv/modules/gui/lttvgui/toolbar.h b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/toolbar.h
similarity index 97%
rename from ltt/branches/poly/lttv/modules/gui/lttvgui/toolbar.h
rename to ltt/branches/poly/lttv/modules/gui/lttvwindow/src/toolbar.h
index 8a8815ad..681311b6 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvgui/toolbar.h
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/src/toolbar.h
@@ -19,7 +19,7 @@
 #ifndef TOOLBAR_H
 #define TOOLBAR_H
 
-#include <lttvgui/common.h>
+#include <lttvwindow/common.h>
 
 /* constructor of the viewer */
 //typedef GtkWidget* (*lttv_constructor)(void * main_window);
diff --git a/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am b/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am
index ae4c8141..cf582c23 100644
--- a/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/statistics/Makefile.am
@@ -7,7 +7,7 @@
 AM_CFLAGS = $(GLIB_CFLAGS) 
 AM_CFLAGS += $(GTK_CFLAGS)
 LIBS += $(GLIB_LIBS)
-LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvgui -llttvgui
+LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
 
 libdir = ${lttvplugindir}
 
diff --git a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c
index d596b859..fe26e80f 100644
--- a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c
+++ b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c
@@ -22,10 +22,10 @@
 
 #include <lttv/lttv.h>
 #include <lttv/module.h>
-#include <lttvgui/gtktraceset.h>
+#include <lttvwindow/gtktraceset.h>
 #include <lttv/tracecontext.h>
 #include <lttv/hook.h>
-#include <lttvgui/common.h>
+#include <lttvwindow/common.h>
 #include <lttv/state.h>
 #include <lttv/stats.h>
 
-- 
2.34.1