summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2001-04-09 20:10:21 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2001-04-09 20:10:21 (GMT)
commit591f52f0f1ff3ce76d17e2490376d6182b0cbbde (patch)
treefb4df23c4ec18f6ca3b2f2399ac8d37dae950f2a
parent8f195c2d389edeeaf0f76de36c5b5db788b6e312 (diff)
downloadDoxygen-591f52f0f1ff3ce76d17e2490376d6182b0cbbde.zip
Doxygen-591f52f0f1ff3ce76d17e2490376d6182b0cbbde.tar.gz
Doxygen-591f52f0f1ff3ce76d17e2490376d6182b0cbbde.tar.bz2
Release-1.2.6-20010409
-rw-r--r--INSTALL4
-rw-r--r--README4
-rw-r--r--VERSION2
-rw-r--r--addon/xmlgen/xml.cpp34
-rw-r--r--doc/commands.doc2
-rw-r--r--packages/rpm/doxygen.spec4
6 files changed, 25 insertions, 25 deletions
diff --git a/INSTALL b/INSTALL
index 320b0bf..5bf3046 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
-DOXYGEN Version 1.2.6-20010408
+DOXYGEN Version 1.2.6-20010409
Please read the installation section of the manual for instructions.
--------
-Dimitri van Heesch (08 April 2001)
+Dimitri van Heesch (09 April 2001)
diff --git a/README b/README
index fa07fc4..afd334e 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOXYGEN Version 1.2.6-20010408
+DOXYGEN Version 1.2.6_20010409
Please read INSTALL for compilation instructions.
@@ -7,4 +7,4 @@ The latest version of doxygen can be obtained at
Enjoy,
-Dimitri van Heesch (08 April 2001)
+Dimitri van Heesch (09 April 2001)
diff --git a/VERSION b/VERSION
index 97a9074..ebc8ce8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.6-20010408
+1.2.6-20010409
diff --git a/addon/xmlgen/xml.cpp b/addon/xmlgen/xml.cpp
index a624426..dbfb0e9 100644
--- a/addon/xmlgen/xml.cpp
+++ b/addon/xmlgen/xml.cpp
@@ -60,7 +60,7 @@ class TextGeneratorXMLImpl : public TextGeneratorIntf
void generateDTD()
{
- QCString fileName=Config::instance()->getString("OUTPUT_DIRECTORY")+"/xml/doxygen.dtd";
+ QCString fileName=Config_getString("OUTPUT_DIRECTORY")+"/xml/doxygen.dtd";
QFile f(fileName);
if (!f.open(IO_WriteOnly))
{
@@ -440,49 +440,49 @@ void generateXMLForFile(FileDef *fd,QTextStream &t)
void generateXML()
{
- if (Config::instance()->getString("OUTPUT_DIRECTORY").isEmpty())
- Config::instance()->getString("OUTPUT_DIRECTORY")=QDir::currentDirPath();
+ if (Config_getString("OUTPUT_DIRECTORY").isEmpty())
+ Config_getString("OUTPUT_DIRECTORY")=QDir::currentDirPath();
else
{
- QDir dir(Config::instance()->getString("OUTPUT_DIRECTORY"));
+ QDir dir(Config_getString("OUTPUT_DIRECTORY"));
if (!dir.exists())
{
dir.setPath(QDir::currentDirPath());
- if (!dir.mkdir(Config::instance()->getString("OUTPUT_DIRECTORY")))
+ if (!dir.mkdir(Config_getString("OUTPUT_DIRECTORY")))
{
err("Error: tag OUTPUT_DIRECTORY: Output directory `%s' does not "
- "exist and cannot be created\n",Config::instance()->getString("OUTPUT_DIRECTORY").data());
+ "exist and cannot be created\n",Config_getString("OUTPUT_DIRECTORY").data());
exit(1);
}
- else if (!Config::instance()->getBool("QUIET"))
+ else if (!Config_getBool("QUIET"))
{
err("Notice: Output directory `%s' does not exist. "
- "I have created it for you.\n", Config::instance()->getString("OUTPUT_DIRECTORY").data());
+ "I have created it for you.\n", Config_getString("OUTPUT_DIRECTORY").data());
}
- dir.cd(Config::instance()->getString("OUTPUT_DIRECTORY"));
+ dir.cd(Config_getString("OUTPUT_DIRECTORY"));
}
- Config::instance()->getString("OUTPUT_DIRECTORY")=dir.absPath();
+ Config_getString("OUTPUT_DIRECTORY")=dir.absPath();
}
- QDir dir(Config::instance()->getString("OUTPUT_DIRECTORY"));
+ QDir dir(Config_getString("OUTPUT_DIRECTORY"));
if (!dir.exists())
{
dir.setPath(QDir::currentDirPath());
- if (!dir.mkdir(Config::instance()->getString("OUTPUT_DIRECTORY")))
+ if (!dir.mkdir(Config_getString("OUTPUT_DIRECTORY")))
{
- err("Cannot create directory %s\n",Config::instance()->getString("OUTPUT_DIRECTORY").data());
+ err("Cannot create directory %s\n",Config_getString("OUTPUT_DIRECTORY").data());
return;
}
}
- QDir xmlDir(Config::instance()->getString("OUTPUT_DIRECTORY")+"/xml");
- if (!xmlDir.exists() && !xmlDir.mkdir(Config::instance()->getString("OUTPUT_DIRECTORY")+"/xml"))
+ QDir xmlDir(Config_getString("OUTPUT_DIRECTORY")+"/xml");
+ if (!xmlDir.exists() && !xmlDir.mkdir(Config_getString("OUTPUT_DIRECTORY")+"/xml"))
{
- err("Could not create xml directory in %s\n",Config::instance()->getString("OUTPUT_DIRECTORY").data());
+ err("Could not create xml directory in %s\n",Config_getString("OUTPUT_DIRECTORY").data());
return;
}
generateDTD();
- QCString fileName=Config::instance()->getString("OUTPUT_DIRECTORY")+"/xml/doxygen.xml";
+ QCString fileName=Config_getString("OUTPUT_DIRECTORY")+"/xml/doxygen.xml";
QFile f(fileName);
if (!f.open(IO_WriteOnly))
{
diff --git a/doc/commands.doc b/doc/commands.doc
index e34d5c5..21f0b6e 100644
--- a/doc/commands.doc
+++ b/doc/commands.doc
@@ -1241,7 +1241,7 @@ Public/Protected/Private/... section.
\subsection cmdem \em <word>
\addindex \e
- Displayis the argument \<word\> in italics.
+ Displays the argument \<word\> in italics.
Use this command to emphasize words.
\par Example:
diff --git a/packages/rpm/doxygen.spec b/packages/rpm/doxygen.spec
index 1a5c75a..b5921f2 100644
--- a/packages/rpm/doxygen.spec
+++ b/packages/rpm/doxygen.spec
@@ -1,5 +1,5 @@
Name: doxygen
-Version: 1.2.6-20010408
+Version: 1.2.6_20010409
Summary: documentation system for C, C++ and IDL
Release: 1
Source0: doxygen_%{version}.src.tar.gz
@@ -8,7 +8,7 @@ Copyright: GPL
Group: unsorted
URL: http://www.stack.nl/~dimitri/doxygen
Packager: Matthias Andree <ma@dt.e-technik.uni-dortmund.de>
-BuildRoot: /var/tmp/doxygen-%{version}.root
+BuildRoot: /var/tmp/doxygen_%{version}.root
# requires Perl for tmake (Troll's make)
BuildPrereq: perl tetex