diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2012-02-25 15:18:56 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2012-02-25 15:18:56 (GMT) |
| commit | cff8111ed33af6033bd188868964d92ea3503188 (patch) | |
| tree | 2a7451abfd771d43ea2b3ac2443d94c3eb5cfee7 /qtools | |
| parent | 34d4ace6d4037862b6d280f1d7534292c714bf59 (diff) | |
| download | Doxygen-cff8111ed33af6033bd188868964d92ea3503188.zip Doxygen-cff8111ed33af6033bd188868964d92ea3503188.tar.gz Doxygen-cff8111ed33af6033bd188868964d92ea3503188.tar.bz2 | |
Release-1.8.0
Diffstat (limited to 'qtools')
| -rw-r--r-- | qtools/qdir_unix.cpp | 6 | ||||
| -rw-r--r-- | qtools/qxml.cpp | 2 | ||||
| -rw-r--r-- | qtools/qxml.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/qtools/qdir_unix.cpp b/qtools/qdir_unix.cpp index 46a3b69..e845043 100644 --- a/qtools/qdir_unix.cpp +++ b/qtools/qdir_unix.cpp @@ -82,12 +82,12 @@ QString QDir::canonicalPath() const char cur[PATH_MAX]; char tmp[PATH_MAX]; - GETCWD( cur, PATH_MAX ); + (void)GETCWD( cur, PATH_MAX ); if ( CHDIR(QFile::encodeName(dPath)) >= 0 ) { - GETCWD( tmp, PATH_MAX ); + (void)GETCWD( tmp, PATH_MAX ); r = QFile::decodeName(tmp); } - CHDIR( cur ); + (void)CHDIR( cur ); slashify( r ); return r; diff --git a/qtools/qxml.cpp b/qtools/qxml.cpp index 83ab89d..ec21c1f 100644 --- a/qtools/qxml.cpp +++ b/qtools/qxml.cpp @@ -1515,7 +1515,7 @@ bool QXmlDefaultHandler::unparsedEntityDecl( const QString&, const QString&, provided in the XML document. */ bool QXmlDefaultHandler::resolveEntity( const QString&, const QString&, - QXmlInputSource* ret ) + QXmlInputSource* &ret ) { ret = 0; return TRUE; diff --git a/qtools/qxml.h b/qtools/qxml.h index 36164ff..0797b94 100644 --- a/qtools/qxml.h +++ b/qtools/qxml.h @@ -440,7 +440,7 @@ class QM_EXPORT QXmlEntityResolver { public: virtual ~QXmlEntityResolver() {} - virtual bool resolveEntity( const QString& publicId, const QString& systemId, QXmlInputSource* ret ) = 0; + virtual bool resolveEntity( const QString& publicId, const QString& systemId, QXmlInputSource* &ret ) = 0; virtual QString errorString() = 0; }; @@ -494,7 +494,7 @@ public: bool notationDecl( const QString& name, const QString& publicId, const QString& systemId ); bool unparsedEntityDecl( const QString& name, const QString& publicId, const QString& systemId, const QString& notationName ); - bool resolveEntity( const QString& publicId, const QString& systemId, QXmlInputSource* ret ); + bool resolveEntity( const QString& publicId, const QString& systemId, QXmlInputSource* &ret ); bool startDTD( const QString& name, const QString& publicId, const QString& systemId ); bool endDTD(); |