[metview] 91/97: Qt5 changes (WIP)
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Sep 1 09:18:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository metview.
commit a2fa1091f4b2b7c893d64c4afc33a083f602d4ca
Merge: f198253 9c4f933
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Aug 5 10:36:40 2015 +0100
Qt5 changes (WIP)
debian/control | 4 +-
debian/patches/qt5.patch | 1417 ++++++++++++++++++++++++++++++----------------
debian/patches/series | 2 +-
3 files changed, 939 insertions(+), 484 deletions(-)
diff --cc debian/patches/qt5.patch
index b4e32b9,07b55af..d17610c
--- a/debian/patches/qt5.patch
+++ b/debian/patches/qt5.patch
@@@ -515,35 -390,596 +390,615 @@@ Index: metview-4.5.6/cmake/Qt5Extras.cm
+ set(${_qm_files} ${${_qm_files}} ${qm})
+ endforeach ()
+endmacro()
- +
- +function(qt4_use_modules _target _link_type)
- + if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
- + message(DEPRECATION "The qt4_use_modules function is obsolete. Use target_link_libraries with IMPORTED targets instead.")
- + endif()
- + if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE")
- + set(modules ${ARGN})
- + set(link_type ${_link_type})
- + else()
- + set(modules ${_link_type} ${ARGN})
- + endif()
- + foreach(_module ${modules})
- + string(TOUPPER ${_module} _ucmodule)
- + set(_targetPrefix QT_QT${_ucmodule})
- + if (_ucmodule STREQUAL QAXCONTAINER OR _ucmodule STREQUAL QAXSERVER)
- + if (NOT QT_Q${_ucmodule}_FOUND)
- + message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
- + endif()
- + set(_targetPrefix QT_Q${_ucmodule})
- + else()
- + if (NOT QT_QT${_ucmodule}_FOUND)
- + message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.")
- + endif()
- + if ("${_ucmodule}" STREQUAL "MAIN")
- + message(FATAL_ERROR "Can not use \"${_module}\" module with qt4_use_modules.")
- + endif()
- + endif()
- + target_link_libraries(${_target} ${link_type} ${${_targetPrefix}_LIBRARIES})
- + set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${${_targetPrefix}_INCLUDE_DIR} ${QT_HEADERS_DIR} ${QT_MKSPECS_DIR}/default)
- + set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${${_targetPrefix}_COMPILE_DEFINITIONS})
- + endforeach()
- +endfunction()
+ Index: metview-4.5.6/src/libMvQtUtil/MvQNetworkProxyFactory.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/libMvQtUtil/MvQNetworkProxyFactory.cc
+ +++ metview-4.5.6/src/libMvQtUtil/MvQNetworkProxyFactory.cc
+ @@ -42,13 +42,13 @@ void MvQNetworkProxyFactory::updateSetti
+
+ const char* proxyPort = myPref( "PROXY_PORT" );
+ if(proxyPort)
+ - proxy_.setPort(QString::fromAscii(proxyPort).toInt());
+ + proxy_.setPort(QString::fromUtf8(proxyPort).toInt());
+
+ const char* noProxy = myPref( "NO_PROXY_FOR" );
+
+ if(noProxy)
+ {
+ - QStringList lst=QString::fromAscii(noProxy).split(",");
+ + QStringList lst=QString::fromUtf8(noProxy).split(",");
+ foreach(QString s,lst)
+ {
+ noProxyLst_ << s.simplified();
+ Index: metview-4.5.6/src/libMvQtGui/MvQX11Application.h
+ ===================================================================
+ --- metview-4.5.6.orig/src/libMvQtGui/MvQX11Application.h
+ +++ metview-4.5.6/src/libMvQtGui/MvQX11Application.h
+ @@ -10,7 +10,7 @@
+ #ifndef MvQX11Application_H
+ #define MvQX11Application_H
+
+ -#include <QtGui/QApplication>
+ +#include <QtWidgets/QApplication>
+ #include <QWidget>
+
+ #include <MvRequest.h>
+ Index: metview-4.5.6/src/libMvQtGui/MvQApplication.h
+ ===================================================================
+ --- metview-4.5.6.orig/src/libMvQtGui/MvQApplication.h
+ +++ metview-4.5.6/src/libMvQtGui/MvQApplication.h
+ @@ -10,7 +10,7 @@
+ #ifndef MvQApplication_H
+ #define MvQApplication_H
+
+ -#include <QtGui/QApplication>
+ +#include <QtWidgets/QApplication>
+ #include <QWidget>
+
+ #include <MvRequest.h>
+ Index: metview-4.5.6/src/libMvQtGui/MvQFileDialog.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/libMvQtGui/MvQFileDialog.cc
+ +++ metview-4.5.6/src/libMvQtGui/MvQFileDialog.cc
+ @@ -137,8 +137,8 @@ MvQFileDialog::MvQFileDialog(QString sta
+
+ urlLst << QUrl("file:");
+
+ - urlLst << QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
+ - //urlLst << QUrl::fromLocalFile(QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation));
+ + urlLst << QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::HomeLocation));
+ + //urlLst << QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
+
+ if(char *mvDir=getenv("METVIEW_USER_DIRECTORY"))
+ {
+ Index: metview-4.5.6/src/libMvQtGui/MvQKeyProfileTree.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/libMvQtGui/MvQKeyProfileTree.cc
+ +++ metview-4.5.6/src/libMvQtGui/MvQKeyProfileTree.cc
+ @@ -72,13 +72,13 @@ void MvQKeyProfileTree::setEditable(bool
+ {
+ setAcceptDrops(true);
+ setDragDropMode(QAbstractItemView::DropOnly);
+ - header()->setMovable(true);
+ + header()->setSectionsMovable(true);
+ }
+ else
+ {
+ setAcceptDrops(false);
+ setDragDropMode(QAbstractItemView::NoDragDrop);
+ - header()->setMovable(false);
+ + header()->setSectionsMovable(false);
+ }
+ }
+
+ Index: metview-4.5.6/src/libMvQtUtil/MvQKeyManager.h
+ ===================================================================
+ --- metview-4.5.6.orig/src/libMvQtUtil/MvQKeyManager.h
+ +++ metview-4.5.6/src/libMvQtUtil/MvQKeyManager.h
+ @@ -17,7 +17,7 @@
+
+ #include <QMap>
+ #include <QString>
+ -#include <QXmlQuery>
+ +#include <QtXmlPatterns/QXmlQuery>
+
+ using namespace std;
+
+ Index: metview-4.5.6/src/libMvQtGui/MvQDragDrop.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/libMvQtGui/MvQDragDrop.cc
+ +++ metview-4.5.6/src/libMvQtGui/MvQDragDrop.cc
+ @@ -7,7 +7,7 @@
+
+ ***************************** LICENSE END *************************************/
+
+ -//#include <QtGui>
+ +#include <QtGui>
+ //#include <QX11Info>
+ //#include <X11/X.h>
+ //#include <X11/Xlib.h>
+ @@ -104,4 +104,4 @@ QString MvQDrop::iconClass(int i) const
+ {
+ return (i >=0 && i < iconPath_.count())?iconClass_.at(i):QString();
+ }
+ -
+ \ No newline at end of file
+ +
+ Index: metview-4.5.6/src/libMvQtGui/MvQKeyFilterModel.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/libMvQtGui/MvQKeyFilterModel.cc
+ +++ metview-4.5.6/src/libMvQtGui/MvQKeyFilterModel.cc
+ @@ -163,7 +163,9 @@ void MvQKeyFilterModel::setKeyProfile(Mv
+ setupKeyFilter();
+
+ //Reset the model (views will be notified)
+ - reset();
+ + // reset();
+ + beginResetModel();
+ + endResetModel();
+ }
+
+ void MvQKeyFilterModel::setupKeyFilter()
+ @@ -361,7 +363,7 @@ QModelIndex MvQKeyFilterModel::index( in
+ return QModelIndex();
+ }
+
+ - return createIndex(row,column,0);
+ + return createIndex(row,column,(void*) 0);
+ }
+
+
+ Index: metview-4.5.6/src/libMvQtGui/MvQKeyModel.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/libMvQtGui/MvQKeyModel.cc
+ +++ metview-4.5.6/src/libMvQtGui/MvQKeyModel.cc
+ @@ -259,7 +259,7 @@ QString MvQKeyModel::label(MvKey* key,co
+
+ QModelIndex MvQKeyModel::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/libMvQtGui/MvQKeyProfileModel.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/libMvQtGui/MvQKeyProfileModel.cc
+ +++ metview-4.5.6/src/libMvQtGui/MvQKeyProfileModel.cc
+ @@ -259,7 +259,7 @@ QModelIndex MvQKeyProfileModel::index( i
+ return QModelIndex();
+ }
+
+ - return createIndex(row,column,0);
+ + return createIndex(row,column, (void*) 0);
+ }
+
+
+ Index: metview-4.5.6/src/libMvQtGui/MvQProfileView.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/libMvQtGui/MvQProfileView.cc
+ +++ metview-4.5.6/src/libMvQtGui/MvQProfileView.cc
+ @@ -30,7 +30,7 @@ MvQNodeItem::MvQNodeItem(MvQProfileItem
+ yPos_(yPos)
+ {
+ setFlag(ItemSendsGeometryChanges);
+ - setAcceptsHoverEvents(true);
+ + setAcceptHoverEvents(true);
+ setZValue(-1);
+
+ if(editable_)
+ Index: metview-4.5.6/src/libMvQtGui/MvQScmModel.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/libMvQtGui/MvQScmModel.cc
+ +++ metview-4.5.6/src/libMvQtGui/MvQScmModel.cc
+ @@ -86,7 +86,7 @@ QModelIndex MvQScmDataModel::index( int
+ return QModelIndex();
+ }
+
+ - return createIndex(row, column, 0);
+ + return createIndex(row, column, (void*) 0);
+ }
+
+ QModelIndex MvQScmDataModel::indexForChange(const MvScmProfileChange& item) const
+ @@ -101,7 +101,9 @@ QModelIndex MvQScmDataModel::parent( con
+
+ void MvQScmDataModel::reload()
+ {
+ - reset();
+ + // reset();
+ + beginResetModel();
+ + endResetModel();
+ }
+
+
+ @@ -248,7 +250,7 @@ QModelIndex MvQScmSurfaceModel::indexFor
+ {
+ if(data_.at(i) == var)
+ {
+ - return createIndex(i,0,0);
+ + return createIndex(i,0, (void*) 0);
+ }
+ }
+ }
+ @@ -426,7 +428,7 @@ QModelIndex MvQScmProfileModel::indexFor
+ {
+ if(data_.at(i) == var)
+ {
+ - return createIndex(level,i, 0);
+ + return createIndex(level,i, (void*) 0);
+ }
+ }
+ }
+ @@ -460,7 +462,9 @@ MvQScmProfileFilterModel::MvQScmProfileF
+ void MvQScmProfileFilterModel::setShowEditableOnly(bool b)
+ {
+ showEditableOnly_=b;
+ - reset();
+ + // reset();
+ + beginResetModel();
+ + endResetModel();
+ }
+
+ bool MvQScmProfileFilterModel::filterAcceptsColumn(int sourceColumn,
+ Index: metview-4.5.6/src/libMvQtGui/MvQStationsWidget.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/libMvQtGui/MvQStationsWidget.cc
+ +++ metview-4.5.6/src/libMvQtGui/MvQStationsWidget.cc
+ @@ -150,7 +150,7 @@ QModelIndex MvQStationsModel::index( int
+ return QModelIndex();
+ }
+
+ - return createIndex(row, column, 0);
+ + return createIndex(row, column, (void*) 0);
+ }
+
+ QModelIndex MvQStationsModel::parent( const QModelIndex & /*index */) const
+ @@ -358,4 +358,4 @@ void MvQStationsWidget::slotSelected(co
+ break;
+ }
+ }
+ -
+ \ No newline at end of file
+ +
+ Index: metview-4.5.6/src/DebugTools/XServ.h
+ ===================================================================
+ --- metview-4.5.6.orig/src/DebugTools/XServ.h
+ +++ metview-4.5.6/src/DebugTools/XServ.h
+ @@ -12,7 +12,8 @@
+
+ #include "mars.h"
+ #undef D /// MARS
+ -#include <QtGui>
+ +#include <QtWidgets>
+ +#include <QWidget>
+
+ class XServBar : public QWidget
+ {
+ Index: metview-4.5.6/src/GeopExaminer/MvGeoPointsModel.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/GeopExaminer/MvGeoPointsModel.cc
+ +++ metview-4.5.6/src/GeopExaminer/MvGeoPointsModel.cc
+ @@ -94,7 +94,7 @@ QModelIndex MvQGeoPointsDataModel::index
+ if(data_ == 0 || data_->count() <= 0 || column < 0)
+ return QModelIndex();
+
+ - return createIndex(row, column, 0);
+ + return createIndex(row, column, (void*) 0);
+ }
+
+
+ Index: metview-4.5.6/src/GribExaminer/MvQGribDumpModel.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/GribExaminer/MvQGribDumpModel.cc
+ +++ metview-4.5.6/src/GribExaminer/MvQGribDumpModel.cc
+ @@ -158,7 +158,7 @@ QString MvQGribMvDumpModel::label(GribIt
+
+ QModelIndex MvQGribMvDumpModel::index( int row, int column, const QModelIndex & /*parent*/ ) const
+ {
+ - return createIndex(row,column,0);
+ + return createIndex(row,column,(void*) 0);
+ }
+
+
+ @@ -922,7 +922,7 @@ QVariant MvQGribValueDumpModel::headerDa
+
+ QModelIndex MvQGribValueDumpModel::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/MacroEditor/CodeTemplateDialog.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/MacroEditor/CodeTemplateDialog.cc
+ +++ metview-4.5.6/src/MacroEditor/CodeTemplateDialog.cc
+ @@ -7,7 +7,7 @@
+
+ ***************************** LICENSE END *************************************/
+
+ -#include <QtGui>
+ +#include <QtWidgets>
+
+ #include "CodeTemplateDialog.h"
+
+ Index: metview-4.5.6/src/MacroEditor/FunctionListDialog.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/MacroEditor/FunctionListDialog.cc
+ +++ metview-4.5.6/src/MacroEditor/FunctionListDialog.cc
+ @@ -7,7 +7,7 @@
+
+ ***************************** LICENSE END *************************************/
+
+ -#include <QtGui>
+ +#include <QtWidgets>
+
+ #include "FunctionListDialog.h"
+
+ Index: metview-4.5.6/src/MacroEditor/GotoLineDialog.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/MacroEditor/GotoLineDialog.cc
+ +++ metview-4.5.6/src/MacroEditor/GotoLineDialog.cc
+ @@ -7,7 +7,7 @@
+
+ ***************************** LICENSE END *************************************/
+
+ -#include <QtGui>
+ +#include <QtWidgets>
+
+ #include "GotoLineDialog.h"
+
+ Index: metview-4.5.6/src/MacroEditor/MacroEdit.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/MacroEditor/MacroEdit.cc
+ +++ metview-4.5.6/src/MacroEditor/MacroEdit.cc
+ @@ -7,7 +7,9 @@
+
+ ***************************** LICENSE END *************************************/
+
+ -#include <QtGui>
+ +#include <QtWidgets>
+ +#include <QtPrintSupport/QPrinter>
+ +#include <QtPrintSupport/QPrintDialog>
+
+ #include "MacroEdit.h"
+ #include "FindTextDialog.h"
+ Index: metview-4.5.6/src/MacroEditor/VerbFunctionHelp.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/MacroEditor/VerbFunctionHelp.cc
+ +++ metview-4.5.6/src/MacroEditor/VerbFunctionHelp.cc
+ @@ -7,7 +7,7 @@
+
+ ***************************** LICENSE END *************************************/
+
+ -#include <QtGui>
+ +#include <QtWidgets>
+
+ #include "VerbFunctionHelp.h"
+
+ Index: metview-4.5.6/src/MacroEditor/VerbFunctionHelpDialog.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/MacroEditor/VerbFunctionHelpDialog.cc
+ +++ metview-4.5.6/src/MacroEditor/VerbFunctionHelpDialog.cc
+ @@ -7,7 +7,7 @@
+
+ ***************************** LICENSE END *************************************/
+
+ -#include <QtGui>
+ +#include <QtWidgets>
+
+ #include "VerbFunctionHelpDialog.h"
+
+ Index: metview-4.5.6/src/MacroEditor/mvplaintextedit.h
+ ===================================================================
+ --- metview-4.5.6.orig/src/MacroEditor/mvplaintextedit.h
+ +++ metview-4.5.6/src/MacroEditor/mvplaintextedit.h
+ @@ -10,7 +10,7 @@
+ #ifndef MvPlainTextEdit_H
+ #define MvPlainTextEdit_H
+
+ -#include <QtGui/QPlainTextEdit>
+ +#include <QtWidgets/QPlainTextEdit>
+
+ #include "TabsSettings.h"
+
+ Index: metview-4.5.6/src/OgcClient/MvQWmsClientEditor.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/OgcClient/MvQWmsClientEditor.cc
+ +++ metview-4.5.6/src/OgcClient/MvQWmsClientEditor.cc
+ @@ -1008,7 +1008,7 @@ void MvQWmsClientEditor::initFormatCombo
+ formatCombo_->addItem(values[i]);
+ if(!client_->supportedMimeType().contains(values[i]))
+ {
+ - formatCombo_->setItemData(i,Qt::darkGray,Qt::ForegroundRole);
+ + formatCombo_->setItemData(i,QColor(Qt::darkGray),Qt::ForegroundRole);
+ formatCombo_->setItemData(i,tr("Not supported by Metview"),Qt::ToolTipRole);
+ }
+ }
+ @@ -1119,7 +1119,7 @@ void MvQWmsClientEditor::initCrsCombo()
+ crsCombo_->addItem(values[i]);
+ if(!client_->supportedCrs().contains(values[i]))
+ {
+ - crsCombo_->setItemData(i,Qt::darkGray,Qt::ForegroundRole);
+ + crsCombo_->setItemData(i,QColor(Qt::darkGray),Qt::ForegroundRole);
+ crsCombo_->setItemData(i,tr("Not supported by Metview"),Qt::ToolTipRole);
+ }
+ }
+ Index: metview-4.5.6/src/Desktop/MvQDetailedFolderView.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/Desktop/MvQDetailedFolderView.cc
+ +++ metview-4.5.6/src/Desktop/MvQDetailedFolderView.cc
+ @@ -88,7 +88,7 @@ MvQDetailedFolderView::MvQDetailedFolder
+ this,SLOT(slotSelectItem(const QModelIndex)));
+
+ //Set header ContextMenuPolicy
+ - header()->setMovable(false);
+ + header()->setSectionsMovable(false);
+ header()->setContextMenuPolicy(Qt::CustomContextMenu);
+
+ connect(header(),SIGNAL(customContextMenuRequested(const QPoint &)),
+ Index: metview-4.5.6/src/Desktop/MvQFolderModel.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/Desktop/MvQFolderModel.cc
+ +++ metview-4.5.6/src/Desktop/MvQFolderModel.cc
+ @@ -421,7 +421,7 @@ QModelIndex MvQFolderModel::index( int r
+ return QModelIndex();
+ }
+
+ - return createIndex(row,column,0);
+ + return createIndex(row,column, (void*) 0);
+ }
+
+
+ @@ -466,7 +466,7 @@ QModelIndex MvQFolderModel::indexFromObj
+ return QModelIndex();
+
+ int i=items_.indexOf(obj);
+ - return (i >=0)?createIndex(i,0,0):QModelIndex();
+ + return (i >=0)?createIndex(i,0,(void*)0):QModelIndex();
+ }
+
+ //Should be called between beginResetModel() and endResetModel() !!
+ @@ -809,7 +809,11 @@ void MvQFolderModel::updateSearchData(bo
+ if(!hasSearchData())
+ {
+ if(doReset)
+ - reset();
+ + {
+ + // reset();
+ + beginResetModel();
+ + endResetModel();
+ + }
+ return;
+ }
+
+ @@ -829,7 +833,11 @@ void MvQFolderModel::updateSearchData(bo
+ searchData_->matchChanged();
+
+ if(doReset)
+ - reset();
+ + {
+ + // reset();
+ + beginResetModel();
+ + endResetModel();
+ + }
+ }
+
+ bool MvQFolderModel::hasSearchData() const
+ @@ -970,4 +978,4 @@ bool MvQFolderFilterModel::setFilter(QSt
+
+ return found;
+ }
+ -*/
+ \ No newline at end of file
+ +*/
+ Index: metview-4.5.6/src/Desktop/MvQIconHolder.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/Desktop/MvQIconHolder.cc
+ +++ metview-4.5.6/src/Desktop/MvQIconHolder.cc
+ @@ -135,7 +135,7 @@ QVariant MvQIconHolderModel::data( const
+
+ QModelIndex MvQIconHolderModel::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/Desktop/MvQIconObjectModel.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/Desktop/MvQIconObjectModel.cc
+ +++ metview-4.5.6/src/Desktop/MvQIconObjectModel.cc
+ @@ -95,7 +95,7 @@ QVariant MvQIconObjectModel::data( const
+
+ QModelIndex MvQIconObjectModel::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/Desktop/MvQListFolderViewBase.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/Desktop/MvQListFolderViewBase.cc
+ +++ metview-4.5.6/src/Desktop/MvQListFolderViewBase.cc
+ @@ -7,6 +7,7 @@
+
+ ***************************** LICENSE END *************************************/
+
+ +#include <QDrag>
+ #include <QApplication>
+ #include <QDataStream>
+ #include <QDropEvent>
+ @@ -501,4 +502,4 @@ void MvQListFolderViewBase::blink(const
+ {
+ scrollTo(index);
+ delegate_->blink(index);
+ -}
+ \ No newline at end of file
+ +}
+ Index: metview-4.5.6/src/Desktop/MvQNewIconWidget.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/Desktop/MvQNewIconWidget.cc
+ +++ metview-4.5.6/src/Desktop/MvQNewIconWidget.cc
+ @@ -9,6 +9,7 @@
+
+ #include "MvQNewIconWidget.h"
+
+ +#include <QtGui>
+ #include <QApplication>
+ #include <QButtonGroup>
+ #include <QComboBox>
+ Index: metview-4.5.6/src/uPlot/ExportDialog.h
+ ===================================================================
+ --- metview-4.5.6.orig/src/uPlot/ExportDialog.h
+ +++ metview-4.5.6/src/uPlot/ExportDialog.h
+ @@ -10,6 +10,7 @@
+ #ifndef ExportDialog_H
+ #define ExportDialog_H
+
+ +#include <QtWidgets>
+ #include <QComboBox>
+ #include <QFileDialog>
+ #include <QGridLayout>
+ Index: metview-4.5.6/src/uPlot/MvQLayerModel.cc
+ ===================================================================
+ --- metview-4.5.6.orig/src/uPlot/MvQLayerModel.cc
+ +++ metview-4.5.6/src/uPlot/MvQLayerModel.cc
+ @@ -687,7 +687,9 @@ void MvQLayerModel::moveLayer(int source
+
+ //layers_[0]->scene()->update();
+
+ - reset();
+ + //reset();
+ + beginResetModel();
+ + endResetModel();
+ }
+
+ string MvQLayerModel::layerId(const QModelIndex& index)
+ 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 @@
+ #include <QImage>
+ #include <QMap>
+ #include <QMenu>
+ -#include <QPlastiqueStyle>
+ +// #include <QFusionStyle>
+ +#include <QFusionStyle>
+ #include <QProxyStyle>
+
+ class QAction;
+ @@ -29,10 +30,10 @@ class MvQZoomStackMenuStyle : public QPr
+ int pixelMetric(PixelMetric, const QStyleOption *option=0, const QWidget *w=0) const;
+ };
+
+ -class MvQZoomStackMenuPlastiqueStyle : public QPlastiqueStyle
+ +class MvQZoomStackMenuFusionStyle : public QFusionStyle
+ {
+ public:
+ - MvQZoomStackMenuPlastiqueStyle() : QPlastiqueStyle() {};
+ + MvQZoomStackMenuFusionStyle() : QFusionStyle() {};
+ int pixelMetric(PixelMetric, const QStyleOption *option=0, const QWidget *w=0) const;
+ };
+
++Index: metview-4.5.6/src/Desktop/MvQFolderViewBase.h
++===================================================================
++--- metview-4.5.6.orig/src/Desktop/MvQFolderViewBase.h
+++++ metview-4.5.6/src/Desktop/MvQFolderViewBase.h
++@@ -11,6 +11,7 @@
++ #define MvQFolderViewBase_H
++
++ #include <QDebug>
+++#include <QtGui>
++ #include <QFile>
++ #include <QModelIndexList>
++ #include <QPixmap>
++@@ -131,4 +132,4 @@ private:
++ bool confirmDelete(int);
++ };
++
++-#endif
++\ No newline at end of file
+++#endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git
More information about the debian-science-commits
mailing list