[metview] 93/97: WIP: First fully compiling qt5 patch

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository metview.

commit f7d0b163e3d8d2da2acf22d6dc2de4e587cbcc97
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Aug 6 02:59:01 2015 +0100

    WIP: First fully compiling qt5 patch
---
 debian/patches/qt5.patch | 129 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 123 insertions(+), 6 deletions(-)

diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
index d17610c..33fea5f 100644
--- a/debian/patches/qt5.patch
+++ b/debian/patches/qt5.patch
@@ -960,29 +960,32 @@ Index: metview-4.5.6/src/uPlot/MvQZoomStackWidget.h
 ===================================================================
 --- metview-4.5.6.orig/src/uPlot/MvQZoomStackWidget.h
 +++ metview-4.5.6/src/uPlot/MvQZoomStackWidget.h
-@@ -13,7 +13,8 @@
+@@ -13,7 +13,7 @@
  #include <QImage>
  #include <QMap>
  #include <QMenu>
 -#include <QPlastiqueStyle>
-+// #include <QFusionStyle>
-+#include <QFusionStyle>
++#include <QCommonStyle>
  #include <QProxyStyle>
  
  class QAction;
-@@ -29,10 +30,10 @@ class MvQZoomStackMenuStyle : public QPr
+@@ -29,13 +29,14 @@ class MvQZoomStackMenuStyle : public QPr
          int pixelMetric(PixelMetric, const QStyleOption *option=0, const QWidget *w=0) const;
  };
      
 -class MvQZoomStackMenuPlastiqueStyle : public QPlastiqueStyle
-+class MvQZoomStackMenuFusionStyle : public QFusionStyle
++class MvQZoomStackMenuCommonStyle : public QCommonStyle
  {
      public:
 -        MvQZoomStackMenuPlastiqueStyle() : QPlastiqueStyle() {};   
-+        MvQZoomStackMenuFusionStyle() : QFusionStyle() {};   
++        MvQZoomStackMenuCommonStyle() : QCommonStyle() {};   
          int pixelMetric(PixelMetric, const QStyleOption *option=0, const QWidget *w=0) const;
  };
  
++
+ class MvQZoomStackLevel
+ {
+ public:
 Index: metview-4.5.6/src/Desktop/MvQFolderViewBase.h
 ===================================================================
 --- metview-4.5.6.orig/src/Desktop/MvQFolderViewBase.h
@@ -1002,3 +1005,117 @@ Index: metview-4.5.6/src/Desktop/MvQFolderViewBase.h
 -#endif
 \ No newline at end of file
 +#endif
+Index: metview-4.5.6/src/Desktop/MvQIconFolderView.cc
+===================================================================
+--- metview-4.5.6.orig/src/Desktop/MvQIconFolderView.cc
++++ metview-4.5.6/src/Desktop/MvQIconFolderView.cc
+@@ -431,7 +431,7 @@ void MvQIconFolderView::changeEvent(QEve
+ 
+ QModelIndex MvQIconFolderView::indexAt(QPointF scenePos)
+ {
+-	QGraphicsItem *item=scene()->itemAt(scenePos);
++	QGraphicsItem *item=scene()->itemAt(scenePos.x(), scenePos.y(), QTransform());
+ 	if(item)
+ 	{	  
+ 	  	MvQIconItem* icItem=static_cast<MvQIconItem*>(item);
+@@ -443,7 +443,7 @@ QModelIndex MvQIconFolderView::indexAt(Q
+ 
+ IconObject* MvQIconFolderView::iconObjectAt(QPointF scenePos)
+ {
+-	QGraphicsItem *item=scene()->itemAt(scenePos);
++	QGraphicsItem *item=scene()->itemAt(scenePos.x(), scenePos.y(), QTransform());
+ 	if(item)
+ 	{	  
+ 	  	MvQIconItem* icItem=static_cast<MvQIconItem*>(item);
+@@ -1918,4 +1918,4 @@ void MvQIconFolderView::showIcon(const Q
+ 		ensureVisible(item);
+ 		selectOnlyOneItem(item);
+ 	}	
+-}
+\ No newline at end of file
++}
+Index: metview-4.5.6/src/Desktop/MvQProductBrowser.cc
+===================================================================
+--- metview-4.5.6.orig/src/Desktop/MvQProductBrowser.cc
++++ metview-4.5.6/src/Desktop/MvQProductBrowser.cc
+@@ -317,7 +317,7 @@ bool MvQProductModel::setData(const QMod
+ QModelIndex MvQProductModel::index( int row, int column, const QModelIndex & /*parent*/ ) const
+ {
+ 
+-	return createIndex(row,column,0);
++	return createIndex(row,column, (void*) 0);
+ }
+ 
+ 
+Index: metview-4.5.6/src/uPlot/ExportDialog.cc
+===================================================================
+--- metview-4.5.6.orig/src/uPlot/ExportDialog.cc
++++ metview-4.5.6/src/uPlot/ExportDialog.cc
+@@ -27,6 +27,29 @@
+ #include "uPlot.h"
+ 
+ 
++/*
++    Makes a list of filters from ;;-separated text.
++*/
++QStringList qt_make_filter_list(const QString &filter)
++{
++    QString f(filter);
++
++    if (f.isEmpty())
++        return QStringList();
++
++    QString sep(QLatin1String(";;"));
++    int i = f.indexOf(sep, 0);
++    if (i == -1) {
++        if (f.indexOf(QLatin1Char('\n'), 0) != -1) {
++            sep = QLatin1Char('\n');
++            i = f.indexOf(sep, 0);
++        }
++    }
++
++    return f.split(sep);
++}
++
++
+ ExportDialog::ExportDialog(int currentFrame, int totalFrames, QWidget *parent) :
+                QFileDialog(parent,"Export"),
+                current_  (currentFrame),
+@@ -48,7 +71,8 @@ ExportDialog::ExportDialog(int currentFr
+     settings.endGroup();
+ 
+     // Set filter options to select which files to be shown
+-    this->setFilter(tr("All Files (*.*);;Images (*.png *.ps *.eps *.jpg *.kml *.gif *.svg *.pdf)"));
++    // this->setFilter(tr("All Files (*.*);;Images (*.png *.ps *.eps *.jpg *.kml *.gif *.svg *.pdf)"));
++    this->setNameFilters(qt_make_filter_list("All Files (*.*);;Images (*.png *.ps *.eps *.jpg *.kml *.gif *.svg *.pdf)"));
+ 
+     // Get the main layout
+     QGridLayout *mainLayout = static_cast<QGridLayout*>(layout());
+Index: metview-4.5.6/src/uPlot/MvQZoomStackWidget.cc
+===================================================================
+--- metview-4.5.6.orig/src/uPlot/MvQZoomStackWidget.cc
++++ metview-4.5.6/src/uPlot/MvQZoomStackWidget.cc
+@@ -31,12 +31,12 @@ int MvQZoomStackMenuStyle::pixelMetric(P
+ }
+     
+ 
+-int MvQZoomStackMenuPlastiqueStyle::pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const
++int MvQZoomStackMenuCommonStyle::pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const
+ {
+         if (metric == PM_SmallIconSize)
+             return 64;
+  
+-       return QPlastiqueStyle::pixelMetric(metric, option,widget);
++       return QCommonStyle::pixelMetric(metric, option,widget);
+ }
+ 
+ //=========================
+@@ -324,7 +324,7 @@ MvQZoomStackWidget::MvQZoomStackWidget(M
+ 	activeScene_=0;
+ 	currentPage_=0;
+ 	skipUpdate_=false;
+-	setStyle(new MvQZoomStackMenuPlastiqueStyle);
++	setStyle(new MvQZoomStackMenuCommonStyle);
+ 
+ 	connect(this,SIGNAL(triggered(QAction*)),
+ 		this,SLOT(slotStepTo(QAction*)));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git