diff --git a/asimage/src/TASImage.cxx b/asimage/src/TASImage.cxx
index d690ca4435376ad379591444aad1ae19f271dcac..dc307bf80172638e7cbf586e157d71eb527c7dbb 100644
--- a/asimage/src/TASImage.cxx
+++ b/asimage/src/TASImage.cxx
@@ -2824,22 +2824,22 @@ void TASImage::Gradient(UInt_t angle, const char *colors, const char *offsets,
gradient.type = GRADIENT_BottomLeft2TopRight;
}
- for (p = (char*)colors; isspace((int)*p); p++);
+ for (p = (char*)colors; isspace((int)*p); p++) { }
for (npoints1 = 0; *p; npoints1++) {
if (*p) {
- for ( ; *p && !isspace((int)*p); p++);
+ for ( ; *p && !isspace((int)*p); p++) { }
}
- for ( ; isspace((int)*p); p++);
+ for ( ; isspace((int)*p); p++) { }
}
if (offsets) {
- for (p = (char*)offsets; isspace((int)*p); p++);
+ for (p = (char*)offsets; isspace((int)*p); p++) { }
for (npoints2 = 0; *p; npoints2++) {
if (*p) {
- for ( ; *p && !isspace((int)*p); p++);
+ for ( ; *p && !isspace((int)*p); p++) { }
}
- for ( ; isspace((int)*p); p++);
+ for ( ; isspace((int)*p); p++) { }
}
}
if (npoints1 > 1) {
@@ -2856,15 +2856,15 @@ void TASImage::Gradient(UInt_t angle, const char *colors, const char *offsets,
gradient.color = new ARGB32[npoints1];
gradient.offset = new double[npoints1];
- for (p = (char*)colors; isspace((int)*p); p++);
+ for (p = (char*)colors; isspace((int)*p); p++) { }
for (npoints1 = 0; *p; ) {
pb = p;
if (*p) {
- for ( ; *p && !isspace((int)*p); p++);
+ for ( ; *p && !isspace((int)*p); p++) { }
}
- for ( ; isspace((int)*p); p++);
+ for ( ; isspace((int)*p); p++) { }
col = str(pb - colors, p - pb);
@@ -2876,20 +2876,20 @@ void TASImage::Gradient(UInt_t angle, const char *colors, const char *offsets,
}
if (offsets) {
- for (p = (char*)offsets; isspace((int)*p); p++);
+ for (p = (char*)offsets; isspace((int)*p); p++) { }
for (npoints2 = 0; *p; ) {
pb = p;
if (*p) {
- for ( ; *p && !isspace((int)*p); p++);
+ for ( ; *p && !isspace((int)*p); p++) { }
}
ch = *p; *p = '\0';
gradient.offset[npoints2] = strtod(pb, &pb);
if (pb == p) npoints2++;
*p = ch;
- for ( ; isspace((int)*p); p++);
+ for ( ; isspace((int)*p); p++) { }
}
} else {
for (npoints2 = 0; npoints2 < npoints1; npoints2++) {
diff --git a/cont/inc/TCollectionProxyInfo.h b/cont/inc/TCollectionProxyInfo.h
index b459910ed13b7eb1c4266929a7ff8112e956fe8b..351be4a16ad3c5791d505c3cc3c39c732223fe3d 100644
--- a/cont/inc/TCollectionProxyInfo.h
+++ b/cont/inc/TCollectionProxyInfo.h
@@ -144,7 +144,7 @@ namespace ROOT {
static void* next(void* env) {
PEnv_t e = PEnv_t(env);
PCont_t c = PCont_t(e->object);
- for (; e->idx > 0 && e->iter() != c->end(); ++(e->iter()), --e->idx );
+ for (; e->idx > 0 && e->iter() != c->end(); ++(e->iter()), --e->idx){ }
// TODO: Need to find something for going backwards....
if ( e->iter() == c->end() ) return 0;
#ifdef R__KCC
diff --git a/eg/inc/cfortran.h b/eg/inc/cfortran.h
index f415a819f917d1215d0ffc654b1dd90d488df20d..293c772ac6e3c1855112ba048afdb976b42c9992 100644
--- a/eg/inc/cfortran.h
+++ b/eg/inc/cfortran.h
@@ -459,7 +459,7 @@ static char *kill_trailing( s, t) char *s; char t;
{char *e;
e = s + strlen(s);
if (e>s) { /* Need this to handle NULL string.*/
- while (e>s && *--e==t); /* Don't follow t's past beginning. */
+ while (e>s && *--e==t) { } /* Don't follow t's past beginning. */
e[*e==t?0:1] = '\0'; /* Handle s[0]=t correctly. */
} return s; }
@@ -475,7 +475,7 @@ static char *kill_trailingn( s, t, e) char *s; char t; char *e;
{
if (e==s) *e = '\0'; /* Kill the string makes sense here.*/
else if (e>s) { /* Watch out for neg. length string.*/
- while (e>s && *--e==t); /* Don't follow t's past beginning. */
+ while (e>s && *--e==t) { } /* Don't follow t's past beginning. */
e[*e==t?0:1] = '\0'; /* Handle s[0]=t correctly. */
} return s; }
@@ -540,7 +540,7 @@ if (num_term == _NUM_ELEMS || num_term == _NUM_ELEM_ARG)
return term_char;
if (num_term <=0) num_term = (int)elem_len;
for (num=0; ; num++) {
- for (i=0; i<(unsigned)num_term && *strv==term_char; i++,strv++);
+ for (i=0; i<(unsigned)num_term && *strv==term_char; i++,strv++) { }
if (i==(unsigned)num_term) break;
else strv += elem_len-i;
}
diff --git a/ftgl/inc/FTCharToGlyphIndexMap.h b/ftgl/inc/FTCharToGlyphIndexMap.h
index 6e40d3c95743bf01bbc5ee250a6e0d7396885f00..2693bd6337ae70902262aba80c3451b37733593d 100644
--- a/ftgl/inc/FTCharToGlyphIndexMap.h
+++ b/ftgl/inc/FTCharToGlyphIndexMap.h
@@ -71,7 +71,7 @@ class FTGL_EXPORT FTCharToGlyphIndexMap
}
}
- const GlyphIndex find( CharacterCode c)
+ GlyphIndex find( CharacterCode c)
{
if( !this->Indices)
{
diff --git a/ftgl/inc/FTGlyphContainer.h b/ftgl/inc/FTGlyphContainer.h
index de668b61dbd4d8efd77d1ed7cb33b695ad356880..4a228c048c4502a3c4ccd3155e5c0ee294fa4e6b 100755
--- a/ftgl/inc/FTGlyphContainer.h
+++ b/ftgl/inc/FTGlyphContainer.h
@@ -68,7 +68,7 @@ class FTGL_EXPORT FTGlyphContainer
* @return An FTGlyph or <code>null</code> is it hasn't been
* loaded.
*/
- const FTGlyph* const Glyph( const unsigned int characterCode) const;
+ FTGlyph* Glyph( const unsigned int characterCode) const;
/**
* Get the bounding box for a character.
diff --git a/ftgl/src/FTGlyphContainer.cxx b/ftgl/src/FTGlyphContainer.cxx
index 7b088de29691afcfe5223db7a170804c0eb69100..3bda0abce61b3c8f6cf28adbc7d2d72d654a3cb7 100644
--- a/ftgl/src/FTGlyphContainer.cxx
+++ b/ftgl/src/FTGlyphContainer.cxx
@@ -47,7 +47,7 @@ void FTGlyphContainer::Add( FTGlyph* tempGlyph, const unsigned int characterCode
}
-const FTGlyph* const FTGlyphContainer::Glyph( const unsigned int characterCode) const
+FTGlyph* FTGlyphContainer::Glyph( const unsigned int characterCode) const
{
signed int index = charMap->GlyphListIndex( characterCode);
return glyphs[index];
diff --git a/fumili/src/TFumili.cxx b/fumili/src/TFumili.cxx
index 07ee379a6968e7a3df8d089c1d38d80950d42a2b..9f4e679685f78bb4b6d588537fdb5528ec8eb9ea 100644
--- a/fumili/src/TFumili.cxx
+++ b/fumili/src/TFumili.cxx
@@ -667,7 +667,7 @@ Int_t TFumili::ExecuteSetCommand(Int_t nargs){
Int_t l = 0,nn=0,nnn=0;
for (i=0;i<fNpar;i++) if(fPL0[i]>0.) nn++;
for (i=0;i<nn;i++) {
- for(;fPL0[nnn]<=0.;nnn++);
+ for(;fPL0[nnn]<=0.;nnn++) { }
printf("%5s: ",fANames[nnn++].Data());
for (Int_t j=0;j<=i;j++)
printf("%11.2E",fZ[l++]);
diff --git a/g3d/src/TView3D.cxx b/g3d/src/TView3D.cxx
index 5972b8d629bcee1ca29b3ceff70192135689a3f0..22bb50a6fdc918b1b72cc274954abd0344f7a792 100644
--- a/g3d/src/TView3D.cxx
+++ b/g3d/src/TView3D.cxx
@@ -1067,7 +1067,7 @@ void TView3D::GetRange(Float_t *min, Float_t *max)
{
// Get Range function.
- for (Int_t i = 0; i < 3; max[i] = fRmax[i], min[i] = fRmin[i], i++);
+ for (Int_t i = 0; i < 3; max[i] = fRmax[i], min[i] = fRmin[i], i++) { }
}
@@ -1076,7 +1076,7 @@ void TView3D::GetRange(Double_t *min, Double_t *max)
{
// Get Range function.
- for (Int_t i = 0; i < 3; max[i] = fRmax[i], min[i] = fRmin[i], i++);
+ for (Int_t i = 0; i < 3; max[i] = fRmax[i], min[i] = fRmin[i], i++) { }
}
@@ -1374,7 +1374,7 @@ void TView3D::SetRange(const Double_t *min, const Double_t *max)
// Set Range function.
Int_t irep;
- for (Int_t i = 0; i < 3; fRmax[i] = max[i], fRmin[i] = min[i], i++);
+ for (Int_t i = 0; i < 3; fRmax[i] = max[i], fRmin[i] = min[i], i++) { }
if (IsPerspective()) SetDefaultWindow();
ResetView(fLongitude, fLatitude, fPsi, irep);
if(irep < 0)
diff --git a/gl/src/TGLStopwatch.cxx b/gl/src/TGLStopwatch.cxx
index 23d1a64ae50a4d5dfdf42e60f1c7003b673d03ac..a403437aaf6883446c2ceff49f1bef2915fe7b80 100644
--- a/gl/src/TGLStopwatch.cxx
+++ b/gl/src/TGLStopwatch.cxx
@@ -135,7 +135,7 @@ Double_t TGLStopwatch::WaitForTick(void) const
start = GetClock();
// Next tick
- while ((current = GetClock()) == start);
+ while ((current = GetClock()) == start) { }
return current;
}
@@ -158,7 +158,7 @@ void TGLStopwatch::InitOverhead(void) const
start = GetClock();
// Next tick
- while ((finish = GetClock()) == start);
+ while ((finish = GetClock()) == start) { }
// Test on 100 ticks range to 0.1 sec - 0.5 sec
runTime = 100.0 * (finish - start);
diff --git a/graf/src/TGraph.cxx b/graf/src/TGraph.cxx
index 48eba372ec7c0e2b9a252b39fc1d26a6eaa0e486..ae6c93e86cd425779af5388a1bc40e0248688680 100644
--- a/graf/src/TGraph.cxx
+++ b/graf/src/TGraph.cxx
@@ -394,7 +394,7 @@ TGraph::~TGraph()
//drawing modes
TObject *obj;
while ((obj = fFunctions->First())) {
- while(fFunctions->Remove(obj));
+ while(fFunctions->Remove(obj)) { }
delete obj;
}
delete fFunctions;
diff --git a/graf/src/TMultiGraph.cxx b/graf/src/TMultiGraph.cxx
index bcde889bbbf7393410f0d303451504b81664b993..d202d65a58a9efd88c577c783cf2759de6b04a98 100644
--- a/graf/src/TMultiGraph.cxx
+++ b/graf/src/TMultiGraph.cxx
@@ -132,7 +132,7 @@ TMultiGraph::~TMultiGraph()
//drawing modes
TObject *obj;
while ((obj = fFunctions->First())) {
- while(fFunctions->Remove(obj));
+ while(fFunctions->Remove(obj)) { }
delete obj;
}
delete fFunctions;
diff --git a/gui/src/TGDNDManager.cxx b/gui/src/TGDNDManager.cxx
index 64a69644f2ff88a20561e59fed48deed01af972f..d4f6ee85d67ae6974b759315def21d87f804133d 100755
--- a/gui/src/TGDNDManager.cxx
+++ b/gui/src/TGDNDManager.cxx
@@ -324,7 +324,7 @@ static int ArrayLength(Atom_t *a)
int n;
- for (n = 0; a[n]; n++);
+ for (n = 0; a[n]; n++) { }
return n;
}
diff --git a/gui/src/TRootContextMenu.cxx b/gui/src/TRootContextMenu.cxx
index e2fffe429643a9124f0f6d5a672992a629f7d6b8..a88baf31e0490713828e400659cd01b690c0176b 100644
--- a/gui/src/TRootContextMenu.cxx
+++ b/gui/src/TRootContextMenu.cxx
@@ -169,7 +169,7 @@ TGPopupMenu * TRootContextMenu::FindHierarchy(const char *commentstring, TString
// Search for popup with corresponding name
while ((ptr = (TGMenuEntry *) next()) &&
(ptr->GetType() != kMenuPopup ||
- last_component.CompareTo(ptr->GetName())));
+ last_component.CompareTo(ptr->GetName()))) { }
if (ptr)
currentMenu = ptr->GetPopup();
else {
@@ -180,7 +180,7 @@ TGPopupMenu * TRootContextMenu::FindHierarchy(const char *commentstring, TString
// Search for popup with corresponding name
while ((ptr2 = (TGMenuEntry *) next()) &&
(ptr2->GetType() != kMenuPopup ||
- last_component.CompareTo(ptr2->GetName()) > 0 ));
+ last_component.CompareTo(ptr2->GetName()) > 0 )) { }
currentMenu->AddPopup(last_component, r,ptr2);
currentMenu = r;
@@ -206,7 +206,7 @@ void TRootContextMenu::AddEntrySorted(TGPopupMenu *currentMenu, const char *s, I
// Search for popup with corresponding name
while ((ptr2 = (TGMenuEntry *) next()) &&
(ptr2->GetType() != kMenuEntry ||
- strcmp(ptr2->GetName(), s)<0 ));
+ strcmp(ptr2->GetName(), s)<0 )) { }
}
currentMenu->AddEntry(s,id,ud,p,ptr2);
}
diff --git a/hist/src/TH1.cxx b/hist/src/TH1.cxx
index d14e626f43064c5e16aaae3dff01bd19bf46d6f2..ed8eb1c40e7858a1e26be293c2248af58c4ad532 100644
--- a/hist/src/TH1.cxx
+++ b/hist/src/TH1.cxx
@@ -572,7 +572,7 @@ TH1::~TH1()
// have been added to the list of functions of several histograms
//and may have been already deleted.
while ((obj = fFunctions->First())) {
- while(fFunctions->Remove(obj));
+ while(fFunctions->Remove(obj)) { }
if (!obj->TestBit(kNotDeleted)) {
break;
}
@@ -5936,7 +5936,7 @@ void TH1::Reset(Option_t *option)
//drawing modes
TObject *obj;
while ((obj = fFunctions->First())) {
- while(fFunctions->Remove(obj));
+ while(fFunctions->Remove(obj)) { }
delete obj;
}
if(stats) fFunctions->Add(stats);
diff --git a/html/src/TDocOutput.cxx b/html/src/TDocOutput.cxx
index 775b185516e76bd3e32696de5faafc2585f8eda1..b2d81648cd86f362367161dc56ef4843941d083d 100644
--- a/html/src/TDocOutput.cxx
+++ b/html/src/TDocOutput.cxx
@@ -75,11 +75,11 @@ namespace {
++selectionChar) {
SectionStart_t checkPrev = cursor;
while (--checkPrev != prevSection->fStart
- && !strncasecmp(checkPrev->c_str(), cursor->c_str(), selectionChar));
+ && !strncasecmp(checkPrev->c_str(), cursor->c_str(), selectionChar)) { }
SectionStart_t checkNext = cursor;
while (++checkNext != end
- && !strncasecmp(checkNext->c_str(), cursor->c_str(), selectionChar));
+ && !strncasecmp(checkNext->c_str(), cursor->c_str(), selectionChar)) { }
// if the previous matching one is closer but not previous section start, take it!
if (checkPrev != prevSection->fStart) {
diff --git a/html/src/THtml.cxx b/html/src/THtml.cxx
index 7e818e663768ed565180e78125d84ebbd18e248f..1f015727d838b3c1688f50c29edb26d8ca84ec31 100644
--- a/html/src/THtml.cxx
+++ b/html/src/THtml.cxx
@@ -642,7 +642,7 @@ TClassDocInfo *THtml::GetNextClass()
TClassDocInfo* classinfo = 0;
while ((classinfo = (TClassDocInfo*)(*fThreadedClassIter)())
- && !classinfo->IsSelected());
+ && !classinfo->IsSelected()) { }
if (!classinfo) {
delete fThreadedClassIter;
diff --git a/proofplayer/src/TEventIter.cxx b/proofplayer/src/TEventIter.cxx
index b517a8591f28b819953c51492d1389ef79ff38ae..a46821796f54da7a2d9145528c30c1bc7daad8d2 100644
--- a/proofplayer/src/TEventIter.cxx
+++ b/proofplayer/src/TEventIter.cxx
@@ -349,7 +349,7 @@ Long64_t TEventIterObj::GetNextEvent()
// Position within this element. TODO: more efficient?
fNextKey->Reset();
- for(fElemCur = -1; fElemCur < fElemFirst-1 ; fElemCur++, fNextKey->Next());
+ for(fElemCur = -1; fElemCur < fElemFirst-1 ; fElemCur++, fNextKey->Next()) { }
}
--fElemNum;
diff --git a/table/src/TFileIter.cxx b/table/src/TFileIter.cxx
index 8880a13f9953c33e79a6ca7a3e23a294d68a89f2..ad8f6af2ca8f060db83b9a7b9a7145ecc9fc75f0 100644
--- a/table/src/TFileIter.cxx
+++ b/table/src/TFileIter.cxx
@@ -349,7 +349,7 @@ void TFileIter::SetCursorPosition(const char *keyNameToFind)
{
// Find the key by the name provided
Reset();
- while( (*this != keyNameToFind) && SkipObjects() );
+ while( (*this != keyNameToFind) && SkipObjects() ) { }
}
//__________________________________________________________________________
TObject *TFileIter::SkipObjects(Int_t nSkip)
diff --git a/table/src/TVolumeView.cxx b/table/src/TVolumeView.cxx
index 3ed44cd574c36d922eced5b153d01c0bc4d1c679..ba48b62cf573a5a3dd239ebaf78718995f8e8724 100644
--- a/table/src/TVolumeView.cxx
+++ b/table/src/TVolumeView.cxx
@@ -666,7 +666,7 @@ TVolumePosition *TVolumeView::Local2Master(const TVolumeView *localNode,const TV
if (masterNode && localNode) {
TVolumeViewIter transform((TVolumeView *)masterNode,0);
TVolumeView *nextNode = 0;
- while ((nextNode = (TVolumeView *)transform()) && nextNode != localNode);
+ while ((nextNode = (TVolumeView *)transform()) && nextNode != localNode) { }
if (nextNode) position = transform[0];
}
return position;
@@ -717,7 +717,7 @@ Float_t *TVolumeView::Local2Master(const Float_t *local, Float_t *master,
if (masterNode && localNode) {
TVolumeViewIter transform((TVolumeView *)masterNode,0);
TVolumeView *nextNode = 0;
- while ((nextNode = (TVolumeView *)transform()) && nextNode != localNode);
+ while ((nextNode = (TVolumeView *)transform()) && nextNode != localNode) { }
if (nextNode && (position = (TVolumePosition *) transform.GetPosition()) )
trans = position->Local2Master(local,master,nVector);
}
diff --git a/treeviewer/src/TParallelCoord.cxx b/treeviewer/src/TParallelCoord.cxx
index 8f2134eee508143dd68eb70c0af061d0946dc792..6cd8939f367a390a7b224d2a57e780adae1d1208 100644
--- a/treeviewer/src/TParallelCoord.cxx
+++ b/treeviewer/src/TParallelCoord.cxx
@@ -154,7 +154,7 @@ TParallelCoord::~TParallelCoord()
printf("TParallelCoord::~TParallelCoord()");
if (fCurrentEntries) delete fCurrentEntries;
- if (fInitEntries != fCurrentEntries && fInitEntries != NULL) delete fInitEntries;
+ if (fInitEntries != fCurrentEntries && fInitEntries != 0) delete fInitEntries;
if (fVarList) {
fVarList->Delete();
delete fVarList;
@@ -233,7 +233,7 @@ void TParallelCoord::ApplySelectionToTree()
if(!fTree) return;
if(fSelectList->GetSize() == 0) return;
- if(fCurrentSelection == NULL) fCurrentSelection = (TParallelCoordSelect*)fSelectList->First();
+ if(fCurrentSelection == 0) fCurrentSelection = (TParallelCoordSelect*)fSelectList->First();
fCurrentEntries = GetEntryList();
fNentries = fCurrentEntries->GetN();
fCurrentFirst = 0;
@@ -254,7 +254,7 @@ void TParallelCoord::ApplySelectionToTree()
}
if (fSelectList) { // FIXME It would be better to update the selections by deleting
fSelectList->Delete(); // the meaningless ranges (selecting everything or nothing for example)
- fCurrentSelection = NULL; // after applying a new entrylist to the tree.
+ fCurrentSelection = 0; // after applying a new entrylist to the tree.
}
gPad->Modified();
gPad->Update();
@@ -301,7 +301,7 @@ void TParallelCoord::DeleteSelection(TParallelCoordSelect * sel)
fSelectList->Remove(sel);
delete sel;
- if(fSelectList->GetSize() == 0) fCurrentSelection = NULL;
+ if(fSelectList->GetSize() == 0) fCurrentSelection = 0;
else fCurrentSelection = (TParallelCoordSelect*)fSelectList->At(0);
}
@@ -356,7 +356,7 @@ void TParallelCoord::Draw(Option_t* option)
TView *view = gPad->GetView();
if(view){
delete view;
- gPad->SetView(NULL);
+ gPad->SetView(0);
}
gPad->Clear();
if (!optcandle) {
@@ -416,7 +416,7 @@ TParallelCoordSelect* TParallelCoord::GetCurrentSelection()
{
// Return the selection currently being edited.
- if (!fSelectList) return NULL;
+ if (!fSelectList) return 0;
if (!fCurrentSelection) {
fCurrentSelection = (TParallelCoordSelect*)fSelectList->First();
}
@@ -495,7 +495,7 @@ TParallelCoordSelect* TParallelCoord::GetSelection(const char* title)
TIter next(fSelectList);
TParallelCoordSelect* sel;
- while ((sel = (TParallelCoordSelect*)next()) && strcmp(title,sel->GetTitle()));
+ while ((sel = (TParallelCoordSelect*)next()) && strcmp(title,sel->GetTitle())) { }
return sel;
}
@@ -509,20 +509,20 @@ TTree* TParallelCoord::GetTree()
if (fTree) return fTree;
if (fTreeFileName=="" || fTreeName=="") {
Error("GetTree","Cannot load the tree: no tree defined!");
- return NULL;
+ return 0;
}
TFile *f = TFile::Open(fTreeFileName.Data());
if (!f) {
Error("GetTree","Tree file name : \"%s\" does not exsist (Are you in the correct directory?).",fTreeFileName.Data());
- return NULL;
+ return 0;
} else if (f->IsZombie()) {
Error("GetTree","while opening \"%s\".",fTreeFileName.Data());
- return NULL;
+ return 0;
} else {
fTree = (TTree*)f->Get(fTreeName.Data());
if (!fTree) {
Error("GetTree","\"%s\" not found in \"%s\".", fTreeName.Data(), fTreeFileName.Data());
- return NULL;
+ return 0;
} else {
fTree->SetEntryList(fCurrentEntries);
TString varexp = "";
@@ -550,9 +550,9 @@ Double_t* TParallelCoord::GetVariable(const char* vartitle)
// Get the variables values from its title.
TIter next(fVarList);
- TParallelCoordVar* var = NULL;
- while(((var = (TParallelCoordVar*)next()) != NULL) && (var->GetTitle() != vartitle));
- if(!var) return NULL;
+ TParallelCoordVar* var = 0;
+ while(((var = (TParallelCoordVar*)next()) != 0) && (var->GetTitle() != vartitle)) { }
+ if(!var) return 0;
else return var->GetValues();
}
@@ -562,7 +562,7 @@ Double_t* TParallelCoord::GetVariable(Int_t i)
{
// Get the variables values from its index.
- if(i<0 || (UInt_t)i>fNvar) return NULL;
+ if(i<0 || (UInt_t)i>fNvar) return 0;
else return ((TParallelCoordVar*)fVarList->At(i))->GetValues();
}
@@ -573,8 +573,8 @@ void TParallelCoord::Init()
// Initialise the data members of TParallelCoord.
fNentries = 0;
- fVarList = NULL;
- fSelectList = NULL;
+ fVarList = 0;
+ fSelectList = 0;
SetBit(kVertDisplay,kTRUE);
SetBit(kCurveDisplay,kFALSE);
SetBit(kPaintEntries,kTRUE);
@@ -582,15 +582,15 @@ void TParallelCoord::Init()
SetBit(kGlobalScale,kFALSE);
SetBit(kCandleChart,kFALSE);
SetBit(kGlobalLogScale,kFALSE);
- fTree = NULL;
- fCurrentEntries = NULL;
- fInitEntries = NULL;
- fCurrentSelection = NULL;
+ fTree = 0;
+ fCurrentEntries = 0;
+ fInitEntries = 0;
+ fCurrentSelection = 0;
fNvar = 0;
fDotsSpacing = 0;
fCurrentFirst = 0;
fCurrentN = 0;
- fCandleAxis = NULL;
+ fCandleAxis = 0;
fWeightCut = 0;
fLineWidth = 1;
fLineColor = kGreen-8;
@@ -609,7 +609,7 @@ void TParallelCoord::Paint(Option_t* /*option*/)
frame->SetLineColor(gPad->GetFillColor());
SetAxesPosition();
if(TestBit(kPaintEntries)){
- PaintEntries(NULL);
+ PaintEntries(0);
TIter next(fSelectList);
TParallelCoordSelect* sel;
while((sel = (TParallelCoordSelect*)next())) {
@@ -634,9 +634,9 @@ void TParallelCoord::PaintEntries(TParallelCoordSelect* sel)
Double_t *x = new Double_t[fNvar];
Double_t *y = new Double_t[fNvar];
- TGraph *gr = NULL;
- TPolyLine *pl = NULL;
- TAttLine *evline = NULL;
+ TGraph *gr = 0;
+ TPolyLine *pl = 0;
+ TAttLine *evline = 0;
if (TestBit (kCurveDisplay)) {gr = new TGraph(fNvar); evline = (TAttLine*)gr;}
else {pl = new TPolyLine(fNvar); evline = (TAttLine*)pl;}
@@ -724,7 +724,7 @@ TParallelCoordVar* TParallelCoord::RemoveVariable(const char* vartitle)
// Delete the variable "vartitle" from the graph.
TIter next(fVarList);
- TParallelCoordVar* var=NULL;
+ TParallelCoordVar* var=0;
while((var = (TParallelCoordVar*)next())) {
if (!strcmp(var->GetTitle(),vartitle)) break;
}
@@ -763,7 +763,7 @@ void TParallelCoord::ResetTree()
}
if (fSelectList) { // FIXME It would be better to update the selections by deleting
fSelectList->Delete(); // the meaningless ranges (selecting everything or nothing for example)
- fCurrentSelection = NULL; // after applying a new entrylist to the tree.
+ fCurrentSelection = 0; // after applying a new entrylist to the tree.
}
gPad->Modified();
gPad->Update();
@@ -978,7 +978,7 @@ void TParallelCoord::SetGlobalScale(Bool_t gl)
SetBit(kGlobalScale,gl);
if (fCandleAxis) {
delete fCandleAxis;
- fCandleAxis = NULL;
+ fCandleAxis = 0;
}
if (gl) {
Double_t min,max;
@@ -1029,7 +1029,7 @@ void TParallelCoord::SetCandleChart(Bool_t can)
var->SetHistogramLineWidth(0);
}
if (fCandleAxis) delete fCandleAxis;
- fCandleAxis = NULL;
+ fCandleAxis = 0;
SetBit(kPaintEntries,!can);
if (can) {
if (TestBit(kVertDisplay)) fCandleAxis = new TGaxis(0.05,0.1,0.05,0.9,GetGlobalMin(),GetGlobalMax());
@@ -1038,7 +1038,7 @@ void TParallelCoord::SetCandleChart(Bool_t can)
} else {
if (fCandleAxis) {
delete fCandleAxis;
- fCandleAxis = NULL;
+ fCandleAxis = 0;
}
}
gPad->Modified();
@@ -1091,7 +1091,7 @@ TParallelCoordSelect* TParallelCoord::SetCurrentSelection(const char* title)
TIter next(fSelectList);
TParallelCoordSelect* sel;
while((sel = (TParallelCoordSelect*)next()) && strcmp(sel->GetTitle(),title))
- if(!sel) return NULL;
+ if(!sel) return 0;
fCurrentSelection = sel;
return sel;
}
diff --git a/x11/src/GX11Gui.cxx b/x11/src/GX11Gui.cxx
index e447204623d213dba8fd503881e686f03b75d1b5..e855318239455d7ccac1f86c94878758ef22574a 100644
--- a/x11/src/GX11Gui.cxx
+++ b/x11/src/GX11Gui.cxx
@@ -2740,7 +2740,7 @@ void TGX11::SetDNDAware(Window_t win, Atom_t *typelist)
if (typelist) {
int n;
- for (n = 0; typelist[n]; n++);
+ for (n = 0; typelist[n]; n++) { }
if (n > 0) {
XChangeProperty(fDisplay, win, dndaware, XA_ATOM, 32, PropModeAppend,
(unsigned char *) typelist, n);
@@ -2755,7 +2755,7 @@ void TGX11::SetTypeList(Window_t win, Atom_t prop, Atom_t *typelist)
if (typelist) {
int n;
- for (n = 0; typelist[n]; n++);
+ for (n = 0; typelist[n]; n++) { }
if (n > 0) {
XChangeProperty(fDisplay, win, prop, XA_ATOM, 32, PropModeAppend,
(unsigned char *) typelist, n);
diff --git a/x11/src/TGX11.cxx b/x11/src/TGX11.cxx
index d241d6ae072b1008c8c08e3d00cc78008583453f..736b267b2ce0d9b3904839c1da752b64c339779e 100644
--- a/x11/src/TGX11.cxx
+++ b/x11/src/TGX11.cxx
@@ -1624,7 +1624,7 @@ Int_t TGX11::RequestString(int x, int y, char *text)
}
if (cursor != 0)
XDefineCursor(fDisplay, gCws->fWindow, cursor);
- for (nt = len_text; nt > 0 && text[nt-1] == ' '; nt--);
+ for (nt = len_text; nt > 0 && text[nt-1] == ' '; nt--) { }
pt = nt;
XGetInputFocus(fDisplay, &focuswindow, &focusrevert);
XSetInputFocus(fDisplay, gCws->fWindow, focusrevert, CurrentTime);