COMP: issue due to merge failure

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

Code/Common/mvdVectorImageModel.h

@@ -542,10 +542,6 @@ VectorImageModel
   m_Settings = settings;
 }
 
-/*****************************************************************************/
-inline
-}
-
 /*****************************************************************************/
 inline
 unsigned int