From b9d55e17a365171d8448eab308aa104cee88bd3f Mon Sep 17 00:00:00 2001 From: asl Date: Thu, 7 Nov 2013 11:57:18 +0000 Subject: [PATCH] patch for correct compilation on Linux --- src/HYDROGUI/HYDROGUI_DataBrowser.h | 2 +- src/HYDROGUI/HYDROGUI_DataObject.h | 2 +- src/HYDROGUI/HYDROGUI_NameValidator.h | 4 ++-- src/HYDROGUI/HYDROGUI_Region.h | 2 +- src/HYDROGUI/HYDROGUI_Zone.h | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/HYDROGUI/HYDROGUI_DataBrowser.h b/src/HYDROGUI/HYDROGUI_DataBrowser.h index 2d79a829..50a77534 100644 --- a/src/HYDROGUI/HYDROGUI_DataBrowser.h +++ b/src/HYDROGUI/HYDROGUI_DataBrowser.h @@ -46,7 +46,7 @@ public: \param theEntry - Entry of the object. \return data object. */ - virtual SUIT_DataObject* findObject( const QString& ) const override; + virtual SUIT_DataObject* findObject( const QString& ) const; signals: void dropped( const QList& theList, diff --git a/src/HYDROGUI/HYDROGUI_DataObject.h b/src/HYDROGUI/HYDROGUI_DataObject.h index a93963bd..41a7bca4 100644 --- a/src/HYDROGUI/HYDROGUI_DataObject.h +++ b/src/HYDROGUI/HYDROGUI_DataObject.h @@ -159,7 +159,7 @@ public: const QString& theName, const QString& theParentEntry ); - bool isDropAccepted() const override { return true; } + bool isDropAccepted() const { return true; } }; #endif diff --git a/src/HYDROGUI/HYDROGUI_NameValidator.h b/src/HYDROGUI/HYDROGUI_NameValidator.h index 05ddc8b7..8eacd50a 100644 --- a/src/HYDROGUI/HYDROGUI_NameValidator.h +++ b/src/HYDROGUI/HYDROGUI_NameValidator.h @@ -36,8 +36,8 @@ public: HYDROGUI_NameValidator( HYDROGUI_Module* theModule, QObject* parent = 0 ); virtual ~HYDROGUI_NameValidator(); - State validate ( QString & theName, int & thePos ) const override; - void fixup ( QString & input ) const override; + State validate ( QString & theName, int & thePos ) const; + void fixup ( QString & input ) const; void setEditedObject( const Handle(HYDROData_Entity) theObj ); diff --git a/src/HYDROGUI/HYDROGUI_Region.h b/src/HYDROGUI/HYDROGUI_Region.h index e7fdf16d..b9e705d2 100644 --- a/src/HYDROGUI/HYDROGUI_Region.h +++ b/src/HYDROGUI/HYDROGUI_Region.h @@ -52,7 +52,7 @@ public: Handle(HYDROData_Region) theData, const QString& theParentEntry ); - bool isDropAccepted() const override { return true; } + bool isDropAccepted() const { return true; } /** * Add zones to the region. diff --git a/src/HYDROGUI/HYDROGUI_Zone.h b/src/HYDROGUI/HYDROGUI_Zone.h index 4dca40d2..ee25b802 100644 --- a/src/HYDROGUI/HYDROGUI_Zone.h +++ b/src/HYDROGUI/HYDROGUI_Zone.h @@ -53,17 +53,17 @@ public: /** * Returns the text for the specified column. */ - QString text( const int = NameId ) const override; + QString text( const int = NameId ) const; /** * Returns the color for the specified column. */ - QColor color( const ColorRole theColorRole, const int theColumnId = NameId ) const override; + QColor color( const ColorRole theColorRole, const int theColumnId = NameId ) const; /** * Return true because zones are draggable. */ - bool isDraggable() const override { return true; } + bool isDraggable() const { return true; } /** * Returns true if it is a zone which needs merge of bathymetries. -- 2.39.2