Revert "Merged master into gtk3, fixed three conflicts."

This reverts commit c857bba95e.

rtgui/lensprofile.h

@@ -22,7 +22,6 @@
 #include <gtkmm.h>
 #include "toolpanel.h"
 #include "guiutils.h"
-#include "lensgeom.h"
 
 class LensProfilePanel : public ToolParamBlock, public FoldableToolPanel
 {
@@ -39,7 +38,6 @@ protected:
     void updateDisabled(bool enable);
     bool allowFocusDep;
     bool isRaw;
-    LensGeometry *lensgeomLcpFill;
 
 public:
 
@@ -54,10 +52,6 @@ public:
     void onUseDistChanged();
     void onUseVignChanged();
     void onUseCAChanged();
-    void setLensGeomRef( LensGeometry *foo)
-    {
-        lensgeomLcpFill = foo ;
-    };
 };
 
 #endif