From a3de274f7c71d0d64604e3dc07dbe151d59054b3 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 19 Sep 2000 22:57:58 +0000 Subject: Moved files, fixed header files and paths - Federico svn path=/trunk/; revision=5513 --- widgets/text/e-entry.c | 6 +++--- widgets/text/e-entry.h | 2 +- widgets/text/e-table-text-model.h | 4 ++-- widgets/text/e-text-event-processor-emacs-like.c | 1 + widgets/text/e-text-event-processor-emacs-like.h | 2 +- widgets/text/e-text-event-processor.c | 1 + widgets/text/e-text-event-processor.h | 2 +- widgets/text/e-text-test.c | 5 +++-- widgets/text/e-text.c | 12 ++++++------ widgets/text/e-text.h | 6 +++--- 10 files changed, 22 insertions(+), 19 deletions(-) (limited to 'widgets/text') diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c index e0e6d7f951..3beebfcdfa 100644 --- a/widgets/text/e-entry.c +++ b/widgets/text/e-entry.c @@ -19,9 +19,9 @@ #include #include #include -#include "util/e-util.h" -#include "widgets/e-canvas.h" -#include "widgets/e-canvas-utils.h" +#include "gal/util/e-util.h" +#include "gal/widgets/e-canvas.h" +#include "gal/widgets/e-canvas-utils.h" #include "e-entry.h" #define MIN_ENTRY_WIDTH 150 diff --git a/widgets/text/e-entry.h b/widgets/text/e-entry.h index ad349659c3..ddb6ee8795 100644 --- a/widgets/text/e-entry.h +++ b/widgets/text/e-entry.h @@ -5,7 +5,7 @@ #include #include #include -#include "e-text.h" +#include BEGIN_GNOME_DECLS diff --git a/widgets/text/e-table-text-model.h b/widgets/text/e-table-text-model.h index 23430950d1..f4d477ecd4 100644 --- a/widgets/text/e-table-text-model.h +++ b/widgets/text/e-table-text-model.h @@ -20,8 +20,8 @@ #define E_TABLE_TEXT_MODEL_H #include -#include "e-text/e-text-model.h" -#include "e-table-model.h" +#include +#include BEGIN_GNOME_DECLS diff --git a/widgets/text/e-text-event-processor-emacs-like.c b/widgets/text/e-text-event-processor-emacs-like.c index be323d028f..71bc3c9212 100644 --- a/widgets/text/e-text-event-processor-emacs-like.c +++ b/widgets/text/e-text-event-processor-emacs-like.c @@ -21,6 +21,7 @@ #include #include "e-text-event-processor-emacs-like.h" + static void e_text_event_processor_emacs_like_init (ETextEventProcessorEmacsLike *card); static void e_text_event_processor_emacs_like_class_init (ETextEventProcessorEmacsLikeClass *klass); static gint e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event); diff --git a/widgets/text/e-text-event-processor-emacs-like.h b/widgets/text/e-text-event-processor-emacs-like.h index 651bb552b3..a2a7bc478c 100644 --- a/widgets/text/e-text-event-processor-emacs-like.h +++ b/widgets/text/e-text-event-processor-emacs-like.h @@ -22,7 +22,7 @@ #define __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ #include -#include "e-text-event-processor.h" +#include #ifdef __cplusplus extern "C" { diff --git a/widgets/text/e-text-event-processor.c b/widgets/text/e-text-event-processor.c index 47f028ca62..cded8171e6 100644 --- a/widgets/text/e-text-event-processor.c +++ b/widgets/text/e-text-event-processor.c @@ -21,6 +21,7 @@ #include #include "e-text-event-processor.h" + static void e_text_event_processor_init (ETextEventProcessor *card); static void e_text_event_processor_class_init (ETextEventProcessorClass *klass); diff --git a/widgets/text/e-text-event-processor.h b/widgets/text/e-text-event-processor.h index 1fc79f3f70..d6937383f0 100644 --- a/widgets/text/e-text-event-processor.h +++ b/widgets/text/e-text-event-processor.h @@ -22,7 +22,7 @@ #define __E_TEXT_EVENT_PROCESSOR_H__ #include -#include "e-text-event-processor-types.h" +#include #ifdef __cplusplus extern "C" { diff --git a/widgets/text/e-text-test.c b/widgets/text/e-text-test.c index 38fd1cfb4c..e3931da02f 100644 --- a/widgets/text/e-text-test.c +++ b/widgets/text/e-text-test.c @@ -7,8 +7,9 @@ #include "e-text.h" #include -#include "widgets/e-canvas.h" -#include "widgets/e-unicode.h" +#include "gal/widgets/e-canvas.h" +#include "gal/widgets/e-unicode.h" + GnomeCanvasItem *rect; static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, GnomeCanvasItem *item) diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 6723f54172..b740a6d36b 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -19,16 +19,16 @@ #include #include #include -#include "e-text.h" #include /* for BlackPixel */ +#include +#include +#include "e-text.h" +#include "gal/widgets/e-canvas.h" +#include "gal/widgets/e-canvas-utils.h" +#include "gal/widgets/e-unicode.h" #include #include #include -#include -#include -#include "widgets/e-canvas.h" -#include "widgets/e-canvas-utils.h" -#include "widgets/e-unicode.h" #include "e-text-event-processor-emacs-like.h" diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index af1d6f946f..fca7578079 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -20,9 +20,9 @@ #define E_TEXT_H #include -#include "widgets/e-font.h" -#include "e-text-event-processor.h" -#include "e-text-model.h" +#include +#include +#include BEGIN_GNOME_DECLS -- cgit v1.2.3