[net] deprecate TNetFile

Author: jblomer

io/io/src/TFile.cxx

@@ -3963,7 +3963,7 @@ TFile *TFile::Open(const char *url, Option_t *options, const char *ftitle,
                if (h->LoadPlugin() == -1)
                   return nullptr;
                TClass *cl = TClass::GetClass(h->GetClass());
-               if (cl && cl->InheritsFrom("TNetFile"))
+               if (cl && cl->InheritsFrom("ROOT::Deprecated::TNetFile"))
                   f = (TFile*) h->ExecPlugin(5, name.Data(), option, ftitle, compress, netopt);
                else
                   f = (TFile*) h->ExecPlugin(4, name.Data(), option, ftitle, compress);

net/net/inc/LinkDef.h

@@ -23,7 +23,7 @@
 #pragma link C++ class TPSocket;
 #pragma link C++ class TMessage;
 #pragma link C++ class TMonitor;
-#pragma link C++ class TNetFile;
+#pragma link C++ class ROOT::Deprecated::TNetFile;
 #pragma link C++ class ROOT::Deprecated::TNetFileStager;
 #pragma link C++ class ROOT::Deprecated::TNetSystem;
 #pragma link C++ class TWebFile;

net/net/inc/TNetFile.h

@@ -30,6 +30,7 @@
 
 class TSocket;
 
+namespace ROOT::Deprecated {
 
 class TNetFile : public TFile {
 
@@ -81,8 +82,6 @@ class TNetFile : public TFile {
    ClassDefOverride(TNetFile,1)  //A ROOT file that reads/writes via a rootd server
 };
 
-namespace ROOT::Deprecated {
-
 class TNetSystem : public TSystem {
 
 private:
@@ -125,6 +124,7 @@ class TNetSystem : public TSystem {
 
 } // namespace ROOT::Deprecated
 
+using TNetFile R__DEPRECATED(6, 42, "TNetFile is deprecated") = ROOT::Deprecated::TNetFile;
 using TNetSystem R__DEPRECATED(6, 42, "TNetSystem is deprecated") = ROOT::Deprecated::TNetSystem;
 
 #endif

roottest/root/io/event/MainEvent.cxx

@@ -180,7 +180,7 @@ int main(int argc, char** argv)
       // -- Read case
       TFile* hfile = nullptr;
       if (netf) {
-         hfile = new TNetFile("root://localhost/root/test/EventNet.root");
+         hfile = new ROOT::Deprecated::TNetFile("root://localhost/root/test/EventNet.root");
       } else {
          hfile = new TFile(gFilename);
       }
@@ -226,7 +226,8 @@ int main(int argc, char** argv)
       // This file is now becoming the current directory.
       TFile* hfile = 0;
       if (netf) {
-         hfile = new TNetFile("root://localhost/root/test/EventNet.root", "RECREATE", "TTree benchmark ROOT file");
+         hfile = new ROOT::Deprecated::TNetFile("root://localhost/root/test/EventNet.root", "RECREATE",
+                                                "TTree benchmark ROOT file");
       } else {
          hfile = new TFile(gFilename, "RECREATE", "TTree benchmark ROOT file");
       }

roottest/root/treeformula/references/TreeFormulaReferencesGenerator.cxx

@@ -154,7 +154,7 @@ int main(int argc, char **argv)
 //         Read case
    if (read) {
       if (netf) {
-         hfile = new TNetFile("root://localhost/root/test/EventNet.root");
+         hfile = new ROOT::Deprecated::TNetFile("root://localhost/root/test/EventNet.root");
       } else
          hfile = new TFile(filename);
       TTree *tree = (TTree*)hfile->Get("T");
@@ -187,7 +187,8 @@ int main(int argc, char **argv)
       // pictures, graphics objects, detector geometries, tracks, events, etc..
       // This file is now becoming the current directory.
       if (netf) {
-         hfile = new TNetFile("root://localhost/root/test/EventNet.root","RECREATE","TTree benchmark ROOT file");
+         hfile = new ROOT::Deprecated::TNetFile("root://localhost/root/test/EventNet.root","RECREATE",
+                                                "TTree benchmark ROOT file");
       } else
          hfile = new TFile(filename,"RECREATE","TTree benchmark ROOT file");
       hfile->SetCompressionLevel(comp);

roottest/root/treeformula/schemaEvolution/MainEvent.cxx

@@ -153,7 +153,7 @@ int main(int argc, char **argv)
 //         Read case
    if (read) {
       if (netf) {
-         hfile = new TNetFile("root://localhost/root/test/EventNet.root");
+         hfile = new ROOT::Deprecated::TNetFile("root://localhost/root/test/EventNet.root");
       } else
          hfile = new TFile("Event.root");
       tree = (TTree*)hfile->Get("T");
@@ -186,7 +186,8 @@ int main(int argc, char **argv)
       // pictures, graphics objects, detector geometries, tracks, events, etc..
       // This file is now becoming the current directory.
       if (netf) {
-         hfile = new TNetFile("root://localhost/root/test/EventNet.root","RECREATE","TTree benchmark ROOT file");
+         hfile = new ROOT::Deprecated::TNetFile("root://localhost/root/test/EventNet.root","RECREATE",
+                                                "TTree benchmark ROOT file");
       } else
          hfile = new TFile("Event.root","RECREATE","TTree benchmark ROOT file");
       hfile->SetCompressionLevel(comp);

test/MainEvent.cxx

@@ -176,7 +176,7 @@ int MainEvent(int nevent, int comp, int split, int arg4, int arg5, int enable_im
 //         Read case
    if (read) {
       if (netf) {
-         hfile = new TNetFile("root://localhost/root/test/EventNet.root");
+         hfile = new ROOT::Deprecated::TNetFile("root://localhost/root/test/EventNet.root");
       } else
          hfile = new TFile(outFiles.back().c_str());
       tree = (TTree*)hfile->Get("T");
@@ -220,7 +220,8 @@ int MainEvent(int nevent, int comp, int split, int arg4, int arg5, int enable_im
       // pictures, graphics objects, detector geometries, tracks, events, etc..
       // This file is now becoming the current directory.
       if (netf) {
-         hfile = new TNetFile("root://localhost/root/test/EventNet.root","RECREATE","TTree benchmark ROOT file");
+         hfile = new ROOT::Deprecated::TNetFile("root://localhost/root/test/EventNet.root","RECREATE",
+                                                "TTree benchmark ROOT file");
       } else
          hfile = new TFile(outFiles.back().c_str(),"RECREATE","TTree benchmark ROOT file");
       hfile->SetCompressionLevel(comp);