From d8dd55eb33a140a810e3d5fd005d79e4166893e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Tue, 16 Nov 2004 23:18:46 +0000 Subject: [PATCH] disable conecpt checks for gtk dir, fix concept checks for qt git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9262 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 4 ++++ src/frontends/ChangeLog | 4 ++++ src/frontends/Painter.h | 3 ++- src/frontends/gtk/Alert_pimpl.C | 5 +++++ src/frontends/gtk/ChangeLog | 9 +++++++-- src/frontends/gtk/Dialogs.C | 5 +++++ src/frontends/gtk/FileDialog.C | 5 +++++ src/frontends/gtk/FileDialogPrivate.C | 5 +++++ src/frontends/gtk/GAboutlyx.C | 5 +++++ src/frontends/gtk/GBC.C | 5 +++++ src/frontends/gtk/GBox.C | 5 +++++ src/frontends/gtk/GCharacter.C | 5 +++++ src/frontends/gtk/GERT.C | 5 +++++ src/frontends/gtk/GErrorList.C | 5 +++++ src/frontends/gtk/GFloat.C | 6 +++++- src/frontends/gtk/GGraphics.C | 5 +++++ src/frontends/gtk/GLyXKeySym.C | 5 +++++ src/frontends/gtk/GMathDelim.C | 5 +++++ src/frontends/gtk/GMathPanel.C | 5 +++++ src/frontends/gtk/GMathsMatrix.C | 11 ++++++++--- src/frontends/gtk/GMenubar.C | 5 +++++ src/frontends/gtk/GMiniBuffer.C | 5 +++++ src/frontends/gtk/GNote.C | 5 +++++ src/frontends/gtk/GPainter.C | 5 +++++ src/frontends/gtk/GParagraph.C | 5 +++++ src/frontends/gtk/GPrint.C | 5 +++++ src/frontends/gtk/GScreen.C | 5 +++++ src/frontends/gtk/GSearch.C | 5 +++++ src/frontends/gtk/GSpellchecker.C | 5 +++++ src/frontends/gtk/GTableCreate.C | 5 +++++ src/frontends/gtk/GText.C | 5 +++++ src/frontends/gtk/GTimeout.C | 5 +++++ src/frontends/gtk/GToc.C | 5 +++++ src/frontends/gtk/GToolbar.C | 5 +++++ src/frontends/gtk/GUrl.C | 5 +++++ src/frontends/gtk/GVSpace.C | 5 +++++ src/frontends/gtk/GView.C | 5 +++++ src/frontends/gtk/GViewBase.C | 5 +++++ src/frontends/gtk/GWorkArea.C | 5 +++++ src/frontends/gtk/GXpmBtnTbl.C | 5 +++++ src/frontends/gtk/LyXScreenFactory.C | 5 +++++ src/frontends/gtk/WorkAreaFactory.C | 5 +++++ src/frontends/gtk/ghelpers.C | 5 +++++ src/frontends/gtk/io_callback.C | 5 +++++ src/frontends/gtk/lyx_gui.C | 5 +++++ src/frontends/gtk/xftFontLoader.C | 5 +++++ src/frontends/gtk/xftFontMetrics.C | 5 +++++ src/frontends/qt2/ChangeLog | 15 ++++++++++----- src/frontends/qt2/QPrefsDialog.h | 2 ++ src/frontends/qt2/lcolorcache.h | 5 ++--- src/frontends/xforms/ChangeLog | 2 +- src/lyxfont.h | 3 ++- src/support/ChangeLog | 2 +- 53 files changed, 253 insertions(+), 18 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 21118ccdbe..7bd4461da0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2004-11-17 Lars Gullik Bjonnes + + * lyxfont.h: include LColor.h to satisfy concept checks. + 2004-11-16 Lars Gullik Bjonnes * pariterator.h: add typdefs for value_type, difference_type, diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 66b23c1dd1..8a8cf452b5 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,7 @@ +2004-11-17 Lars Gullik Bjonnes + + * Painter.h: include LColor.h to satisfy concept checks. + 2004-11-15 Jean-Marc Lasgouttes * LyXView.h (hasFocus): new abstract virtual function diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h index 1fb8a74a96..4dfc02331c 100644 --- a/src/frontends/Painter.h +++ b/src/frontends/Painter.h @@ -13,10 +13,11 @@ #ifndef PAINTER_H #define PAINTER_H +#include "LColor.h" + #include -class LColor_color; class LyXFont; namespace lyx { diff --git a/src/frontends/gtk/Alert_pimpl.C b/src/frontends/gtk/Alert_pimpl.C index b745de4de9..00f9c433e2 100644 --- a/src/frontends/gtk/Alert_pimpl.C +++ b/src/frontends/gtk/Alert_pimpl.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "frontends/Alert.h" #include "frontends/Alert_pimpl.h" diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog index 6987564398..9a60027874 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -1,3 +1,8 @@ +2004-11-17 Lars Gullik Bjonnes + + * Disable concept checks with the use of ugly preprocessor stuff + in several files. + 2004-11-15 Jean-Marc Lasgouttes * GView.C (hasFocus): new method, always returns true for now @@ -23,7 +28,7 @@ * The Box dialog: Dialogs.C, Makefile.am, GBox.C, GBox.h * ghelpers.[Ch], GGraphics.[Ch]: new functions unitsComboFromLength - and getDefaultUnit take functionality that was in GGraphics into + and getDefaultUnit take functionality that was in GGraphics into ghelpers 2004-11-08 Jean-Marc Lasgouttes @@ -32,7 +37,7 @@ 2004-11-05 Jean-Marc Lasgouttes - * GToolbar.C (selected, clicked): + * GToolbar.C (selected, clicked): * GMenubar.C (onCommandActivate): do not use the verbose argument to dispatch diff --git a/src/frontends/gtk/Dialogs.C b/src/frontends/gtk/Dialogs.C index bfb1fc939e..97e96af536 100644 --- a/src/frontends/gtk/Dialogs.C +++ b/src/frontends/gtk/Dialogs.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "Dialogs.h" #include "Dialog.h" diff --git a/src/frontends/gtk/FileDialog.C b/src/frontends/gtk/FileDialog.C index 2bfa33a7a0..7aa48f8e2b 100644 --- a/src/frontends/gtk/FileDialog.C +++ b/src/frontends/gtk/FileDialog.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "FileDialogPrivate.h" using std::string; diff --git a/src/frontends/gtk/FileDialogPrivate.C b/src/frontends/gtk/FileDialogPrivate.C index 46d36c440f..3cdc89e98c 100644 --- a/src/frontends/gtk/FileDialogPrivate.C +++ b/src/frontends/gtk/FileDialogPrivate.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "FileDialogPrivate.h" using std::string; diff --git a/src/frontends/gtk/GAboutlyx.C b/src/frontends/gtk/GAboutlyx.C index a6ac4c12c2..1d1a827808 100644 --- a/src/frontends/gtk/GAboutlyx.C +++ b/src/frontends/gtk/GAboutlyx.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "ControlAboutlyx.h" #include "GAboutlyx.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GBC.C b/src/frontends/gtk/GBC.C index 3d3febd792..bc6fe2b745 100644 --- a/src/frontends/gtk/GBC.C +++ b/src/frontends/gtk/GBC.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GBC.h" using std::string; diff --git a/src/frontends/gtk/GBox.C b/src/frontends/gtk/GBox.C index 1be4cfbecb..1d30568fe8 100644 --- a/src/frontends/gtk/GBox.C +++ b/src/frontends/gtk/GBox.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GBox.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GCharacter.C b/src/frontends/gtk/GCharacter.C index 60403a962b..ffe6c5706d 100644 --- a/src/frontends/gtk/GCharacter.C +++ b/src/frontends/gtk/GCharacter.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GCharacter.h" #include "ghelpers.h" #include "LColor.h" diff --git a/src/frontends/gtk/GERT.C b/src/frontends/gtk/GERT.C index 2b558db8ac..4627ee3a6c 100644 --- a/src/frontends/gtk/GERT.C +++ b/src/frontends/gtk/GERT.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GERT.h" #include "ControlERT.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GErrorList.C b/src/frontends/gtk/GErrorList.C index d642547529..e43d15bacc 100644 --- a/src/frontends/gtk/GErrorList.C +++ b/src/frontends/gtk/GErrorList.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GErrorList.h" #include "ControlErrorList.h" diff --git a/src/frontends/gtk/GFloat.C b/src/frontends/gtk/GFloat.C index 1596a9ff4c..aa008e850a 100644 --- a/src/frontends/gtk/GFloat.C +++ b/src/frontends/gtk/GFloat.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GFloat.h" #include "ControlFloat.h" @@ -216,4 +221,3 @@ void GFloat::apply() } // namespace frontend } // namespace lyx - diff --git a/src/frontends/gtk/GGraphics.C b/src/frontends/gtk/GGraphics.C index 8722f9d89c..9fba9d0b29 100644 --- a/src/frontends/gtk/GGraphics.C +++ b/src/frontends/gtk/GGraphics.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GGraphics.h" #include "ControlGraphics.h" diff --git a/src/frontends/gtk/GLyXKeySym.C b/src/frontends/gtk/GLyXKeySym.C index 1c17e0a05f..73e87c9d2d 100644 --- a/src/frontends/gtk/GLyXKeySym.C +++ b/src/frontends/gtk/GLyXKeySym.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GLyXKeySym.h" #include "kbmap.h" diff --git a/src/frontends/gtk/GMathDelim.C b/src/frontends/gtk/GMathDelim.C index 5002b08c2f..bf23037aa0 100644 --- a/src/frontends/gtk/GMathDelim.C +++ b/src/frontends/gtk/GMathDelim.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "ControlMath.h" #include "GMathDelim.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GMathPanel.C b/src/frontends/gtk/GMathPanel.C index 0645601c0c..625b9b19ca 100644 --- a/src/frontends/gtk/GMathPanel.C +++ b/src/frontends/gtk/GMathPanel.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "ControlMath.h" #include "GMathPanel.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GMathsMatrix.C b/src/frontends/gtk/GMathsMatrix.C index a968c0b2a8..8c17a6f00e 100644 --- a/src/frontends/gtk/GMathsMatrix.C +++ b/src/frontends/gtk/GMathsMatrix.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GMathsMatrix.h" #include "ControlMath.h" @@ -111,17 +116,17 @@ void GMathsMatrix::updateHorzAlignEntry() columnsspin_->get_adjustment()->get_value()) { // erase last character of stripped stripped = stripped.erase(stripped.length() - 1,1); - barcount = countbars(stripped); + barcount = countbars(stripped); } while (stripped.length() - barcount < columnsspin_->get_adjustment()->get_value()) { stripped = stripped + "c"; - barcount = countbars(stripped); + barcount = countbars(stripped); } if (orig.compare(stripped) != 0) { - ignoreHorzAlign_ = true; + ignoreHorzAlign_ = true; horzalignentry_->set_text(stripped); ignoreHorzAlign_ = false; } diff --git a/src/frontends/gtk/GMenubar.C b/src/frontends/gtk/GMenubar.C index f015fa826e..76a679d455 100644 --- a/src/frontends/gtk/GMenubar.C +++ b/src/frontends/gtk/GMenubar.C @@ -11,6 +11,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GMenubar.h" #include "GView.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GMiniBuffer.C b/src/frontends/gtk/GMiniBuffer.C index aeff395a5d..3f117a7745 100644 --- a/src/frontends/gtk/GMiniBuffer.C +++ b/src/frontends/gtk/GMiniBuffer.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GView.h" #include "GMiniBuffer.h" #include "debug.h" diff --git a/src/frontends/gtk/GNote.C b/src/frontends/gtk/GNote.C index 6fe76ddee3..77eb2fb8d0 100644 --- a/src/frontends/gtk/GNote.C +++ b/src/frontends/gtk/GNote.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GNote.h" #include "ControlNote.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GPainter.C b/src/frontends/gtk/GPainter.C index 78e59d786b..7b87fc1cc4 100644 --- a/src/frontends/gtk/GPainter.C +++ b/src/frontends/gtk/GPainter.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GPainter.h" #include "debug.h" #include "GWorkArea.h" diff --git a/src/frontends/gtk/GParagraph.C b/src/frontends/gtk/GParagraph.C index a63582aa79..38a8564681 100644 --- a/src/frontends/gtk/GParagraph.C +++ b/src/frontends/gtk/GParagraph.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GParagraph.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GPrint.C b/src/frontends/gtk/GPrint.C index 9489503e56..db3b2399ef 100644 --- a/src/frontends/gtk/GPrint.C +++ b/src/frontends/gtk/GPrint.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GPrint.h" #include "ControlPrint.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GScreen.C b/src/frontends/gtk/GScreen.C index d69c54e4f7..2bd933637a 100644 --- a/src/frontends/gtk/GScreen.C +++ b/src/frontends/gtk/GScreen.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GScreen.h" #include "GWorkArea.h" diff --git a/src/frontends/gtk/GSearch.C b/src/frontends/gtk/GSearch.C index 0b1fdb0dba..c966ede402 100644 --- a/src/frontends/gtk/GSearch.C +++ b/src/frontends/gtk/GSearch.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GSearch.h" #include "ControlSearch.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GSpellchecker.C b/src/frontends/gtk/GSpellchecker.C index cda95eea4c..ebb5d8295f 100644 --- a/src/frontends/gtk/GSpellchecker.C +++ b/src/frontends/gtk/GSpellchecker.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GSpellchecker.h" #include "controllers/ControlSpellchecker.h" diff --git a/src/frontends/gtk/GTableCreate.C b/src/frontends/gtk/GTableCreate.C index 24a9fcb1fa..3405f60265 100644 --- a/src/frontends/gtk/GTableCreate.C +++ b/src/frontends/gtk/GTableCreate.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GTableCreate.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GText.C b/src/frontends/gtk/GText.C index 58041e25ae..2f28716cd5 100644 --- a/src/frontends/gtk/GText.C +++ b/src/frontends/gtk/GText.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GText.h" #include "ControlCommand.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GTimeout.C b/src/frontends/gtk/GTimeout.C index 200dba64a4..0603c027b9 100644 --- a/src/frontends/gtk/GTimeout.C +++ b/src/frontends/gtk/GTimeout.C @@ -12,6 +12,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GTimeout.h" #include "debug.h" diff --git a/src/frontends/gtk/GToc.C b/src/frontends/gtk/GToc.C index c0ebc510c3..3b89d83244 100644 --- a/src/frontends/gtk/GToc.C +++ b/src/frontends/gtk/GToc.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GToc.h" #include "ControlToc.h" diff --git a/src/frontends/gtk/GToolbar.C b/src/frontends/gtk/GToolbar.C index 3f9b2678fc..081dacb489 100644 --- a/src/frontends/gtk/GToolbar.C +++ b/src/frontends/gtk/GToolbar.C @@ -11,6 +11,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GToolbar.h" #include "GView.h" diff --git a/src/frontends/gtk/GUrl.C b/src/frontends/gtk/GUrl.C index 194a037002..dc0587d554 100644 --- a/src/frontends/gtk/GUrl.C +++ b/src/frontends/gtk/GUrl.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "ControlCommand.h" #include "GUrl.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GVSpace.C b/src/frontends/gtk/GVSpace.C index f016d9d0a5..e63aad6f04 100644 --- a/src/frontends/gtk/GVSpace.C +++ b/src/frontends/gtk/GVSpace.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GVSpace.h" #include "ControlVSpace.h" #include "ghelpers.h" diff --git a/src/frontends/gtk/GView.C b/src/frontends/gtk/GView.C index 61f8d707a9..742541afa3 100644 --- a/src/frontends/gtk/GView.C +++ b/src/frontends/gtk/GView.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GView.h" #include "GMenubar.h" #include "GMiniBuffer.h" diff --git a/src/frontends/gtk/GViewBase.C b/src/frontends/gtk/GViewBase.C index 9103e33e8c..f7762c93c2 100644 --- a/src/frontends/gtk/GViewBase.C +++ b/src/frontends/gtk/GViewBase.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GViewBase.h" #include "support/filetools.h" diff --git a/src/frontends/gtk/GWorkArea.C b/src/frontends/gtk/GWorkArea.C index 4aa8ef86d3..1d06147fe9 100644 --- a/src/frontends/gtk/GWorkArea.C +++ b/src/frontends/gtk/GWorkArea.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GWorkArea.h" #include "GView.h" #include "GtkmmX.h" diff --git a/src/frontends/gtk/GXpmBtnTbl.C b/src/frontends/gtk/GXpmBtnTbl.C index 0db5c88306..73390e64b1 100644 --- a/src/frontends/gtk/GXpmBtnTbl.C +++ b/src/frontends/gtk/GXpmBtnTbl.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GXpmBtnTbl.h" #include diff --git a/src/frontends/gtk/LyXScreenFactory.C b/src/frontends/gtk/LyXScreenFactory.C index 5afc877e55..d035488211 100644 --- a/src/frontends/gtk/LyXScreenFactory.C +++ b/src/frontends/gtk/LyXScreenFactory.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GWorkArea.h" #include "GScreen.h" diff --git a/src/frontends/gtk/WorkAreaFactory.C b/src/frontends/gtk/WorkAreaFactory.C index d40ce1b9aa..6c7b8ddf99 100644 --- a/src/frontends/gtk/WorkAreaFactory.C +++ b/src/frontends/gtk/WorkAreaFactory.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GWorkArea.h" #include "frontends/WorkAreaFactory.h" diff --git a/src/frontends/gtk/ghelpers.C b/src/frontends/gtk/ghelpers.C index 9dd1ed7541..5d1e540ee1 100644 --- a/src/frontends/gtk/ghelpers.C +++ b/src/frontends/gtk/ghelpers.C @@ -11,6 +11,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "ghelpers.h" #include "lyxrc.h" diff --git a/src/frontends/gtk/io_callback.C b/src/frontends/gtk/io_callback.C index e2d7f8273d..3962af0572 100644 --- a/src/frontends/gtk/io_callback.C +++ b/src/frontends/gtk/io_callback.C @@ -11,6 +11,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "io_callback.h" diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C index 4218311c76..d84074d25f 100644 --- a/src/frontends/gtk/lyx_gui.C +++ b/src/frontends/gtk/lyx_gui.C @@ -12,6 +12,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "lyx_gui.h" #include "debug.h" diff --git a/src/frontends/gtk/xftFontLoader.C b/src/frontends/gtk/xftFontLoader.C index 4c7daedaef..408a46398b 100644 --- a/src/frontends/gtk/xftFontLoader.C +++ b/src/frontends/gtk/xftFontLoader.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "xftFontLoader.h" #include "FontInfo.h" #include "gettext.h" diff --git a/src/frontends/gtk/xftFontMetrics.C b/src/frontends/gtk/xftFontMetrics.C index 466feffba1..09d76a80e4 100644 --- a/src/frontends/gtk/xftFontMetrics.C +++ b/src/frontends/gtk/xftFontMetrics.C @@ -10,6 +10,11 @@ #include +// Too hard to make concept checks work with this file +#ifdef _GLIBCPP_CONCEPT_CHECKS +#undef _GLIBCPP_CONCEPT_CHECKS +#endif + #include "GtkmmX.h" #include "xftFontLoader.h" #include "font_metrics.h" diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 86a96f2ba6..60e205896d 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2004-11-17 Lars Gullik Bjonnes + + * QPrefsDialog.h: include LColor.h to satisfy concept checks. + * lcolorcache.h: ditto + 2004-11-15 Jean-Marc Lasgouttes * QtView.C (hasFocus): new method @@ -11,22 +16,22 @@ 2004-11-05 Jean-Marc Lasgouttes - * QLToolbar.C (activated, clicked): + * QLToolbar.C (activated, clicked): * QtView.C (activated): do not use the verbose argument to dispatch 2004-11-08 Jürgen Spitzmüller - * QPrefsDialog.C (new_format(), remove_format()): fix crash when + * QPrefsDialog.C (new_format(), remove_format()): fix crash when adding new formats (add missing converters().update() call) [bug 1692] - + * QPrefsDialog.[Ch]: - * ui/QPrefConvertersModule.C: improve ui for converter changes + * ui/QPrefConvertersModule.C: improve ui for converter changes [bug 1488]. 2004-11-06 Lars Gullik Bjonnes * QLImage.C (loadableFormats): use bind, equal_to instead of - compare_memfun + compare_memfun * lyx_gui.C (start): use for_each instead of explict for loop diff --git a/src/frontends/qt2/QPrefsDialog.h b/src/frontends/qt2/QPrefsDialog.h index 4ad1ad26e6..1ea10d57a9 100644 --- a/src/frontends/qt2/QPrefsDialog.h +++ b/src/frontends/qt2/QPrefsDialog.h @@ -12,6 +12,8 @@ #ifndef QPREFSDIALOG_H #define QPREFSDIALOG_H +#include "LColor.h" + #include "ui/QPrefsDialogBase.h" #include diff --git a/src/frontends/qt2/lcolorcache.h b/src/frontends/qt2/lcolorcache.h index 90d384ccd9..e03f5b2f78 100644 --- a/src/frontends/qt2/lcolorcache.h +++ b/src/frontends/qt2/lcolorcache.h @@ -12,14 +12,13 @@ #ifndef LCOLORCACHE_H #define LCOLORCACHE_H +#include "LColor.h" + #include #include -class LColor_color; - - // FIXME: use a fixed-size array not a map ? /** diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index f429aeef52..5a19d8a3e4 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -7,7 +7,7 @@ * XFormsView.[Ch]: modify to fit * XMiniBuffer.[Ch]: modify to fit * XWorkArea.[Ch]: modify to fit - + * LayoutEngine.C (show): use std::for_each (hide): ditto diff --git a/src/lyxfont.h b/src/lyxfont.h index 488932d208..06eef154ea 100644 --- a/src/lyxfont.h +++ b/src/lyxfont.h @@ -15,10 +15,11 @@ #ifndef LYXFONT_H #define LYXFONT_H +#include "LColor.h" + #include #include -class LColor_color; class LyXLex; class BufferParams; class Language; diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 379521bf59..5fc0b18e26 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,7 +1,7 @@ 2004-11-16 Lars Gullik Bjonnes * forkedcontr.C (find_pid): simplify and also make pass concept - checks. + checks. (handleCompletedProcesses): make sure that we do not slice the object and satisfy concept checks. -- 2.39.2