summaryrefslogtreecommitdiffstats
path: root/src/msc.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2010-05-07 19:37:33 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2010-05-07 19:37:33 (GMT)
commit0fb3f32dfd7ac31a2677d76647700cd3fb730ef6 (patch)
tree58636054e8f52c5851109b908053cc4da26b060a /src/msc.cpp
parent600fbfb8b03442ff97f4fb94964b2e0e11d14bd4 (diff)
downloadDoxygen-0fb3f32dfd7ac31a2677d76647700cd3fb730ef6.zip
Doxygen-0fb3f32dfd7ac31a2677d76647700cd3fb730ef6.tar.gz
Doxygen-0fb3f32dfd7ac31a2677d76647700cd3fb730ef6.tar.bz2
Release-1.6.3-20100507
Diffstat (limited to 'src/msc.cpp')
-rw-r--r--src/msc.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/msc.cpp b/src/msc.cpp
index 14f41a4..72f9681 100644
--- a/src/msc.cpp
+++ b/src/msc.cpp
@@ -27,7 +27,7 @@
static const int maxCmdLine = 40960;
static bool convertMapFile(QTextStream &t,const char *mapName,const QCString relPath,
- const QString &context)
+ const QCString &context)
{
QFile f(mapName);
if (!f.open(IO_ReadOnly))
@@ -140,10 +140,10 @@ error:
QDir::setCurrent(oldDir);
}
-QString getMscImageMapFromFile(const QString& inFile, const QString& outDir,
- const QCString& relPath,const QString& context)
+QCString getMscImageMapFromFile(const QCString& inFile, const QCString& outDir,
+ const QCString& relPath,const QCString& context)
{
- QString outFile = inFile + ".map";
+ QCString outFile = inFile + ".map";
// chdir to the output dir, so dot can find the font file.
QCString oldDir = convertToQCString(QDir::currentDirPath());
@@ -169,7 +169,7 @@ QString getMscImageMapFromFile(const QString& inFile, const QString& outDir,
QDir().remove(outFile);
QDir::setCurrent(oldDir);
- return result;
+ return result.data();
}