[med-svn] [clonalorigin] 01/01: GUI builds now.
Andreas Tille
tille at debian.org
Sat Dec 2 22:09:46 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository clonalorigin.
commit ff7dab5ae6a0bfb20cf581942cb11f9731d8df64
Author: Andreas Tille <tille at debian.org>
Date: Sat Dec 2 23:09:26 2017 +0100
GUI builds now.
---
debian/patches/qt5.patch | 53 +++++++++++++++++++++++++++++++++---------------
1 file changed, 37 insertions(+), 16 deletions(-)
diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
index 55a24b3..11f8e1f 100644
--- a/debian/patches/qt5.patch
+++ b/debian/patches/qt5.patch
@@ -4,20 +4,21 @@ Description: Migration from Qt4 to Qt5
--- a/gui/mainwindowimpl.cpp
+++ b/gui/mainwindowimpl.cpp
-@@ -1,9 +1,10 @@
+@@ -1,9 +1,11 @@
#include "mainwindowimpl.h"
#include <QDBusConnection>
#include <QDBusMessage>
-
+#include <QtPrintSupport/QPrinter>
+#include <QMessageBox>
++#include <QFileDialog>
//
-MainWindowImpl::MainWindowImpl( QWidget * parent, Qt::WFlags f):QMainWindow(parent, f) {
+MainWindowImpl::MainWindowImpl( QWidget * parent, Qt::WindowFlags f):QMainWindow(parent, f) {
param=new ParamQt();
outputFile=NULL;
data=NULL;
-@@ -313,8 +314,8 @@ void MainWindowImpl::on_actionExtractIte
+@@ -313,8 +315,8 @@ void MainWindowImpl::on_actionExtractIte
{
//Select iterations to combine
bool ok;
@@ -28,7 +29,7 @@ Description: Migration from Qt4 to Qt5
QString qstr = QFileDialog::getSaveFileName(this, tr("Save output file"),".","XML files (*.xml);;All files (*)");
on_actionExtractIterations_activated(qstr,istart,iend);
}
-@@ -344,7 +345,7 @@ void MainWindowImpl::on_actionThinIterat
+@@ -344,7 +346,7 @@ void MainWindowImpl::on_actionThinIterat
{
//Select iterations to combine
bool ok;
@@ -37,7 +38,7 @@ Description: Migration from Qt4 to Qt5
QString qstr = QFileDialog::getSaveFileName(this, tr("Save output file"),".","XML files (*.xml);;All files (*)");
on_actionThinIterations_activated(qstr,thin);
}
-@@ -362,7 +363,7 @@ void MainWindowImpl::on_actionOnly_one_g
+@@ -362,7 +364,7 @@ void MainWindowImpl::on_actionOnly_one_g
actionAll_genes->setChecked(false);
actionOnly_one_gene->setChecked(true);
bool ok;
@@ -46,7 +47,7 @@ Description: Migration from Qt4 to Qt5
if (ok) param->setGene(i);
repaint();
}
-@@ -532,7 +533,7 @@ void MainWindowImpl::on_actionMajority_r
+@@ -532,7 +534,7 @@ void MainWindowImpl::on_actionMajority_r
{
if (outputFile==NULL) {QMessageBox::about(0,"Information","Need some data first.");return;}
bool ok=true;
@@ -55,7 +56,7 @@ Description: Migration from Qt4 to Qt5
if (!ok || cutoff>100) return;
ParamTreeCons * paramtreecons=new ParamTreeCons();
paramtreecons->setBlocks(outputFile->getBlocks());
-@@ -715,7 +716,7 @@ void MainWindowImpl::on_actionPd_map_act
+@@ -715,7 +717,7 @@ void MainWindowImpl::on_actionPd_map_act
if (outputFile==NULL) {QMessageBox::about(0,"Information","Need some data first.");return;}
bool ok;
@@ -64,7 +65,7 @@ Description: Migration from Qt4 to Qt5
if(!ok) return;
if(!param->displaySet()) param->newDisplayTree(param->getTree());
outputFile->startOver();
-@@ -831,7 +832,7 @@ void MainWindowImpl::on_actionPrev_site_
+@@ -831,7 +833,7 @@ void MainWindowImpl::on_actionPrev_site_
void MainWindowImpl::on_actionSet_cutoff_activated()
{
bool ok;
@@ -73,7 +74,7 @@ Description: Migration from Qt4 to Qt5
if (!ok) return;
explorerCutoff=cutoff;
((ParamMR*)param)->consensus(explorerCutoff,explorerSite);
-@@ -841,7 +842,7 @@ void MainWindowImpl::on_actionSet_cutoff
+@@ -841,7 +843,7 @@ void MainWindowImpl::on_actionSet_cutoff
void MainWindowImpl::on_actionJump_to_site_activated()
{
bool ok;
@@ -82,7 +83,7 @@ Description: Migration from Qt4 to Qt5
if (!ok) return;
jumpToSite(site);
}
-@@ -858,7 +859,7 @@ void MainWindowImpl::on_actionExport_mov
+@@ -858,7 +860,7 @@ void MainWindowImpl::on_actionExport_mov
{
QString qstr = QFileDialog::getSaveFileName(this, tr("Save movie file"),".",tr("WMV files (*.wmv);;AVI files (*.avi)"));
if (qstr==NULL) return;
@@ -91,7 +92,7 @@ Description: Migration from Qt4 to Qt5
QImage image(width(),height(),QImage::Format_ARGB32);
explorerSite=0;
QString time=QTime::currentTime().toString();
-@@ -887,7 +888,7 @@ void MainWindowImpl::on_actionExport_CSV
+@@ -887,7 +889,7 @@ void MainWindowImpl::on_actionExport_CSV
{
QString qstr = QFileDialog::getSaveFileName(this, tr("Export to CSV"),".","CSV index files (*.csv);;All files (*)");
if (qstr==NULL) return;
@@ -136,8 +137,9 @@ Description: Migration from Qt4 to Qt5
private slots:
--- a/gui/gelmanrubinimpl.cpp
+++ b/gui/gelmanrubinimpl.cpp
-@@ -1,6 +1,6 @@
+@@ -1,6 +1,7 @@
#include "gelmanrubinimpl.h"
++#include <QFileDialog>
//
-GelmanRubinImpl::GelmanRubinImpl( QWidget * parent, Qt::WFlags f)
+GelmanRubinImpl::GelmanRubinImpl( QWidget * parent, Qt::WindowFlags f)
@@ -157,9 +159,10 @@ Description: Migration from Qt4 to Qt5
void outputTracer(ParamQt*param,OutputFile*outputfile,QString*qstr,bool csv=false,bool getparams=true,bool getnumedges=true,bool getpairwisedists=false);
--- a/gui/heatimpl.cpp
+++ b/gui/heatimpl.cpp
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,8 @@
#include "heatimpl.h"
+#include <QtPrintSupport/QPrinter>
++#include <QFileDialog>
//
-HeatImpl::HeatImpl(int n, QWidget * parent, Qt::WFlags f)
+HeatImpl::HeatImpl(int n, QWidget * parent, Qt::WindowFlags f)
@@ -179,7 +182,12 @@ Description: Migration from Qt4 to Qt5
void compute_correct(int mode);
--- a/gui/mainwindowimpl.h
+++ b/gui/mainwindowimpl.h
-@@ -18,7 +18,7 @@
+@@ -14,11 +14,12 @@
+ #include "heatimpl.h"
+ #include "pdimpl.h"
+ #include "pheatimpl.h"
++#include <QFileDialog>
+ //
class MainWindowImpl : public QMainWindow, public Ui::MainWindow {
Q_OBJECT
public:
@@ -190,9 +198,10 @@ Description: Migration from Qt4 to Qt5
void doColourPlot(QStringList*nodes,QStringList*colors,bool denDep,bool colDep);
--- a/gui/pdimpl.cpp
+++ b/gui/pdimpl.cpp
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,8 @@
#include "pdimpl.h"
+#include <QtPrintSupport/QPrinter>
++#include <QFileDialog>
//
-PdImpl::PdImpl(int n, int dist, QWidget * parent, Qt::WFlags f)
+PdImpl::PdImpl(int n, int dist, QWidget * parent, Qt::WindowFlags f)
@@ -212,9 +221,10 @@ Description: Migration from Qt4 to Qt5
void print(ostream* f_out);
--- a/gui/pheatimpl.cpp
+++ b/gui/pheatimpl.cpp
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,8 @@
#include "pheatimpl.h"
+#include <QtPrintSupport/QPrinter>
++#include <QFileDialog>
//
-PHeatImpl::PHeatImpl(int n, bool reldists, QWidget * parent, Qt::WFlags f)
+PHeatImpl::PHeatImpl(int n, bool reldists, QWidget * parent, Qt::WindowFlags f)
@@ -234,9 +244,10 @@ Description: Migration from Qt4 to Qt5
void print(ostream* f_out);
--- a/gui/plotimpl.cpp
+++ b/gui/plotimpl.cpp
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,8 @@
#include "plotimpl.h"
+#include <QtPrintSupport/QPrinter>
++#include <QFileDialog>
//
-PlotImpl::PlotImpl( QWidget * parent, Qt::WFlags f)
+PlotImpl::PlotImpl( QWidget * parent, Qt::WindowFlags f)
@@ -273,3 +284,13 @@ Description: Migration from Qt4 to Qt5
//
class ParamConsMult : public ParamQt
{
+--- a/gui/gui.cpp
++++ b/gui/gui.cpp
+@@ -5,6 +5,7 @@
+ #include "../warg/src/mpiutils.h"
+ #include "mainapplicationdbusadaptor.h"
+ #include <QDBusConnection>
++#include <getopt.h>
+
+ bool verbose=false;
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/clonalorigin.git
More information about the debian-med-commit
mailing list