Changeset 2173 for trunk/MagicSoft/Mars/mmain

Timestamp:

06/13/03 16:42:37 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MAnalysis.cc (modified) (2 diffs)
• MBrowser.cc (modified) (2 diffs)
• MMars.cc (modified) (4 diffs)
• MMonteCarlo.cc (modified) (2 diffs)
• MStatusDisplay.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mmain/MAnalysis.cc

@@ -24 +24 @@
 #include "MAnalysis.h"
 
-#include <iostream.h>
+#include <iostream>
 
 #include <TGLabel.h>       // TGlabel
@@ -33 +33 @@
 #include "MImgCleanStd.h"  // MImgCleanStd
 
-ClassImp(MAnalysis)
+ClassImp(MAnalysis);
+
+using namespace std;
 
 enum {

trunk/MagicSoft/Mars/mmain/MBrowser.cc

@@ -26 +26 @@
 #include "MBrowser.h"
 
-#include <iostream.h>
+#include <iostream>
 #include <sys/stat.h>       // S_ISDIR
 
@@ -45 +45 @@
 
 ClassImp(MBrowser);
+
+using namespace std;
 
 enum {

trunk/MagicSoft/Mars/mmain/MMars.cc

@@ -26 +26 @@
 #include "MMars.h"
 
-#include <iostream.h>
+#include <iostream>
 
 #include <TApplication.h>  // gROOT->GetApplication()->...
@@ -44 +44 @@
 #include "MCameraDisplay.h"
 
-ClassImp(MMars)
+ClassImp(MMars);
+
+using namespace std;
 
 enum {
@@ -94 +96 @@
         fList->Add(magic);
         magic->Associate(this);
-        TGLayoutHints *lay1 = new TGLayoutHints(kLHintsLeft,  10., 10., 20., 10.);
+        TGLayoutHints *lay1 = new TGLayoutHints(kLHintsLeft,  10, 10, 20, 10);
         fList->Add(lay1);
         top->AddFrame(magic, lay1);
@@ -105 +107 @@
         fList->Add(mars);
         mars->Associate(this);
-        TGLayoutHints *lay2 = new TGLayoutHints(kLHintsRight, 10., 10., 10., 10.);
+        TGLayoutHints *lay2 = new TGLayoutHints(kLHintsRight, 10, 10, 10, 10);
         fList->Add(lay2);
         top->AddFrame(mars,  lay2);

trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc

@@ -27 +27 @@
 
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
 
 #include <TGLabel.h>        // TGLabel
@@ -37 +37 @@
 #include "MGList.h"
 
-ClassImp(MMonteCarlo)
+ClassImp(MMonteCarlo);
+
+using namespace std;
 
 enum {

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -61 +61 @@
 #include "MStatusDisplay.h"
 
-#include <fstream.h>              // fstream
+#include <fstream>                // fstream
 
 #include <TLine.h>                // TLine
@@ -98 +98 @@
 
 ClassImp(MStatusDisplay);
+
+using namespace std;
 
 // ------------ Workaround for a non working TGTextView::Search -------------
@@ -1356 +1358 @@
     const TString newstr("%%DocumentPaperSizes: a4\n%%Orientation: Landscape");
 
+    // gcc 3.2:
+    /*
     fstream f(name, ios::in|ios::out|ios::nocreate);
 
@@ -1393 +1397 @@
     delete c2;
     delete c1;
+    */
 }
 
@@ -1770 +1775 @@
     // canculate new size of frame (canvas @ 1:sqrt(2))
     if (hchanged)
-        w = (UInt_t)((h-ch)*sqrt(2)+.5)+cw;
+        w = (UInt_t)((h-ch)*sqrt(2.)+.5)+cw;
     else
-        h = (UInt_t)((w-cw)/sqrt(2)+.5)+ch;
+        h = (UInt_t)((w-cw)/sqrt(2.)+.5)+ch;
 
     //cout << "Res: " << w << " " << h << " " << evt->fX << " " << evt->fY << endl;