r19842 by craig - Add fparser 4.5.1, code changes

[scribus-commit]

Author: craig
Date: Thu Feb 19 22:51:04 2015
New Revision: 19842

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19842
Log:
Add fparser 4.5.1, code changes

Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
    trunk/Scribus/scribus/ui/scrspinbox.cpp

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19842&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Thu Feb 19 22:51:04 2015
@@ -719,8 +719,8 @@
 	tablecell.cpp
 	tableutils.cpp
 	textwriter.cpp
-	third_party/fparser/fpoptimizer.cpp
-	third_party/fparser/fparser.cpp
+	third_party/fparser/fpoptimizer.cc
+	third_party/fparser/fparser.cc
 	tocgenerator.cpp
 	transaction.cpp
 	undogui.cpp

Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19842&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp Thu Feb 19 22:51:04 2015
@@ -36,7 +36,7 @@
 
 #include "color.h"
 #include "fileloader.h"
-#include "third_party/fparser/fparser.h"
+#include "third_party/fparser/fparser.hh"
 #include "loadsaveplugin.h"
 #include "pageitem_table.h"
 #include "pagesize.h"

Modified: trunk/Scribus/scribus/ui/scrspinbox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19842&path=/trunk/Scribus/scribus/ui/scrspinbox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrspinbox.cpp (original)
+++ trunk/Scribus/scribus/ui/scrspinbox.cpp Thu Feb 19 22:51:04 2015
@@ -20,7 +20,7 @@
 #include "commonstrings.h"
 #include "scrspinbox.h"
 #include "units.h"
-#include "third_party/fparser/fparser.h"
+#include "third_party/fparser/fparser.hh"
 
 ScrSpinBox::ScrSpinBox(QWidget *parent, int unitIndex) : QDoubleSpinBox(parent), m_constants(NULL)
 {