From 3df394155f84bc94be85db66fbf95770ca49bc48 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 8 Feb 2001 14:36:25 +0000 Subject: [PATCH] compilation fixes in the new InsetGraphics stuff git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1460 a592a061-630c-0410-9148-cb99ea01b6c8 --- po/POTFILES.in | 28 ++++++++++++++-------------- src/graphics/ChangeLog | 17 ++++++++++++----- src/graphics/ImageLoader.C | 2 ++ src/graphics/ImageLoader.h | 4 ++-- 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index debe726c64..28523b982e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -64,36 +64,36 @@ src/frontends/kde/urldlg.C src/frontends/qt2/FormCopyright.C src/frontends/xforms/FormBase.h src/frontends/xforms/form_browser.C -src/frontends/xforms/form_citation.C src/frontends/xforms/FormCitation.C -src/frontends/xforms/form_copyright.C +src/frontends/xforms/form_citation.C src/frontends/xforms/FormCopyright.C -src/frontends/xforms/form_document.C +src/frontends/xforms/form_copyright.C src/frontends/xforms/FormDocument.C -src/frontends/xforms/form_error.C +src/frontends/xforms/form_document.C src/frontends/xforms/FormError.C -src/frontends/xforms/form_graphics.C +src/frontends/xforms/form_error.C src/frontends/xforms/FormGraphics.C -src/frontends/xforms/form_index.C +src/frontends/xforms/form_graphics.C src/frontends/xforms/FormIndex.C +src/frontends/xforms/form_index.C src/frontends/xforms/FormInset.h src/frontends/xforms/FormLog.C -src/frontends/xforms/form_paragraph.C src/frontends/xforms/FormParagraph.C -src/frontends/xforms/form_preferences.C +src/frontends/xforms/form_paragraph.C src/frontends/xforms/FormPreferences.C -src/frontends/xforms/form_print.C +src/frontends/xforms/form_preferences.C src/frontends/xforms/FormPrint.C -src/frontends/xforms/form_ref.C +src/frontends/xforms/form_print.C src/frontends/xforms/FormRef.C -src/frontends/xforms/form_tabular.C +src/frontends/xforms/form_ref.C src/frontends/xforms/FormTabular.C -src/frontends/xforms/form_tabular_create.C +src/frontends/xforms/form_tabular.C src/frontends/xforms/FormTabularCreate.C -src/frontends/xforms/form_toc.C +src/frontends/xforms/form_tabular_create.C src/frontends/xforms/FormToc.C -src/frontends/xforms/form_url.C +src/frontends/xforms/form_toc.C src/frontends/xforms/FormUrl.C +src/frontends/xforms/form_url.C src/frontends/xforms/FormVCLog.C src/frontends/xforms/input_validators.C src/frontends/xforms/Menubar_pimpl.C diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog index f525104979..546b3ea8d6 100644 --- a/src/graphics/ChangeLog +++ b/src/graphics/ChangeLog @@ -1,8 +1,15 @@ +2001-02-08 Jean-Marc Lasgouttes + + * ImageLoader.C: add a "using" directive. + + * ImageLoader.h: remove extra comma at the end of enum; add an + std:: qualifier for vector. + 2001-01-21 Baruch Even - * GraphicsCacheItem.[Ch]: Changes due to the storage of width and height - in the image itself and minor cleanups. + * GraphicsCacheItem.[Ch]: Changes due to the storage of width and + height in the image itself and minor cleanups. - * GraphicsCacheItem_impl.[Ch]: Changes due to the switch to use a new - ImageLoader class instead of the older Renderer class. This means change - of responsibilities. + * GraphicsCacheItem_impl.[Ch]: Changes due to the switch to use a + new ImageLoader class instead of the older Renderer class. This + means change of responsibilities. diff --git a/src/graphics/ImageLoader.C b/src/graphics/ImageLoader.C index b874ef55b7..74710b452b 100644 --- a/src/graphics/ImageLoader.C +++ b/src/graphics/ImageLoader.C @@ -18,6 +18,8 @@ #include "support/filetools.h" +using std::endl; + ImageLoader::ImageLoader() : image_(0) { diff --git a/src/graphics/ImageLoader.h b/src/graphics/ImageLoader.h index c96884ddc8..4a1a4dc379 100644 --- a/src/graphics/ImageLoader.h +++ b/src/graphics/ImageLoader.h @@ -36,11 +36,11 @@ public: OK = 0, ImageFormatUnknown, // This loader doesn't know how to load this file. NoFile, // File doesn't exists. - ErrorWhileLoading, // Unknown error when loading. + ErrorWhileLoading // Unknown error when loading. }; /// A list of supported formats. - typedef vector FormatList; + typedef std::vector FormatList; /// c-tor. ImageLoader(); -- 2.39.5