facsanadu now builds and runs with QtJambi 6.4.1 !

src/MANIFEST.STARTQTCLIENT

@@ -1,8 +1,8 @@
-Main-Class: facsanadu.gui.MainWindow
-Manifest-Version: 1.0
-Class-Path: jdom-2.0.4.jar  qtjambi-4.6.3.jar  qtjambi-macosx-gcc-4.6.3
- .jar qtjambi-util-4.6.3.jar qtjambi-win32-msvc2005-4.6.3.jar qtjambi-4
- .7.0.jar qtjambi-linux32-gcc-4.7.0.jar qtjambi-linux64-gcc-4.7.0.jar q
- tjambi-util-4.7.0.jar qtjambi-macosx-gcc-4.7.0.jar qtjambi-linux64-gcc
- -4.6.3.jar qtjambi-4.7.1.jar qtjambi-win32-msvc2008-4.7.1.jar vecmath.
- jar
+Manifest-Version: 1.0
+Main-Class: facsanadu.gui.MainWindow
+Class-Path: jdom2-2.0.6.jar qtjambi-6.4.2.jar qtjambi-native-linux-x64-6
+ .4.2.jar qtjambi-native-macos-6.4.2.jar qtjambi-native-windows-x64-6.4.
+ 2.jar vecmath-1.5.2.jar
+
+
+

src/Makefile

@@ -1,6 +1,6 @@
 all:
-	javac -d ../bin \
-	-cp ../lib/jdom-2.0.4.jar:../lib/linux64/qtjambi-4.7.0.jar:../lib/linux64/qtjambi-linux64-gcc-4.7.0.jar:../lib/linux64/qtjambi-util-4.7.0.jar:../lib/vecmath.jar \
+	javac -Xlint:deprecation -Xdiags:verbose -d ../bin \
+	-cp ../lib/jdom2-2.0.6.1.jar:../lib/qtjambi-6.4.2.jar:../lib/linux64/qtjambi-native-linux64-6.4.2.jar:../lib/vecmath-1.5.2.jar \
 	*/*/*java \
         */*/*/*java \
         */*/*/*/*java
@@ -21,11 +21,17 @@ jars:
 	*/*/*/*.txt \
 	*/*/*/*.png
 
+clean:
+	rm -rf ../bin/facsanadu
+	rm -rf ../bin/port
+	rm ../facsanadu.jar
+	rm -rf ../release
+
 ############################################################################################
 ############################ osx ###########################################################
 ############################################################################################
 
-macport: jars
+macport: all jars
 	rm -Rf ../release/mac
 	cp -r ../ports/mac ../release/mac
 	cp ../facsanadu.jar ../lib/*jar ../lib/mac/*.jar ../release/mac/FACSanadu.app/
@@ -37,56 +43,50 @@ macport: jars
 ############################ linux #########################################################
 ############################################################################################
 
-ubuntuport: jars
+ubuntuport: all jars
 	sudo rm -f ../release/facsanadu*deb
 	cd ..; sudo java -cp bin port.ubuntu.Main
 	sudo mv ../release/facsanadu*deb ../release/facsanadu.deb
 
-linuxport32: jars
-	mkdir -p ../release/linux32
-	rm -Rf ../release/linux32/facsanadu
-	cd ..; cp -r ports/linux release/linux32/facsanadu
-	cd ..; cp -r facsanadu.jar lib/*jar lib/linux32/*jar release/linux32/facsanadu/
-	#cp translations/* ../release/linux32/facsanadu/translations/
 
-linuxport64: jars
+linuxport64: all jars
 	mkdir -p ../release/linux64
 	rm -Rf ../release/linux64/facsanadu
 	cd ..; cp -r ports/linux release/linux64/facsanadu
 	cd ..; cp -r facsanadu.jar lib/*jar lib/linux64/*jar release/linux64/facsanadu/
 	#cp -r translations/* ../release/linux64/facsanadu/translations/
 
-linuxport: linuxport32 linuxport64 ubuntuport
+linuxport: linuxport64 ubuntuport
 
 
 
 ############################################################################################
 ############################ windows #######################################################
 ############################################################################################
 
-winportjre: jars
+winportjre: all jars
 	rm -Rf ../release/winjre/
 	mkdir -p ../release/winjre/facsanadu
 	cd ..; cp ports/win/starter/facsanadu_bundledjre.exe release/winjre/facsanadu/start.exe
 	cd ..; cp ports/win/installer/* release/winjre/
-	cd ..; cp facsanadu.jar lib/*jar lib/win32/*jar release/winjre/facsanadu/
+	cd ..; cp facsanadu.jar lib/*jar lib/win64/*jar release/winjre/facsanadu/
 	#cp -r translations ../release/winjre/facsanadu/
 	cd ..; cp -r ../support_programs/jre release/winjre/
 	cd ../release/winjre; "/home/mahogny/.wine/drive_c/Program Files (x86)/NSIS/makensis.exe" bundledjre.nsi
 	cd ../release/winjre; mv install.exe ../facsanadu_winjre.exe
 
 
-winportzip: jars
+winportzip: all jars
 	rm -Rf ../release/facsanadu_win/
 	mkdir -p ../release/facsanadu_win
 	cd ..; cp ports/win/starter/facsanadu_bundledjre.exe release/facsanadu_win/facsanadu.exe
-	cd ..; cp facsanadu.jar lib/*jar lib/win32/*jar release/facsanadu_win/
+	cd ..; cp facsanadu.jar lib/*jar lib/win64/*jar release/facsanadu_win/
 	cd ..; cp -r ../support_programs/jre/* release/facsanadu_win/
 	cd ../release/; zip -r facsanadu_win facsanadu_win
 
 
 
-winport: winportzip # winportjre # winport32 winport64 winportjre
+winport: winportzip # winportjre # winport64 winportjre
 
 
 ############################################################################################
@@ -97,14 +97,13 @@ release: macport linuxport winport #docs
 	mkdir -p ../release
 	rm -f ../release/facsanadu*zip 
 	cd ../release/linux64; zip -r ../facsanadu_linux64.zip  facsanadu
-	cd ../release/linux32; zip -r ../facsanadu_linux32.zip  facsanadu
 	#cd ports; zip -r ../../release/docs.zip            documentation
 	cd ..; cp -f src/facsanadu/gui/version.txt release/qtversion.txt
 
 cleanports:
 	cd ports; rm facsanadu.app/*.jar
 #	cd ports; rm linux/*.jar
-#	cd ports; rm win32/*.jar
+#	cd ports; rm win64/*.jar
 	cd ports; rm documentation/*
 
 
@@ -138,9 +137,6 @@ lupdate:
 	-ts translations/*ts
 
 
-
-
-
 gitaddall:
 	git add --all \
 	*/*java \

src/facsanadu/gates/GatePolygon.java

@@ -2,9 +2,9 @@
 
 import java.util.ArrayList;
 
-import com.trolltech.qt.core.QPointF;
-import com.trolltech.qt.core.Qt.FillRule;
-import com.trolltech.qt.gui.QPolygonF;
+import io.qt.core.QPointF;
+import io.qt.core.Qt.FillRule;
+import io.qt.gui.QPolygonF;
 
 /**
  * 
@@ -21,12 +21,12 @@ public class GatePolygon extends Gate
 	public ArrayList<Double> arrY=new ArrayList<Double>();
 
 	private QPolygonF poly;
-	
+
 	public void updateInternal()
 		{
 		poly=new QPolygonF();
 		for(int i=0;i<getNumPoints();i++)
-			poly.add(arrX.get(i), arrY.get(i));
+			poly.append(arrX.get(i), arrY.get(i));
 		setUpdated();
 		}
 

src/facsanadu/gui/AddMeasureDialog.java

@@ -5,15 +5,15 @@
 import java.util.Collection;
 import java.util.LinkedList;
 
-import com.trolltech.qt.core.QModelIndex;
-import com.trolltech.qt.core.Qt;
-import com.trolltech.qt.gui.QCheckBox;
-import com.trolltech.qt.gui.QDialog;
-import com.trolltech.qt.gui.QPushButton;
-import com.trolltech.qt.gui.QTableWidget;
-import com.trolltech.qt.gui.QTableWidgetItem;
-import com.trolltech.qt.gui.QAbstractItemView.SelectionBehavior;
-import com.trolltech.qt.gui.QHeaderView.ResizeMode;
+import io.qt.core.QModelIndex;
+import io.qt.core.Qt;
+import io.qt.widgets.QCheckBox;
+import io.qt.widgets.QDialog;
+import io.qt.widgets.QPushButton;
+import io.qt.widgets.QTableWidget;
+import io.qt.widgets.QTableWidgetItem;
+import io.qt.widgets.QAbstractItemView.SelectionBehavior;
+import io.qt.widgets.QHeaderView.ResizeMode;
 
 import facsanadu.data.ChannelInfo;
 import facsanadu.gates.measure.GateMeasure;
@@ -46,7 +46,7 @@ public AddMeasureDialog(FacsanaduProject proj)
 		tableChannels.verticalHeader().hide();
 		tableChannels.setHorizontalHeaderLabels(Arrays.asList(tr("Channel")));
 		tableChannels.setSelectionBehavior(SelectionBehavior.SelectRows);
-		tableChannels.horizontalHeader().setResizeMode(ResizeMode.ResizeToContents);
+		tableChannels.horizontalHeader().setSectionResizeMode(ResizeMode.ResizeToContents);
 		tableChannels.horizontalHeader().setStretchLastSection(true);		
 
 		bOk.clicked.connect(this,"actionOK()");

src/facsanadu/gui/DatasetListWidget.java

@@ -5,19 +5,19 @@
 import java.util.Arrays;
 import java.util.LinkedList;
 
-import com.trolltech.qt.QSignalEmitter;
-import com.trolltech.qt.core.QModelIndex;
-import com.trolltech.qt.core.Qt;
-import com.trolltech.qt.gui.QFileDialog;
-import com.trolltech.qt.gui.QPushButton;
-import com.trolltech.qt.gui.QTableWidget;
-import com.trolltech.qt.gui.QTableWidgetItem;
-import com.trolltech.qt.gui.QVBoxLayout;
-import com.trolltech.qt.gui.QAbstractItemView.SelectionBehavior;
-import com.trolltech.qt.gui.QFileDialog.FileMode;
-import com.trolltech.qt.gui.QHeaderView.ResizeMode;
-import com.trolltech.qt.gui.QIcon;
-import com.trolltech.qt.gui.QSizePolicy.Policy;
+import io.qt.core.QModelIndex;
+import io.qt.core.Qt;
+import io.qt.core.QItemSelection;
+import io.qt.widgets.QFileDialog;
+import io.qt.widgets.QPushButton;
+import io.qt.widgets.QTableWidget;
+import io.qt.widgets.QTableWidgetItem;
+import io.qt.widgets.QVBoxLayout;
+import io.qt.widgets.QAbstractItemView.SelectionBehavior;
+import io.qt.widgets.QFileDialog.FileMode;
+import io.qt.widgets.QHeaderView.ResizeMode;
+import io.qt.gui.QIcon;
+import io.qt.widgets.QSizePolicy.Policy;
 
 import facsanadu.data.Dataset;
 import facsanadu.gui.events.EventDatasetsChanged;
@@ -40,18 +40,18 @@ public class DatasetListWidget extends QVBoxLayout
 
 	private QTableWidget tableDatasets=new QTableWidget();
 
-	public QSignalEmitter.Signal0 selectionChanged=new QSignalEmitter.Signal0();
+	public final Signal0 selectionChanged=new Signal0();
 
 	public DatasetListWidget(MainWindow mw)
 		{
 		this.mw=mw;
-		setMargin(0);
+		setContentsMargins(0,0,0,0);
 
 		tableDatasets.setColumnCount(1);
 		tableDatasets.verticalHeader().hide();
 		tableDatasets.setHorizontalHeaderLabels(Arrays.asList(tr("Dataset")));
 		tableDatasets.setSelectionBehavior(SelectionBehavior.SelectRows);
-		tableDatasets.horizontalHeader().setResizeMode(ResizeMode.ResizeToContents);
+		tableDatasets.horizontalHeader().setSectionResizeMode(ResizeMode.ResizeToContents);
 		tableDatasets.horizontalHeader().setStretchLastSection(true);		
 		tableDatasets.selectionModel().selectionChanged.connect(this,"dothelayout()");
 

src/facsanadu/gui/DialogAbout.java

@@ -1,11 +1,11 @@
 package facsanadu.gui;
 
 
-import com.trolltech.qt.gui.QDialog;
-import com.trolltech.qt.gui.QLabel;
-import com.trolltech.qt.gui.QPushButton;
-import com.trolltech.qt.gui.QTextEdit;
-import com.trolltech.qt.gui.QVBoxLayout;
+import io.qt.widgets.QDialog;
+import io.qt.widgets.QLabel;
+import io.qt.widgets.QPushButton;
+import io.qt.widgets.QTextEdit;
+import io.qt.widgets.QVBoxLayout;
 
 import facsanadu.gui.resource.ImgResource;
 

src/facsanadu/gui/GatesListWidget.java

@@ -4,17 +4,18 @@
 import java.util.Collection;
 import java.util.LinkedList;
 
-import com.trolltech.qt.core.Qt;
-import com.trolltech.qt.gui.QIcon;
-import com.trolltech.qt.gui.QInputDialog;
-import com.trolltech.qt.gui.QPushButton;
-import com.trolltech.qt.gui.QTreeWidget;
-import com.trolltech.qt.gui.QTreeWidgetItem;
-import com.trolltech.qt.gui.QVBoxLayout;
-import com.trolltech.qt.gui.QAbstractItemView.SelectionBehavior;
-import com.trolltech.qt.gui.QAbstractItemView.SelectionMode;
-import com.trolltech.qt.gui.QLineEdit.EchoMode;
-import com.trolltech.qt.gui.QSizePolicy.Policy;
+import io.qt.core.Qt;
+import io.qt.gui.QIcon;
+import io.qt.gui.QColor;
+import io.qt.widgets.QInputDialog;
+import io.qt.widgets.QPushButton;
+import io.qt.widgets.QTreeWidget;
+import io.qt.widgets.QTreeWidgetItem;
+import io.qt.widgets.QVBoxLayout;
+import io.qt.widgets.QAbstractItemView.SelectionBehavior;
+import io.qt.widgets.QAbstractItemView.SelectionMode;
+import io.qt.widgets.QLineEdit.EchoMode;
+import io.qt.widgets.QSizePolicy.Policy;
 
 import facsanadu.gates.Gate;
 import facsanadu.gates.measure.GateMeasure;
@@ -52,7 +53,7 @@ private interface CallbackColor
 	public GatesListWidget(MainWindow mw)
 		{
 		this.mw=mw;
-		setMargin(0);
+		setContentsMargins(0,0,0,0);
 
 		treeGates.setHeaderLabels(Arrays.asList(tr("Gate"),tr("Color")));
 		treeGates.setSelectionBehavior(SelectionBehavior.SelectRows);

src/facsanadu/gui/GraphExportWindow.java

@@ -1,11 +1,11 @@
 package facsanadu.gui;
 
-import com.trolltech.qt.gui.QButtonGroup;
-import com.trolltech.qt.gui.QDialog;
-import com.trolltech.qt.gui.QLayout;
-import com.trolltech.qt.gui.QPushButton;
-import com.trolltech.qt.gui.QRadioButton;
-import com.trolltech.qt.gui.QSpinBox;
+import io.qt.widgets.QButtonGroup;
+import io.qt.widgets.QDialog;
+import io.qt.widgets.QLayout;
+import io.qt.widgets.QPushButton;
+import io.qt.widgets.QRadioButton;
+import io.qt.widgets.QSpinBox;
 import facsanadu.gui.qt.QTutil;
 
 /**