Skip to content

Commit

Permalink
Renamed Portables to Portable
Browse files Browse the repository at this point in the history
  • Loading branch information
@doxygen
doxygen committed Dec 8, 2019
1 parent 7d4f520 commit 352ac91
Show file tree
Hide file tree
Showing 23 changed files with 157 additions and 157 deletions.
6 changes: 3 additions & 3 deletions src/cite.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,14 @@ void CiteDict::generatePage() const
// 5. run bib2xhtml perl script on the generated file which will insert the
// bibliography in citelist.doc
int exitCode;
Portables::sysTimerStop();
if ((exitCode=Portables::system("perl","\""+bib2xhtmlFile+"\" "+bibOutputFiles+" \""+
Portable::sysTimerStop();
if ((exitCode=Portable::system("perl","\""+bib2xhtmlFile+"\" "+bibOutputFiles+" \""+
citeListFile+"\"")) != 0)
{
err("Problems running bibtex. Verify that the command 'perl --version' works from the command line. Exit code: %d\n",
exitCode);
}
Portables::sysTimerStop();
Portable::sysTimerStop();

QDir::setCurrent(oldDir);

Expand Down
2 changes: 1 addition & 1 deletion src/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ Go to the <a href="commands.html">next</a> section or return to the
]]>
</docs>
</option>
<option type='bool' id='CASE_SENSE_NAMES' defval='0' altdefval='Portables::fileSystemIsCaseSensitive()'>
<option type='bool' id='CASE_SENSE_NAMES' defval='0' altdefval='Portable::fileSystemIsCaseSensitive()'>
<docs>
<![CDATA[
If the \c CASE_SENSE_NAMES tag is set to \c NO then doxygen
Expand Down
16 changes: 8 additions & 8 deletions src/configimpl.l
View file
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ static FILE *tryPath(const char *path,const char *fileName)
QFileInfo fi(absName);
if (fi.exists() && fi.isFile())
{
FILE *f=Portables::fopen(absName,"r");
FILE *f=Portable::fopen(absName,"r");
if (!f) config_err("could not open file %s for reading\n",absName.data());
return f;
}
Expand All @@ -619,7 +619,7 @@ static FILE *findFile(const char *fileName)
{
return 0;
}
if (Portables::isAbsolutePath(fileName))
if (Portable::isAbsolutePath(fileName))
{
return tryPath(NULL, fileName);
}
Expand Down Expand Up @@ -1012,7 +1012,7 @@ static void substEnvVarsInString(QCString &s)
while ((i=re.match(s,p,&l))!=-1 || (i=re2.match(s,p,&l))!=-1)
{
//printf("Found environment var s.mid(%d,%d)='%s'\n",i+2,l-3,s.mid(i+2,l-3).data());
QCString env=Portables::getenv(s.mid(i+2,l-3));
QCString env=Portable::getenv(s.mid(i+2,l-3));
substEnvVarsInString(env); // recursively expand variables if needed.
s = s.left(i)+env+s.right(s.length()-i-l);
p=i+env.length(); // next time start at the end of the expanded string
Expand Down Expand Up @@ -1579,7 +1579,7 @@ void Config::checkAndCorrect()
}
else
{
QFileInfo dp(dotPath+"/dot"+Portables::commandExtension());
QFileInfo dp(dotPath+"/dot"+Portable::commandExtension());
if (!dp.exists() || !dp.isFile())
{
warn_uncond("the dot tool could not be found at %s\n",dotPath.data());
Expand Down Expand Up @@ -1607,10 +1607,10 @@ void Config::checkAndCorrect()
QFileInfo pu(plantumlJarPath);
if (pu.exists() && pu.isDir()) // PLANTUML_JAR_PATH is directory
{
QFileInfo jar(plantumlJarPath+Portables::pathSeparator()+"plantuml.jar");
QFileInfo jar(plantumlJarPath+Portable::pathSeparator()+"plantuml.jar");
if (jar.exists() && jar.isFile())
{
plantumlJarPath = jar.dirPath(TRUE).utf8()+Portables::pathSeparator();
plantumlJarPath = jar.dirPath(TRUE).utf8()+Portable::pathSeparator();
}
else
{
Expand All @@ -1621,7 +1621,7 @@ void Config::checkAndCorrect()
}
else if (pu.exists() && pu.isFile() && plantumlJarPath.right(4)==".jar") // PLANTUML_JAR_PATH is file
{
plantumlJarPath = pu.dirPath(TRUE).utf8()+Portables::pathSeparator();
plantumlJarPath = pu.dirPath(TRUE).utf8()+Portable::pathSeparator();
}
else
{
Expand All @@ -1635,7 +1635,7 @@ void Config::checkAndCorrect()
QCString &diaPath = Config_getString(DIA_PATH);
if (!diaPath.isEmpty())
{
QFileInfo dp(diaPath+"/dia"+Portables::commandExtension());
QFileInfo dp(diaPath+"/dia"+Portable::commandExtension());
if (!dp.exists() || !dp.isFile())
{
warn_uncond("dia could not be found at %s\n",diaPath.data());
Expand Down
34 changes: 17 additions & 17 deletions src/context.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1978,7 +1978,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
{
cg->writeGraph(t,GOF_BITMAP,EOF_Html,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
);
}
Expand All @@ -1987,7 +1987,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
{
cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
);
}
Expand Down Expand Up @@ -2077,7 +2077,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
{
cg->writeGraph(t,GOF_BITMAP,EOF_Html,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
);
}
Expand All @@ -2086,7 +2086,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
{
cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
);
}
Expand Down Expand Up @@ -3123,7 +3123,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
{
cg->writeGraph(t,GOF_BITMAP,EOF_Html,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
relPathAsString(),TRUE,g_globals.dynSectionId
);
}
Expand All @@ -3132,7 +3132,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
{
cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
relPathAsString(),TRUE,g_globals.dynSectionId
);
}
Expand Down Expand Up @@ -3175,7 +3175,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
{
cg->writeGraph(t,GOF_BITMAP,EOF_Html,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
relPathAsString(),TRUE,g_globals.dynSectionId
);
}
Expand All @@ -3184,7 +3184,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
{
cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
relPathAsString(),TRUE,g_globals.dynSectionId
);
}
Expand Down Expand Up @@ -3613,7 +3613,7 @@ class DirContext::Private : public DefinitionContext<DirContext::Private>
graph->writeGraph(t,GOF_BITMAP,
EOF_Html,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_dirDef->getOutputFileBase()+Doxygen::htmlFileExtension,
g_globals.outputDir+Portable::pathSeparator()+m_dirDef->getOutputFileBase()+Doxygen::htmlFileExtension,
relPathAsString(),
TRUE,
g_globals.dynSectionId,
Expand All @@ -3625,7 +3625,7 @@ class DirContext::Private : public DefinitionContext<DirContext::Private>
graph->writeGraph(t,GOF_EPS,
EOF_LaTeX,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_dirDef->getOutputFileBase()+".tex",
g_globals.outputDir+Portable::pathSeparator()+m_dirDef->getOutputFileBase()+".tex",
relPathAsString(),
TRUE,
g_globals.dynSectionId,
Expand Down Expand Up @@ -5026,7 +5026,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
{
cg->writeGraph(t,GOF_BITMAP,EOF_Html,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
relPathAsString(),TRUE,g_globals.dynSectionId
);
}
Expand All @@ -5035,7 +5035,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
{
cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
relPathAsString(),TRUE,g_globals.dynSectionId
);
}
Expand Down Expand Up @@ -5098,7 +5098,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
{
cg->writeGraph(t,GOF_BITMAP,EOF_Html,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
relPathAsString(),TRUE,g_globals.dynSectionId
);
}
Expand All @@ -5107,7 +5107,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
{
cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
relPathAsString(),TRUE,g_globals.dynSectionId
);
}
Expand Down Expand Up @@ -5368,7 +5368,7 @@ class ModuleContext::Private : public DefinitionContext<ModuleContext::Private>
graph->writeGraph(t,GOF_BITMAP,
EOF_Html,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_groupDef->getOutputFileBase()+Doxygen::htmlFileExtension,
g_globals.outputDir+Portable::pathSeparator()+m_groupDef->getOutputFileBase()+Doxygen::htmlFileExtension,
relPathAsString(),
TRUE,
g_globals.dynSectionId);
Expand All @@ -5379,7 +5379,7 @@ class ModuleContext::Private : public DefinitionContext<ModuleContext::Private>
graph->writeGraph(t,GOF_EPS,
EOF_LaTeX,
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+m_groupDef->getOutputFileBase()+".tex",
g_globals.outputDir+Portable::pathSeparator()+m_groupDef->getOutputFileBase()+".tex",
relPathAsString(),
TRUE,
g_globals.dynSectionId);
Expand Down Expand Up @@ -8461,7 +8461,7 @@ class InheritanceGraphContext::Private
/*GOF_BITMAP,
EOF_Html,*/
g_globals.outputDir,
g_globals.outputDir+Portables::pathSeparator()+"inherits"+Doxygen::htmlFileExtension,
g_globals.outputDir+Portable::pathSeparator()+"inherits"+Doxygen::htmlFileExtension,
m_id);
}
return TemplateVariant(result.data(),TRUE);
Expand Down
16 changes: 8 additions & 8 deletions src/definition.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -744,12 +744,12 @@ class FilterCache
// file already processed, get the results after filtering from the tmp file
Debug::print(Debug::FilterOutput,0,"Reusing filter result for %s from %s at offset=%d size=%d\n",
qPrint(fileName),qPrint(Doxygen::filterDBFileName),(int)item->filePos,(int)item->fileSize);
f = Portables::fopen(Doxygen::filterDBFileName,"rb");
f = Portable::fopen(Doxygen::filterDBFileName,"rb");
if (f)
{
bool success=TRUE;
str.resize(item->fileSize+1);
if (Portables::fseek(f,item->filePos,SEEK_SET)==-1)
if (Portable::fseek(f,item->filePos,SEEK_SET)==-1)
{
err("Failed to seek to position %d in filter database file %s\n",(int)item->filePos,qPrint(Doxygen::filterDBFileName));
success=FALSE;
Expand Down Expand Up @@ -780,8 +780,8 @@ class FilterCache
// filter file
QCString cmd=filter+" \""+fileName+"\"";
Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
f = Portables::popen(cmd,"r");
FILE *bf = Portables::fopen(Doxygen::filterDBFileName,"a+b");
f = Portable::popen(cmd,"r");
FILE *bf = Portable::fopen(Doxygen::filterDBFileName,"a+b");
FilterCacheItem *item = new FilterCacheItem;
item->filePos = m_endPos;
if (bf==0)
Expand All @@ -790,7 +790,7 @@ class FilterCache
err("Error opening filter database file %s\n",qPrint(Doxygen::filterDBFileName));
str.addChar('\0');
delete item;
Portables::pclose(f);
Portable::pclose(f);
return FALSE;
}
// append the filtered output to the database file
Expand All @@ -806,7 +806,7 @@ class FilterCache
qPrint(Doxygen::filterDBFileName),bytesWritten,bytesRead);
str.addChar('\0');
delete item;
Portables::pclose(f);
Portable::pclose(f);
fclose(bf);
return FALSE;
}
Expand All @@ -821,14 +821,14 @@ class FilterCache
qPrint(fileName),qPrint(Doxygen::filterDBFileName),(int)item->filePos,(int)item->fileSize);
// update end of file position
m_endPos += size;
Portables::pclose(f);
Portable::pclose(f);
fclose(bf);
}
else // no filtering
{
// normal file
//printf("getFileContents(%s): no filter\n",qPrint(fileName));
f = Portables::fopen(fileName,"r");
f = Portable::fopen(fileName,"r");
while (!feof(f))
{
int bytesRead = fread(buf,1,blockSize,f);
Expand Down
18 changes: 9 additions & 9 deletions src/dia.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir,
const char *outFile,DiaOutputFormat format)
{
QCString absOutFile = outDir;
absOutFile+=Portables::pathSeparator();
absOutFile+=Portable::pathSeparator();
absOutFile+=outFile;

// chdir to the output dir, so dot can find the font file.
QCString oldDir = QDir::currentDirPath().utf8();
// go to the html output directory (i.e. path)
QDir::setCurrent(outDir);
//printf("Going to dir %s\n",QDir::currentDirPath().data());
QCString diaExe = Config_getString(DIA_PATH)+"dia"+Portables::commandExtension();
QCString diaExe = Config_getString(DIA_PATH)+"dia"+Portable::commandExtension();
QCString diaArgs;
QCString extension;
diaArgs+="-n ";
Expand All @@ -62,26 +62,26 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir,

int exitCode;
//printf("*** running: %s %s outDir:%s %s\n",diaExe.data(),diaArgs.data(),outDir,outFile);
Portables::sysTimerStart();
if ((exitCode=Portables::system(diaExe,diaArgs,FALSE))!=0)
Portable::sysTimerStart();
if ((exitCode=Portable::system(diaExe,diaArgs,FALSE))!=0)
{
err("Problems running %s. Check your installation or look typos in you dia file %s\n",
diaExe.data(),inFile);
Portables::sysTimerStop();
Portable::sysTimerStop();
goto error;
}
Portables::sysTimerStop();
Portable::sysTimerStop();
if ( (format==DIA_EPS) && (Config_getBool(USE_PDFLATEX)) )
{
QCString epstopdfArgs(maxCmdLine);
epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
outFile,outFile);
Portables::sysTimerStart();
if (Portables::system("epstopdf",epstopdfArgs)!=0)
Portable::sysTimerStart();
if (Portable::system("epstopdf",epstopdfArgs)!=0)
{
err("Problems running epstopdf. Check your TeX installation!\n");
}
Portables::sysTimerStop();
Portable::sysTimerStop();
}

error:
Expand Down
8 changes: 4 additions & 4 deletions src/diagram.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1338,14 +1338,14 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path,
epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
epsBaseName.data(),epsBaseName.data());
//printf("Converting eps using '%s'\n",epstopdfArgs.data());
Portables::sysTimerStart();
if (Portables::system("epstopdf",epstopdfArgs)!=0)
Portable::sysTimerStart();
if (Portable::system("epstopdf",epstopdfArgs)!=0)
{
err("Problems running epstopdf. Check your TeX installation!\n");
Portables::sysTimerStop();
Portable::sysTimerStop();
return;
}
Portables::sysTimerStop();
Portable::sysTimerStop();
}
}

Expand Down
Loading

0 comments on commit 352ac91

Please sign in to comment.