1 diff --git a/tools/Display/Makefile b/tools/Display/Makefile
5 --- a/tools/Display/Makefile
6 +++ b/tools/Display/Makefile
7 @@ -15,7 +15,9 @@ CXX = g++
8 CFLAGS = -pipe -Wno-deprecated -O2 -DNO_DEBUG
9 # CXXFLAGS= -g -pipe -Wno-deprecated -Wall -W -O2 -std=c++98
10 CXXFLAGS= -pipe -Wno-deprecated -O2 -DNO_DEBUG -std=c++98
11 +QTINCDIR=-I/usr/include/qt4 -I/usr/include/qt4/Qt
13 +QTLIBDIR=/usr/lib/qt4
15 SNARK14LIB = $(SNARK14ROOT)/lib
16 SNARK14INC = $(SNARK14ROOT)/include
17 @@ -33,10 +35,10 @@ DIGFILEINCLUDE = $(SNARK14INC)/DIGFile
18 DIGFILESNARKLIB = DIGFileSnark
19 DIGFILESNARKINCLUDE = $(SNARK14INC)/DIGFileSnark
21 -INCPATH = -I$(QTDIR)/include -I$(XERCESINCLUDE)/.. -I$(DIGFILEINCLUDE) -I$(DIGFILESNARKINCLUDE)
22 +INCPATH = $(QTINCDIR) -I$(XERCESINCLUDE)/.. -I$(DIGFILEINCLUDE) -I$(DIGFILESNARKINCLUDE) -I../../include
23 LINK = $(CXX) -std=c++98
25 -LIBS = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(XERCESLIBDIR) -L$(DIGLIBDIR) -lqt-mt -lm -l$(XERCESLIB) -l$(DIGFILELIB) -l$(DIGFILESNARKLIB)
26 +LIBS = $(SUBLIBS) -L$(QTLIBDIR) -L/usr/X11R6/lib -L$(XERCESLIBDIR) -L$(DIGLIBDIR) -lqt-mt -lm -l$(XERCESLIB) -l$(DIGFILELIB) -l$(DIGFILESNARKLIB)
27 MOC = $(QTDIR)/bin/moc
28 UIC = $(QTDIR)/bin/uic
30 diff --git a/tools/Display/QPL b/tools/Display/QPL
33 diff --git a/tools/Display/SnarkDisplay.cpp b/tools/Display/SnarkDisplay.cpp
36 diff --git a/tools/Display/SnarkDisplay.hpp b/tools/Display/SnarkDisplay.hpp
39 diff --git a/tools/Display/chooseRanges.cpp b/tools/Display/chooseRanges.cpp
42 diff --git a/tools/Display/chooseRanges.hpp b/tools/Display/chooseRanges.hpp
45 index c7439aa..6b80b0e
46 --- a/tools/Display/chooseRanges.hpp
47 +++ b/tools/Display/chooseRanges.hpp
51 #include <qlineedit.h>
52 -#include <qlistbox.h>
53 +#include <q3listbox.h>
54 #include <qmessagebox.h>
57 diff --git a/tools/Display/chooseYVar.cpp b/tools/Display/chooseYVar.cpp
60 diff --git a/tools/Display/chooseYVar.hpp b/tools/Display/chooseYVar.hpp
63 index 53cd861..1ad182f
64 --- a/tools/Display/chooseYVar.hpp
65 +++ b/tools/Display/chooseYVar.hpp
69 #include <qlineedit.h>
70 -#include <qlistbox.h>
71 +#include <q3listbox.h>
72 #include <qmessagebox.h>
75 diff --git a/tools/Display/displaylines.cpp b/tools/Display/displaylines.cpp
78 diff --git a/tools/Display/displaylines.hpp b/tools/Display/displaylines.hpp
81 diff --git a/tools/Display/displayprojection.cpp b/tools/Display/displayprojection.cpp
84 diff --git a/tools/Display/displayprojection.hpp b/tools/Display/displayprojection.hpp
87 diff --git a/tools/Display/displaywidget.cpp b/tools/Display/displaywidget.cpp
90 diff --git a/tools/Display/displaywidget.hpp b/tools/Display/displaywidget.hpp
93 diff --git a/tools/Display/displaywindow.cpp b/tools/Display/displaywindow.cpp
96 diff --git a/tools/Display/displaywindow.hpp b/tools/Display/displaywindow.hpp
99 diff --git a/tools/Display/eval_helper.cpp b/tools/Display/eval_helper.cpp
102 diff --git a/tools/Display/eval_helper.hpp b/tools/Display/eval_helper.hpp
105 diff --git a/tools/Display/image.cpp b/tools/Display/image.cpp
108 diff --git a/tools/Display/image.hpp b/tools/Display/image.hpp
111 diff --git a/tools/Display/line_real_set_t.cpp b/tools/Display/line_real_set_t.cpp
114 diff --git a/tools/Display/line_real_set_t.hpp b/tools/Display/line_real_set_t.hpp
117 diff --git a/tools/Display/line_real_t.cpp b/tools/Display/line_real_t.cpp
120 diff --git a/tools/Display/line_real_t.hpp b/tools/Display/line_real_t.hpp
123 diff --git a/tools/Display/line_window_onevar_t.cpp b/tools/Display/line_window_onevar_t.cpp
126 diff --git a/tools/Display/line_window_onevar_t.hpp b/tools/Display/line_window_onevar_t.hpp
129 index e27fb23..995f58d
130 --- a/tools/Display/line_window_onevar_t.hpp
131 +++ b/tools/Display/line_window_onevar_t.hpp
136 -#include <qcanvas.h>
137 +#include <q3canvas.h>
139 #include "line_window_t.hpp"
141 diff --git a/tools/Display/line_window_t.cpp b/tools/Display/line_window_t.cpp
144 diff --git a/tools/Display/line_window_t.hpp b/tools/Display/line_window_t.hpp
147 diff --git a/tools/Display/lines.cpp b/tools/Display/lines.cpp
150 index 208fe49..95415e8
151 --- a/tools/Display/lines.cpp
152 +++ b/tools/Display/lines.cpp
156 #include <qlineedit.h>
157 -#include <qlistbox.h>
158 +#include <q3listbox.h>
159 #include <qpushbutton.h>
160 #include <qradiobutton.h>
162 diff --git a/tools/Display/lines.hpp b/tools/Display/lines.hpp
165 diff --git a/tools/Display/linesimages.cpp b/tools/Display/linesimages.cpp
168 index 5bf485e..f9a9bfd
169 --- a/tools/Display/linesimages.cpp
170 +++ b/tools/Display/linesimages.cpp
174 #include <qlineedit.h>
175 -#include <qlistbox.h>
176 +#include <q3listbox.h>
177 #include <qpushbutton.h>
178 #include <qradiobutton.h>
180 diff --git a/tools/Display/linesimages.hpp b/tools/Display/linesimages.hpp
183 diff --git a/tools/Display/openimages.cpp b/tools/Display/openimages.cpp
186 index e132424..a0fd64e
187 --- a/tools/Display/openimages.cpp
188 +++ b/tools/Display/openimages.cpp
191 #include <qapplication.h>
193 -#include <qlistbox.h>
194 +#include <q3listbox.h>
195 #include <qpushbutton.h>
197 #include <qvariant.h>
198 diff --git a/tools/Display/openimages.hpp b/tools/Display/openimages.hpp
201 diff --git a/tools/Display/plot_t.cpp b/tools/Display/plot_t.cpp
204 diff --git a/tools/Display/plot_t.hpp b/tools/Display/plot_t.hpp
207 diff --git a/tools/Display/proj.cpp b/tools/Display/proj.cpp
210 diff --git a/tools/Display/proj.hpp b/tools/Display/proj.hpp
213 diff --git a/tools/Display/range.cpp b/tools/Display/range.cpp
216 diff --git a/tools/Display/range.hpp b/tools/Display/range.hpp
219 diff --git a/tools/Display/sd_line_t.cpp b/tools/Display/sd_line_t.cpp
222 diff --git a/tools/Display/sd_line_t.hpp b/tools/Display/sd_line_t.hpp
225 diff --git a/tools/Display/selectEvalExecutions.cpp b/tools/Display/selectEvalExecutions.cpp
228 index b382f1d..4b178cb
229 --- a/tools/Display/selectEvalExecutions.cpp
230 +++ b/tools/Display/selectEvalExecutions.cpp
233 #include <qapplication.h>
235 -#include <qlistbox.h>
236 +#include <q3listbox.h>
237 #include <qpushbutton.h>
239 #include <qvariant.h>
240 diff --git a/tools/Display/selectEvalExecutions.hpp b/tools/Display/selectEvalExecutions.hpp
243 diff --git a/tools/Display/selectimages.cpp b/tools/Display/selectimages.cpp
246 index edaa1b4..64988d3
247 --- a/tools/Display/selectimages.cpp
248 +++ b/tools/Display/selectimages.cpp
253 -#include <qlistbox.h>
254 +#include <q3listbox.h>
255 #include <qpushbutton.h>
257 #include <qvariant.h>
258 diff --git a/tools/Display/selectimages.hpp b/tools/Display/selectimages.hpp
261 diff --git a/tools/Display/variables.hpp b/tools/Display/variables.hpp
264 diff --git a/tools/Display/verbosity.hpp b/tools/Display/verbosity.hpp