Release-1.8.2-20120930

Doxyfile

@@ -224,7 +224,7 @@ USE_MATHJAX            = NO
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 MATHJAX_EXTENSIONS     =
 SEARCHENGINE           = YES
-SERVER_BASED_SEARCH    = NO
+SERVER_BASED_SEARCH    = YES
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
@@ -294,7 +294,7 @@ SKIP_FUNCTION_MACROS   = YES
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 TAGFILES               = qtools_docs/qtools.tag=../../qtools_docs/html
-GENERATE_TAGFILE       =
+GENERATE_TAGFILE       = doxygen.tag
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl

INSTALL

@@ -1,7 +1,7 @@
-DOXYGEN Version 1.8.2
+DOXYGEN Version 1.8.2-20120930
 
 Please read the installation section of the manual 
 (http://www.doxygen.org/install.html) for instructions.
 
 --------
-Dimitri van Heesch (12 August 2012)
+Dimitri van Heesch (30 September 2012)

README

@@ -1,4 +1,4 @@
-DOXYGEN Version 1.8.2
+DOXYGEN Version 1.8.2_20120930
 
 Please read INSTALL for compilation instructions.
 
@@ -26,4 +26,4 @@ forum.
 
 Enjoy,
 
-Dimitri van Heesch ([email protected]) (12 August 2012)
+Dimitri van Heesch ([email protected]) (30 September 2012)

configure

@@ -20,7 +20,7 @@ doxygen_version_minor=8
 doxygen_version_revision=2
 
 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
-doxygen_version_mmn=NO
+doxygen_version_mmn=20120930
 
 bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
 

doc/commands.doc

@@ -55,6 +55,7 @@ documentation:
 \refitem cmdclass \\class
 \refitem cmdcode \\code
 \refitem cmdcond \\cond
+\refitem cmdcondnot \\condnot
 \refitem cmdcopybrief \\copybrief
 \refitem cmdcopydetails \\copydetails
 \refitem cmdcopydoc \\copydoc
@@ -1125,7 +1126,29 @@ class Implementation : public Intf
 The output will be different depending on whether or not \c ENABLED_SECTIONS
 contains \c TEST, or \c DEV
 
-  \sa section \ref cmdendcond "\\endcond".
+  \sa section \ref cmdcondnot "\\condnot" and section \ref cmdendcond "\\endcond".
+
+<hr>
+\section cmdcondnot \\condnot <section-label>
+
+  \addindex \\condnot
+  Starts a conditional section that ends with a corresponding
+  \ref cmdendcond "\\endcond" command, which is typically found in
+  another comment block. The main purpose of this pair of
+  commands is to (conditionally) exclude part of a file from processing
+  (in older version of doxygen this could only be achieved using C preprocessor commands).
+
+  The section between \\condnot and \\endcond commands can be excluded by
+  adding its section label to the \ref cfg_enabled_sections "ENABLED_SECTIONS"
+  configuration option.
+
+  For conditional sections within a comment block one should
+  use a \ref cmdif "\\if" ... \ref cmdendif "\\endif" block.
+
+  Conditional sections can be nested. In this case a nested section will only
+  be shown if it and its containing section are included.
+
+  \sa section \ref cmdcond "\\cond" and section \ref cmdendcond "\\endcond".
 
 <hr>
 \section cmdcopyright \\copyright { copyright description }
@@ -1197,9 +1220,9 @@ contains \c TEST, or \c DEV
 \section cmdendcond \\endcond
 
   \addindex \\endcond
-  Ends a conditional section that was started by \ref cmdcond "\\cond".
+  Ends a conditional section that was started by \ref cmdcond "\\cond" or \ref cmdcondnot "\\condnot".
 
-  \sa section \ref cmdcond "\\cond".
+  \sa section \ref cmdcond "\\cond" and section \ref cmdcondnot "\\condnot".
 
 <hr>
 \section cmdendif \\endif

doc/customize.doc

@@ -109,12 +109,19 @@ This will create 3 files:
   a HTML page. Also here special commands can be used. This file contain the 
   link to www.doxygen.org and the body and html end tags.
 - customdoxygen.css is the default cascading style sheet
-  used by doxygen. 
+  used by doxygen. It is recommended only to look into this file and overrule
+  some settings you like by putting them in a separate stylesheet and
+  referencing that extra file 
+  via \ref cfg_html_extra_stylesheet "HTML_EXTRA_STYLESHEET".
 
 You should edit these files and then reference them from the config file.
 - \ref cfg_html_header "HTML_HEADER" = \c header.html
 - \ref cfg_html_footer "HTML_FOOTER" = \c footer.html
-- \ref cfg_html_stylesheet "HTML_STYLESHEET" = \c customdoxygen.css
+- \ref cfg_html_stylesheet "HTML_STYLESHEET" = \c customdoxygen.css <b>&larr;obsolete</b>
+
+\note it is not longer recommended to use HTML_STYLESHEET this way,
+as it make it difficult to upgrade to a newer version of doxygen. Use
+\ref cfg_html_extra_stylesheet "HTML_EXTRA_STYLESHEET" instead.
 
 See the documentation of the \ref cfg_html_header "HTML_HEADER" tag
 for more information about the possible meta commands you can use inside

doc/faq.doc

@@ -80,7 +80,7 @@ document either the class or namespace.
 <li><b>How can I make doxygen ignore some code fragment?</b>
 
 The new and easiest way is to add one comment block 
-with a \ref cmdcond "\\cond" command at the start and one comment block 
+with a \ref cmdcond "\\cond" or \ref cmdcondnot "\\condnot" command at the start and one comment block 
 with a \ref cmdendcond "\\endcond" command at the end of the piece of
 code that should be ignored. This should be within the same file of course.
 

doc/language.doc

@@ -23,7 +23,7 @@ text fragments, generated by doxygen, can be produced in languages other
 than English (the default). The output language is chosen through the
 configuration file (with default name and known as Doxyfile).
 
-Currently (version 1.8.1.2), 39 languages 
+Currently (version 1.8.2), 39 languages 
 are supported (sorted alphabetically):
 Afrikaans, Arabic, Armenian, Brazilian Portuguese, Catalan, Chinese,
 Chinese Traditional, Croatian, Czech, Danish, Dutch, English,

doc/translator_report.txt

@@ -1,4 +1,4 @@
-(1.8.1.2)
+(1.8.2)
 
 Doxygen supports the following 39 languages (sorted alphabetically):
 

qtools/qarray.h

@@ -55,19 +55,19 @@ template<class type> class Q_EXPORT QArray : public QGArray
 
 public:
     QArray() {}
-    QArray( int size ) : QGArray(size*sizeof(type)) {}
+    QArray( int size ) : QGArray(size*(int)sizeof(type)) {}
     QArray( const QArray<type> &a ) : QGArray(a) {}
    ~QArray() {}
     QArray<type> &operator=(const QArray<type> &a)
 				{ return (QArray<type>&)QGArray::assign(a); }
     type *data()    const	{ return (type *)QGArray::data(); }
     uint  nrefs()   const	{ return QGArray::nrefs(); }
-    uint  size()    const	{ return QGArray::size()/sizeof(type); }
+    uint  size()    const	{ return QGArray::size()/(int)sizeof(type); }
     uint  count()   const 	{ return size(); }
     bool  isEmpty() const	{ return QGArray::size() == 0; }
     bool  isNull()  const	{ return QGArray::data() == 0; }
-    bool  resize( uint size )	{ return QGArray::resize(size*sizeof(type)); }
-    bool  truncate( uint pos )	{ return QGArray::resize(pos*sizeof(type)); }
+    bool  resize( uint size )	{ return QGArray::resize(size*(int)sizeof(type)); }
+    bool  truncate( uint pos )	{ return QGArray::resize(pos*(int)sizeof(type)); }
     bool  fill( const type &d, int size = -1 )
 	{ return QGArray::fill((char*)&d,size,sizeof(type) ); }
     void  detach()		{ QGArray::detach(); }
@@ -94,9 +94,9 @@ template<class type> class Q_EXPORT QArray : public QGArray
     int  bsearch( const type &d ) const
 	{ return QGArray::bsearch((const char*)&d,sizeof(type)); }
     type& operator[]( int i ) const
-	{ return (type &)(*(type *)QGArray::at(i*sizeof(type))); }
+	{ return (type &)(*(type *)QGArray::at(i*(int)sizeof(type))); }
     type& at( uint i ) const
-	{ return (type &)(*(type *)QGArray::at(i*sizeof(type))); }
+	{ return (type &)(*(type *)QGArray::at(i*(int)sizeof(type))); }
 	 operator const type*() const { return (const type *)QGArray::data(); }
     bool operator==( const QArray<type> &a ) const { return isEqual(a); }
     bool operator!=( const QArray<type> &a ) const { return !isEqual(a); }

qtools/qbuffer.cpp

@@ -375,7 +375,7 @@ int QBuffer::readLine( char *p, uint maxlen )
 	    break;
     }
     *p = '\0';
-    ioIndex = d - a.data();
+    ioIndex = (int)(d - a.data());
     return (uint)ioIndex - start;
 }
 

qtools/qdatastream.cpp

@@ -412,7 +412,7 @@ static Q_INT32 read_int_ascii( QDataStream *s )
 	n++;
     }
     buf[n] = '\0';
-    return atol( buf );
+    return (Q_INT32)atol( buf );
 }
 
 

qtools/qdir.cpp

@@ -1184,7 +1184,7 @@ int qt_cmp_si( const void *n1, const void *n2 )
 
     if ( r == 0 ) {
 	// Enforce an order - the order the items appear in the array
-	r = (char*)n1 - (char*)n2;
+	r = (int)((char*)n1 - (char*)n2);
     }
 
     if ( qt_cmp_si_sortSpec & QDir::Reversed )

qtools/qfile_unix.cpp

@@ -403,7 +403,7 @@ uint QFile::size() const
     } else {
 	STAT( QFile::encodeName(fn), &st );
     }
-    return st.st_size;
+    return (uint)st.st_size;
 }
 
 /*!
@@ -500,13 +500,13 @@ int QFile::readBlock( char *p, uint len )
 
     if ( nread < (int)len ) {
 	if ( isRaw() ) {				// raw file
-	    nread += READ( fd, p, len-nread );
+	    nread += (int)READ( fd, p, len-nread );
 	    if ( len && nread <= 0 ) {
 		nread = 0;
 		setStatus(IO_ReadError);
 	    }
 	} else {					// buffered file
-	    nread += fread( p, 1, len-nread, fh );
+	    nread += (int)fread( p, 1, len-nread, fh );
 	    if ( (uint)nread != len ) {
 		if ( ferror( fh ) || nread==0 )
 		    setStatus(IO_ReadError);
@@ -552,9 +552,9 @@ int QFile::writeBlock( const char *p, uint len )
 #endif
     int nwritten;				// number of bytes written
     if ( isRaw() )				// raw file
-	nwritten = WRITE( fd, p, len );
+	nwritten = (int)WRITE( fd, p, len );
     else					// buffered file
-	nwritten = fwrite( p, 1, len, fh );
+	nwritten = (int)fwrite( p, 1, len, fh );
     if ( nwritten != (int)len ) {		// write error
 	if ( errno == ENOSPC )			// disk is full
 	    setStatus( IO_ResourceError );
@@ -661,7 +661,7 @@ bool QFile::seek( int64 pos )
   if (isOpen())
   {
     // TODO: support 64 bit size
-    return fseek( fh, pos, SEEK_SET )!=-1;
+    return fseek( fh, (long)pos, SEEK_SET )!=-1;
   }
   return FALSE;
 }

qtools/qfileinfo_unix.cpp

@@ -124,7 +124,7 @@ QString QFileInfo::readLink() const
     char s[PATH_MAX+1];
     if ( !isSymLink() )
 	return QString();
-    int len = readlink( QFile::encodeName(fn).data(), s, PATH_MAX );
+    int len = (int)readlink( QFile::encodeName(fn).data(), s, PATH_MAX );
     if ( len >= 0 ) {
 	s[len] = '\0';
 	r = QFile::decodeName(s);
@@ -297,7 +297,7 @@ QDateTime QFileInfo::lastModified() const
     if ( !fic || !cache )
 	doStat();
     if ( fic )
-	dt.setTime_t( fic->st.st_mtime );
+	dt.setTime_t( (uint)fic->st.st_mtime );
     return dt;
 }
 
@@ -316,7 +316,7 @@ QDateTime QFileInfo::lastRead() const
     if ( !fic || !cache )
 	doStat();
     if ( fic )
-	dt.setTime_t( fic->st.st_atime );
+	dt.setTime_t( (uint)fic->st.st_atime );
     return dt;
 }
 

qtools/qregexp.cpp

@@ -525,7 +525,7 @@ static int matchstring( uint *rxd, const char *str, uint strlength,
 		while ( p >= first_p ) {	// go backwards
 		    int end = matchstring( d, p, pl, bol, cs );
 		    if ( end >= 0 )
-			return ( p - start ) + end;
+			return ( (int)(p - start) ) + end;
 		    if ( !p )
 			return -1;
 		    --p;
@@ -587,7 +587,7 @@ static int matchstring( uint *rxd, const char *str, uint strlength,
 		while ( p >= first_p ) {	// go backwards
 		    int end = matchstring( d, p, pl, bol, cs );
 		    if ( end >= 0 )
-			return ( p - start ) + end;
+			return ( (int)(p - start) ) + end;
 		    if ( !p )
 			return -1;
 		    --p;
@@ -600,7 +600,7 @@ static int matchstring( uint *rxd, const char *str, uint strlength,
 		return -1;
 	}
     }
-    return p - start;
+    return (int)(p - start);
 }
 
 
@@ -1043,7 +1043,7 @@ void QRegExp::compile()
 			error = PatSyntax;
 			return;
 		}
-		int ddiff = d - prev_d;
+		int ddiff = (int)(d - prev_d);
 		if ( *p == '+' ) {		// convert to Kleene closure
 		    if ( d + ddiff >= rxarray + maxlen ) {
 			error = PatOverflow;	// pattern too long
@@ -1082,7 +1082,7 @@ void QRegExp::compile()
 	}
     }
     GEN( END );
-    int len = d - rxarray;
+    int len = (int)(d - rxarray);
     rxdata = new uint[ len ];			// copy from rxarray to rxdata
     CHECK_PTR( rxdata );
     memcpy( rxdata, rxarray, len*sizeof(uint) );

qtools/qstring.cpp

@@ -13535,7 +13535,7 @@ QString &QString::insert( uint index, const QChar* s, uint len )
     uint olen = length();
     int nlen = olen + len;
 
-    int df = s - d->unicode; // ### pointer subtraction, cast down to int
+    int df = (int)(s - d->unicode); // ### pointer subtraction, cast down to int
     if ( df >= 0 && (uint)df < d->maxl ) {
 	// Part of me - take a copy.
 	QChar *tmp = QT_ALLOC_QCHAR_VEC( len );
@@ -13679,7 +13679,7 @@ QString &QString::replace( uint index, uint len, const QChar* s, uint slen )
 	real_detach();
 	memcpy( d->unicode+index, s, len*sizeof(QChar) );
     } else {
-	int df = s - d->unicode; // ### pointer subtraction, cast down to int
+	int df = (int)(s - d->unicode); // ### pointer subtraction, cast down to int
 	if ( df >= 0 && (uint)df < d->maxl ) {
 	    // Part of me - take a copy.
 	    QChar *tmp = QT_ALLOC_QCHAR_VEC( slen );
@@ -15017,7 +15017,7 @@ QDataStream &operator<<( QDataStream &s, const QString &str )
 	if ( ub || s.version() < 3 ) {
 	    if ( QChar::networkOrdered() ==
 		    (s.byteOrder()==QDataStream::BigEndian) ) {
-		s.writeBytes( ub, sizeof(QChar)*str.length() );
+		s.writeBytes( ub, (int)sizeof(QChar)*str.length() );
 	    } else {
 		static const uint auto_size = 1024;
 		char t[auto_size];
@@ -15034,7 +15034,7 @@ QDataStream &operator<<( QDataStream &s, const QString &str )
 		    *c++ = ub[0];
 		    ub+=sizeof(QChar);
 		}
-		s.writeBytes( b, sizeof(QChar)*str.length() );
+		s.writeBytes( b, (int)sizeof(QChar)*str.length() );
 		if ( str.length()*sizeof(QChar) > auto_size )
 		    delete [] b;
 	    }

qtools/qtextcodec.cpp

@@ -931,11 +931,11 @@ static int getByte(char* &cursor)
     int byte = 0;
     if ( *cursor ) {
         if ( cursor[1] == 'x' )
-            byte = strtol(cursor+2,&cursor,16);
+            byte = (int)strtol(cursor+2,&cursor,16);
         else if ( cursor[1] == 'd' )
-            byte = strtol(cursor+2,&cursor,10);
+            byte = (int)strtol(cursor+2,&cursor,10);
         else
-            byte = strtol(cursor+2,&cursor,8);
+            byte = (int)strtol(cursor+2,&cursor,8);
     }
     return byte&0xff;
 }
@@ -1017,7 +1017,7 @@ class QTextCodecFromIOD : public QTextCodec {
                         cursor[2]>='0' && cursor[2]<='9' &&
                         cursor[3]>='0' && cursor[3]<='9') {
 
-                        unicode = strtol(cursor+2,&cursor,16);
+                        unicode = (int)strtol(cursor+2,&cursor,16);
 
                     } else if (*cursor==esc) {