Changes for QT4 headers

diff --git a/tools/Display/qt4-headers.diff b/tools/Display/qt4-headers.diff
new file mode 100644 (file)
index 0000000..864dba4
--- /dev/null
+++ b/tools/Display/qt4-headers.diff
@@ -0,0 +1,266 @@
+diff --git a/tools/Display/Makefile b/tools/Display/Makefile
+old mode 100755
+new mode 100644
+index 6195ed7..2e43f57
+--- a/tools/Display/Makefile
++++ b/tools/Display/Makefile
+@@ -15,7 +15,9 @@ CXX  =       g++
+ CFLAGS        =       -pipe -Wno-deprecated -O2 -DNO_DEBUG
+ # CXXFLAGS=   -g -pipe -Wno-deprecated -Wall -W -O2 -std=c++98
+ CXXFLAGS=     -pipe -Wno-deprecated -O2 -DNO_DEBUG -std=c++98
++QTINCDIR=-I/usr/include/qt4 -I/usr/include/qt4/Qt
+ 
++QTLIBDIR=/usr/lib/qt4
+ SNARK14ROOT = ../..
+ SNARK14LIB = $(SNARK14ROOT)/lib
+ SNARK14INC = $(SNARK14ROOT)/include
+@@ -33,10 +35,10 @@ DIGFILEINCLUDE = $(SNARK14INC)/DIGFile
+ DIGFILESNARKLIB = DIGFileSnark
+ DIGFILESNARKINCLUDE = $(SNARK14INC)/DIGFileSnark
+ 
+-INCPATH       =       -I$(QTDIR)/include -I$(XERCESINCLUDE)/.. -I$(DIGFILEINCLUDE) -I$(DIGFILESNARKINCLUDE)
++INCPATH       =       $(QTINCDIR) -I$(XERCESINCLUDE)/.. -I$(DIGFILEINCLUDE) -I$(DIGFILESNARKINCLUDE) -I../../include
+ LINK  =       $(CXX) -std=c++98
+ LFLAGS        =       
+-LIBS  =       $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(XERCESLIBDIR) -L$(DIGLIBDIR) -lqt-mt -lm -l$(XERCESLIB) -l$(DIGFILELIB) -l$(DIGFILESNARKLIB)
++LIBS  =       $(SUBLIBS) -L$(QTLIBDIR) -L/usr/X11R6/lib -L$(XERCESLIBDIR) -L$(DIGLIBDIR) -lqt-mt -lm -l$(XERCESLIB) -l$(DIGFILELIB) -l$(DIGFILESNARKLIB)
+ MOC   =       $(QTDIR)/bin/moc
+ UIC   =       $(QTDIR)/bin/uic
+ TAR   =       tar -cf
+diff --git a/tools/Display/QPL b/tools/Display/QPL
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/SnarkDisplay.cpp b/tools/Display/SnarkDisplay.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/SnarkDisplay.hpp b/tools/Display/SnarkDisplay.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/chooseRanges.cpp b/tools/Display/chooseRanges.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/chooseRanges.hpp b/tools/Display/chooseRanges.hpp
+old mode 100755
+new mode 100644
+index c7439aa..6b80b0e
+--- a/tools/Display/chooseRanges.hpp
++++ b/tools/Display/chooseRanges.hpp
+@@ -24,7 +24,7 @@
+ #include <qlabel.h>
+ #include <qlayout.h>
+ #include <qlineedit.h>
+-#include <qlistbox.h>
++#include <q3listbox.h>
+ #include <qmessagebox.h>
+ #include <qpainter.h>
+ #include <qpen.h>
+diff --git a/tools/Display/chooseYVar.cpp b/tools/Display/chooseYVar.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/chooseYVar.hpp b/tools/Display/chooseYVar.hpp
+old mode 100755
+new mode 100644
+index 53cd861..1ad182f
+--- a/tools/Display/chooseYVar.hpp
++++ b/tools/Display/chooseYVar.hpp
+@@ -24,7 +24,7 @@
+ #include <qlabel.h>
+ #include <qlayout.h>
+ #include <qlineedit.h>
+-#include <qlistbox.h>
++#include <q3listbox.h>
+ #include <qmessagebox.h>
+ #include <qpainter.h>
+ #include <qpen.h>
+diff --git a/tools/Display/displaylines.cpp b/tools/Display/displaylines.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/displaylines.hpp b/tools/Display/displaylines.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/displayprojection.cpp b/tools/Display/displayprojection.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/displayprojection.hpp b/tools/Display/displayprojection.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/displaywidget.cpp b/tools/Display/displaywidget.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/displaywidget.hpp b/tools/Display/displaywidget.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/displaywindow.cpp b/tools/Display/displaywindow.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/displaywindow.hpp b/tools/Display/displaywindow.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/eval_helper.cpp b/tools/Display/eval_helper.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/eval_helper.hpp b/tools/Display/eval_helper.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/image.cpp b/tools/Display/image.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/image.hpp b/tools/Display/image.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/line_real_set_t.cpp b/tools/Display/line_real_set_t.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/line_real_set_t.hpp b/tools/Display/line_real_set_t.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/line_real_t.cpp b/tools/Display/line_real_t.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/line_real_t.hpp b/tools/Display/line_real_t.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/line_window_onevar_t.cpp b/tools/Display/line_window_onevar_t.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/line_window_onevar_t.hpp b/tools/Display/line_window_onevar_t.hpp
+old mode 100755
+new mode 100644
+index e27fb23..995f58d
+--- a/tools/Display/line_window_onevar_t.hpp
++++ b/tools/Display/line_window_onevar_t.hpp
+@@ -11,7 +11,7 @@
+ #include <list>
+ #include <qstring.h>
+ 
+-#include <qcanvas.h>
++#include <q3canvas.h>
+ class QColor;
+ #include "line_window_t.hpp"
+ class line_real_t;
+diff --git a/tools/Display/line_window_t.cpp b/tools/Display/line_window_t.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/line_window_t.hpp b/tools/Display/line_window_t.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/lines.cpp b/tools/Display/lines.cpp
+old mode 100755
+new mode 100644
+index 208fe49..95415e8
+--- a/tools/Display/lines.cpp
++++ b/tools/Display/lines.cpp
+@@ -18,7 +18,7 @@
+ #include <qframe.h>
+ #include <qlabel.h>
+ #include <qlineedit.h>
+-#include <qlistbox.h>
++#include <q3listbox.h>
+ #include <qpushbutton.h>
+ #include <qradiobutton.h>
+ #include <qlayout.h>
+diff --git a/tools/Display/lines.hpp b/tools/Display/lines.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/linesimages.cpp b/tools/Display/linesimages.cpp
+old mode 100755
+new mode 100644
+index 5bf485e..f9a9bfd
+--- a/tools/Display/linesimages.cpp
++++ b/tools/Display/linesimages.cpp
+@@ -19,7 +19,7 @@
+ #include <qframe.h>
+ #include <qlabel.h>
+ #include <qlineedit.h>
+-#include <qlistbox.h>
++#include <q3listbox.h>
+ #include <qpushbutton.h>
+ #include <qradiobutton.h>
+ #include <qlayout.h>
+diff --git a/tools/Display/linesimages.hpp b/tools/Display/linesimages.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/openimages.cpp b/tools/Display/openimages.cpp
+old mode 100755
+new mode 100644
+index e132424..a0fd64e
+--- a/tools/Display/openimages.cpp
++++ b/tools/Display/openimages.cpp
+@@ -13,7 +13,7 @@
+ #include <stdio.h>
+ #include <qapplication.h>
+ #include <qframe.h>
+-#include <qlistbox.h>
++#include <q3listbox.h>
+ #include <qpushbutton.h>
+ #include <qlayout.h>
+ #include <qvariant.h>
+diff --git a/tools/Display/openimages.hpp b/tools/Display/openimages.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/plot_t.cpp b/tools/Display/plot_t.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/plot_t.hpp b/tools/Display/plot_t.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/proj.cpp b/tools/Display/proj.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/proj.hpp b/tools/Display/proj.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/range.cpp b/tools/Display/range.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/range.hpp b/tools/Display/range.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/sd_line_t.cpp b/tools/Display/sd_line_t.cpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/sd_line_t.hpp b/tools/Display/sd_line_t.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/selectEvalExecutions.cpp b/tools/Display/selectEvalExecutions.cpp
+old mode 100755
+new mode 100644
+index b382f1d..4b178cb
+--- a/tools/Display/selectEvalExecutions.cpp
++++ b/tools/Display/selectEvalExecutions.cpp
+@@ -13,7 +13,7 @@
+ #include <stdio.h>
+ #include <qapplication.h>
+ #include <qframe.h>
+-#include <qlistbox.h>
++#include <q3listbox.h>
+ #include <qpushbutton.h>
+ #include <qlayout.h>
+ #include <qvariant.h>
+diff --git a/tools/Display/selectEvalExecutions.hpp b/tools/Display/selectEvalExecutions.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/selectimages.cpp b/tools/Display/selectimages.cpp
+old mode 100755
+new mode 100644
+index edaa1b4..64988d3
+--- a/tools/Display/selectimages.cpp
++++ b/tools/Display/selectimages.cpp
+@@ -11,7 +11,7 @@
+ #include <malloc.h>
+ #include <qfont.h>
+ #include <qframe.h>
+-#include <qlistbox.h>
++#include <q3listbox.h>
+ #include <qpushbutton.h>
+ #include <qlayout.h>
+ #include <qvariant.h>
+diff --git a/tools/Display/selectimages.hpp b/tools/Display/selectimages.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/variables.hpp b/tools/Display/variables.hpp
+old mode 100755
+new mode 100644
+diff --git a/tools/Display/verbosity.hpp b/tools/Display/verbosity.hpp
+old mode 100755
+new mode 100644