From 82ebece7d60d8582303dd513966236d589bcf8c2 Mon Sep 17 00:00:00 2001
From: Otmane Lahlou <otmane.lahlou@c-s.fr>
Date: Fri, 15 Feb 2013 17:59:22 +0100
Subject: [PATCH] COMP: issue due to merge failure
---
Code/Application/mvdMainWindow.h | 12 ++++++++++++
Code/Common/mvdVectorImageModel.h | 4 ----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Code/Application/mvdMainWindow.h b/Code/Application/mvdMainWindow.h
index 7446c7ee90..5264e7fb19 100644
--- a/Code/Application/mvdMainWindow.h
+++ b/Code/Application/mvdMainWindow.h
@@ -150,6 +150,9 @@ private:
/** */
inline const QDockWidget* GetQuicklookDock() const;
+ /** */
+ inline QDockWidget* GetQuicklookDock();
+
/**
* \brief Assign model to the controller which is child of given
* dock-widget.
@@ -266,6 +269,15 @@ MainWindow
return findChild< QDockWidget* >( QUICKLOOK_DOCK );
}
+/*****************************************************************************/
+inline
+QDockWidget*
+MainWindow
+::GetQuicklookDock()
+{
+ return findChild< QDockWidget* >( QUICKLOOK_DOCK );
+}
+
/*****************************************************************************/
inline
void
diff --git a/Code/Common/mvdVectorImageModel.h b/Code/Common/mvdVectorImageModel.h
index 85566daae6..90a7d84433 100644
--- a/Code/Common/mvdVectorImageModel.h
+++ b/Code/Common/mvdVectorImageModel.h
@@ -542,10 +542,6 @@ VectorImageModel
m_Settings = settings;
}
-/*****************************************************************************/
-inline
-}
-
/*****************************************************************************/
inline
unsigned int
--
GitLab