Permalink
Browse files

Moved some includes from the headers into the source files, this should

speed up incremental builds a bit
  • Loading branch information...
1 parent abea4b4 commit 0d3df2428b3f98c798ec06112c97111867594879 @aelliott committed Mar 22, 2012
View
@@ -220,14 +220,12 @@ else()
message("## NOT Building ICU Support ##")
endif(NOT NO_ICU)
-# Disabled for now, if this becomes available the application is ready for it
-# but it will require some testing because as of now the implementation for
-# GCC is incomplete meaning no code could be tested.
-# Add C++11 if requested
+# Add C++11 if available
if(NOT NO_CPP11)
message("## -- Building C++11 Support ##")
LIST(APPEND expressioneditor_HPP_SRCS RegexModules/cpp11regex.hpp)
LIST(APPEND expressioneditor_CPP_SRCS RegexModules/cpp11regex.cpp)
+ # This needs to be made more cross-platform with compiler checks
LIST(APPEND CMAKE_CXX_FLAGS "--std=c++0x")
else()
message("## NOT Building C++11 Support ##")
@@ -21,6 +21,8 @@
*/
#include "anchorgraphicsitem.hpp"
+#include "RegexModules/tokens.hpp"
+
AnchorGraphicsItem::AnchorGraphicsItem(Token *token, int tokenPos, QGraphicsItem *parent)
: RegexGraphicsItem(token, tokenPos, parent)
{
@@ -24,8 +24,6 @@
#include "GraphicsItems/regexgraphicsitem.hpp"
-#include "RegexModules/tokens.hpp"
-
class AnchorGraphicsItem : public RegexGraphicsItem
{
Q_OBJECT
@@ -20,6 +20,16 @@
* along with Expression editor. If not, see <http://www.gnu.org/licenses/>.
*/
#include "expressiongraphicsitem.hpp"
+#include "GraphicsItems/alternationgraphicsitem.hpp"
+#include "GraphicsItems/anchorgraphicsitem.hpp"
+#include "GraphicsItems/bracketexpressiongraphicsitem.hpp"
+#include "GraphicsItems/characterclassitem.hpp"
+#include "GraphicsItems/commentgraphicsitem.hpp"
+#include "GraphicsItems/errorgraphicsitem.hpp"
+#include "GraphicsItems/groupinggraphicsitem.hpp"
+#include "GraphicsItems/literalgraphicsitem.hpp"
+#include "GraphicsItems/repeatgraphicsitem.hpp"
+#include "GraphicsItems/specialchargraphicsitem.hpp"
ExpressionGraphicsItem::ExpressionGraphicsItem(QString expression, RegexFactory::RegexFormat format, QGraphicsItem *parent)
: QGraphicsWidget(parent)
@@ -29,16 +29,7 @@
#include <QPainter>
#include "regexfactory.hpp"
-#include "GraphicsItems/alternationgraphicsitem.hpp"
-#include "GraphicsItems/anchorgraphicsitem.hpp"
-#include "GraphicsItems/bracketexpressiongraphicsitem.hpp"
-#include "GraphicsItems/characterclassitem.hpp"
-#include "GraphicsItems/commentgraphicsitem.hpp"
-#include "GraphicsItems/errorgraphicsitem.hpp"
-#include "GraphicsItems/groupinggraphicsitem.hpp"
-#include "GraphicsItems/literalgraphicsitem.hpp"
-#include "GraphicsItems/repeatgraphicsitem.hpp"
-#include "GraphicsItems/specialchargraphicsitem.hpp"
+#include "GraphicsItems/regexgraphicsitem.hpp"
class ExpressionGraphicsItem : public QGraphicsWidget
{
@@ -21,6 +21,8 @@
*/
#include "specialchargraphicsitem.hpp"
+#include "RegexModules/token.hpp"
+
SpecialCharGraphicsItem::SpecialCharGraphicsItem(Token *token, int tokenPos, QGraphicsItem *parent)
: RegexGraphicsItem(token, tokenPos, parent)
{
@@ -33,8 +33,6 @@
#include <unicode/ucnv.h>
#endif // NO_ICU
-#include "RegexModules/token.hpp"
-
class SpecialCharGraphicsItem : public RegexGraphicsItem
{
Q_OBJECT
View
@@ -22,6 +22,9 @@
#include "mainwindow.hpp"
#include "ui_mainwindow.h"
+#include "settingsdialog.hpp"
+#include "expressionedit.hpp"
+
#include <QFileDialog>
#include <QPixmap>
View
@@ -36,9 +36,6 @@
#include "GraphicsItems/placeholdergraphicsitem.hpp"
#include "expressiongraphicsscene.hpp"
-#include "settingsdialog.hpp"
-#include "expressionedit.hpp"
-
namespace Ui {
class MainWindow;
}
View
@@ -21,6 +21,33 @@
*/
#include "regexfactory.hpp"
+#include "RegexModules/qtparser.hpp"
+#include "RegexModules/qtregex.hpp"
+
+#ifndef NO_POSIX
+#include "RegexModules/posixparser.hpp"
+#include "RegexModules/posixregex.hpp"
+#endif
+
+#ifndef NO_PCRE
+#include "RegexModules/pcreparser.hpp"
+#include "RegexModules/pcreregex.hpp"
+#include "RegexModules/perlregex.hpp"
+#endif // NO_PCRE
+
+#ifndef NO_ICU
+#include "RegexModules/icuparser.hpp"
+#include "RegexModules/icuregex.hpp"
+#endif // NO_ICU
+
+#ifndef NO_CPP11
+#include "RegexModules/cppawkparser.hpp"
+#include "RegexModules/cppecmascriptparser.hpp"
+#include "RegexModules/cppgrepparser.hpp"
+#include "RegexModules/cppposixparser.hpp"
+#include "RegexModules/cpp11regex.hpp"
+#endif // NO_CPP11
+
/*!
* Create a new RegexFactory
*
View
@@ -22,33 +22,10 @@
#ifndef REGEXFACTORY_HPP
#define REGEXFACTORY_HPP
-#include "RegexModules/qtparser.hpp"
-#include "RegexModules/qtregex.hpp"
-#include "cmakeconfig.hpp"
-
-#ifndef NO_POSIX
-#include "RegexModules/posixparser.hpp"
-#include "RegexModules/posixregex.hpp"
-#endif
-
-#ifndef NO_PCRE
-#include "RegexModules/pcreparser.hpp"
-#include "RegexModules/pcreregex.hpp"
-#include "RegexModules/perlregex.hpp"
-#endif // NO_PCRE
+#include "RegexModules/regexbase.hpp"
+#include "RegexModules/parser.hpp"
-#ifndef NO_ICU
-#include "RegexModules/icuparser.hpp"
-#include "RegexModules/icuregex.hpp"
-#endif // NO_ICU
-
-#ifndef NO_CPP11
-#include "RegexModules/cppawkparser.hpp"
-#include "RegexModules/cppecmascriptparser.hpp"
-#include "RegexModules/cppgrepparser.hpp"
-#include "RegexModules/cppposixparser.hpp"
-#include "RegexModules/cpp11regex.hpp"
-#endif // NO_CPP11
+#include "cmakeconfig.hpp"
/*!
* \brief The RegexFactory class is a simple implementation of the factory
View
@@ -22,6 +22,8 @@
#include "settingsdialog.hpp"
#include "ui_settingsdialog.h"
+#include "GraphicsItems/groupinggraphicsitem.hpp"
+
#include <QFontDialog>
SettingsDialog::SettingsDialog(QWidget *parent)

0 comments on commit 0d3df24

Please sign in to comment.