Unify naming for chm internal files, no function change.

Author: gonwan

lib/libebook/ebook_chm.cpp

@@ -57,7 +57,7 @@ EBook_CHM::EBook_CHM()
 	m_filename = m_font = QString();
 
 	m_textCodec = 0;
-	m_textCodecForSpecialFiles = 0;
+	m_textCodecForInternalFiles = 0;
 	m_detectedLCID = 0;
 	m_currentEncoding = "UTF-8";
 	m_htmlEntityDecoder = 0;
@@ -84,7 +84,7 @@ void EBook_CHM::close()
 	m_indexFile.clear();
 
 	m_textCodec = 0;
-	m_textCodecForSpecialFiles = 0;
+	m_textCodecForInternalFiles = 0;
 	m_detectedLCID = 0;
 	m_currentEncoding = "UTF-8";
 	m_lookupTablesValid = false;
@@ -212,21 +212,6 @@ bool EBook_CHM::getFileContentAsBinary( QByteArray& data, const QUrl& url ) cons
 	return getBinaryContent( data, urlToPath( url ) );
 }
 
-bool EBook_CHM::getBinaryContent( QByteArray& data, const QString& url ) const
-{
-	chmUnitInfo ui;
-
-	if ( !ResolveObject( url, &ui ) )
-		return false;
-
-	data.resize( ui.length );
-
-	if ( RetrieveObject( &ui, ( unsigned char* ) data.data(), 0, ui.length ) )
-		return true;
-
-	return false;
-}
-
 bool EBook_CHM::getTextContent( QString& str, const QString& url, bool internal_encoding ) const
 {
 	QByteArray buf;
@@ -248,6 +233,21 @@ bool EBook_CHM::getTextContent( QString& str, const QString& url, bool internal_
 	return false;
 }
 
+bool EBook_CHM::getBinaryContent( QByteArray& data, const QString& url ) const
+{
+	chmUnitInfo ui;
+
+	if ( !ResolveObject( url, &ui ) )
+		return false;
+
+	data.resize( ui.length );
+
+	if ( RetrieveObject( &ui, ( unsigned char* ) data.data(), 0, ui.length ) )
+		return true;
+
+	return false;
+}
+
 int EBook_CHM::getContentSize( const QString& url )
 {
 	chmUnitInfo ui;
@@ -290,7 +290,7 @@ bool EBook_CHM::load( const QString& archiveName )
 
 	// Reset encoding
 	m_textCodec = 0;
-	m_textCodecForSpecialFiles = 0;
+	m_textCodecForInternalFiles = 0;
 	m_currentEncoding = "UTF-8";
 
 	// Get information from /#WINDOWS and /#SYSTEM files (encoding, title, context file and so)
@@ -892,7 +892,7 @@ bool EBook_CHM::changeFileEncoding( const QString& qtencoding )
 	if ( p != -1 )
 	{
 		QString global = qtencoding.left( p );
-		QString special = qtencoding.mid( p + 1 );
+		QString internal = qtencoding.mid( p + 1 );
 
 		m_textCodec = QTextCodec::codecForName( global.toUtf8() );
 
@@ -902,17 +902,17 @@ bool EBook_CHM::changeFileEncoding( const QString& qtencoding )
 			return false;
 		}
 
-		m_textCodecForSpecialFiles = QTextCodec::codecForName( special.toUtf8() );
+		m_textCodecForInternalFiles = QTextCodec::codecForName( internal.toUtf8() );
 
-		if ( !m_textCodecForSpecialFiles )
+		if ( !m_textCodecForInternalFiles )
 		{
-			qWarning( "Could not set up Text Codec for encoding '%s'", qPrintable( special ) );
+			qWarning( "Could not set up Text Codec for encoding '%s'", qPrintable( internal ) );
 			return false;
 		}
 	}
 	else
 	{
-		m_textCodecForSpecialFiles = m_textCodec = QTextCodec::codecForName( qtencoding.toUtf8() );
+		m_textCodecForInternalFiles = m_textCodec = QTextCodec::codecForName( qtencoding.toUtf8() );
 
 		if ( !m_textCodec )
 		{

lib/libebook/ebook_chm.h

@@ -248,14 +248,14 @@ class EBook_CHM : public EBook
 		//! Or return as-is, if not.
 		inline QString encodeInternalWithCurrentCodec( const QByteArray& str ) const
 		{
-			return ( m_textCodecForSpecialFiles ? m_textCodecForSpecialFiles->toUnicode( str.constData() ) : str );
+			return ( m_textCodecForInternalFiles ? m_textCodecForInternalFiles->toUnicode( str.constData() ) : str );
 		}
 
 		//! Encode the string from internal files with the currently selected text codec, if possible.
 		//! Or return as-is, if not.
 		inline QString encodeInternalWithCurrentCodec( const char* str ) const
 		{
-			return ( m_textCodecForSpecialFiles ? m_textCodecForSpecialFiles->toUnicode( str ) : ( QString ) str );
+			return ( m_textCodecForInternalFiles ? m_textCodecForInternalFiles->toUnicode( str ) : ( QString ) str );
 		}
 
 		//! Helper. Translates from Win32 encodings to generic wxWidgets ones.
@@ -264,8 +264,8 @@ class EBook_CHM : public EBook
 		//! Parse the HHC or HHS file, and fill the context (asIndex is false) or index (asIndex is true) array.
 		bool        parseFileAndFillArray( const QString& file, QList< ParsedEntry >& data, bool asIndex ) const;
 
-		bool        getBinaryContent( QByteArray& data, const QString& url ) const;
 		bool        getTextContent( QString& str, const QString& url, bool internal_encoding = false ) const;
+		bool        getBinaryContent( QByteArray& data, const QString& url ) const;
 
 		/*!
 		 * Parse binary TOC
@@ -328,7 +328,7 @@ class EBook_CHM : public EBook
 
 		//! Chosen text codec
 		QTextCodec* m_textCodec;
-		QTextCodec* m_textCodecForSpecialFiles;
+		QTextCodec* m_textCodecForInternalFiles;
 
 		//! Current encoding
 		QString     m_currentEncoding;