Optimize graf2d includes

graf2d/gpad/inc/TCanvas.h

@@ -16,13 +16,9 @@
 
 #include "TAttCanvas.h"
 
-#include "TString.h"
-
-#include "TCanvasImp.h"
-
+class TCanvasImp;
 class TContextMenu;
 class TControlBar;
-class TBrowser;
 
 class TCanvas : public TPad {
 
@@ -130,7 +126,7 @@ friend class TInterpreter;
    void              FeedbackMode(Bool_t set);
    void              Flush();
    void              UseCurrentStyle(); // *MENU*
-   void              ForceUpdate() { if (fCanvasImp) fCanvasImp->ForceUpdate(); }
+   void              ForceUpdate();
    const char       *GetDISPLAY() const {return fDISPLAY.Data();}
    TContextMenu     *GetContextMenu() const {return fContextMenu;};
    Int_t             GetDoubleBuffer() const {return fDoubleBuffer;}
@@ -169,13 +165,13 @@ friend class TInterpreter;
    virtual void      HandleInput(EEventType button, Int_t x, Int_t y);
    Bool_t            HasMenuBar() const { return TestBit(kMenuBar); }
    virtual void      HighlightConnect(const char *slot);
-   void              Iconify() { if (fCanvasImp) fCanvasImp->Iconify(); }
+   void              Iconify();
    Bool_t            IsBatch() const { return fBatch; }
    Bool_t            IsDrawn() { return fDrawn; }
    Bool_t            IsFolder() const;
    Bool_t            IsGrayscale();
    Bool_t            IsRetained() const { return fRetained; }
-   Bool_t            IsWeb() const { return fCanvasImp ? fCanvasImp->IsWeb() : kFALSE; }
+   Bool_t            IsWeb() const;
    virtual void      ls(Option_t *option="") const;
    void              MoveOpaque(Int_t set=1);
    Bool_t            OpaqueMoving() const { return TestBit(kMoveOpaque); }
@@ -189,7 +185,7 @@ friend class TInterpreter;
    virtual void      Selected(TVirtualPad *pad, TObject *obj, Int_t event);            // *SIGNAL*
    virtual void      Cleared(TVirtualPad *pad);                                        // *SIGNAL*
    virtual void      Closed();                                                         // *SIGNAL*
-   void              RaiseWindow() { if (fCanvasImp) fCanvasImp->RaiseWindow(); }
+   void              RaiseWindow();
    void              ResetDrawn() { fDrawn=kFALSE; }
    virtual void      Resize(Option_t *option="");
    void              ResizeOpaque(Int_t set=1);
@@ -200,22 +196,16 @@ friend class TInterpreter;
    virtual void      SetName(const char *name="");
    virtual void      SetFixedAspectRatio(Bool_t fixed = kTRUE);  // *TOGGLE*
    void              SetGrayscale(Bool_t set = kTRUE); // *TOGGLE* *GETTER=IsGrayscale
-   void              SetWindowPosition(Int_t x, Int_t y) { if (fCanvasImp) fCanvasImp->SetWindowPosition(x, y); }
-   void SetWindowSize(UInt_t ww, UInt_t wh)
-   {
-      if (fBatch)
-         SetCanvasSize((ww + fCw) / 2, (wh + fCh) / 2);
-      else if (fCanvasImp)
-         fCanvasImp->SetWindowSize(ww, wh);
-   }
+   void              SetWindowPosition(Int_t x, Int_t y);
+   void              SetWindowSize(UInt_t ww, UInt_t wh);
    void              SetCanvasImp(TCanvasImp *i) { fCanvasImp = i; }
    void              SetCanvasSize(UInt_t ww, UInt_t wh); // *MENU*
    void              SetHighLightColor(Color_t col) { fHighLightColor = col; }
    void              SetSelected(TObject *obj);
    void              SetClickSelected(TObject *obj) { fClickSelected = obj; }
    void              SetSelectedPad(TPad *pad) { fSelectedPad = pad; }
    void              SetClickSelectedPad(TPad *pad) { fClickSelectedPad = pad; }
-   void              Show() { if (fCanvasImp) fCanvasImp->Show(); }
+   void              Show();
    virtual void      Size(Float_t xsizeuser=0, Float_t ysizeuser=0);
    void              SetBatch(Bool_t batch=kTRUE);
    static  void      SetFolder(Bool_t isfolder=kTRUE);

graf2d/gpad/inc/TControlBar.h

@@ -12,10 +12,14 @@
 #ifndef ROOT_TControlBar
 #define ROOT_TControlBar
 
-
 #include "TControlBarButton.h"
 
+#ifdef R__LESS_INCLUDES
+class TObjArray;
+class TControlBarImp;
+#else
 #include "TControlBarImp.h"
+#endif
 
 class TList;
 

graf2d/gpad/inc/TControlBarButton.h

@@ -12,12 +12,8 @@
 #ifndef ROOT_TControlBarButton
 #define ROOT_TControlBarButton
 
-
-#include "Rtypes.h"
-
 #include "TNamed.h"
 
-
 class TControlBarButton : public TNamed {
 
 protected:

graf2d/gpad/inc/TCreatePrimitives.h

@@ -12,8 +12,6 @@
 #define ROOT_TCreatePrimitives
 
 
-#include "Rtypes.h"
-
 #include "TLatex.h"
 #include "TCurlyArc.h"
 #include "TArrow.h"

graf2d/gpad/inc/TPad.h

@@ -12,19 +12,16 @@
 #ifndef ROOT_TPad
 #define ROOT_TPad
 
-
 #include "TVirtualPad.h"
 #include "TAttBBox2D.h"
-#include "TPoint.h"
-#include "GuiTypes.h"
 
 class TVirtualViewer3D;
 class TVirtualPadPainter;
 class TBrowser;
 class TBox;
 class TLegend;
 class TArrow;
-
+class TPoint;
 
 class TPad : public TVirtualPad, public TAttBBox2D {
 

graf2d/gpad/inc/TPaveClass.h

@@ -13,8 +13,12 @@
 
 
 #include "TPaveLabel.h"
-#include "TClassTree.h"
 
+#ifdef R__LESS_INCLUDES
+class TClassTree;
+#else
+#include "TClassTree.h"
+#endif
 
 class TPaveClass : public TPaveLabel{
 

graf2d/gpad/src/TCanvas.cxx

@@ -16,6 +16,7 @@
 #include "TROOT.h"
 #include "TBuffer.h"
 #include "TCanvas.h"
+#include "TCanvasImp.h"
 #include "TDatime.h"
 #include "TClass.h"
 #include "TStyle.h"
@@ -1155,6 +1156,14 @@ void TCanvas::Flush()
    if (padsav) padsav->cd();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+/// Force canvas update
+
+void TCanvas::ForceUpdate()
+{
+   if (fCanvasImp) fCanvasImp->ForceUpdate();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// Force a copy of current style for all objects in canvas.
 
@@ -1448,6 +1457,15 @@ void TCanvas::HandleInput(EEventType event, Int_t px, Int_t py)
    }
 }
 
+////////////////////////////////////////////////////////////////////////////////
+/// Iconify canvas
+
+void TCanvas::Iconify()
+{
+   if (fCanvasImp)
+      fCanvasImp->Iconify();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// Is folder ?
 
@@ -1456,6 +1474,14 @@ Bool_t TCanvas::IsFolder() const
    return fgIsFolder;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+/// Is web canvas
+
+Bool_t TCanvas::IsWeb() const
+{
+   return fCanvasImp ? fCanvasImp->IsWeb() : kFALSE;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// List all pads.
 
@@ -1710,6 +1736,16 @@ void TCanvas::Resize(Option_t *)
    if (padsav) padsav->cd();
 }
 
+
+////////////////////////////////////////////////////////////////////////////////
+/// Raise canvas window
+
+void TCanvas::RaiseWindow()
+{
+   if (fCanvasImp)
+      fCanvasImp->RaiseWindow();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// Set option to resize objects/pads in a canvas.
 ///
@@ -2144,6 +2180,26 @@ void TCanvas::SetTitle(const char *title)
    if (fCanvasImp) fCanvasImp->SetWindowTitle(title);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+/// Set canvas window position
+
+void TCanvas::SetWindowPosition(Int_t x, Int_t y)
+{
+   if (fCanvasImp)
+      fCanvasImp->SetWindowPosition(x, y);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// Set canvas window size
+
+void TCanvas::SetWindowSize(UInt_t ww, UInt_t wh)
+{
+   if (fBatch)
+      SetCanvasSize((ww + fCw) / 2, (wh + fCh) / 2);
+   else if (fCanvasImp)
+      fCanvasImp->SetWindowSize(ww, wh);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// Set the canvas scale in centimeters.
 ///
@@ -2172,6 +2228,15 @@ void TCanvas::Size(Float_t xsize, Float_t ysize)
    Resize();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+/// Show canvas
+
+void TCanvas::Show()
+{
+   if (fCanvasImp)
+      fCanvasImp->Show();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// Stream a class object.
 

graf2d/gpad/src/TControlBar.cxx

@@ -78,6 +78,7 @@ will return the name of the last clicked button.
 
 #include "TApplication.h"
 #include "TControlBar.h"
+#include "TControlBarImp.h"
 #include "TGuiFactory.h"
 #include "TList.h"
 #include "TStyle.h"

graf2d/gpad/src/TPaveClass.cxx

@@ -12,6 +12,7 @@
 #include "TROOT.h"
 #include "Buttons.h"
 #include "TPaveClass.h"
+#include "TClassTree.h"
 
 ClassImp(TPaveClass);
 

graf2d/graf/inc/TArc.h

@@ -21,10 +21,8 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
-#include "Rtypes.h"
 #include "TEllipse.h"
 
-
 class TArc : public TEllipse {
 
 public:

graf2d/graf/inc/TBox.h

@@ -12,14 +12,12 @@
 #ifndef ROOT_TBox
 #define ROOT_TBox
 
-
 #include "TObject.h"
 #include "TAttLine.h"
 #include "TAttFill.h"
 #include "TAttBBox2D.h"
-#include "TPoint.h"
-#include "GuiTypes.h"
 
+class TPoint;
 
 class TBox : public TObject, public TAttLine, public TAttFill, public TAttBBox2D {
 

graf2d/graf/inc/TCurlyArc.h

@@ -11,12 +11,10 @@
 #ifndef ROOT_TCurlyArc
 #define ROOT_TCurlyArc
 
-#include "GuiTypes.h"
+#include "TCurlyLine.h"
 
 class TPoint;
 
-#include "TCurlyLine.h"
-
 class TCurlyArc : public TCurlyLine {
 
 private:

graf2d/graf/inc/TCurlyLine.h

@@ -11,14 +11,12 @@
 #ifndef ROOT_TCurlyLine
 #define ROOT_TCurlyLine
 
-
 #include "TPolyLine.h"
 #include "TAttBBox2D.h"
-#include "GuiTypes.h"
 
 class TPoint;
 
-class TCurlyLine : public TPolyLine , public TAttBBox2D {
+class TCurlyLine : public TPolyLine, public TAttBBox2D {
 
 protected:
    Double_t fX1;             ///< start x, center for arc

graf2d/graf/inc/TEllipse.h

@@ -17,9 +17,8 @@
 #include "TAttLine.h"
 #include "TAttFill.h"
 #include "TAttBBox2D.h"
-#include "TPoint.h"
-#include "GuiTypes.h"
 
+class TPoint;
 
 class TEllipse : public TObject, public TAttLine, public TAttFill, public TAttBBox2D {
 

graf2d/graf/inc/TGaxis.h

@@ -12,10 +12,9 @@
 #ifndef ROOT_TGaxis
 #define ROOT_TGaxis
 
-
-#include "TNamed.h"
 #include "TLine.h"
 #include "TAttText.h"
+#include "TString.h"
 
 class TF1;
 class TAxis;

graf2d/graf/inc/TGraphPolar.h

@@ -13,11 +13,12 @@
 #define ROOT_TGraphPolar
 
 #include "TGraphErrors.h"
-#include "TAttText.h"
-#include "TAttLine.h"
 
+#ifdef R__LESS_INCLUDES
+class TGraphPolargram;
+#else
 #include "TGraphPolargram.h"
-
+#endif
 
 class TGraphPolar: public TGraphErrors {
 

graf2d/graf/inc/TLine.h

@@ -16,9 +16,8 @@
 #include "TObject.h"
 #include "TAttLine.h"
 #include "TAttBBox2D.h"
-#include "TPoint.h"
-#include "GuiTypes.h"
 
+class TPoint;
 
 class TLine : public TObject, public TAttLine, public TAttBBox2D {
 

graf2d/graf/inc/TMarker.h

@@ -13,10 +13,9 @@
 #define ROOT_TMarker
 
 
+#include "TObject.h"
 #include "TAttMarker.h"
-#include "TNamed.h"
 #include "TAttBBox2D.h"
-#include "GuiTypes.h"
 
 class TPoint;