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

diff --git a/src/ChangeLog b/src/ChangeLog
index 21118ccdbe187993bd68636ed63b533977440727..7bd4461da0d1a2c7089b5c621d2b6d9b106d5e78 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-17  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * lyxfont.h: include LColor.h to satisfy concept checks.
+
 2004-11-16  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * pariterator.h: add typdefs for value_type, difference_type,

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index 66b23c1dd16d0509ae3266b4486e1702da590990..8a8cf452b5ee5ad20a44646518ad37dc8cbe3ab3 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-17  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * Painter.h: include LColor.h to satisfy concept checks.
+
 2004-11-15  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * LyXView.h (hasFocus): new abstract virtual function

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index 1fb8a74a965046d5d23e27614da2d5b70b83e76c..4dfc02331cbe3a1eae840874b8e02320e62cc4a2 100644 (file)
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -13,10 +13,11 @@
 #ifndef PAINTER_H
 #define PAINTER_H
 
+#include "LColor.h"
+
 #include <string>
 
 
-class LColor_color;
 class LyXFont;
 
 namespace lyx {

diff --git a/src/frontends/gtk/Alert_pimpl.C b/src/frontends/gtk/Alert_pimpl.C
index b745de4de999ddf68ae03f33b9146e330621f767..00f9c433e2c63d3e4329387ce590f8312b235149 100644 (file)
--- a/src/frontends/gtk/Alert_pimpl.C
+++ b/src/frontends/gtk/Alert_pimpl.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 6987564398324b5b8986e90aa72bcd1b61882c48..9a60027874608006ec8243b0875dbdac4b5abd1f 100644 (file)
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-17  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * Disable concept checks with the use of ugly preprocessor stuff
+       in several files. 
+
 2004-11-15  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * 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  <lasgouttes@lyx.org>
@@ -32,7 +37,7 @@
 
 2004-11-05  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
-       * 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 bfb1fc939e299b976096031fd907c0041104b6ea..97e96af5368c8cdc436d7faaa82b3ba1087dbc8e 100644 (file)
--- a/src/frontends/gtk/Dialogs.C
+++ b/src/frontends/gtk/Dialogs.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 2bfa33a7a006b8d28728d93f56787c69085b3f30..7aa48f8e2b907927b61c8cc14fdbd03686b55367 100644 (file)
--- a/src/frontends/gtk/FileDialog.C
+++ b/src/frontends/gtk/FileDialog.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 46d36c440fdb3d4e081eb6bc1914e6ad56a6dc19..3cdc89e98cb72f337570f5bef3ffde6827e0ee9b 100644 (file)
--- a/src/frontends/gtk/FileDialogPrivate.C
+++ b/src/frontends/gtk/FileDialogPrivate.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 a6ac4c12c22263c4242f843be290b48f3faf9dab..1d1a8278088e33ba89dfefa0741a2e245bd42363 100644 (file)
--- a/src/frontends/gtk/GAboutlyx.C
+++ b/src/frontends/gtk/GAboutlyx.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 3d3febd7925c65f4a4684bea3f5fabadd3277f99..bc6fe2b7458041005c12fdf8983c5846e1029d42 100644 (file)
--- a/src/frontends/gtk/GBC.C
+++ b/src/frontends/gtk/GBC.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 1be4cfbecb92948665e5c717c599dbf25f691bb5..1d30568fe88ac822259037c889e92e3ccbc09c09 100644 (file)
--- a/src/frontends/gtk/GBox.C
+++ b/src/frontends/gtk/GBox.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 60403a962b15e23e388f0d167a361f7d84ee1050..ffe6c5706dce3051b1545fd46a949aace0926d74 100644 (file)
--- a/src/frontends/gtk/GCharacter.C
+++ b/src/frontends/gtk/GCharacter.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 2b558db8ac4d3df467634507902285b454e08217..4627ee3a6c535324c2126b383ae4c93eccb6092f 100644 (file)
--- a/src/frontends/gtk/GERT.C
+++ b/src/frontends/gtk/GERT.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 d642547529a439e0866609bfd6f7a6278053955a..e43d15bacc60d95a31e3f3b6dbeec721ce57ffcc 100644 (file)
--- a/src/frontends/gtk/GErrorList.C
+++ b/src/frontends/gtk/GErrorList.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 1596a9ff4cdd9f372a60b79a8e58fa8bf18a243c..aa008e850aba9c6ad6bdd6ea2a8274e9c92e584c 100644 (file)
--- a/src/frontends/gtk/GFloat.C
+++ b/src/frontends/gtk/GFloat.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 8722f9d89cc4e343ce7f5c3a92c47be7da1ab9ca..9fba9d0b29c7999dc2848b90566324d55f5e2e9d 100644 (file)
--- a/src/frontends/gtk/GGraphics.C
+++ b/src/frontends/gtk/GGraphics.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 1c17e0a05f70269f5475177d47591cf02c218631..73e87c9d2dd1b05cc6462e6ed835c003d5870eac 100644 (file)
--- a/src/frontends/gtk/GLyXKeySym.C
+++ b/src/frontends/gtk/GLyXKeySym.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 5002b08c2f08e1571804ce1beec8b6ba7059b334..bf23037aa07191aac5a7ba94628e09993e99d3d7 100644 (file)
--- a/src/frontends/gtk/GMathDelim.C
+++ b/src/frontends/gtk/GMathDelim.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 0645601c0c3c843faf3d49c1f4733f6894f17edc..625b9b19ca759bb89bf0ac2f1b4f53f181dac98b 100644 (file)
--- a/src/frontends/gtk/GMathPanel.C
+++ b/src/frontends/gtk/GMathPanel.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 a968c0b2a85ac8951c25adc055ca46813ceb4c79..8c17a6f00e515e5ea74eff27dfa25b1b0efd0a91 100644 (file)
--- a/src/frontends/gtk/GMathsMatrix.C
+++ b/src/frontends/gtk/GMathsMatrix.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 f015fa826e10f02a48b6c36163d144e98a7a4fa1..76a679d455fe4a6847cefe5eb21df1529d0dabbb 100644 (file)
--- a/src/frontends/gtk/GMenubar.C
+++ b/src/frontends/gtk/GMenubar.C
@@ -11,6 +11,11 @@
 
 #include <config.h>
 
+// 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 aeff395a5deff299e69c7f66a42b1746db874753..3f117a77455978e218f83caaff500f64103dc078 100644 (file)
--- a/src/frontends/gtk/GMiniBuffer.C
+++ b/src/frontends/gtk/GMiniBuffer.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 6fe76ddee3563f5f8c5f620d9e8c343bf3028f3c..77eb2fb8d0a1a93ca803981ee3f85c22482bf12a 100644 (file)
--- a/src/frontends/gtk/GNote.C
+++ b/src/frontends/gtk/GNote.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 78e59d786b95245f91b2870ff6a3fa1631f406c2..7b87fc1cc4804b94ee84cf5bdf0c4b35a7463b18 100644 (file)
--- a/src/frontends/gtk/GPainter.C
+++ b/src/frontends/gtk/GPainter.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 a63582aa79cc73b42ce1ae8117905c1b3b4137db..38a85646810bce4e782c5011e9207297b7a6c79f 100644 (file)
--- a/src/frontends/gtk/GParagraph.C
+++ b/src/frontends/gtk/GParagraph.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 9489503e568dffa4646a7cedb67ae777d7507984..db3b2399eff43b8efaf14ccb957d3c0ce6d0b97a 100644 (file)
--- a/src/frontends/gtk/GPrint.C
+++ b/src/frontends/gtk/GPrint.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 d69c54e4f7af01a10b313e6002b85b3c885dc484..2bd933637ac0f218fd26e918330927aa52560e91 100644 (file)
--- a/src/frontends/gtk/GScreen.C
+++ b/src/frontends/gtk/GScreen.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 0b1fdb0dbab512f3b36a762c70374e0378ebe439..c966ede402383d5a2e4cc4818fae41b6f1bc9314 100644 (file)
--- a/src/frontends/gtk/GSearch.C
+++ b/src/frontends/gtk/GSearch.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 cda95eea4c2012d12d76c463530905d10cc7e65b..ebb5d8295fad26394a3f648409d68e1435239697 100644 (file)
--- a/src/frontends/gtk/GSpellchecker.C
+++ b/src/frontends/gtk/GSpellchecker.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 24a9fcb1fa559006a50a50e6d7f5ce0aad2bf09b..3405f602657dfd30709d2eaaea3d5d37a213d255 100644 (file)
--- a/src/frontends/gtk/GTableCreate.C
+++ b/src/frontends/gtk/GTableCreate.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 58041e25aeca5f3afb54e88af91d539c148cc6e2..2f28716cd5280727163553415bbeab7956a93573 100644 (file)
--- a/src/frontends/gtk/GText.C
+++ b/src/frontends/gtk/GText.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 200dba64a440dfe152e679859352be9ea9040d34..0603c027b9e97a86cf3d9fe7d6c252c2e4679c3f 100644 (file)
--- a/src/frontends/gtk/GTimeout.C
+++ b/src/frontends/gtk/GTimeout.C
@@ -12,6 +12,11 @@
 
 #include <config.h>
 
+// 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 c0ebc510c3f8635494319246f676396cfeb5be7c..3b89d83244c0082ab1f3256e5954096e8b471ac6 100644 (file)
--- a/src/frontends/gtk/GToc.C
+++ b/src/frontends/gtk/GToc.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 3f9b2678fc9b3554d5dad732b10da76f83a40cc0..081dacb489df861f99aa389d7245261bdb8fa134 100644 (file)
--- a/src/frontends/gtk/GToolbar.C
+++ b/src/frontends/gtk/GToolbar.C
@@ -11,6 +11,11 @@
 
 #include <config.h>
 
+// 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 194a037002fc568e2b31fc25d128aff2256d04ce..dc0587d5546a36728a37a1f1cdcada4eea49ffe3 100644 (file)
--- a/src/frontends/gtk/GUrl.C
+++ b/src/frontends/gtk/GUrl.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 f016d9d0a5892e08d4e8261ed3f9a1822340ec29..e63aad6f04fbfdf96c9b6e495df57409fd33a9aa 100644 (file)
--- a/src/frontends/gtk/GVSpace.C
+++ b/src/frontends/gtk/GVSpace.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 61f8d707a9fa642412b64f68c7f6daa94c8be614..742541afa31eeeb45e488b7b402f2120d3e0bb23 100644 (file)
--- a/src/frontends/gtk/GView.C
+++ b/src/frontends/gtk/GView.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 9103e33e8c2c15145e7c958aa8376ec3190f1f7c..f7762c93c2b5e66220c56ed9cf048acde682ce28 100644 (file)
--- a/src/frontends/gtk/GViewBase.C
+++ b/src/frontends/gtk/GViewBase.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 4aa8ef86d32f8015bbdedcc7157a6b4d36ab5a36..1d06147fe9dc71ebbb217d65448608563301ae75 100644 (file)
--- a/src/frontends/gtk/GWorkArea.C
+++ b/src/frontends/gtk/GWorkArea.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 0db5c88306ed6f5bf8f37a688445e2bb36e5ff6d..73390e64b1c6e55a2c905fafc693859002584415 100644 (file)
--- a/src/frontends/gtk/GXpmBtnTbl.C
+++ b/src/frontends/gtk/GXpmBtnTbl.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// Too hard to make concept checks work with this file
+#ifdef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCPP_CONCEPT_CHECKS
+#endif
+
 #include "GXpmBtnTbl.h"
 
 #include <gtkmm.h>

diff --git a/src/frontends/gtk/LyXScreenFactory.C b/src/frontends/gtk/LyXScreenFactory.C
index 5afc877e55fc9d82ca8824b3cd6ef3042999dc79..d0354882110d09cdb52ef6f1eabf3a04e1853e44 100644 (file)
--- a/src/frontends/gtk/LyXScreenFactory.C
+++ b/src/frontends/gtk/LyXScreenFactory.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 d40ce1b9aacb245d1650bd358686d2f2f696f39e..6c7b8ddf99ddd28dda816b0ddb7c4f59761d0f8d 100644 (file)
--- a/src/frontends/gtk/WorkAreaFactory.C
+++ b/src/frontends/gtk/WorkAreaFactory.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 9dd1ed7541565a36679a640b575b579ce18600c7..5d1e540ee1f1554508958bca6bbb738fdc31f3fe 100644 (file)
--- a/src/frontends/gtk/ghelpers.C
+++ b/src/frontends/gtk/ghelpers.C
@@ -11,6 +11,11 @@
 
 #include <config.h>
 
+// 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 e2d7f8273db87695d0ca6f8a7a5c279862515d61..3962af05725e44e8d72ff32f77edb5c58c9905a2 100644 (file)
--- a/src/frontends/gtk/io_callback.C
+++ b/src/frontends/gtk/io_callback.C
@@ -11,6 +11,11 @@
 
 #include <config.h>
 
+// 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 4218311c76cb454d2c1cd2f72c84e427547b23b7..d84074d25f91f872762bd04e1cda4036c2872b43 100644 (file)
--- a/src/frontends/gtk/lyx_gui.C
+++ b/src/frontends/gtk/lyx_gui.C
@@ -12,6 +12,11 @@
 
 #include <config.h>
 
+// 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 4c7daedaef47203a7851b332161950690aee9eca..408a46398b3667fe8b8cfdfcf10d0246b6b209a0 100644 (file)
--- a/src/frontends/gtk/xftFontLoader.C
+++ b/src/frontends/gtk/xftFontLoader.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 466feffba1432d2de78137b3c6b44aeddb3a9861..09d76a80e4b620579636efcdbe9eb29e0268aca2 100644 (file)
--- a/src/frontends/gtk/xftFontMetrics.C
+++ b/src/frontends/gtk/xftFontMetrics.C
@@ -10,6 +10,11 @@
 
 #include <config.h>
 
+// 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 86a96f2ba6b4998ebad316d9df260d148e4f0769..60e205896da4319d6491434dc62a2345042145b9 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-17  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * QPrefsDialog.h: include LColor.h to satisfy concept checks.
+       * lcolorcache.h: ditto
+
 2004-11-15  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * QtView.C (hasFocus): new method
@@ -11,22 +16,22 @@
 
 2004-11-05  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
-       * 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  <j.spitzmueller@gmx.de>
 
-       * 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  <larsbj@gullik.net>
 
        * 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 4ad1ad26e6a8a352e62ed191c85aa15edb5b8f16..1ea10d57a93c78749f31d3e6a254140c118c9456 100644 (file)
--- 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 <vector>

diff --git a/src/frontends/qt2/lcolorcache.h b/src/frontends/qt2/lcolorcache.h
index 90d384ccd937ade02d4d798ed3e95f7a683aaaed..e03f5b2f789a9f18f3c5f526405ea0e7fb5c5e12 100644 (file)
--- 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 <map>
 
 #include <qcolor.h>
 
 
-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 f429aeef52d038abef638c87ff6c50c790387471..5a19d8a3e4e91466aa0fe2887009e6d55c438093 100644 (file)
--- 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 488932d208f592e52bd8299aa101b0bfb9c8c9be..06eef154ea7efe1015a21df8d7a4644972ea64d9 100644 (file)
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -15,10 +15,11 @@
 #ifndef LYXFONT_H
 #define LYXFONT_H
 
+#include "LColor.h"
+
 #include <iosfwd>
 #include <string>
 
-class LColor_color;
 class LyXLex;
 class BufferParams;
 class Language;

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 379521bf59af79db2b705e70b54cac2e38202879..5fc0b18e26eaf427417e661fd696265989d46550 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,7 +1,7 @@
 2004-11-16  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * 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.