Skip to content

Commit f406c77

Browse files
committed
Revert "[net] deprecate TGridJDL"
This reverts commit b928abe.
1 parent 92d091c commit f406c77

4 files changed

Lines changed: 12 additions & 19 deletions

File tree

net/net/inc/LinkDef.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#pragma link C++ class TSQLMonitoringWriter;
3333
#pragma link C++ class ROOT::Deprecated::TGrid;
3434
#pragma link C++ class TGridResult+;
35-
#pragma link C++ class ROOT::Deprecated::TGridJDL+;
35+
#pragma link C++ class TGridJDL+;
3636
#pragma link C++ class TGridJob+;
3737
#pragma link C++ class TGridJobStatus+;
3838
#pragma link C++ class TGridJobStatusList+;
@@ -44,6 +44,5 @@
4444
#pragma link C++ class TParallelMergingFile+;
4545

4646
#pragma read sourceClass="TGridCollection" version="[-1]" targetClass="ROOT::Deprecated::TGridCollection"
47-
#pragma read sourceClass="TGridJDL" version="[-1]" targetClass="ROOT::Deprecated::TGridJDL"
4847

4948
#endif

net/net/inc/TGrid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
#include "TGridJob.h"
3636

3737
class TGridResult;
38+
class TGridJDL;
3839
class TGridJob;
3940
class TGridJobStatusList;
4041

4142
namespace ROOT::Deprecated {
4243

4344
class TGridCollection;
44-
class TGridJDL;
4545

4646
class TGrid : public TObject {
4747

net/net/inc/TGridJDL.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "TString.h"
2929
#include "TMap.h"
3030

31-
namespace ROOT::Deprecated {
3231

3332
class TGridJDL : public TObject {
3433
protected:
@@ -76,9 +75,4 @@ class TGridJDL : public TObject {
7675
ClassDefOverride(TGridJDL,1) // ABC defining interface JDL generator
7776
};
7877

79-
} // namespace ROOT::Deprecated
80-
81-
using TGridJDL R__DEPRECATED(6, 42, "TGridJDL is expected to be unused and thus deprecated") =
82-
ROOT::Deprecated::TGridJDL;
83-
8478
#endif

net/net/src/TGridJDL.cxx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@
3030
////////////////////////////////////////////////////////////////////////////////
3131
/// Cleanup.
3232

33-
ROOT::Deprecated::TGridJDL::~TGridJDL()
33+
TGridJDL::~TGridJDL()
3434
{
3535
Clear();
3636
}
3737

3838
////////////////////////////////////////////////////////////////////////////////
3939
/// Clears the JDL information.
4040

41-
void ROOT::Deprecated::TGridJDL::Clear(const Option_t*)
41+
void TGridJDL::Clear(const Option_t*)
4242
{
4343
fMap.DeleteAll();
4444
}
4545

4646
////////////////////////////////////////////////////////////////////////////////
4747
/// Sets a value. If the entry already exists the old one is replaced.
4848

49-
void ROOT::Deprecated::TGridJDL::SetValue(const char *key, const char *value)
49+
void TGridJDL::SetValue(const char *key, const char *value)
5050
{
5151
TObject *object = fMap.FindObject(key);
5252
TPair *pair = dynamic_cast<TPair*>(object);
@@ -73,7 +73,7 @@ void ROOT::Deprecated::TGridJDL::SetValue(const char *key, const char *value)
7373
/// Returns the value corresponding to the provided key. Return 0 in case
7474
/// key is not found.
7575

76-
const char *ROOT::Deprecated::TGridJDL::GetValue(const char *key)
76+
const char *TGridJDL::GetValue(const char *key)
7777
{
7878
if (!key)
7979
return 0;
@@ -100,7 +100,7 @@ const char *ROOT::Deprecated::TGridJDL::GetValue(const char *key)
100100
////////////////////////////////////////////////////////////////////////////////
101101
/// Sets a value. If the entry already exists the old one is replaced.
102102

103-
void ROOT::Deprecated::TGridJDL::SetDescription(const char *key, const char* description)
103+
void TGridJDL::SetDescription(const char *key, const char* description)
104104
{
105105
TObject *object = fDescriptionMap.FindObject(key);
106106
TPair *pair = dynamic_cast<TPair*>(object);
@@ -127,7 +127,7 @@ void ROOT::Deprecated::TGridJDL::SetDescription(const char *key, const char* des
127127
/// Returns the value corresponding to the provided key. Return 0 in case
128128
/// key is not found.
129129

130-
const char *ROOT::Deprecated::TGridJDL::GetDescription(const char *key)
130+
const char *TGridJDL::GetDescription(const char *key)
131131
{
132132
if (!key)
133133
return 0;
@@ -155,7 +155,7 @@ const char *ROOT::Deprecated::TGridJDL::GetDescription(const char *key)
155155
/// Adds quotes to the provided string.
156156
/// E.g. Value --> "Value"
157157

158-
TString ROOT::Deprecated::TGridJDL::AddQuotes(const char *value)
158+
TString TGridJDL::AddQuotes(const char *value)
159159
{
160160
TString temp = TString("\"");
161161
temp += value;
@@ -168,7 +168,7 @@ TString ROOT::Deprecated::TGridJDL::AddQuotes(const char *value)
168168
/// Adds a value to a key value which hosts a set of values.
169169
/// E.g. InputSandbox: {"file1","file2"}
170170

171-
void ROOT::Deprecated::TGridJDL::AddToSet(const char *key, const char *value)
171+
void TGridJDL::AddToSet(const char *key, const char *value)
172172
{
173173
const char *oldValue = GetValue(key);
174174
TString newString;
@@ -191,7 +191,7 @@ void ROOT::Deprecated::TGridJDL::AddToSet(const char *key, const char *value)
191191
/// Adds a value to a key value which hosts a set of values.
192192
/// E.g. InputSandbox: {"file1","file2"}
193193

194-
void ROOT::Deprecated::TGridJDL::AddToSetDescription(const char *key, const char *description)
194+
void TGridJDL::AddToSetDescription(const char *key, const char *description)
195195
{
196196
const char *oldValue = GetDescription(key);
197197
TString newString;
@@ -204,7 +204,7 @@ void ROOT::Deprecated::TGridJDL::AddToSetDescription(const char *key, const char
204204
////////////////////////////////////////////////////////////////////////////////
205205
/// Generates the JDL snippet.
206206

207-
TString ROOT::Deprecated::TGridJDL::Generate()
207+
TString TGridJDL::Generate()
208208
{
209209
TString output("");
210210

0 commit comments

Comments
 (0)